From 6bb8f311eac13437184d51a7d02730901400e4ff Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 13 Apr 2026 09:16:39 +0900 Subject: [PATCH 01/10] Add support for creating new folder comparisons directly from the "New" menu (both 2-pane and 3-pane). --- Src/DirDoc.cpp | 3 +- Src/DirView.cpp | 15 +- Src/HexMergeDoc.cpp | 4 +- Src/ImgMergeFrm.cpp | 4 +- Src/MainFrm.cpp | 46 +- Src/MainFrm.h | 6 + Src/Merge.cpp | 2 + Src/Merge.rc | 11 + Src/Merge2.rc | 1 + Src/MergeCmdLineInfo.cpp | 2 + Src/MergeCmdLineInfo.h | 2 + Src/MergeDoc.cpp | 2 +- Src/OpenView.cpp | 4 +- Src/PropShell.cpp | 15 +- Src/WebPageDiffFrm.cpp | 4 +- Src/res/new_folder.bmp | Bin 0 -> 774 bytes Src/resource.h | 53 +- Translations/WinMerge/Arabic.po | 3117 +++++++++--------- Translations/WinMerge/Basque.po | 3117 +++++++++--------- Translations/WinMerge/Brazilian.po | 3117 +++++++++--------- Translations/WinMerge/Bulgarian.po | 3117 +++++++++--------- Translations/WinMerge/Catalan.po | 3117 +++++++++--------- Translations/WinMerge/ChineseSimplified.po | 3117 +++++++++--------- Translations/WinMerge/ChineseTraditional.po | 3117 +++++++++--------- Translations/WinMerge/Corsican.po | 3117 +++++++++--------- Translations/WinMerge/Croatian.po | 3117 +++++++++--------- Translations/WinMerge/Czech.po | 3117 +++++++++--------- Translations/WinMerge/Danish.po | 3117 +++++++++--------- Translations/WinMerge/Dutch.po | 3117 +++++++++--------- Translations/WinMerge/English.pot | 3119 ++++++++++--------- Translations/WinMerge/Finnish.po | 3117 +++++++++--------- Translations/WinMerge/French.po | 3117 +++++++++--------- Translations/WinMerge/Galician.po | 3117 +++++++++--------- Translations/WinMerge/German.po | 3117 +++++++++--------- Translations/WinMerge/Greek.po | 3117 +++++++++--------- Translations/WinMerge/Hebrew.po | 3117 +++++++++--------- Translations/WinMerge/Hungarian.po | 3117 +++++++++--------- Translations/WinMerge/Italian.po | 3117 +++++++++--------- Translations/WinMerge/Japanese.po | 3117 +++++++++--------- Translations/WinMerge/Korean.po | 3117 +++++++++--------- Translations/WinMerge/Lithuanian.po | 3117 +++++++++--------- Translations/WinMerge/Norwegian.po | 3117 +++++++++--------- Translations/WinMerge/Persian.po | 3117 +++++++++--------- Translations/WinMerge/Polish.po | 3117 +++++++++--------- Translations/WinMerge/Portuguese.po | 3117 +++++++++--------- Translations/WinMerge/Romanian.po | 3117 +++++++++--------- Translations/WinMerge/Russian.po | 3117 +++++++++--------- Translations/WinMerge/Serbian.po | 3117 +++++++++--------- Translations/WinMerge/Sinhala.po | 3117 +++++++++--------- Translations/WinMerge/Slovak.po | 3117 +++++++++--------- Translations/WinMerge/Slovenian.po | 3117 +++++++++--------- Translations/WinMerge/Spanish.po | 3117 +++++++++--------- Translations/WinMerge/Swedish.po | 3117 +++++++++--------- Translations/WinMerge/Tamil.po | 3117 +++++++++--------- Translations/WinMerge/Turkish.po | 3117 +++++++++--------- Translations/WinMerge/Ukrainian.po | 3117 +++++++++--------- Translations/WinMerge/Vietnamese.po | 3117 +++++++++--------- 57 files changed, 62685 insertions(+), 62171 deletions(-) create mode 100644 Src/res/new_folder.bmp 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 8f2cfc5ded7..23a5089886b 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); } @@ -4338,7 +4339,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)) @@ -4483,7 +4484,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)) { @@ -4521,7 +4522,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 d293d505193..7d28e1d8705 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 72c0f3e4430..1b00cc3a2d4 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 8f36b6f05d8..18581437646 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -111,11 +111,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 +252,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 +732,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 +856,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(pDirDoc, 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 +900,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(pDirDoc, 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 +1181,14 @@ 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*/) +{ + return true; +} + /** * @brief Show GNU licence information in notepad (local file) or in Web Browser */ @@ -2149,7 +2168,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, _T(""), GetOptionsMgr()->GetBool(OPT_CMP_INCLUDE_SUBDIRS)); } /** diff --git a/Src/MainFrm.h b/Src/MainFrm.h index f8335282a10..17ea28e32d0 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; @@ -209,6 +210,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); void UpdateTitleBarAndTabBar(); void UpdateResources(); @@ -373,6 +378,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 01e133499ad..cfc538f8082 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..70270fa5a17 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 "&Folder", 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 "&Folder", 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 "&Folder", 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/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 3907510399c..7e805b5ee29 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 3cbe4e63799..f1cb5701356 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 6273cffc62a..ece5dade397 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 0000000000000000000000000000000000000000..1fbc3090fbfd9087e9ec48c1bc35a5cc43dccfde GIT binary patch literal 774 zcmZ?rWn*Rl12Z700mK48%n!tj3=%++f#CuZ1H%zM2nGuPiT@1$X^nV_mJ&p8H%QDn zCOzl)od5r`uj51-Gxq}xglGY(mz;I1^2rCFmg>jY(Ea~To9;" 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,4393 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4872,7 @@ msgstr "" "مستندات جديدة (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4875,7 +4881,7 @@ msgstr "" "فتح(Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4884,27 +4890,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 +4919,7 @@ msgstr "" "تراجع (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4922,7 +4928,7 @@ msgstr "" "إعادة الأمر" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4941,7 +4947,7 @@ msgstr "" "مقارنة الملف عبر WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4960,7 +4966,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 +4974,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 +5133,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 +5172,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 +5304,7 @@ msgstr "" "\n" "يرجى التأكد من وجود المجلد والتأكد من وجود الصلاحية للكتابة فيه." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5308,7 +5314,7 @@ msgstr "" "\n" "يرجى اختيار مجلد المرشحات من قائمة الخيارات أو قائمة النظام." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5322,11 +5328,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 +5343,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 +5361,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 +5585,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 +5599,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 +5640,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 +5651,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 +5661,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 +5677,7 @@ msgstr "" "هل تريد حفظ النسخة التي تم فك تحزيمها إلى ملف آخر؟" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5688,7 +5694,7 @@ msgstr "" "البرنامج الآخر)؟" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5698,7 +5704,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 +5715,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 +5742,7 @@ msgstr "" "أختفى. يرجى حفظ نسخ من الملف للإستمرر." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5747,186 +5753,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 +5944,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 +5974,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 +6776,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 +6853,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 +6898,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 +6954,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 +7057,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 +7072,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 +7113,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 +7159,7 @@ msgstr "" "الاختلاف في السطر الحالي (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7162,7 +7168,7 @@ msgstr "" "الخيارات" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7171,7 +7177,7 @@ msgstr "" "تحديث (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7180,7 +7186,7 @@ msgstr "" "الاختلاف السابق (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7189,7 +7195,7 @@ msgstr "" "الاختلاف التالي (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7198,7 +7204,7 @@ msgstr "" "التضارب السابق (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7207,7 +7213,7 @@ msgstr "" "التضارب التالي (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7216,7 +7222,7 @@ msgstr "" "الاختلاف الأول (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7225,7 +7231,7 @@ msgstr "" "الاختلاف الحالي (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7234,37 +7240,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 +7279,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 +7340,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 +7469,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..9e75a2d9e83 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,4889 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +5407,7 @@ msgstr "" "WinMerge Agiri Alderaketa" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5421,183 +5427,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 +5612,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 +5795,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 +5806,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 +5820,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 +5837,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 +5857,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 +6104,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 +6119,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 +6161,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 +6172,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 +6182,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 +6198,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 +6214,7 @@ msgstr "" "Gainidatzi aldatutako agiria?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6218,7 +6224,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 +6235,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 +6265,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 +6277,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 +6471,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 +6502,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 +7383,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 +7448,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 +7471,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 +7517,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 +7685,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 +7699,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 +7747,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..894f1b192aa 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,7594 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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..db9bfc5c247 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,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4088,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 +4097,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 +4868,7 @@ msgstr "" "Нови документи (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4871,7 +4877,7 @@ msgstr "" "Отваряне (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4880,27 +4886,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 +4915,7 @@ msgstr "" "Отменяне (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4918,7 +4924,7 @@ msgstr "" "Повтаряне (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4937,7 +4943,7 @@ msgstr "" "Сравняване на файлове с WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4956,317 +4962,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 +5285,7 @@ msgstr "" "Kопирайте файла %1 в папката WinMerge/Filters:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5292,7 +5298,7 @@ msgstr "" "\n" "Уверете се че папката съществува и в нея може да се запазва." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5302,7 +5308,7 @@ msgstr "" "\n" "Изберете папка за филтри в Настройки/Системни." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5316,11 +5322,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 +5337,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 +5358,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 +5582,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 +5599,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 +5608,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 +5643,7 @@ msgstr "" "Продължаване?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5652,7 +5658,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 +5669,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 +5680,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 +5692,7 @@ msgstr "" "Изходният файл няма да бъде променян. Запазване на непакетираната версия?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5702,7 +5708,7 @@ msgstr "" "Желаете ли файлът да бъде презаписан?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5712,7 +5718,7 @@ msgstr "" "е само за четене. Презаписване?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5728,22 +5734,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 +5761,7 @@ msgstr "" "не е намерен. Запазете негово копие и продължете." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5766,188 +5772,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 +5965,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 +5996,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 +6796,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 +6856,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 +6878,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 +6923,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 +6977,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 +7080,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 +7096,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 +7137,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 +7183,7 @@ msgstr "" "Различия на текущия ред (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7186,7 +7192,7 @@ msgstr "" "Настройки" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7195,7 +7201,7 @@ msgstr "" "Презареждане (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7204,7 +7210,7 @@ msgstr "" "Предишно различие (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7213,7 +7219,7 @@ msgstr "" "Следващо различие (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7222,7 +7228,7 @@ msgstr "" "Предишен конфликт (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7231,7 +7237,7 @@ msgstr "" "Следващ конфликт (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7240,7 +7246,7 @@ msgstr "" "Първо различие (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7249,7 +7255,7 @@ msgstr "" "Текущо различие (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7258,7 +7264,7 @@ msgstr "" "Последно различие (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7267,7 +7273,7 @@ msgstr "" "Копира вдясно (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7276,7 +7282,7 @@ msgstr "" "Копира вляво (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7285,7 +7291,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 +7300,7 @@ msgstr "" "Копира вляво и продължава (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7303,7 +7309,7 @@ msgstr "" "Копира всичко вдясно" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7312,7 +7318,7 @@ msgstr "" "Копира всичко вляво" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7321,7 +7327,7 @@ msgstr "" "Автоматично сливане (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7330,7 +7336,7 @@ msgstr "" "Първи файл" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7339,7 +7345,7 @@ msgstr "" "Следващ файл (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7348,7 +7354,7 @@ msgstr "" "Последен файл" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7357,37 +7363,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 +7403,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 +7532,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 +8134,7 @@ msgid "" msgstr "" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8132,7 +8143,7 @@ msgid "" msgstr "" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8142,7 +8153,7 @@ msgid "" msgstr "" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8152,7 +8163,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 +8172,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 +8181,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..df540b9bb09 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,3976 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4481,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 +4490,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 +5350,7 @@ msgstr "" "Nous documents (Control+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 #, c-format msgid "" "\n" @@ -5354,7 +5360,7 @@ msgstr "" "Obre (Control+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 #, c-format msgid "" "\n" @@ -5364,29 +5370,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 +5402,7 @@ msgstr "" "Desfés (Control+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 #, c-format msgid "" "\n" @@ -5406,7 +5412,7 @@ msgstr "" "Refés (Control+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 #, c-format msgid "" "\n" @@ -5426,7 +5432,7 @@ msgstr "" "WinMerge File Compare" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5446,183 +5452,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 +5637,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 +5815,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 +5828,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 +5839,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 +5853,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 +5870,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 +5893,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 +6140,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 +6155,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 +6164,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 +6201,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 +6212,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 +6222,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 +6232,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 +6243,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 +6259,7 @@ msgstr "" "Voleu sobreescriure el fitxer?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6263,7 +6269,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 +6280,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 +6310,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 +6322,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 +6516,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 +6547,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 +6598,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 +7432,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 +7497,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 +7520,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 +7566,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 +7626,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 +7738,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 +7755,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 +7803,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 +7854,7 @@ msgstr "" "Diferència en la línia actual (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 #, c-format msgid "" "\n" @@ -7858,7 +7864,7 @@ msgstr "" "Opcions" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 #, c-format msgid "" "\n" @@ -7868,7 +7874,7 @@ msgstr "" "Actualitza (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 #, c-format msgid "" "\n" @@ -7878,7 +7884,7 @@ msgstr "" "Diferència anterior (Alt+Amunt)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 #, c-format msgid "" "\n" @@ -7888,7 +7894,7 @@ msgstr "" "Diferència següent (Alt+Avall)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 #, c-format msgid "" "\n" @@ -7898,7 +7904,7 @@ msgstr "" "Conflicte anterior (Alt+Maj+Amunt)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 #, c-format msgid "" "\n" @@ -7908,7 +7914,7 @@ msgstr "" "Conflicte següent (Alt+Maj+Avall)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 #, c-format msgid "" "\n" @@ -7918,7 +7924,7 @@ msgstr "" "Primera diferència (Alt+Inici)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 #, c-format msgid "" "\n" @@ -7928,7 +7934,7 @@ msgstr "" "Diferència actual (Alt+Retorn)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 #, c-format msgid "" "\n" @@ -7938,7 +7944,7 @@ msgstr "" "Darrera diferència (Alt+Fi)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7947,7 +7953,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 +7962,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 +7971,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 +7980,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 +7989,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 +7998,7 @@ msgstr "" "Copia-ho tot a l'esquerra" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 #, c-format msgid "" "\n" @@ -8002,7 +8008,7 @@ msgstr "" "Fusiona automàticament (Control+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -8011,7 +8017,7 @@ msgstr "" "Primer fitxer" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -8020,7 +8026,7 @@ msgstr "" "Següent fitxer (Control+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -8029,7 +8035,7 @@ msgstr "" "Darrer fitxer" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -8038,39 +8044,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 +8086,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 +8231,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 +8719,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..ee192c64d2a 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,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4095,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 +4104,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 +4875,7 @@ msgstr "" "新建文档 (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4878,7 +4884,7 @@ msgstr "" "打开 (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4887,27 +4893,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 +4922,7 @@ msgstr "" "撤销 (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4925,7 +4931,7 @@ msgstr "" "重做 (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4944,7 +4950,7 @@ msgstr "" "WinMerge 文件比较" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4963,162 +4969,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 +5133,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 +5294,7 @@ msgstr "" "\n" "请将文件 %1 复制到 WinMerge/Filters 文件夹下。" -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5301,7 +5307,7 @@ msgstr "" "\n" "请确认此文件夹存在且可以写入。" -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5311,7 +5317,7 @@ msgstr "" "\n" "请在选项/系统中选择一个过滤器文件夹。" -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5325,11 +5331,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 +5346,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 +5367,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 +5591,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 +5608,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 +5617,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 +5652,7 @@ msgstr "" "仍要继续吗？" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5662,7 +5668,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 +5681,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 +5694,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 +5708,7 @@ msgstr "" "是否将解包版本保存为另一文件？" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5718,7 +5724,7 @@ msgstr "" "要覆盖已被修改的文件吗？" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5728,7 +5734,7 @@ msgstr "" "文件标记为只读。您要覆盖只读的文件吗？" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5743,22 +5749,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 +5776,7 @@ msgstr "" "已不存在。请保存文件的副本再继续。" #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5781,124 +5787,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 +5913,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 +5983,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 +6014,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 +6062,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 +6584,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 +6822,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 +6851,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 +6860,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 +6874,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 +6899,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 +6923,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 +6968,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 +7022,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 +7125,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 +7141,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 +7181,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 +7227,7 @@ msgstr "" "当前行中差异 (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7230,7 +7236,7 @@ msgstr "" "选项" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7239,7 +7245,7 @@ msgstr "" "刷新 (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7248,7 +7254,7 @@ msgstr "" "上一处差异 (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7257,7 +7263,7 @@ msgstr "" "下一处差异 (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7266,7 +7272,7 @@ msgstr "" "上一处冲突 (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7275,7 +7281,7 @@ msgstr "" "下一处冲突 (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7284,7 +7290,7 @@ msgstr "" "首个差异 (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7293,7 +7299,7 @@ msgstr "" "当前差异 (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7302,7 +7308,7 @@ msgstr "" "末个差异 (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7311,7 +7317,7 @@ msgstr "" "复制到右侧 (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7320,7 +7326,7 @@ msgstr "" "复制到左侧 (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7329,7 +7335,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 +7344,7 @@ msgstr "" "复制到左侧并前进 (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7347,7 +7353,7 @@ msgstr "" "全部复制到右侧" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7356,7 +7362,7 @@ msgstr "" "全部复制到左侧" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7365,7 +7371,7 @@ msgstr "" "自动合并 (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7374,7 +7380,7 @@ msgstr "" "第一个文件" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7383,7 +7389,7 @@ msgstr "" "下一个文件 (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7392,7 +7398,7 @@ msgstr "" "最后一个文件" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7401,37 +7407,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 +7447,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 +7576,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 +8063,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 +8184,7 @@ msgstr "" "(Alt+滚轮上滚)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8186,7 +8197,7 @@ msgstr "" "(Alt+滚轮下滚)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8201,7 +8212,7 @@ msgstr "" "(Alt+Shift+滚轮下滚)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8216,7 +8227,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 +8240,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 +8253,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 +8518,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..0c9c2313bd9 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,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 "網頁 (&W)" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +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." @@ -4103,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 "被分隔符號分隔的自訂數值 (&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 "當大小超過以下ＭＢ限制時，切換為快速比較 (&Q)：" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "當大小超過以下ＭＢ限制時，切換為二進制比較 (&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 +4880,7 @@ msgstr "" "新增 (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4883,7 +4889,7 @@ msgstr "" "開啟 (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4892,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)" @@ -4921,7 +4927,7 @@ msgstr "" "復原 (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4930,7 +4936,7 @@ msgstr "" "取消復原 (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4949,7 +4955,7 @@ msgstr "" "WinMerge 檔案比較" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4968,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 通用公共授權條款（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 +5137,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 +5300,7 @@ msgstr "" "請複製檔案 %1 到 WinMerge/檔案篩選器-資料夾：\n" "%2。" -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5307,7 +5313,7 @@ msgstr "" "\n" "請確定有該資料夾，而且允許寫入。" -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5317,7 +5323,7 @@ msgstr "" "\n" "請於「選項/系統」中選定檔案篩選器資料夾。" -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5331,11 +5337,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 +5352,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 +5373,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 +5597,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 +5614,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 +5623,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 +5658,7 @@ msgstr "" "仍舊繼續嗎？" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5668,7 +5674,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 +5687,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 +5700,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 +5714,7 @@ msgstr "" "您要將未封裝版本儲存成為另一檔案嗎？" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5724,7 +5730,7 @@ msgstr "" "要覆寫更新過的檔案嗎？" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5734,7 +5740,7 @@ msgstr "" "已標記成唯讀。仍要覆寫它嗎？" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5750,22 +5756,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 +5783,7 @@ msgstr "" "消失。請儲存檔案副本再繼續。" #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5785,188 +5791,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 +5984,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 +6014,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 +6062,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 +6581,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 +6819,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 +6848,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 +6857,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 +6871,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 +6896,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 +6920,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 +6965,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 +7019,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 +7125,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 +7141,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 +7182,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 +7229,7 @@ msgstr "" "選取行內差異 (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7232,7 +7238,7 @@ msgstr "" "選項" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7241,7 +7247,7 @@ msgstr "" "重整 (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7250,7 +7256,7 @@ msgstr "" "上一個差異 (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7259,7 +7265,7 @@ msgstr "" "下一個差異 (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7268,7 +7274,7 @@ msgstr "" "上一個衝突 (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7277,7 +7283,7 @@ msgstr "" "下一個衝突 (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7286,7 +7292,7 @@ msgstr "" "首個差異 (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7295,7 +7301,7 @@ msgstr "" "目前差異 (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7304,7 +7310,7 @@ msgstr "" "最後一個差異 (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7313,7 +7319,7 @@ msgstr "" "複製到右側 (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7322,7 +7328,7 @@ msgstr "" "複製到左側 (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7331,7 +7337,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 +7346,7 @@ msgstr "" "複製到左側後到下一個 (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7349,7 +7355,7 @@ msgstr "" "全部複製到右側" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7358,7 +7364,7 @@ msgstr "" "全部複製到左側" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7367,7 +7373,7 @@ msgstr "" "自動合併 (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7376,7 +7382,7 @@ msgstr "" "首個檔案" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7385,7 +7391,7 @@ msgstr "" "下個檔案 (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7394,7 +7400,7 @@ msgstr "" "最後一個檔案" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7403,37 +7409,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 +7449,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 +7579,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 +8066,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 +8187,7 @@ msgstr "" "(Alt+滾輪上滾)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8189,7 +8200,7 @@ msgstr "" "(Alt+滾輪下滾)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8204,7 +8215,7 @@ msgstr "" "(Alt+Shift+滾輪下滾)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8219,7 +8230,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 +8243,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 +8256,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 +8516,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..5fa1193e2c9 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,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4093,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 +4102,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 +4873,7 @@ msgstr "" "Novi ducumenti (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4876,7 +4882,7 @@ msgstr "" "Apre (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4885,27 +4891,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 +4920,7 @@ msgstr "" "Disfà (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4923,7 +4929,7 @@ msgstr "" "Rifà (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4942,7 +4948,7 @@ msgstr "" "Paragone WinMerge di schedariu" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4961,164 +4967,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 +5133,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 +5295,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 +5308,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 +5318,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 +5332,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 +5347,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 +5368,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 +5592,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 +5609,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 +5618,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 +5653,7 @@ msgstr "" "Cuntinuà quantunque ?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5662,7 +5668,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 +5679,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 +5690,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 +5702,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 +5718,7 @@ msgstr "" "Vulete rimpiazzallu ?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5722,7 +5728,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 +5744,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 +5771,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 +5782,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 +5908,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 +5977,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 +6008,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 +6056,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 +6578,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 +6816,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 +6845,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 +6854,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 +6868,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 +6893,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 +6915,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 +6960,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 +7014,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 +7117,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 +7133,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 +7174,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 +7220,7 @@ msgstr "" "Sfarenza nant’à a linea attuale (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7223,7 +7229,7 @@ msgstr "" "Ozzioni" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7232,7 +7238,7 @@ msgstr "" "Attualizà (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7241,7 +7247,7 @@ msgstr "" "Sfarenza precedente (Alt+Insù)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7250,7 +7256,7 @@ msgstr "" "Sfarenza seguente (Alt+Inghjò)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7259,7 +7265,7 @@ msgstr "" "Cunflittu precedente (Alt+Maius+Insù)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7268,7 +7274,7 @@ msgstr "" "Cunflittu seguente (Alt+Maius+Inghjò)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7277,7 +7283,7 @@ msgstr "" "Prima sfarenza (Alt+Accolta)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7286,7 +7292,7 @@ msgstr "" "Sfarenza currente (Alt+Entr.)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7295,7 +7301,7 @@ msgstr "" "Ultima sfarenza (Alt+Fine)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7304,7 +7310,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 +7319,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 +7328,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 +7337,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 +7346,7 @@ msgstr "" "Tuttu cupià versu a diritta" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7349,7 +7355,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 +7364,7 @@ msgstr "" "Fusione autumatica (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7367,7 +7373,7 @@ msgstr "" "Primu schedariu" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7376,7 +7382,7 @@ msgstr "" "Schedariu seguente (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7385,7 +7391,7 @@ msgstr "" "Ultimu schedariu" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7394,37 +7400,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 +7440,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 +7570,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 +8057,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 +8178,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 +8191,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 +8205,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 +8219,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 +8232,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 +8245,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 +8510,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..885da99d458 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,4890 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +5405,7 @@ msgstr "" "WinMerge Usporedba datoteka" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5419,183 +5425,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 +5610,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 +5793,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 +5804,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 +5818,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 +5835,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 +5855,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 +6102,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 +6117,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 +6159,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 +6170,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 +6180,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 +6196,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 +6212,7 @@ msgstr "" "Natpisati datoteku?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6216,7 +6222,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 +6233,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 +6263,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 +6275,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 +6469,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 +6500,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 +7381,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 +7446,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 +7469,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 +7515,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 +7683,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 +7697,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 +7745,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..792c44b6c76 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,5078 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +5582,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 +5765,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 +5776,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 +5790,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 +5807,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 +6071,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 +6125,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 +6136,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 +6146,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 +6162,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 +6178,7 @@ msgstr "" "Přepsat změněný soubor?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6182,37 +6188,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 +6230,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 +6424,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 +6455,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 +7336,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 +7460,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 +7628,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 +7643,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 +7691,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..7f838195d71 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,3954 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4458,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 +5410,7 @@ msgstr "" "WinMerge FilSammenligning" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5424,7 +5430,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 +5439,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 +5618,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 +5663,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 +5805,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 +5816,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 +5830,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 +5847,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 +5867,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 +6114,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 +6129,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 +6154,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 +6173,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 +6184,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 +6195,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 +6212,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 +6228,7 @@ msgstr "" "Vil du overskrive den ændrede fil?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6233,7 +6239,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 +6250,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 +6280,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 +6292,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 +6486,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 +6517,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 +7327,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 +7400,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 +7458,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 +7470,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 +7493,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 +7541,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 +7709,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 +7725,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 +7773,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..370598b0a63 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,2674 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +3151,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 +3700,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 +4101,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 +4110,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 +4881,7 @@ msgstr "" "Nieuwe documenten (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4884,7 +4890,7 @@ msgstr "" "Openen (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4893,27 +4899,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 +4928,7 @@ msgstr "" "Ongedaan maken (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4931,7 +4937,7 @@ msgstr "" "Opnieuw (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4950,7 +4956,7 @@ msgstr "" "WinMerge bestandsVergelijking" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4969,7 +4975,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 +4983,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 +5144,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 +5183,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 +5310,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 +5323,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 +5333,7 @@ msgstr "" "\n" "Selecteer filtermap in Opties/Systeem." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5341,11 +5347,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 +5362,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 +5383,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 +5609,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 +5623,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 +5632,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 +5651,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 +5669,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 +5680,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 +5690,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 +5700,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 +5711,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 +5727,7 @@ msgstr "" "Het gewijzigde bestand overschrijven?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5731,7 +5737,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 +5748,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 +5775,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 +5786,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 +5974,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 +6005,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 +6055,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 +6805,7 @@ msgstr "" "overschrijven?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6809,52 +6815,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 +6868,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 +6878,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 +6899,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 +6942,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 +6998,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 +7101,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 +7117,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 +7158,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 +7204,7 @@ msgstr "" "Verschil in de huidige regel (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7207,7 +7213,7 @@ msgstr "" "Opties" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7216,7 +7222,7 @@ msgstr "" "Vernieuwen (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7225,7 +7231,7 @@ msgstr "" "Vorig verschil (Alt+Omhoog)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7234,7 +7240,7 @@ msgstr "" "Volgend verschil (Alt+Omlaag)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7243,7 +7249,7 @@ msgstr "" "Vorig conflict (Alt+Shift+Omhoog)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7252,7 +7258,7 @@ msgstr "" "Volgend conflict (Alt+Shift+Omlaag)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7261,7 +7267,7 @@ msgstr "" "Eerste verschil (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7270,7 +7276,7 @@ msgstr "" "Huidig verschil (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7279,7 +7285,7 @@ msgstr "" "Laatste verschil (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7288,7 +7294,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 +7303,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 +7312,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 +7321,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 +7330,7 @@ msgstr "" "Alles naar rechts kopiëren" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7333,7 +7339,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 +7348,7 @@ msgstr "" "Automatisch samenvoegen (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7351,7 +7357,7 @@ msgstr "" "Eerste bestand" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7360,7 +7366,7 @@ msgstr "" "Volgend bestand (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7369,7 +7375,7 @@ msgstr "" "Laatste bestand" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7378,39 +7384,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 +7426,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 +7556,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 +8045,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 +8166,7 @@ msgstr "" "(Alt+Wiel omhoog)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8168,7 +8179,7 @@ msgstr "" "(Alt+Wiel omlaag)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8183,7 +8194,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 +8209,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 +8222,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 +8235,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..b00281f3d59 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-13 06:57+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,7594 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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..22498722125 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,2674 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +3152,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 +3700,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 +4878,7 @@ msgstr "" "Uudet asiakirjat (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4881,7 +4887,7 @@ msgstr "" "Avaa (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4890,27 +4896,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 +4925,7 @@ msgstr "" "Kumoa (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4928,7 +4934,7 @@ msgstr "" "Tee uudelleen (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4947,7 +4953,7 @@ msgstr "" "WinMerge File Compare" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4966,7 +4972,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 +4980,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 +5139,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 +5178,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 +5311,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 +5321,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 +5335,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 +5350,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 +5372,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 +5598,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 +5612,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 +5621,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 +5640,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 +5658,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 +5669,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 +5679,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 +5690,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 +5701,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 +5717,7 @@ msgstr "" "Korvataanko muuttunut tiedosto?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5721,7 +5727,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 +5738,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 +5765,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 +5776,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 +5967,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 +5998,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 +6047,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 +6802,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 +6866,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 +6887,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 +6930,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 +6986,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 +7090,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 +7104,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 +7145,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 +7191,7 @@ msgstr "" "Ero nykyisessä rivissä (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7194,7 +7200,7 @@ msgstr "" "Asetukset" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7203,7 +7209,7 @@ msgstr "" "Päivitä (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7212,7 +7218,7 @@ msgstr "" "Edellinen ero (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7221,7 +7227,7 @@ msgstr "" "Seuraava ero (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7230,7 +7236,7 @@ msgstr "" "Edellinen ristiriita (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7239,7 +7245,7 @@ msgstr "" "Seuraava ristiriita (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7248,7 +7254,7 @@ msgstr "" "Ensimmäinen ero (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7257,7 +7263,7 @@ msgstr "" "Nykyinen ero (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7266,37 +7272,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 +7311,7 @@ msgstr "" "Yhdistä automaattisesti (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7314,7 +7320,7 @@ msgstr "" "Ensimmäinen tiedosto" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7323,7 +7329,7 @@ msgstr "" "Seuraava tiedosto (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7332,7 +7338,7 @@ msgstr "" "Viimeinen tiedosto" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7341,39 +7347,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 +7389,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 +7518,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 +7822,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..21a4fc909b9 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,3615 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4100,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 +4109,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 +4880,7 @@ msgstr "" "Nouveaux documents (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4883,7 +4889,7 @@ msgstr "" "Ouvrir (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4892,27 +4898,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 +4927,7 @@ msgstr "" "Annuler (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4930,7 +4936,7 @@ msgstr "" "Répéter (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4949,7 +4955,7 @@ msgstr "" "Comparaison de fichier WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4968,317 +4974,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 +5297,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 +5310,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 +5320,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 +5334,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 +5349,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 +5370,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 +5594,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 +5611,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 +5620,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 +5655,7 @@ msgstr "" "Continuer quand même ?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5664,7 +5670,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 +5681,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 +5692,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 +5704,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 +5720,7 @@ msgstr "" "Écraser ?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5724,7 +5730,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 +5746,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 +5773,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 +5784,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 +5910,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 +5979,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 +6010,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 +6058,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 +6580,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 +6818,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 +6847,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 +6856,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 +6870,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 +6895,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 +6917,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 +6962,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 +7016,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 +7116,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 +7132,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 +7173,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 +7219,7 @@ msgstr "" "Différence sur la ligne courante (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7222,7 +7228,7 @@ msgstr "" "Préférences" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7231,7 +7237,7 @@ msgstr "" "Actualiser (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7240,7 +7246,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 +7255,7 @@ msgstr "" "Différence suivante (Alt+Bas)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7258,7 +7264,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 +7273,7 @@ msgstr "" "Conflit suivant (Alt+Maj+Bas)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7276,7 +7282,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 +7291,7 @@ msgstr "" "Différence courante (Alt+Entrée)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7294,7 +7300,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 +7309,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 +7318,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 +7327,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 +7336,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 +7345,7 @@ msgstr "" "Tout copier vers la Droite" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7348,7 +7354,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 +7363,7 @@ msgstr "" "Fusionner automatiquement (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7366,7 +7372,7 @@ msgstr "" "Premier fichier" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7375,7 +7381,7 @@ msgstr "" "Fichier suivant (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7384,7 +7390,7 @@ msgstr "" "Dernier fichier" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7393,37 +7399,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 +7439,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 +7569,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 +8056,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 +8177,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 +8190,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 +8205,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 +8220,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 +8233,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 +8246,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 +8512,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..64e4ed2c86b 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,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4092,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 +4101,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 +4872,7 @@ msgstr "" "Novo documento (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4875,7 +4881,7 @@ msgstr "" "Abrir (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4884,27 +4890,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 +4919,7 @@ msgstr "" "Desfacer (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4922,7 +4928,7 @@ msgstr "" "Refacer (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4941,7 +4947,7 @@ msgstr "" "Comparación de arquivos de WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4960,162 +4966,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 +5130,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 +5292,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 +5305,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 +5315,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 +5329,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 +5344,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 +5365,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 +5589,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 +5603,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 +5612,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 +5647,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 +5658,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 +5668,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 +5678,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 +5689,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 +5705,7 @@ msgstr "" "Quere sobrescribir o ficheiro cambiado?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5709,7 +5715,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 +5726,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 +5753,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 +5764,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 +5955,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 +5986,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 +6034,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 +6788,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 +6848,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 +6869,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 +6911,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 +6965,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 +7068,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 +7084,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 +7125,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 +7171,7 @@ msgstr "" "Diferenza na liña actual (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7174,7 +7180,7 @@ msgstr "" "Configuración" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7183,7 +7189,7 @@ msgstr "" "Actualizar (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7192,7 +7198,7 @@ msgstr "" "Diferenza anterior (Alt+Arriba)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7201,7 +7207,7 @@ msgstr "" "Diferenza seguinte (Alt+Abaixo)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7210,7 +7216,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 +7225,7 @@ msgstr "" "Conflito seguinte (Alt+Maiús+Abaixo)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7228,7 +7234,7 @@ msgstr "" "Primeira diferenza (Alt+Inicio)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7237,7 +7243,7 @@ msgstr "" "Diferenza actual (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7246,7 +7252,7 @@ msgstr "" "Derradeira diferenza (Alt+Fin)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7255,7 +7261,7 @@ msgstr "" "Copiar ao dereito (Alt+Dereita)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7264,7 +7270,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 +7279,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 +7288,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 +7297,7 @@ msgstr "" "Copiar todo ao dereito" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7300,7 +7306,7 @@ msgstr "" "Copiar todo ao esquerdo" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7309,7 +7315,7 @@ msgstr "" "Automesturar (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7318,7 +7324,7 @@ msgstr "" "Primeiro ficheiro" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7327,7 +7333,7 @@ msgstr "" "Seguinte ficheiro (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7336,7 +7342,7 @@ msgstr "" "Derradeiro ficheiro" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7345,37 +7351,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 +7391,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 +7520,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 +8007,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..349774ab353 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,3132 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +3640,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 +4492,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 +4501,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 +5361,7 @@ msgstr "" "Neue Dokumente" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 #, c-format msgid "" "\n" @@ -5365,7 +5371,7 @@ msgstr "" "Öffnen (Strg+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 #, c-format msgid "" "\n" @@ -5375,29 +5381,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 +5413,7 @@ msgstr "" "Rückgängig (Strg+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 #, c-format msgid "" "\n" @@ -5417,7 +5423,7 @@ msgstr "" "Wiederherstellen (Strg+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 #, c-format msgid "" "\n" @@ -5437,7 +5443,7 @@ msgstr "" "WinMerge Dateivergleich" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5457,183 +5463,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 +5648,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 +5826,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 +5839,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 +5850,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 +5864,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 +5881,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 +5904,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 +6151,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 +6169,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 +6178,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 +6215,7 @@ msgstr "" "Dennoch fortfahren?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -6225,7 +6231,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 +6244,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 +6257,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 +6271,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 +6287,7 @@ msgstr "" "Geänderte Datei überschreiben?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6291,7 +6297,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 +6313,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 +6343,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 +6355,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 +6481,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 +6554,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 +6585,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 +6614,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 +6639,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 +7208,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 +7479,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 +7511,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 +7520,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 +7534,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 +7561,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 +7587,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 +7636,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 +7696,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 +7808,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 +7825,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 +7873,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 +7924,7 @@ msgstr "" "Zeilenunterschied markieren (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 #, c-format msgid "" "\n" @@ -7928,7 +7934,7 @@ msgstr "" "Einstellungen" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 #, c-format msgid "" "\n" @@ -7938,7 +7944,7 @@ msgstr "" "Aktualisieren (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 #, c-format msgid "" "\n" @@ -7948,7 +7954,7 @@ msgstr "" "Vorheriger Unterschied (Alt+Hoch)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 #, c-format msgid "" "\n" @@ -7958,7 +7964,7 @@ msgstr "" "Nächster Unterschied (Alt+Runter)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 #, c-format msgid "" "\n" @@ -7968,7 +7974,7 @@ msgstr "" "Vorheriger Konflikt (Alt+Umschalt+Hoch)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 #, c-format msgid "" "\n" @@ -7978,7 +7984,7 @@ msgstr "" "Nächster Konflikt (Alt+Umschalt+Runter)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 #, c-format msgid "" "\n" @@ -7988,7 +7994,7 @@ msgstr "" "Erster Unterschied (Alt+Pos 1)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 #, c-format msgid "" "\n" @@ -7998,7 +8004,7 @@ msgstr "" "Aktueller Unterschied (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 #, c-format msgid "" "\n" @@ -8008,7 +8014,7 @@ msgstr "" "Letzter Unterschied (Alt+Ende)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -8017,7 +8023,7 @@ msgstr "" "Nach rechts kopieren (Alt+Rechts)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -8026,7 +8032,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 +8041,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 +8050,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 +8059,7 @@ msgstr "" "Alles nach rechts kopieren" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -8062,7 +8068,7 @@ msgstr "" "Alles nach links kopieren" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 #, c-format msgid "" "\n" @@ -8072,7 +8078,7 @@ msgstr "" "Automatisch mischen (Strg+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -8081,7 +8087,7 @@ msgstr "" "Erste Datei" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -8090,7 +8096,7 @@ msgstr "" "Nächste Datei (Strg+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -8099,7 +8105,7 @@ msgstr "" "Letzte Datei" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -8108,39 +8114,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 +8156,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 +8301,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 +8789,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 +8910,7 @@ msgstr "" "(Alt+Mausrad Hoch)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8912,7 +8923,7 @@ msgstr "" "(Alt+Mausrad Runter)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8927,7 +8938,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 +8953,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 +8966,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 +8979,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 +9244,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..23a403a7c91 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,4888 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +5402,7 @@ msgstr "" "Σύγκριση Αρχείων WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5416,183 +5422,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 +5607,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 +5790,7 @@ msgstr "" "\n" "Παρακαλώ βεβαιωθείτε ότι ο φάκελος υπάρχει και δεν έχει την ιδιότητα \"Μόνο για Ανάγνωση\"." -#: Merge.rc:4343 +#: Merge.rc:4353 #, c-format msgid "" "User's filter folder is not defined!\n" @@ -5795,7 +5801,7 @@ msgstr "" "\n" "Παρακαλώ επιλέξτε φάκελο αρχείων από Επιλογές/Σύστημα." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5809,12 +5815,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 +5832,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 +6096,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 +6111,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 +6153,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 +6164,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 +6174,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 +6190,7 @@ msgstr "" "Επιθυμείτε να αποθηκεύσετε το αποσυμπιεσμένο αρχείο ως διαφορετικό αρχείο;" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -6200,7 +6206,7 @@ msgstr "" "Αντικατάσταση μεταβληθέντος αρχείου?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6210,37 +6216,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 +6258,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 +6452,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 +6483,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 +7364,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 +7429,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 +7452,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 +7498,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 +7666,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 +7680,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 +7728,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..4a70719de56 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,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4089,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 +4098,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 +4904,7 @@ msgstr "" "ביטול (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4907,7 +4913,7 @@ msgstr "" "חזור (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4926,7 +4932,7 @@ msgstr "" "WinMerge השוואת קבצים" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4945,162 +4951,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 +5115,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 +5277,7 @@ msgstr "" "אנא העתק את הקובץ %1 לתיקיית WinMerge/Filters:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5284,7 +5290,7 @@ msgstr "" "\n" "אנא ודא שהתיקיה קיימת וניתן לכתוב בה." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5294,7 +5300,7 @@ msgstr "" "\n" "אנא בחר תיקיית מסננים באפשרויות/מערכת." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5308,241 +5314,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 +5562,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 +5576,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 +5585,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 +5620,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 +5631,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 +6691,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 +6954,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 +6970,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 +7011,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 +7057,7 @@ msgstr "" "הבדל בשורה הנוכחית (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7060,7 +7066,7 @@ msgstr "" "אפשרויות" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7069,7 +7075,7 @@ msgstr "" "רענן (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7078,7 +7084,7 @@ msgstr "" "הבדל קודם (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7087,7 +7093,7 @@ msgstr "" "הבדל הבא (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7096,7 +7102,7 @@ msgstr "" "סתירה קודמת (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7105,7 +7111,7 @@ msgstr "" "סתירה הבאה (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7114,7 +7120,7 @@ msgstr "" "הבדל ראשון (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7123,7 +7129,7 @@ msgstr "" "הבדל נוכחי (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7132,7 +7138,7 @@ msgstr "" "הבדל אחרון (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7141,7 +7147,7 @@ msgstr "" "העתק לימין (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7150,7 +7156,7 @@ msgstr "" "העתק לשמאל (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7159,7 +7165,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 +7174,7 @@ msgstr "" "העתק לשמאל והתקדם (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7177,7 +7183,7 @@ msgstr "" "העתק הכל לימין" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7186,7 +7192,7 @@ msgstr "" "העתק הכל לשמאל" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7195,57 +7201,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 +7261,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 +7872,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 +7993,7 @@ msgstr "" "(Alt+גלגלת למעלה)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -7995,7 +8006,7 @@ msgstr "" "(Alt+גלגלת למטה)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8010,7 +8021,7 @@ msgstr "" "(Alt+Shift+גלגלת למטה)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8025,7 +8036,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 +8049,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 +8062,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..9dc5719e8c5 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,3976 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4482,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 +4491,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 +5351,7 @@ msgstr "" "Új dokumentumok (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 #, c-format msgid "" "\n" @@ -5355,7 +5361,7 @@ msgstr "" "Megnyitás (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 #, c-format msgid "" "\n" @@ -5365,29 +5371,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 +5403,7 @@ msgstr "" "Visszavonás (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 #, c-format msgid "" "\n" @@ -5407,7 +5413,7 @@ msgstr "" "Mégis (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 #, c-format msgid "" "\n" @@ -5427,7 +5433,7 @@ msgstr "" "WinMerge Fájl összehasonlító" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5447,358 +5453,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 +5817,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 +5828,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 +5842,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 +5859,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 +5882,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 +6129,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 +6184,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 +6195,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 +6210,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 +6221,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 +6237,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 +6247,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 +6258,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 +6288,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 +6300,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 +6494,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 +6525,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 +7406,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 +7471,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 +7494,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 +7540,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 +7600,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 +7712,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 +7729,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 +7777,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 +7828,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 +7838,7 @@ msgstr "" "Lehetőségek" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 #, c-format msgid "" "\n" @@ -7842,7 +7848,7 @@ msgstr "" "Frissítés (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 #, c-format msgid "" "\n" @@ -7852,7 +7858,7 @@ msgstr "" "Előző különbség (Alt+Fel)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 #, c-format msgid "" "\n" @@ -7862,7 +7868,7 @@ msgstr "" "Következő különbség (Alt+Le)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 #, c-format msgid "" "\n" @@ -7872,7 +7878,7 @@ msgstr "" "Előző konfliktus (Alt+Shift+Fel)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 #, c-format msgid "" "\n" @@ -7882,7 +7888,7 @@ msgstr "" "Következő konfliktus (Alt+Shift+Le)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 #, c-format msgid "" "\n" @@ -7892,7 +7898,7 @@ msgstr "" "Első különbség (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 #, c-format msgid "" "\n" @@ -7902,7 +7908,7 @@ msgstr "" "Aktuális különbség (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 #, c-format msgid "" "\n" @@ -7912,37 +7918,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 +7958,7 @@ msgstr "" "Automatikus egyesítés (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7961,7 +7967,7 @@ msgstr "" "Első fájl" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7970,7 +7976,7 @@ msgstr "" "Következő fájl (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7979,7 +7985,7 @@ msgstr "" "Utolsó fájl" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7988,39 +7994,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 +8036,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 +8181,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..ced6a723794 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,2674 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +3154,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 +3704,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 +4105,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 +4114,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 +4885,7 @@ msgstr "" "Nuovi documenti (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4888,7 +4894,7 @@ msgstr "" "Apri (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4897,27 +4903,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 +4932,7 @@ msgstr "" "Annulla (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4935,7 +4941,7 @@ msgstr "" "Ripristina (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4954,7 +4960,7 @@ msgstr "" "Comparazione file WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4973,7 +4979,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 +4991,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 +5059,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 +5154,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 +5193,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 +5320,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 +5334,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 +5344,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 +5358,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 +5373,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 +5398,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 +5622,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 +5639,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 +5650,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 +5686,7 @@ msgstr "" "Vuoi continuare comunque?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5696,7 +5702,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 +5716,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 +5730,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 +5745,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 +5761,7 @@ msgstr "" "Vuoi sovrascrivere il file modificato?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5765,7 +5771,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 +5787,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 +5815,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 +5826,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 +5952,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 +6021,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 +6052,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 +6104,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 +6864,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 +6933,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 +6957,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 +7005,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 +7061,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 +7167,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 +7184,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 +7225,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 +7271,7 @@ msgstr "" "Differenza nella linea attuale (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7274,7 +7280,7 @@ msgstr "" "Opzioni" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7283,7 +7289,7 @@ msgstr "" "Aggiorna (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7292,7 +7298,7 @@ msgstr "" "Differenza precedente (Alt+Su)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7301,7 +7307,7 @@ msgstr "" "Differenza successiva (Alt+Giù)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7310,7 +7316,7 @@ msgstr "" "Conflitto precedente (Alt+Maiusc+Su)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7319,7 +7325,7 @@ msgstr "" "Conflitto successivo (Alt+Maiusc+Giù)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7328,7 +7334,7 @@ msgstr "" "Prima differenza (Alt+Inizio)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7337,7 +7343,7 @@ msgstr "" "Differenza attuale (Alt+Invio)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7346,7 +7352,7 @@ msgstr "" "Ultima differenza (Alt+Fine)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7355,7 +7361,7 @@ msgstr "" "Copia a destra (Alt+Destra)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7364,7 +7370,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 +7379,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 +7388,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 +7397,7 @@ msgstr "" "Copia tutto a destra" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7400,7 +7406,7 @@ msgstr "" "Copia tutto a sinistra" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7409,7 +7415,7 @@ msgstr "" "Unione automatica (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7418,7 +7424,7 @@ msgstr "" "Primo file" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7427,7 +7433,7 @@ msgstr "" "File successivo (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7436,7 +7442,7 @@ msgstr "" "Ultimo file" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7445,39 +7451,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 +7494,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 +7611,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 +7627,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 +8117,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 +8241,7 @@ msgstr "" "(Alt+Rotellina Su)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8243,7 +8254,7 @@ msgstr "" "(Alt+Rotellina Giù)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8258,7 +8269,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 +8284,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 +8297,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 +8310,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..3a02059bbe9 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,3617 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +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." @@ -4097,769 +4103,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 +4874,7 @@ msgstr "" "新しいドキュメント (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4877,7 +4883,7 @@ msgstr "" "開く (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4886,27 +4892,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 +4921,7 @@ msgstr "" "元に戻す (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4924,7 +4930,7 @@ msgstr "" "やり直し (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4943,7 +4949,7 @@ msgstr "" "WinMerge File Compare" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4962,162 +4968,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 +5132,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 +5294,7 @@ msgstr "" "ファイル %1 を以下の WinMerge/Filters フォルダーにコピーしてください:\n" "%2" -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5300,7 +5306,7 @@ msgstr "" "\n" "フォルダーの存在または書き込み可能であるか確認してください。" -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5310,7 +5316,7 @@ msgstr "" "\n" "[オプション/システム] でフィルター用フォルダーを指定してください。" -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5323,11 +5329,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 +5344,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 +5365,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 +5589,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 +5606,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 +5616,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 +5629,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 +5653,7 @@ msgstr "" "無視して続けますか?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5662,7 +5668,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 +5681,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 +5694,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 +5708,7 @@ msgstr "" "展開されたものを別ファイルに保存しますか?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5715,7 +5721,7 @@ msgstr "" "このファイルは WinMerge 以外のアプリケーションで修正されています。修正されたファイルに上書きしますか?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5725,7 +5731,7 @@ msgstr "" "は、読み取り専用です。読み取り専用の項目を上書きしますか?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5740,22 +5746,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 +5773,7 @@ msgstr "" "は消滅しました。続行するためにファイルのコピーを保存してください。" #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5778,124 +5784,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 +5910,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 +5980,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 +6011,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 +6059,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 +6581,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 +6819,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 +6848,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 +6857,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 +6871,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 +6898,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 +6921,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 +6966,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 +7022,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 +7125,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 +7141,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 +7182,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 +7228,7 @@ msgstr "" "現在の行内差異 (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7231,7 +7237,7 @@ msgstr "" "設定" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7240,7 +7246,7 @@ msgstr "" "表示更新 (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7249,7 +7255,7 @@ msgstr "" "前の差異 (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7258,7 +7264,7 @@ msgstr "" "次の差異 (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7267,7 +7273,7 @@ msgstr "" "前のコンフリクト (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7276,7 +7282,7 @@ msgstr "" "次のコンフリクト (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7285,7 +7291,7 @@ msgstr "" "最初の差異 (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7294,7 +7300,7 @@ msgstr "" "現在の差異 (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7303,7 +7309,7 @@ msgstr "" "最後の差異 (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7312,7 +7318,7 @@ msgstr "" "右側へコピー (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7321,7 +7327,7 @@ msgstr "" "左側へコピー (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7330,7 +7336,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 +7345,7 @@ msgstr "" "左側へコピーし次へ (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7348,7 +7354,7 @@ msgstr "" "すべてを右側にコピー" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7357,7 +7363,7 @@ msgstr "" "すべてを左側にコピー" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7366,7 +7372,7 @@ msgstr "" "自動マージ (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7375,7 +7381,7 @@ msgstr "" "最初のファイル" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7384,7 +7390,7 @@ msgstr "" "次のファイル (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7393,7 +7399,7 @@ msgstr "" "最後のファイル" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7402,37 +7408,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 +7448,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 +7577,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 +8064,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 +8185,7 @@ msgstr "" "(Alt+Wheel Up)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8187,7 +8198,7 @@ msgstr "" "(Alt+Wheel Down)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8202,7 +8213,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 +8228,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 +8241,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 +8254,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 +8519,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..3b7c4dfed27 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,3976 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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 +4489,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 +4498,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 +5358,7 @@ msgstr "" "새 문서 (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 #, c-format msgid "" "\n" @@ -5362,7 +5368,7 @@ msgstr "" "열기 (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 #, c-format msgid "" "\n" @@ -5372,29 +5378,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 +5410,7 @@ msgstr "" "실행 취소 (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 #, c-format msgid "" "\n" @@ -5414,7 +5420,7 @@ msgstr "" "다시 실행 (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 #, c-format msgid "" "\n" @@ -5434,7 +5440,7 @@ msgstr "" "WinMerge 파일 비교" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5454,183 +5460,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 +5645,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 +5823,7 @@ msgstr "" "%1 파일을 다음 WinMerge/Filters 폴더에 복사하세요:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5830,7 +5836,7 @@ msgstr "" "\n" "폴더가 존재하고 쓰기 가능한지 확인하세요." -#: Merge.rc:4343 +#: Merge.rc:4353 #, c-format msgid "" "User's filter folder is not defined!\n" @@ -5841,7 +5847,7 @@ msgstr "" "\n" "옵션/시스템에서 필터 폴더를 선택하세요." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5855,12 +5861,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 +5878,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 +5901,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 +6147,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 +6165,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 +6174,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 +6211,7 @@ msgstr "" "그래도 계속하시겠습니까?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -6221,7 +6227,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 +6240,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 +6253,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 +6267,7 @@ msgstr "" "압축을 푼 버전을 다른 파일에 저장하시겠습니까?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -6277,7 +6283,7 @@ msgstr "" "변경된 파일을 덮어쓰시겠습니까?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6287,7 +6293,7 @@ msgstr "" "읽기 전용으로 표시됩니다. 읽기 전용 항목을 재정의하시겠습니까?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -6303,25 +6309,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 +6339,7 @@ msgstr "" "이 사라졌습니다. 계속하려면 이 파일의 사본을 저장하세요." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 #, c-format msgid "" "Cannot merge unsynched documents.\n" @@ -6345,124 +6351,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 +6477,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 +6549,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 +6579,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 +6630,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 +7199,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 +7470,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 +7502,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 +7511,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 +7525,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 +7552,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 +7578,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 +7627,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 +7687,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 +7799,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 +7816,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 +7864,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 +7915,7 @@ msgstr "" "현재 줄의 차이 (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 #, c-format msgid "" "\n" @@ -7919,7 +7925,7 @@ msgstr "" "옵션" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 #, c-format msgid "" "\n" @@ -7929,7 +7935,7 @@ msgstr "" "새로 고침 (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 #, c-format msgid "" "\n" @@ -7939,7 +7945,7 @@ msgstr "" "이전 차이 (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 #, c-format msgid "" "\n" @@ -7949,7 +7955,7 @@ msgstr "" "다음 차이 (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 #, c-format msgid "" "\n" @@ -7959,7 +7965,7 @@ msgstr "" "이전 충돌 (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 #, c-format msgid "" "\n" @@ -7969,7 +7975,7 @@ msgstr "" "다음 충돌 (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 #, c-format msgid "" "\n" @@ -7979,7 +7985,7 @@ msgstr "" "첫 차이 (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 #, c-format msgid "" "\n" @@ -7989,7 +7995,7 @@ msgstr "" "현재 차이 (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 #, c-format msgid "" "\n" @@ -7999,7 +8005,7 @@ msgstr "" "마지막 차이 (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -8008,7 +8014,7 @@ msgstr "" "오른쪽으로 복사 (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -8017,7 +8023,7 @@ msgstr "" "왼쪽으로 복사 (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -8026,7 +8032,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 +8041,7 @@ msgstr "" "왼쪽으로 복사 후 진행 (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -8044,7 +8050,7 @@ msgstr "" "모두 오른쪽으로 복사" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -8053,7 +8059,7 @@ msgstr "" "모두 왼쪽으로 복사" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 #, c-format msgid "" "\n" @@ -8063,7 +8069,7 @@ msgstr "" "자동 병합 (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -8072,7 +8078,7 @@ msgstr "" "첫 파일" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -8081,7 +8087,7 @@ msgstr "" "다음 파일 (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -8090,7 +8096,7 @@ msgstr "" " 마지막 파일" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -8099,39 +8105,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 +8147,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 +8292,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 +8780,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 +8901,7 @@ msgstr "" "(Alt+휠 ⭡)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8903,7 +8914,7 @@ msgstr "" "(Alt+휠 ⭣)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8918,7 +8929,7 @@ msgstr "" "(Alt+Shift+휠 ⭣)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8933,7 +8944,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 +8957,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 +8970,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 +9235,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..061d70f2343 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,7593 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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_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: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n" msgstr "# Pakeitimų sąrašas\r\n# Formatas: searchreplacement\r\n# Lines starting with # are ignored\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index a51dd7db988..625658cde88 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -22,7 +22,7 @@ msgstr "" "X-Generator: Poedit 3.0.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_NORWEGIAN, 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 "&Marker linjeforskjell\tF4" @@ -137,7 +137,7 @@ msgid "Cu&t" msgstr "&Klipp ut" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "Ko&pier" @@ -147,19 +147,19 @@ msgid "&Paste" msgstr "&Lim inn" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Skript" #. 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 "< 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" @@ -179,27 +179,27 @@ msgid "Op&en" msgstr "&Åpne" #. 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 ®istrert 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 &eksternt redigeringsprogram\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 "" @@ -234,8 +234,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 "&Ingen" @@ -250,12 +250,12 @@ msgid "&Horizontal" msgstr "&Horisontal" #. 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 "&Forrige side" #. 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 "&Neste side" @@ -265,42 +265,42 @@ msgid "&Active Pane" msgstr "&Aktive 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 "Roter &høyre 90gr" #. 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 "Roter &venstre 90gr" #. 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 "Speilvend v&ertikalt" #. 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 "Speilvend h&orisontalt" #. 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 &inn\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Zoom &ut\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+*" @@ -325,27 +325,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 "&Flytt" #. 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 "" @@ -380,37 +380,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 "" @@ -425,27 +425,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 "" @@ -475,3214 +475,3220 @@ 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 "&Fil" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 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 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 "T&abell" #. 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&æ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 msgid "&Image" msgstr "&Bilde" #. 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Ny (&3 paneler)" #. 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 "&Åpne...\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 "Åpne 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 "Åpne utk&lippstavle" #. 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 "Åpne p&rosjekt...\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 "Lagre pr&osjekt..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Seneste prosjekter" #. 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 "Nylige f&iler eller mapper" #. 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 "&Avslutt\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 "&Rediger" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "&Lim inn\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 "&Innstillinger...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "&Vis" #. 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 "F&anelinje" #. 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 "Verkt&øylinje" #. 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 "&Liten" #. 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 "&Stor" #. 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 "Stat&uslinje" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "&Verktøy" #. 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 "&Filter..." #. 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 "&Generer rettelse..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "&Programtillegg" #. 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 "P&rogramtillegginnstillinger..." #. 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 "&Manuell utpakking" #. 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 "&Automatisk utpakking" #. 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 "&Gjeninnlast programtillegg" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 msgid "&Window" msgstr "&Vindu" #. 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 "&Lukk\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 "L&ukk alle" #. 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 "&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 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 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 msgid "&Cascade" msgstr "&Overlappende" #. 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 "&Hjelp" #. 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 hjelp\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 "&Konfigurasjon" #. 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 "Om Win&Merge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "Skrive&beskyttet" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Venstre skrive&beskyttet" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "M&idten skrivebeskyttet" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "H&øyre 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 msgid "&File Encoding..." msgstr "Filko&ding..." #. 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 "Me&rk alt\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Vis &identiske objekter" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Vis &forskjellige objekter" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Vis &venstre unike objekter" #. 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 "Vis &høyre unike objekter" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Vis ob&jekter hoppet over" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "V&is binærfiler" #. 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 "Vis sk&julte objekter" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "Tre&modus" #. 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 "Sammen&trekk 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 msgid "Select &Font..." msgstr "Velg &skrifttype..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Bruk standard s&krifttype" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "&Bytt om paneler" #. 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 "Sammen&lign statistikker..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "&Gjenoppfrisk\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "G&jenoppfrisk valgte\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "&Sammenslå" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Sa&mmenlign\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "&Neste forskjell\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskjell\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&ørste forskjell\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskjell\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "&Siste forskjell\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 "Kopier til &høyre\tAlt+Høyre" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "Sle&tt\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "&Tilpass kolonner..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Generer &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 "" #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Lagre\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Lagr&e" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Lagre &venstre" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Lagre &midten" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Lagre &høyre" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Lagre &som" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "Lagre &venstre som..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Lagre &midten som..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Lagre &høyre som..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "Skri&v ut...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "&Utskriftsformat..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "&Forhåndsvisning..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "&Konverter linjeslutt til" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Sammenslå-&modus\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Lastpån&ytt\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "Sa&mmenlign på nytt som" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "&Angre\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "Ann&uler angre\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\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 "Ko&pier\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "S&øk...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "&Erstatt...\tCtrl+H" #. 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 "Avansert" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenummer\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "&Bokmerker" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Vis/Skjul bokmerke\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "&Neste bokmerke\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "&Forrige bokmerke\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Fjern &alle bokmerker" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Syntaksmarkering" #. 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 "&Lås paneler" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "&Vis blanktegn" #. 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 "Vis linjefo&rksjell" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Vis linje&nummer" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Vis &marger" #. 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 "&Tekstbrytning" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Splitt v&ertikalt" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "&Forskjellspanel" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "L&okaliseringspanel" #. 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 "Neste k&onflikt\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Forri&ge konflikt\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Avanse&rt" #. 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 "Kopier fra &venstre til" #. 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 "&Midten" #. 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 "&Høyre" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Kopier fra &midten til" #. 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 "&Venstre" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Kopier fra &høyre til" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Kopier valgte linje(r) fra &venstre til" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Kopier valgte linje(r) fra mi&dten til" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Kopier valgte linje(r) fra hø&yre til" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Kopier fra venstre\tAlt+Shift+Høyre" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopier fra høyre\tAlt+Shift+Venstre" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Kopier til høyre og g&å videre\tCtrl+Alt+Høyre" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Kopier &til venstre og gå videre\tCtrl+Alt+Venstre" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "&Kopier alt til høyre" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "K&opier alt til venstre" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "A&uto-sammenslå\tCtrl+Alt+M" #. 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 "&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 msgid "Sp&lit" msgstr "S&plitt" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 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 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 "Venstre til høyre (%1 av %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 av %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øyre til venstre (%1 av %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øyre til... (%1 av %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "&Slett" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "&Begge" #. 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 "&Merket område" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "En&dre navn" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "&Skjul objekter" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "&Åpne venstre" #. 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 "Å&pne høyre" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Kop&ier baner" #. 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 av %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øyre (%1 av %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 av %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 msgid "Copy &Filenames" msgstr "Kopier &filnavn" #. 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 "" #. 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 "Venstre skallmeny" #. 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 "Høyre skallmeny" #. 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 "&Kopier full bane" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 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 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 "&Velg..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Prediffer-innstillinger" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "G&å til forskjell" #. 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 "&Ingen flyttede blokker" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "&Alle flyttede blokker" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "&Blanktegn" #. 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 "Sammen&lign" #. 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 endringer" #. 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 alle" #. 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 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 msgid "Ignore &Case" msgstr "Ignorer store/små &bokstaver" #. 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&rer linjebruddforskjeller (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 "&Inkluder undermapper" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 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 msgid "Full Contents" msgstr "Fullt innhold" #. 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 "Raskt innhold" #. 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 "Binærinnhold" #. 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 "Endringsdato" #. 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 "Endringsdato 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 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 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 "Skill mellom store/små &bokstaver" #. 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 "Om WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Besøk hjemmesiden til 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 "Bidragsytere" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Velg filer eller mapper" #. 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 "Sk&rivebeskyttet" #. 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 "&Bla gjennom.." #. 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 "B&la gjennom.." #. 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 "Bla gjennom.." #. 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 "&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 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 "Avbryt" #. 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 "Hjelp" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "&Innstillinger..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Søk" #. 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 "F&inn hva:" #. 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 "Bare &hele ord" #. 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 "Regulære &uttrykk" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Ikke br&yt ved filende" #. 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 "&Finn neste" #. 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 "Erstatt" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Ers&tatt med:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "&Ikke bryt ved filende" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Erstatt i" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 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 msgid "&Replace" msgstr "&Erstatt" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Erstatt &alle" #. 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 "Ny" #. 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 "&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 "&Bruk" #. 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 "Aktiver linjefiltere" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Regulære uttrykk (en pr. linje):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 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 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 msgid "Options" msgstr "Innstillinger" #. 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 "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 msgid "General" msgstr "Generelt" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Automatisk &rulling til første forskjell" #. 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&ukk vinduer med 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Verifiser baner automatisk i Åpne-dialog" #. 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 "Sp&ør ved lukking av flere vinduer" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "&Bevar fil-tid i filsammenligning" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Vis \"Velg filer eller mapper\" dialog ved oppstart" #. 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 "Auto-fullførelse for Å&pne-dialog:" #. 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 "Standardverdier" #. 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 "Farger" #. 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 "Bakgrunn" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 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 msgid "Text" msgstr "Tekst" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Forskjell:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Valgt forskjell:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Ignorert forskjell:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Flyttet:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Valgt flyttet:" #. 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 "Ordforskjell:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Valgt ordforskjell:" #. 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 "Dialog" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Nøkkelord:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Funksjonsnavn:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Kommentarer:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Nummere:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Operatorer:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Strenger:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Preprosessor:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Bruker 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Bruker 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 "Fet" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "&Bruk egendefinerte tekstfarger" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Blanktegn:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Normal tekst:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Markering:" #. 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 "System" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "&Send slettede filer til papirkurven" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "&Eksternt redigeringsprogram:" #. 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 "&Filter-mappe:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Mappe for midlertidige filer" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "S&ystemets midlertidige mappe" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "E&gen mappe:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "B&la gjennom.." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Sammenlign" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Blanktegn" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "S&ammenlign" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "Ignorer e&ndringer" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "Ignorer &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å &bokstaver" #. 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 "&Aktiver flyttet blokk-oppdagelse" #. 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 "Redigering" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "&Marker syntaksen" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "&Bevar originale EOL-tegn" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Tabulator" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "&Tabulatorstørrelse:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Sett inn tabulatorer" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Sett inn mellomrom" #. 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 "Automatisk &oppdatering" #. 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 "Linjeforskjells-farger" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Vis linjeforskjeller" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "&Tegnnivå" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "&Ord-nivå:" #. 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." @@ -3691,398 +3697,398 @@ msgstr "" "knappen for å gjøre alle meldingsboksene synlige igjen." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Tilbakestill" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Rettelsegenerator" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Fil&1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Fil&2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "B&ytt" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "&Kopier til utklippstavle" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Legg til i eksisterende fil" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Resultat:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Bla &gjennom.." #. 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&il:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "&Kontekst:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Inklud&er kommandolinje" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Åpne i e&ksternt redigeringsprogram" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Visningskolonner" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Flytt &opp" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Flytt &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 msgid "Extensions list:" msgstr "Filetypeliste:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 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 msgid "Stop" msgstr "Stopp" #. 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 "Objekter totalt:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Objekter sammenlignet:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "&Lukk" #. 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 msgid "File" msgstr "Fil" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Gå til hva" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Li&nje" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Forskjell" #. 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 msgid "Install..." msgstr "Installer..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Ny..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Rediger..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Slett..." #. 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 "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 msgid "Different" msgstr "Forskjellig" #. 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 "Tegnsett" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Standard tegnsett" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "" "Velg standard tegnsett som blir antatt når det lastes ikke-Unicode filer:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "System-tegnsett" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "I følge WinMerge brukergrensesnitt" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Egendefinert tegnsett:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4091,776 +4097,776 @@ msgstr "" "Nødvendig å starte programmet på nytt." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "" "Detect codepage for files with mlang.dll\n" "Restart required." msgstr "" #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Arkiv-støtte" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "&Aktiver arkivfil-støtte" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Detekter arkivtype fra filsignatur" #. 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 "Lagre endrede filer?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Fil på venstre side" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Lagre endringer" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Forkast endringer" #. 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 "Fil på høyre side" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "L&agre endringer" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Fork&ast endringer" #. 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 "Mappesammenlignings-rapport" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Rapport&fil:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "&Stil:" #. 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 "Delt eller privat filter" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Hvilken filtertype vil du opprette?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Delt filter (for alle brukere på denne maskin)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Privat filter (bare for aktuelle bruker)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Sammenlignings-statistikk" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Mapper:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 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 msgid "Binary:" msgstr "Binær:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Unik" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Venstre:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Høyre:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Totalt:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Lukk" #. 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 "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 msgid "(Affects)" msgstr "(Påvirker)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Velg tegnsett til" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "&Fil-lasting:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Fil-&lagring:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "&Bruk samme tegnsett for begge" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "&Avbryt" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 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 msgid "&Enter text to test:" msgstr "&Oppfør tekst å teste:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "&Mappenavn" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Resultat:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 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 "Tabell" #. 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 "Sikkerhetskopifiler" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Opprett sikkerhetskopifiler i:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "&Mappe-sammenligning" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "&Fil-sammenligning" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Opprett sikkerhetskopifiler til:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "&Originalfilens mappe" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "&Global sikkerhetskopi-mappe:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Sikkerhetskopi-filnavn:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "&Legg til .bak -endelse" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "L&egg til tidsstempel" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Bekreft kopiering" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Er du sikker på at du vil kopiere XXX objekter?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Fra venstre" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Til høyre" #. 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 "Ikke still dette &spørsmålet igjen." #. 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 "Nei" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Programtillegg" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "&Aktiver programtillegg" #. 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 "Skall-integrasjon" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "Utforsker" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "Le&gg til i høyreklikkmeny" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "&Aktiver avansert meny" #. 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 "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 msgid "S&top after first difference" msgstr "S&topp etter første forskjell" #. 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 tidsforskjeller mindre enn 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 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 "Binær" #. 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 "Bilde" #. 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)" @@ -4869,7 +4875,7 @@ msgstr "" "Nye dokumenter (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4878,7 +4884,7 @@ msgstr "" "Åpne (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4887,27 +4893,27 @@ msgstr "" "Lagre (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Ukjent feil ved forsøk på å åpne prosjektfil." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Ukjent feil ved forsøk på å lagre prosjektfil." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Prosjektfil lastet vellykket." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Prosjektfil lagret vellykket." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4916,7 +4922,7 @@ msgstr "" "Angre (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4925,7 +4931,7 @@ msgstr "" "Annuler angre (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4944,7 +4950,7 @@ msgstr "" "WinMerge Filsammenligning" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4963,7 +4969,7 @@ msgstr "" "WinMerge Mappesammenligning" #. 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 kommer med ABSOLUTT INGEN GARANTIER. Dette er gratis programvare og " @@ -4971,157 +4977,157 @@ msgstr "" "GNU General Public License i Hjelp-menyen for detaljer." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "&Avbryt" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Prøv igjen" #. 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 &alle" #. 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 til &alt" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "&Nei" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Nei til a<" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "&Fortsett" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "&Hopp over" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Hopp over &alle" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Ikke vis denne &meldingen igjen." -#: 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 "Prosjekt" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Forskjeller" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Meldingsbokser" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Til:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Fra venstre:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Til venstre:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Fra høyre:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Til høyre:" #. 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 "Versjon %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Innstillinger (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Alle meldingsbokser vises nå igjen." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5131,37 +5137,37 @@ msgstr "" "Bruk verdiene 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Åpne" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge prosjektfiler (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Innstillingsfiler (*.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 msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" "*.*||" @@ -5170,126 +5176,126 @@ msgstr "" "*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 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 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 msgid "Extension" msgstr "Filtype" #. 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 "Navn" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Plassering" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filter" #. 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 "Beskrivelse" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Velg navn for nytt filter" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfiltere (*.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 finne filfilter-mal!\n\nKopier filen %1 til WinMerge/Filtermappe:\n%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5302,7 +5308,7 @@ msgstr "" "\n" "Forsikre om at mappen eksisterer og kan skrives til." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5312,7 +5318,7 @@ msgstr "" "\n" "Velg filter-mappe i Innstillinger/System." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5326,11 +5332,11 @@ msgstr "" "Kanskje filen er skrivebeskyttet?" #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Velg filter-fil å installere" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5341,17 +5347,17 @@ msgstr "" "Kunne ikke kopiere ny filter-fil til filter-mappe." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Filter-fil eksisterer allerede. Overskrive eksisterende filter?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Regulære uttrykk" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later." msgstr "" "Filtre ble oppdaterte. Vil du gjenoppfriske alle åpne mappesammenligninger?\n" @@ -5360,217 +5366,217 @@ msgstr "" "gjenoppfriske sammenligninger senere." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Resultat av mappesammenligning" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Filsammenligning" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Venstre uten tittel" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Midten uten tittel" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Høyre uten tittel" #. 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 "Deres fil" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 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 msgid "Merge" msgstr "Slå sammen" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "1 forskjell funnet" #. 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 "SB" #. IDS_DIRVIEW_STATUS_FMT_FOCUS -#: Merge.rc:4397 +#: Merge.rc:4407 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Objekter: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Sammenligner objekter..." #. 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 "Velg to eksisterende mapper eller filer for å sammenligne." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Mappe-valg" #. 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 "Begge baner er ugyldig!" -#: 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 "Kan ikke sammenligne fil og mappe!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5584,12 +5590,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Kunne ikke analysere konflikt-fil." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" @@ -5598,23 +5604,23 @@ 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 msgid "Save As" msgstr "Lagre som" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer 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 "" @@ -5622,11 +5628,11 @@ msgstr "" "filen? (Nei for å lagre filen med et annet navn.)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Feil under sikkerhetskopiering av filen" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5640,7 +5646,7 @@ msgstr "" "Fortsette likevel?" #. 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 "" @@ -5651,7 +5657,7 @@ msgstr "" "\t- bruk et annet filnavn (Klikk OK)\n" "\t- avbryt den aktuelle operasjonen (Klikk Avbryt)?" -#: 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,12 +5668,12 @@ msgstr "" "\n" "Vil du lagre den utpakkede versjonen til en annen fil?" -#: 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 "" @@ -5679,7 +5685,7 @@ msgstr "" "Vil du lagre den upakkede versjonen fil en annen fil?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5695,7 +5701,7 @@ msgstr "" "Overskrive endret fil?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5705,7 +5711,7 @@ msgstr "" "er markert skrivebeskyttet. Vil du overskrive det skrivebeskyttede objekt?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "" @@ -5716,22 +5722,22 @@ msgstr "" "Vil du laste inn igjen filen?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Lagre venstre fil som" #. 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 "Lagre høyre fil som" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5743,7 +5749,7 @@ msgstr "" "har forsvunnet. Lagre en kopi av filen for å fortsette." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5754,186 +5760,186 @@ msgstr "" "Gjenoppfrisk dokumenter før du fortsetter." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Bryt ved blanktegn" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Bryt ved blanktegn eller tegnsetting" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Kopier til &midten\tAlt+Høyre" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Kopier til &midten\tAlt+Venstre" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Kopier fra midten\tAlt+Shift+Høyre" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Kopier fra midten\tAlt+Shift+Venstre" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Kopier til midten og gå videre\tCtrl+Alt+Høyre" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Kopier til midten og gå videre\tCtrl+Alt+Venstre" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Kopier alt til midten" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Høyre 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øyre (%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øyre 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øyre (%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 msgid "Left Side - Select Destination Folder:" msgstr "Venstre side - velg målmappe:" #. 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 "Høyre side - velg målmappe:" #. 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 av %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" @@ -5945,18 +5951,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å at 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å at du vil kopiere %d objekter?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -5976,799 +5982,799 @@ msgstr "" "Gjenoppfrisk sammenligning." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Er du sikker på at 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å at du vil flytte %d objekter?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Bekreft flytting" -#: 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 "Feilet i å kjøre eksternt redigeringsprogram: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Ukjent 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 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 msgid "Comparison Result" msgstr "Resultat av sammenligningen" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Venstre dato" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Høyre dato" #. 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 "Venstre størrelse" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Høyre størrelse" #. 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 "Høyre størrelse (kort)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" #. 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 "Venstre opprettelsestid" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Høyre opprettelsestid" #. 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 "Nyere fil" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Venstre filversjon" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Høyre filversjon" #. 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 "Kort resultat" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Venstre attributter" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Høyre attributter" #. 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 "Venstre EOL" #. 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 "Høyre EOL" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Venstre koding" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Høyre koding" #. 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 "Ignorerte forskjeller" #. 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 msgid "Unpacker" msgstr "Utpakker" #. 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 "Venstre" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Midten" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Høyre" #. 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 "Kan ikke sammenligne filer" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Objekt avbrutt" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Fil hoppet over" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Mappe hoppet over" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Bare venstre: %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 "Bare høyre: %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 msgid "Binary files are identical" msgstr "Binære filer er identiske" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Binære filer er forskjellige" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Filer er forskjellige" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Mapper er forskjellige" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Bare venstre" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Bare høyre" #. 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 "Feil" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 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 msgid "Text files are different" msgstr "Tekstfiler er forskjellige" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Bildefiler er identiske" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Bildefiler er forskjellige" #. 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 "Forløpt tid: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "1 objekt valgt" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 objekter valgt" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Fil eller mappe-navn." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkludert." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Venstre side endringsdato." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Høyre side endringsdato." #. 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 "Filtype." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Venstre filstørrelse i byte." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Høyre filstørrelse i byte." #. 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 "Venstre filstørrelse forkortet." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Høyre filstørrelse forkortet." #. 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 "Venstre side opprettelsestid." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Høyre side opprettelsestid." #. 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 "Forteller hvilken side som har en nyere endringsdato." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Venstre side filversjon, bare for noen filtyper." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Høyre side filversjon, bare for noen filetyper." #. 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 "Kort sammenligningsresultat." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Venstre side attributter." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Høyre side attributter." #. 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 "Venstre side fil EOL type." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Høyre side fil 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 msgid "Left side encoding." msgstr "Venstre side koding." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Høyre side koding." #. 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 "" "Antall ignorerte forskjeller i filen. Disse forskjeller ignoreres av " "WinMerge og kan ikke slås sammen." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "" "Antall forskjeller i filen. Dette antall inkluderer ikke ignorerte " "forskjeller." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen 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 "Sammenligning %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 msgid "Comma-separated list" msgstr "Komma-separert liste" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Tab-separarert liste" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Enkel HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Rapportfilen eksisterer allerede. Vil du overskrive eksisterende fil?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6778,59 +6784,59 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Rapporten er vellykket opprettet." #. 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 "Samme filen er åpen i begge paneler." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "De valgte filene 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 msgid "An error occurred while comparing files." msgstr "Det skjedde en feil under sammenligning av filene." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "" "Could not create temporary files. Check your temporary path settings." msgstr "" "Midlertidige filer kan ikke opprettes. Sjekk TEMP-mappebane innstillinger." #. 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 filene har forskjellig linjeskifttype.\n" @@ -6843,17 +6849,17 @@ msgstr "" "Innstillinger)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Den valgte mappen er ugyldig." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Kan ikke åpne en binærfil til redigering." #. 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 "" @@ -6864,41 +6870,41 @@ msgstr "" "på andre siden og åpne 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 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 "" @@ -6908,51 +6914,51 @@ msgstr "" "Vil du behandle begge filer som om de var i standard Windows tegnsett " "(anbefales)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Informasjon tapt på grunn av kodings-feil: begge filer" -#: 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 "Ingen forskjell" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Linjeforskjell" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Kan ikke finne 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\n" @@ -6960,99 +6966,99 @@ msgid "" 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 "Lokaliseringspanel" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Forskjellspanel" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Fil med rettelser vellykket skrevet." #. 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 "Rettelsesfilen 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 msgid "Normal" msgstr "Normal" #. IDS_DIFF_CONTEXT -#: Merge.rc:4914 +#: Merge.rc:4924 msgid "Context" msgstr "Kontekst" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Forenet" #. 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 spesifiserte utdata-bane er ikke en absolutt bane: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Spesifiser en utdata-fil." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Kan ikke opprette en patch-fil fra binære filer." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7064,12 +7070,12 @@ msgstr "" "filer." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Mappe 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 "" "Arkivstøtte er ikke arkivert.\n" @@ -7078,37 +7084,37 @@ msgstr "" "Se manualen for mer informasjon om arkivstøtte og hvordan aktivere den." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Velg fil for eksport" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Velg fil for import" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Innstillinger importert fra filen." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Innstillinger eksportert til filen." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Feilet i å importere innstillinger fra filen." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Feilet i å skrive innstillinger til filen." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7119,44 +7125,44 @@ msgstr "" "Vil du fortsette?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Blandet" #. 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 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 msgid "Type" msgstr "Type" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Redigeringsskript" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7165,7 +7171,7 @@ msgstr "" "Forskjell i den gjeldende linjen (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7174,7 +7180,7 @@ msgstr "" "Innstillinger" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7183,7 +7189,7 @@ msgstr "" "Gjenoppfrisk (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7192,7 +7198,7 @@ msgstr "" "Forrige forskjell (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7201,7 +7207,7 @@ msgstr "" "Neste forskjell (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7210,7 +7216,7 @@ msgstr "" "Forrige konflikt (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7219,7 +7225,7 @@ msgstr "" "Neste konflikt (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7228,7 +7234,7 @@ msgstr "" "Første forskjell (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7237,7 +7243,7 @@ msgstr "" "Gjeldende forskjell (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7246,37 +7252,37 @@ msgstr "" "Siste forskjell (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "\nCopy to Right (Alt+Right)" msgstr "\nKopier høyre (Alt+Høyre)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "\nCopy to Left (Alt+Left)" msgstr "\nKopier venstre (Alt+Venstre)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)" msgstr "\nKopier høyre og gå videre (Ctrl+Alt+Høyre)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)" msgstr "\nKopier venstre og gå videre (Ctrl+Alt+Venstre)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "\nCopy All to Right" msgstr "\nKopier alt til høyre" #. 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 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7285,7 +7291,7 @@ msgstr "" "Auto-sammenslå (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7294,7 +7300,7 @@ msgstr "" "Første fil" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7303,7 +7309,7 @@ msgstr "" "Neste fil (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7312,7 +7318,7 @@ msgstr "" "Siste fil" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7321,39 +7327,39 @@ msgstr "" "Forrige fil (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "" "Den tilpassede utpakkeren brukes på begge filer (bare en fil behøver " "filendelsen)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Ingen prediffer (normal)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Foreslåtte programtillegg" #. 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 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" @@ -7361,125 +7367,125 @@ msgid "" 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 "Innstillinger for programtillegg" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" #. 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 msgid "From file system" msgstr "Fra filsystem" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Fra MRU-liste" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Ingen 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 "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 "" #. 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" @@ -7487,878 +7493,883 @@ msgid "" 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 "Tillat bare en instans å kjøre" #. 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/Persian.po b/Translations/WinMerge/Persian.po index b646c0b838b..c0ce0d0c743 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -22,7 +22,7 @@ msgstr "" "X-Generator: Poedit 1.5.7\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_FARSI, 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 "&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 #, c-format msgid "&Copy" msgstr "&C رونوشت برداري " @@ -154,21 +154,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" @@ -189,27 +189,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 "" #. 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 "" #. 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 "&N هيچکدام " @@ -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 "&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+*" @@ -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 "&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 "" #. 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,3002 +503,3008 @@ 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 "&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 جديد \tCtl+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 "" #. 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 "&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 "" #. 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "&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 "" #. 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 "" #. 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 "" #. 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 "&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 "" #. 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 "" #. 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 ميله وضعيت " #. 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 "" #. 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 "&a پيش متفاوت به طور دستي" #. 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 "&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 "&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 "&A درباره وينمرج ... " #. 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 "&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 "" #. 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 "" #. 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 "" #. 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 "&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 "" #. 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 "&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 #, 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 "&o استفاده از قلم پيش فرض " #. 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 "" #. 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 "&r مقايسه آمارها ... " #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 #, c-format msgid "Refresh\tF5" msgstr "&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 "&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 "" #. 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 "" #. 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 "" #. 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 "" #. 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 "&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 "&M سبک پيوند \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_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 "" #. 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 "" #. 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 قفل کردن چهارگوشها " #. 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 "" #. 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 "" #. 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 "" #. 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 "" #. 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 "&R راست " #. 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 "&L چپ " #. 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 "&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 "" #. 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 "&P پيش فرق گذار " #. 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 "&a همسنجي " #. 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 "&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 "" #. 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 "&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 "" #. 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 "" #. 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 "" #. 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 "&F رونوشت برداري از نام پرونده ها " #. 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 "&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 "" #. 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 "&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 "" #. 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 "&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 "" #. 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 "&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 #, 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 "&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 "" #. 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 "&c تطبيق اندازه حروف " #. 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 " درباره وينمرج " #. 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 #, 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 "&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 "" #. 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 "&r مرور ... " #. 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 "&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 "" #. 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 "" #. 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 "" #. 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 "" #. 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 "" #. 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 "&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 "" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "&o 'Esc' بستن پنجره ها با کليد :" #. 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 "" @@ -3506,947 +3512,947 @@ 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 "&p بازکردن پنجره محاوره اتمام خودکار " #. 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 "&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 "" #. 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 "&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 "" #. 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 "" #. 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 "&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 "" #. 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 "&H برجسته نمايي ترکيب " #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 #, c-format msgid "&Preserve original EOL" msgstr "&P اصلي EOL نگاهداشت حروف " #. 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 "" #. 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 "" #. 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 "" #. 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 #, 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 " جابجايي به پايين " #. 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 "&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 "" #. 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 "" @@ -4454,939 +4460,939 @@ 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 " مطابق با رابط کاربر وينمرج " #. 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 "" " تشخيص اطلاعات صفحه کد براي اين پرونده ها : .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 "" #. 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 "" #. 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 "&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 "" #. 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 "&S سبک " #. 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 "&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 "" #. 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 "&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 "&A پيوست کردن توسعه .bak " #. 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 "" #. 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 "&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 "" #. 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 "&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 "&o چشم پوشي از تفاوت زماني کمتر از 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 "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 " مشاهده خطاي نامشخص هنگام مبادرت به بازکردن پرونده پروژه / طرح " #. 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" @@ -5406,7 +5412,7 @@ msgstr "" " مقايسه پرونده وينمرج" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5426,7 +5432,7 @@ 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 "" @@ -5435,177 +5441,177 @@ msgstr "" "ان يو را در گزينگان / فهرست راهنما ببينيد " #. 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 "" @@ -5614,42 +5620,42 @@ 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||" #. 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 (*.*)|" @@ -5659,132 +5665,132 @@ msgstr "" "پرونده ها (*.*)|*.*||" #. 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\nCopy %1 to WinMerge/Filters Folder:\n%2." msgstr "" @@ -5793,7 +5799,7 @@ msgstr "" " لطفا پرونده روبرو به پوشه صافيهاي وينمرج (زير) رونوشت برداري شود : %1 \n" "%2" -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5805,7 +5811,7 @@ msgstr "" "%1\n" " لطفا اطمينان حاصل شود که پوشه وجود دارد و قابل نوشتن است " -#: Merge.rc:4343 +#: Merge.rc:4353 #, c-format msgid "" "User's filter folder is not defined!\n" @@ -5816,7 +5822,7 @@ msgstr "" "\n" " لطفا در خيارات > سيستم پوشه صافي را انتخاب نماييد " -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5830,12 +5836,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" @@ -5847,19 +5853,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\nSelect 'No' to refresh later." msgstr "" " صافي ها به هنگام شدند. آيا مي خواهيد تا تمام همسنجيهاي پوشه باز، دوباره " @@ -5869,240 +5875,240 @@ 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 "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 #, 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 " يک تفاوت پيدا شد " #. 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 " مورد %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" @@ -6116,13 +6122,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 "" @@ -6131,24 +6137,24 @@ 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 "" @@ -6156,12 +6162,12 @@ msgstr "" "خواندني باطل گردد؟ - با نام جديد ذخيره نگردد " #. 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" @@ -6175,7 +6181,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 "" @@ -6186,7 +6192,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 "" @@ -6197,12 +6203,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 "" @@ -6214,7 +6220,7 @@ msgstr "" " آيا مي خواهيد که نسخه با بسته بازشده به صورت پرونده ديگري ذخيره شود؟ " #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -6230,7 +6236,7 @@ msgstr "" " پرونده تغيير يافته دوباره نويسي شود؟" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6241,7 +6247,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 "" @@ -6252,25 +6258,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" @@ -6282,7 +6288,7 @@ msgstr "" " ناپديد شده است. لطفا يک رونوشت از پرونده را ذخيره نماييد تا کار ادامه يابد " #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 #, c-format msgid "" "Cannot merge unsynched documents.\n" @@ -6294,189 +6300,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" @@ -6488,18 +6494,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" @@ -6518,809 +6524,809 @@ 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" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 #, c-format 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 #, 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 "" @@ -7328,72 +7334,72 @@ 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 "" #. 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 " ساده اچ تي ام ال" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 #, c-format msgid "Simple XML" msgstr " ساده ايکس ام ال " -#: 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" @@ -7403,56 +7409,56 @@ 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." @@ -7460,7 +7466,7 @@ 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" @@ -7474,19 +7480,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%1\non the other side and open?" msgstr "" @@ -7497,45 +7503,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 "" @@ -7545,164 +7551,164 @@ msgstr "" " آيا مايل هستيد تا با هر دو پرونده به شکلي که در صفحه کد پيش فرض ويندوز مي " "باشد، کار شود - اينگونه توصيه ميشود - ؟" -#: 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 " پرونده وصله با موفقيت نوشته شد " #. 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 "" " پرونده وصله در حال حاضر موجود مي باشد. آيا مي خواهيد تا بازنويسي شود؟ " #. 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" @@ -7715,13 +7721,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.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support." msgstr "" " پشتيباني از بايگاني فعال نشده است \n" @@ -7731,43 +7737,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" @@ -7779,1213 +7785,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 " .sct پيدا نشد - دست نوشته ها غير فعال شد WSH " #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "&G برو به خط %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 "اجازه اجراي همزمان تنها يک نسخه از نرم افزار " #. 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/Polish.po b/Translations/WinMerge/Polish.po index e0f3ee219d8..fd3930977c3 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -24,7 +24,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_POLISH, SUBLANG_DEFAULT" @@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Kopiuj zaznaczone różnice (prawy) do schowka\tCtrl+&3" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "Zaznacz różniący się wiersz\tF4" @@ -139,7 +139,7 @@ msgid "Cu&t" msgstr "Wytnij" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "Kopiuj" @@ -149,19 +149,19 @@ msgid "&Paste" msgstr "Wklej" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Skrypty" #. 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 "< Pusty >" #. 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 "Idź do...\tCtrl+G" @@ -181,27 +181,27 @@ msgid "Op&en" msgstr "Otwórz" #. 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 "W zarejestrowanej aplikacji" #. 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 "W zewnętrznym edytorze\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 "Za pomocą..." #. 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 "Otwórz nadrzędny 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 "Menu powłoki" @@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Wykrywanie wstawiania/usuwania" #. 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 "Brak" @@ -252,12 +252,12 @@ msgid "&Horizontal" msgstr "Poziomo" #. 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 "Poprzednia strona" #. 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 "Następna strona" @@ -267,42 +267,42 @@ msgid "&Active Pane" msgstr "Aktywny 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 "Obróć w prawo o 90 stopni" #. 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 "Obróć w lewo o 90 stopni" #. 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 "Odbij w pionie" #. 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 "Odbij w poziomie" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "Powiększenie" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "Powiększ\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Zmniejsz\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 "Normalne\tCtrl+*" @@ -327,27 +327,27 @@ msgid "Dragging &Mode" msgstr "Tryb przeciągania" #. 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 "Przenieś" #. 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 "Dostosuj przesunięcie" #. 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 "Wymazywanie pionowe" #. 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 "Wymazywanie poziome" #. 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 "Zaznacz prostokąt" @@ -382,37 +382,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Porównaj wyodrębniony tekst z obrazu" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "Porównaj" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "Zrzuty ekranu" #. 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 "Zrzuty ekranu całej strony" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS -#: Merge.rc:276 Merge.rc:1249 +#: Merge.rc:276 Merge.rc:1259 msgid "&HTMLs" msgstr "Pliki HTML" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS -#: Merge.rc:277 Merge.rc:1250 +#: Merge.rc:277 Merge.rc:1260 msgid "&Texts" msgstr "Pliki tekstowe" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES -#: Merge.rc:278 Merge.rc:1251 +#: Merge.rc:278 Merge.rc:1261 msgid "&Resource Trees" msgstr "Drzewa zasobów" #. 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 "Rozmiar" @@ -427,27 +427,27 @@ msgid "&Event Sync" msgstr "Synchronizacja zdarzeń" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED -#: Merge.rc:291 Merge.rc:1259 +#: Merge.rc:291 Merge.rc:1269 msgid "&Enabled" msgstr "Włączona" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL -#: Merge.rc:293 Merge.rc:1261 +#: Merge.rc:293 Merge.rc:1271 msgid "&Scroll" msgstr "Przewijanie" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK -#: Merge.rc:294 Merge.rc:1262 +#: Merge.rc:294 Merge.rc:1272 msgid "&Click" msgstr "Kliknięcie" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT -#: Merge.rc:295 Merge.rc:1263 +#: Merge.rc:295 Merge.rc:1273 msgid "&Input" msgstr "Wejście" #. 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 "Wstecz/Dalej" @@ -477,7582 +477,7593 @@ msgid "&All Profiles" msgstr "Wszystkie profile" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "Plik" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 msgid "&New" msgstr "Nowy" #. 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 "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 "&Binarny" #. 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 "Obraz" #. 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 "Strona internetowa" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Nowy (3 panele)" #. 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 "Otwórz...\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 "Otwórz plik konfliktu..." #. 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 "Otwórz schowek" #. 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 "Otwórz projekt...\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 "Zapisz projekt..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Ostatnie projekty" #. 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 "Ostatnie pliki lub foldery" #. 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 "Zakończ\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 "Edycja" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "Wklej\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 "Opcje...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "Widok" #. 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 "Pasek kart" #. 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 "Wyświetl pasek kart" #. 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 pasku tytułu" #. IDR_MERGEDOCTYPE -#: Merge.rc:356 Merge.rc:505 Merge.rc:749 +#: Merge.rc:358 Merge.rc:509 Merge.rc:756 msgid "&Toolbar" msgstr "Pasek narzędzi" #. 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ły" #. 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 "Średni" #. 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 "Duży" #. 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 "Ogromny" #. 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 "Pasek menu" #. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR -#: Merge.rc:365 Merge.rc:515 +#: Merge.rc:367 Merge.rc:519 msgid "&Output Pane" msgstr "Panel wyników" #. 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 "Pasek stanu" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "Narzędzia" #. 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 "Filtry..." #. 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 "Generuj łatkę..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "Wtyczki" #. 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 "Ustawienia wtyczki..." #. 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 "Ręczne porównywanie" #. 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 "Automatyczne porównywanie" #. 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 "Ręczne rozpakowywanie" #. 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 "Automatyczne rozpakowywanie" #. 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 "Przeładuj wtyczki" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 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 "Zamknij\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 "Zamknij wszystkie" #. 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 "Przełącz 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 "Poziomo" #. 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 "Pionowo" #. 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 "Kaskadowo" #. 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 "Pomoc" #. 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 "Pomoc 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 "Informacje o wydaniu" #. 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łumaczenia" #. 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 "Konfiguracja" #. 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 "Powszechna Licencja Publiczna 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 "O WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "Tylko do odczytu" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Lewy tylko do odczytu" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "Środkowy tylko do odczytu" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "Prawy tylko do odczytu" #. 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 "Kodowanie pliku..." #. 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 "Zaznacz wszystko\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Pokaż identyczne elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Pokaż różniące się elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Pokaż unikatowe elementy po lewej" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Pokaż unikatowe elementy na środku" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Pokaż unikatowe elementy po prawej" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Pokaż pominięte elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Pokaż pliki binarne" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "Porównanie trójstronne" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Po lewej pokaż tylko różniące się elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Na środku pokaż tylko różniące się elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Po prawej pokaż tylko różniące się elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Po lewej pokaż tylko brakujące elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Na środku pokaż tylko brakujące elementy" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Po prawej pokaż tylko brakujące elementy" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Pokaż ukryte elementy" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "Tryb drzewa" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "Rozwiń podfoldery" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "Wszystkie podfoldery" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "Różniące się podfoldery" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "Identyczne podfoldery" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "Zwiń wszystkie podfoldery" #. 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 "Wybierz czcionkę..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Użyj domyślnej czcionki" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Zamień panele" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Zamień &1 | 2" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Zamień &2 | 3" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Zamień 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 "Wyświetl pasek filtrów\tCtrl+Shift+L" #. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS -#: Merge.rc:518 +#: Merge.rc:522 msgid "Com&pare Statistics..." msgstr "Statystyki porównania..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Odśwież\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "Odśwież zaznaczone\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "Scal" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Porównaj\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "Następna różnica\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Poprzednia różnica\tAlt+Up" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "Pierwsza różnica\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "Bieżąca różnica\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "Ostatnia różnica\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 "Kopiuj do prawej\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 "Kopiuj do lewej\tAlt+Left" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "Usuń\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "Dostosuj kolumny..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Utwórz raport..." #. 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 "Edytuj za pomocą programu rozpakowującego..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "Zapisz\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Zapisz" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Zapisz lewy" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Zapisz środkowy" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Zapisz prawy" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Zapisz jako" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "Zapisz lewy jako..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Zapisz środkowy jako..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Zapisz prawy jako..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "Drukuj...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Ustawienia strony..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Podgląd wydruku..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "Konwertuj końce linii do" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Tryb scalania\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Odśwież\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "Porównaj ponownie jako" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "Cofnij\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "Powtó&rz\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "Wy&tnij\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 "Kopiuj\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "Znajdź...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Zastąp...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "&Marker...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Zaawansowane" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Kopiuj z numerami wierszy\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "Zakładki" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Przełącz zakładkę\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "&Następna zakładka\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "&Poprzednia zakładka\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Wy&czyść wszystkie zakładki" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Podświetlenie składni" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Różnice" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "Wszystkie wiersze" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 wierszy" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 wiersz" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 wiersze" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 wierszy" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 wierszy" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 wierszy" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Przełącz wszystkie i 0-9 wierszy\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "&Odwróć (ukryj różniące się wiersze)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "Zab&lokuj panele" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "Wyświetl białe znaki" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Wyświetl znaki końca linii" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Wyświetl różniące się wiersze" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Wyświetl &numery wierszy" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Wyświetl &marginesy" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Wyświetl górne marginesy" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Zawijaj wiersze" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Podziel pionowo" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "&Panel różnic" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Panel lokaliza&cji" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Panel wyników" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "Następny konflikt\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Poprzedni konflikt\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Zaawansowane" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Następna różnica (lewy/środkowy)\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Poprzednia różnica (lewy/środkowy)\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Następna różnica (lewy/prawy)\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Poprzednia różnica (lewy/prawy)\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Następna różnica (środkowy/prawy)\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Poprzednia różnica (środkowy/prawy)\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Następna różnica tylko w lewym\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Poprzednia różnica tylko w lewym\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Następna różnica tylko w środkowym\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Poprzednia różnica tylko w środkowym\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Następna różnica tylko w prawym\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Poprzednia różnica tylko w prawym\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Kopiuj z lewej do" #. 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 "Środkowy" #. 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 "P&rawy" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Kopiuj ze środka do" #. 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 "&Lewy" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Kopiuj z prawej do" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Kopiuj zaznaczony wiersz(e) z lewej do" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Kopiuj zaznaczony wiersz(e) ze środka do" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Kopiuj zaznaczony wiersz(e) z prawej do" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Kopiuj z lewej\tAlt+Shift+Right" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopiuj z prawej\tAlt+Shift+Left" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Kopiuj do prawej i przejdź dalej\tCtrl+Alt+Right" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Kopiuj do lewej i przejdź dalej\tCtrl+Alt+Left" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Kopiuj wszystko do pr&awej" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Kopiuj wsz&ystko do lewej" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "A&utomatyczne łączenie\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Dodaj punkt &synchronizacji\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Wyczyść punkty sync&hronizacji" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Rozpakowywanie" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "Porównywanie" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Zastosuj porównywanie..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "Przekształć za pomocą edytora skryptu..." #. IDR_MERGEDOCTYPE -#: Merge.rc:880 +#: Merge.rc:887 msgid "Scripts for &Copying" msgstr "Skrypty dla kopiowanych" #. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING -#: Merge.rc:886 +#: Merge.rc:893 msgid "Select &Editor Script..." msgstr "Wybierz edytor skryptu" #. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT -#: Merge.rc:898 +#: Merge.rc:905 msgid "Sp&lit" msgstr "Podzie&lone" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "Porówn&aj" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED -#: Merge.rc:922 +#: Merge.rc:929 msgid "Compar&e with Renamed/Moved Items" msgstr "Porównaj z elementami zmienionej nazwy/przeniesionymi" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW -#: Merge.rc:923 +#: Merge.rc:930 msgid "Compare in New &Window" msgstr "Porównaj w nowym oknie" #. 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 "Porównaj nie poz&iomo..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "Porównaj nie poz&iomo" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Pierwszy &lewy element z drugim lewym elementem" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Pierwszy p&rawy element z drugim prawym elementem" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "Pierwszy lewy element z drugim prawym elementem" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Drugi lewy element z pierw&szym prawym elementem" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "Porównaj jako" #. 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 "Lewy do środka (%1 z %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 "Lewy do prawej (%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 "Lewy 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 "Środek do lewej (%1 z %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 "Środek do prawej (%1 z %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 "Środek do... (%1 z %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 "Prawy do środka (%1 z %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 "Prawy do lewej (%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 "Prawy do... (%1 z %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "Usuń" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "O&ba" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "Wszystkie" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "Zaznaczeniu" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Zmień &nazwę" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "Ukryj elementy" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "&Otwórz lewy" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Otwórz środkowy" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Otwórz &prawy" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Kopiuj nazwy ścieżek" #. 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 "Lewy (%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 "Środkowy (%1 z %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 "Prawy (%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 "Oba (%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 "Wszystkie (%1 z %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Kopiuj nazwy plików" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Kopiuj elementy do schowka" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Kopiuj wszystkie wyświetlone kolumny" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1020 +#: Merge.rc:1028 msgid "&Zip" msgstr "Spakuj" #. 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 "Oba do... (%1 z %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 "Wszystkie do... (%1 z %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 "Różnice do... (%1 z %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Lewe menu powłoki" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Środkowe menu powłoki" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Prawe menu powłoki" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Oba menu powłoki" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Wszystkie menu powłoki" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Kopiuj" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "Kopiuj pełną ś&cieżkę" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Kopiuj nazwę pliku" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "Edytuj podpis\tF2" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH -#: Merge.rc:1055 +#: Merge.rc:1063 msgid "Edit &Path\tCtrl+L" msgstr "Edytuj ścieżkę\tCtrl+L" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE -#: Merge.rc:1056 +#: Merge.rc:1064 msgid "&Open..." msgstr "Otwórz..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Ustawienia programu rozpakowującego" #. 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 "Wybierz..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Ustawienia porównywania" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Idź d&o różnicy" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK -#: Merge.rc:1083 +#: Merge.rc:1091 msgid "Move Cursor on &Click" msgstr "Przesuń kursor po kliknięciu" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE -#: Merge.rc:1085 +#: Merge.rc:1093 msgid "&No Moved Blocks" msgstr "Bez prze&niesionych bloków" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "Wszystkie przeniesione bloki" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Białe znaki" #. 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 "&Porównaj" #. 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&gnoruj zmiany" #. 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&noruj wszystkie" #. 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 "Ignoruj puste wiersze" #. 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 "Ignoruj wielkości liter" #. 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&ruj różnice znaku końca linii (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 "Ignoruj różnice strony ko&dowej" #. 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 "Ignoruj liczby" #. 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 "Ignoruj różnice w komentarzach" #. 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 "Ignoruj brakujące znaki końca linii" #. 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 "Ignoruj podział wierszy (traktuj jako spacje)" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK -#: Merge.rc:1109 Merge.rc:2963 +#: Merge.rc:1117 Merge.rc:2973 msgid "&Include Subfolders" msgstr "Uwzględn&ij podfoldery" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "Metoda porównania" #. 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 "Pełna zawartość" #. 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 "Szybka zawartość" #. 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 "Binarna zawartość" #. 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 modyfikacji" #. 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 modyfikacji i rozmiar" #. 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 "Rozmiar" #. 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 "Czy istnieje" #. IDR_POPUP_PROJECT, ID_LOAD_PROJECT -#: Merge.rc:1192 +#: Merge.rc:1202 msgid "&Load Project..." msgstr "Wczytaj 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 "${*} - Wszystkie argumenty" #. 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} - Pierwszy 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} - Drugi 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} - Trzeci 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} - Czwarty 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} - Piąty 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} - Szósty 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} - Siódmy 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} - Ósmy 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} - Dziewiąty 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} - Plik źródłowy" #. 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} - Folder źródłowy" #. 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 źródłowy" #. 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} - Protokół źródła 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} - Przyrostek źródła 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} - Plik docelowy" #. 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} - Folder docelowy" #. 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 docelowy" #. 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} - Protokół docelowego adresu 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} - Przyrostek docelowego adresu 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} - Katalog domowy 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} - Plik skryptu" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Dodaj wtyczkę rozpakowującą..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER -#: Merge.rc:1319 +#: Merge.rc:1329 msgid "Add &Prediffer Plugin..." msgstr "Dodaj wtyczkę porównującą..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE -#: Merge.rc:1320 +#: Merge.rc:1330 msgid "&Duplicate Plugin..." msgstr "Duplikuj wtyczkę..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "Wyczyść wszystko" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR -#: Merge.rc:1352 +#: Merge.rc:1362 msgid "&Clear All" msgstr "Wyczyść wszystko" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST -#: Merge.rc:1353 +#: Merge.rc:1363 msgid "Remove Last Filter &Group" msgstr "Usuń ostatnio dodaną grupę filtrów" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL -#: Merge.rc:1354 +#: Merge.rc:1364 msgid "R&eset to Default (*.*)" msgstr "Przywróć ustawienia domyślne (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Dodaj wykluczony plik" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "Pliki systemowe" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "Pliki kopii zapasowej edytora" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "Skompilowane pliki binarne" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Pliki dziennika" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "Pliki tymczasowe lub pliki pamięci podręcznej" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Dodaj wykluczony folder" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "Kontrola wersji" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "Artefakty kompilacji" #. 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 "Dodaj warunek pliku" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Rozmiar pliku" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Własny zakres..." #. 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 "Ostatnia modyfikacja" #. 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 "Godzina" #. 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 "Ponad godzinę temu" #. 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 "W ciągu ostatniej godziny" #. 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 "Dzień" #. 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 "Do dziś" #. 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 "Dzisiaj" #. 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 "Przedwczoraj" #. 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 "Wczoraj" #. 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 "Od wczoraj" #. 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 "Tydzień" #. 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 "Przed tym tygodniem" #. 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 "W tym tygodniu" #. 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 "Przed zeszłym tygodniem" #. 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 "W zeszłym tygodniu" #. 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 "Od zeszłego tygodnia" #. 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 "Miesiąc" #. 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 "Przed miesiącem" #. 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 "W tym miesiącu" #. 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 "Przed zeszłym miesiącem" #. 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 "W zeszłym miesiącu" #. 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 "Od zeszłego miesiąca" #. 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 "Rok" #. 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 "Przed rokiem" #. 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 "W tym roku" #. 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 "Przed zeszłym rokiem" #. 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 "W ubiegłym roku" #. 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 "Od zeszłego roku" #. 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 "Własny zakres..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1431 Merge.rc:1589 +#: Merge.rc:1441 Merge.rc:1599 msgid "&Attributes" msgstr "Atrybuty" #. 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 "Pliki tylko do odczytu" #. 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 "Pliki nie tylko do odczytu" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN -#: Merge.rc:1435 Merge.rc:1609 +#: Merge.rc:1445 Merge.rc:1619 msgid "Hidden files" msgstr "Ukryte pliki" #. 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 "Nie ukryte pliki" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Pliki systemowe" #. 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 "Nie pliki systemowe" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "Zawartość pliku" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "Nie zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "Pierwszy wiersz zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS -#: Merge.rc:1445 +#: Merge.rc:1455 msgid "First line does not contain string..." msgstr "Pierwszy wiersz nie zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "Pierwsze 10 wierszy zawiera ciąg znaków..." #. 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 "Pierwsze 10 wierszy nie zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "Ostatnie 10 wierszy zawiera ciąg znaków..." #. 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 "Ostatnie 10 wierszy nie zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "Ostatni wiersz zawiera ciąg znaków..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS -#: Merge.rc:1451 +#: Merge.rc:1461 msgid "Last line does not contain string..." msgstr "Ostatni wiersz nie zawiera ciągu znaków..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1453 +#: Merge.rc:1463 msgid "&Line Count" msgstr "Liczba wierszy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10 -#: Merge.rc:1455 +#: Merge.rc:1465 msgid "Less than 10" msgstr "Mniej niż 10" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10 -#: Merge.rc:1456 +#: Merge.rc:1466 msgid "10 or more" msgstr "10 lub więcej" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100 -#: Merge.rc:1457 +#: Merge.rc:1467 msgid "Less than 100" msgstr "Mniej niż 100" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100 -#: Merge.rc:1458 +#: Merge.rc:1468 msgid "100 or more" msgstr "100 lub więcej" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000 -#: Merge.rc:1459 +#: Merge.rc:1469 msgid "Less than 1000" msgstr "Mniej niż 1000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000 -#: Merge.rc:1460 +#: Merge.rc:1470 msgid "1000 or more" msgstr "1000 lub więcej" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000 -#: Merge.rc:1461 +#: Merge.rc:1471 msgid "Less than 10000" msgstr "Mniej niż 10000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000 -#: Merge.rc:1462 +#: Merge.rc:1472 msgid "10000 or more" msgstr "10000 lub więcej" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000 -#: Merge.rc:1463 +#: Merge.rc:1473 msgid "Less than 100000" msgstr "Mniej niż 100000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000 -#: Merge.rc:1464 +#: Merge.rc:1474 msgid "100000 or more" msgstr "100000 lub więcej" #. 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 "Dodatkowe właściwości..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1469 +#: Merge.rc:1479 msgid "Add F&older Condition" msgstr "Dodaj warunek folderu" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1513 +#: Merge.rc:1523 msgid "&Files" msgstr "Pliki" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0 -#: Merge.rc:1515 +#: Merge.rc:1525 msgid "0 files" msgstr "0 plików" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1 -#: Merge.rc:1516 +#: Merge.rc:1526 msgid "1 file or more" msgstr "1 plik lub więcej" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1519 +#: Merge.rc:1529 msgid "&Items" msgstr "Elementy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0 -#: Merge.rc:1521 +#: Merge.rc:1531 msgid "0 items" msgstr "0 elementów" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1 -#: Merge.rc:1522 +#: Merge.rc:1532 msgid "1 item or more" msgstr "1 element lub więcej" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1525 +#: Merge.rc:1535 msgid "&Total Size" msgstr "Całkowity rozmiar" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE -#: Merge.rc:1542 +#: Merge.rc:1552 msgid "&Recursive" msgstr "Rekurencyjny" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY -#: Merge.rc:1544 +#: Merge.rc:1554 msgid "Target: &Any (Left/Middle/Right)" msgstr "Miejsce docelowe: dowolne (lewy/środkowy/prawy)" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT -#: Merge.rc:1545 +#: Merge.rc:1555 msgid "Target: &Left" msgstr "Miejsce docelowe: lewy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE -#: Merge.rc:1546 +#: Merge.rc:1556 msgid "Target: &Middle" msgstr "Miejsce docelowe: środkowy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT -#: Merge.rc:1547 +#: Merge.rc:1557 msgid "Target: &Right" msgstr "Miejsce docelowe: prawy" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1549 +#: Merge.rc:1559 msgid "Add &Difference Condition" msgstr "Dodaj warunek różnicy" #. 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 "Równy" #. 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 "Nierówny" #. 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 "Mniej niż" #. 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 "Mniejsze lub równe" #. 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 "Większe niż" #. 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 "Większe lub równe" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 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 lub więcej" #. 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 "Mniej niż 1 sekunda" #. 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 sekunda lub więcej" #. 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 "Mniej niż 1 minuta" #. 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 minuta lub więcej" #. 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 "Mniej niż 1 godzina" #. 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 godzina lub więcej" #. 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 "Mniej niż 1 dzień" #. 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 dzień lub dłużej" #. 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 "Mniej niż 1 tydzień" #. 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 tydzień lub dłużej" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT -#: Merge.rc:1596 +#: Merge.rc:1606 msgid "Target: &Left and Right" msgstr "Miejsce docelowe: lewy i prawy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE -#: Merge.rc:1597 +#: Merge.rc:1607 msgid "Target: Left and &Middle" msgstr "Miejsce docelowe: lewy i środkowy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT -#: Merge.rc:1598 +#: Merge.rc:1608 msgid "Target: Middle and &Right" msgstr "Miejsce docelowe: środkowy i prawy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL -#: Merge.rc:1599 +#: Merge.rc:1609 msgid "Target: &All" msgstr "Miejsce docelowe: wszystkie" #. 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 "Wyczyść warunki" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE -#: Merge.rc:1757 +#: Merge.rc:1767 msgid "Compare &Size" msgstr "Porównaj rozmiar" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE -#: Merge.rc:1758 +#: Merge.rc:1768 msgid "Compare &Date" msgstr "Porównaj datę" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR -#: Merge.rc:1759 +#: Merge.rc:1769 msgid "Compare &Attributes" msgstr "Porównaj atrybuty" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS -#: Merge.rc:1760 +#: Merge.rc:1770 msgid "Compare C&ontents" msgstr "Porównaj zawartość" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR -#: Merge.rc:1769 +#: Merge.rc:1779 msgid "&Clear Keys" msgstr "Wyczyść klucze" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME -#: Merge.rc:1771 +#: Merge.rc:1781 msgid "&Name" msgstr "Nazwa" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME -#: Merge.rc:1772 +#: Merge.rc:1782 msgid "&Base name (without extension)" msgstr "Nazwa podstawowa (bez rozszerzenia)" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME -#: Merge.rc:1773 +#: Merge.rc:1783 msgid "Normalized &Unicode Name" msgstr "Znormalizowana nazwa Unicode" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH -#: Merge.rc:1774 +#: Merge.rc:1784 msgid "&Relative Path" msgstr "Ścieżka względna" #. 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 "Wstaw funkcję zastąp()" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REGEXREPLACE -#: Merge.rc:1781 +#: Merge.rc:1791 msgid "Insert rege&xReplace() Function" msgstr "Wstaw funkcję zastąpWyrażenieRegularne()" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1782 +#: Merge.rc:1792 msgid "Replace &Lists" msgstr "Listy zastąp" #. 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 "Utwórz listę zastąp ciągów znaków i wstaw..." #. 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 "Utwórz listę zastąp wyrażenie regularne i wstaw..." #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1787 +#: Merge.rc:1797 msgid "&String Replace Lists" msgstr "Listy zastąp ciągów znaków" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1791 +#: Merge.rc:1801 msgid "Re&gex Replace Lists" msgstr "Listy zastąp wyrażenie regularne" #. 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 "Otwórz folder listy zastąp ciągu znaków..." #. 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 "Otwórz folder listy zastąp wyrażenie regularne..." #. 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 "Uwzględnij wielkość liter" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1801 +#: Merge.rc:1811 msgid "Text &Normalization" msgstr "Normalizacja tekstu" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER -#: Merge.rc:1803 +#: Merge.rc:1813 msgid "&Lowercase" msgstr "Małe litery" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER -#: Merge.rc:1804 +#: Merge.rc:1814 msgid "&Uppercase" msgstr "Duże litery" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH -#: Merge.rc:1805 +#: Merge.rc:1815 msgid "&Half-width" msgstr "Połowa szerokości" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH -#: Merge.rc:1806 +#: Merge.rc:1816 msgid "&Full-width" msgstr "Pełna szerokość" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1807 +#: Merge.rc:1817 msgid "&Chinese Conversion" msgstr "Konwersja chińska" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE -#: Merge.rc:1809 +#: Merge.rc:1819 msgid "&Simplified Chinese" msgstr "Chiński uproszczony" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE -#: Merge.rc:1810 +#: Merge.rc:1820 msgid "&Traditional Chinese" msgstr "Chiński tradycyjny" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1812 +#: Merge.rc:1822 msgid "&Japanese Conversion" msgstr "Konwersja japońska" #. 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 "Normalizuj Unicode" #. IDD_ABOUTBOX -#: Merge.rc:1932 +#: Merge.rc:1942 msgid "About WinMerge" msgstr "O programie WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Odwiedź stronę 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 "Współtwórcy" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Wybierz pliki lub foldery" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "Pierwszy plik lub folder" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Tylko do odczytu" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Zamień 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 "Przeglądaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "Drugi plik lub folder" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Tylko &do odczytu" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Zamień 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 "P&rzeglądaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "Trzeci plik lub folder (opcjonalnie)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Tylko do odczytu" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Zamień 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 "Przeglądaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Folder: filtr" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "Uwzględn&ij podfoldery" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Plik: wtyczka porównywająca" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Plik: wtyczka rozpakowująca" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Wybierz..." #. 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 "Anuluj" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Stan:" #. 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 "Pomoc" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "Opcje..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Znajdź" #. 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 "Z&najdź:" #. 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 "Dopasuj tylko całe sło&wa" #. 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 "Wyrażenie r&egularne" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Szukaj tylk&o do końca pliku" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "Nie zamykaj tego okna" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "Znajdź następny" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Znajdź poprzedni" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Zastąp" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Zastą&p na:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "Szukaj tylko &do końca pliku" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Zastąp w" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "Całym pliku" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Znajdź poprzedni" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Zastąp" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Z&astąp wszystkie" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "Markery" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "Włącz &markery" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Nowy" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Kolor tła:" #. 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 "Z&astosuj" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Filtry wiersza" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Włącz filtry wiersza" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Wyrażenia regularne (jedno na wiersz):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Edytuj" #. 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 "Usuń" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Filtry zamiany" #. 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 "Zmiany, które pojawią się na panelach jako wymienione poniżej pary, zostaną zignorowane lub oznaczone jako nieistotne. Poprawki pozostaną nienaruszone." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Włącz" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Dodaj" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Wyczyść" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Opcje" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Importuj..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Eksportuj..." #. 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 "Ogólne" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Przewiń automatycznie do pierw&szej różnicy" #. 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 "Przewiń automatycznie do pierwszej różnicy w wierszu" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Zamknij &okna klawiszem 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Zweryfikuj automatycznie ścieżki w oknie otwierania plików" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Tryb pojedynczej instancji:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "Zapytaj przed zamknięciem wielu o&kien" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Zachowaj czas &pliku w porównanym pliku" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Po uruchomieniu pokaż okno \"wybierz pliki lub foldery\"" #. 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 "Zamknij okno \"wybierz pliki lub foldery\" po kliknięciu \"porównaj\"" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Otwórz okno automatycznego uzu&pełniania:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Automatycznie przeładuj zmodyfikowane pliki:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Język:" #. 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 "Domyślne" #. 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 "Kolory" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2127 +#: Merge.rc:2137 msgid "Color &mode:" msgstr "Tryb koloru:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2129 +#: Merge.rc:2139 msgid "&Light mode scheme:" msgstr "Schemat trybu jasnego:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2131 +#: Merge.rc:2141 msgid "&Dark mode scheme:" msgstr "Schemat trybu ciemnego:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2133 +#: Merge.rc:2143 msgid "Your custom schemes" msgstr "Twoje niestandardowe schematy" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE -#: Merge.rc:2134 +#: Merge.rc:2144 msgid "&Save current scheme..." msgstr "Zapisz bieżący schemat..." #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE -#: Merge.rc:2135 +#: Merge.rc:2145 msgid "Delete ¤t scheme..." msgstr "Usuń bieżący schemat..." #. 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 "Tło" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Usunięte" #. 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 "Różnica:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Zaznaczona różnica:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Pominięta różnica:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Przeniesione:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Zaznaczone przeniesione:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Taki sam jak następny (3 panele):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Taki sam jak następny (zaznaczone):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Różniące się słowa:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Zaznaczone różniące się słowa:" #. 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 "Okno dialogowe" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Słowa kluczowe:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Nazwy funkcji:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Komentarze:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Liczby:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Operatory:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Ciągi znaków:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Preprocesor:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Użytkownik 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Użytkownik 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 "Pogrubienie" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "Użyj niestandardowych kolorów tekstu" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Odstęp:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Czcionka regularna:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Zaznaczenie:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Margines:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Znaleziony marker:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Marker zdefiniowany przez użytkownika 1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Marker zdefiniowany przez użytkownika 2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Marker zdefiniowany przez użytkownika 3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "Użyj kolorów do porównania folderów" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Identyczne elementy:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Różniące się elementy:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Nieistniejące elementy:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Przefiltrowane elementy:" #. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED -#: Merge.rc:2295 +#: Merge.rc:2305 msgid "&Use custom system colors" msgstr "Użyj niestandardowych kolorów systemowych" #. 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 "System" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "Przenieś u&sunięte pliki do kosza" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "Z&ewnętrzny edytor:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2311 +#: Merge.rc:2321 msgid "&Store user data in:" msgstr "Przechowuj dane użytkownika w:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2313 +#: Merge.rc:2323 msgid "&Filter folder:" msgstr "Folder &filtrów:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Folder plików tymczasowych" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Systemowy folder tymczasowy" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Folder niestandardowy:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Przeglądaj..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Porównaj" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Białe znaki" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "Porównaj" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "Ignoruj zmiany" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "Ignoruj wszystkie" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Ignoruj puste wiersze" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Ignoruj wielkości liter" #. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE -#: Merge.rc:2335 +#: Merge.rc:2345 msgid "Igno&re EOL differences (Windows/Unix/Mac)" msgstr "Ignoruj różnice w znaku końca linii (Windows/Unix/Mac)" #. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS -#: Merge.rc:2337 +#: Merge.rc:2347 msgid "Ignore num&bers" msgstr "Ignoruj liczby" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Ignoruj różnice strony ko&dowej" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignoruj różnice w komentarzach" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "Ignoruj brakujący znak końca linii" #. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK -#: Merge.rc:2343 +#: Merge.rc:2353 msgid "Ignore line &breaks (treat as spaces)" msgstr "Ignoruj podział wierszy (traktuj jako spacje)" #. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS -#: Merge.rc:2345 +#: Merge.rc:2355 msgid "E&nable moved block detection" msgstr "Włącz wykrywanie przeniesionych bloków" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Wyrównaj podobne wiersze" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "Algorytm porównywania:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Włącz heurystykę wcięcia" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Nie podświetlaj ignorowanych różnic" #. IDS_OPTIONSPG_EDITOR -#: Merge.rc:2357 Merge.rc:4201 +#: Merge.rc:2367 Merge.rc:4211 msgid "Editor" msgstr "Edytor" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "Podświetlaj składnię" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "Zachowaj oryginalne znaki końca linii" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Tabulatory" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "Rozmiar tabulatora:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Wstaw tabulatory" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Wstaw spacje" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "&Tryb renderowania:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Automatycznie powtórz skanowanie" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2377 +#: Merge.rc:2387 msgid "Copy &granularity for selected differences:" msgstr "Dokładność kopiowania zaznaczonych różnic:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP -#: Merge.rc:2379 +#: Merge.rc:2389 msgid "Line Difference Coloring" msgstr "Kolorowanie różniących się wierszy" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Wyświetl różniące się wiersze" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "Z poziomu znaku" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "Z poziomu słowa:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Znaki dzielenia wyrazów:" #. 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 pozwala ukryć niektóre komunikaty. Naciśnij Resetuj, aby ponownie wyświetlać wszystkie komunikaty." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Resetuj" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Generuj łatkę" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Plik &1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Plik &2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "Zamień" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "Kopiuj do schowka" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "Dod&aj do istniejącego pliku" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "Wynik:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Przeglądaj..." #. 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&yl:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "Kontekst:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Uwzględnij wiersz poleceń" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Otwórz w zewnętrznym edytorze" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Wyświetl kolumny" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "W górę" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "W dół" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "Dodatkowe właściwości" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Dodatkowe właściwości" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Wybierz wtyczkę" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "Nazwa wtyczki:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC -#: Merge.rc:2480 +#: Merge.rc:2490 msgid "&Target files:" msgstr "Pliki docelowe:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2482 Merge.rc:3117 +#: Merge.rc:2492 Merge.rc:3127 msgid "Extensions list:" msgstr "Lista rozszerzeń:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 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 "Domyślne argumenty:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Wyświetl wszystkie wtyczki (ignoruj rozszerzenia)" #. 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 "Po rozpakowaniu otwórz pliki w tym samym typie okna" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "Wtyczka 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 "Zatrzymaj" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Wstrzymaj" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "kontynuuj" #. 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 "Liczba rdzeni CPU do wykorzystania:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Łącznie elementów:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Porównano elementów:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "Zamknij" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Idź do" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "Idź do:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Plik" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Element docelowy" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Wiersz" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "Różnica" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "Idź do" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Filtry plików" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "Wyrażenie maski / filtra" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2562 +#: Merge.rc:2572 msgid "Preset &Filters" msgstr "Predefiniowane filtry" #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN -#: Merge.rc:2564 +#: Merge.rc:2574 msgid "Test..." msgstr "Testuj..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Instaluj..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Nowy..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Edycja..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Usuń..." #. IDD_FILTERS_CONDITION -#: Merge.rc:2573 +#: Merge.rc:2583 msgid "Filter Condition" msgstr "Warunek filtrowania" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2576 +#: Merge.rc:2586 msgid "&Left-hand side:" msgstr "Lewa strona:" #. 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 "Prawa strona:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2586 +#: Merge.rc:2596 msgid "Expression:" msgstr "Wyrażenie:" #. 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 "Identyczne" #. 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 "Różne" #. 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 "Strona kodowa" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Domyślna strona kodowa" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Wybierz domyślną stronę kodową dla plików nie-Unicode:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Strona kodowa systemu" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Według interfejsu użytkownika WinMerge" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Niestandardowa strona kodowa:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "Detect codepage for: .html, .rc, .xml\nRestart required." msgstr "Wykryj stronę kodową dla plików: .html, .rc, .xml \nWymagany restart." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "Detect codepage for files with mlang.dll\nRestart required." msgstr "Wykryj stronę kodową dla plików tekstowych wykorzystując mlang.dll\nWymagany restart." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Wsparcie dla archiwów" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Włącz wsparcie dla archiwów" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "Wykryj typ archiwum z sygnatury pliku" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Elementy zapisane lub przywrócone z pliku projektu:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Zapisać zmodyfikowane pliki?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Lewy plik" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "Zapisz zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "Odrzuć zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Środkowy plik" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Zapisz zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Odrzuć zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Prawy plik" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Zapisz zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Odrzuć zmiany" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Odrzuć wszystkie" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Raport porównania folderów" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Plik raportu:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "Styl:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "Uwzględnij raport porównania plików" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Filtr współdzielony lub prywatny" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Jaki typ filtra chcesz utworzyć?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Filtr współdzielony (dla wszystkich użytkowników)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Filtr prywatny (tylko dla bieżącego użytkownika)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Statystyki porównania" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Foldery:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 msgid "Files:" msgstr "Pliki:" #. 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 "Binarny:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Unikalne" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Lewa:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Prawa:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Łącznie:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Zamknij" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Środek:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Brakujące w lewej:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Brakujące na środku:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Brakujące w prawej:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Działanie" #. 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 "(Działanie)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Wybierz stronę kodową dla" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "Wczytanego pliku:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Zapisanego pliku:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "Użyj tej samej strony kodowej dla obu" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "Anuluj" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Test filtra" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Testowanie filtra:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "Wpisz tekst do sprawdz.:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "Nazwa folderu" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Wynik:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "Testuj" #. 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 "Typ pliku" #. 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 "Niestandardowe wartości - rozdzielone separatorem" #. 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 "Znak rozgraniczający:" #. 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 "Zezwól na nowe wiersze w cudzysłowach" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Znak cudzysłowu:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Pliki kopii zapasowej" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Twórz pliki kopii zapasowej dla:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "Porównywanie folderów" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Porównywanie plików" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Utwórz pliki kopii zapasowej w:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Folderze oryginalnych plików" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Globalnym folderze kopii zapasowej:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Nazwa pliku kopii zapasowej:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "Dodaj rozszerzenie .bak" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Dodaj czas utworzenia" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Potwierdź kopiowanie" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Czy na pewno chcesz skopiować XXX elementów?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Z lewej" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Na prawą" #. 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 "Nie pytaj ponownie." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Tak" #. IDD_CONFIRM_COPY, IDNO -#: Merge.rc:2904 +#: Merge.rc:2914 msgid "No" msgstr "Nie" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Wtyczki" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "Włącz wtyczki" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2913 Merge.rc:3113 +#: Merge.rc:2923 Merge.rc:3123 msgid "Plugin &type:" msgstr "Typ wtyczki:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2916 +#: Merge.rc:2926 msgid "File filters:" msgstr "Filtry pliku:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Argumenty wtyczki:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Włącz automatyczne rozpakowywanie/porównywanie" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integracja z powłoką" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "Eksplorator" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "Dodaj do menu kontekstowego" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Włącz menu zaawansowane" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Włącz menu \"porównaj jako\"" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "Zarejestruj rozszerzenie powłoki" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "Wyrejestruj rozszerzenie powłoki" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Zarejestruj rozszerzenie powłoki tylko dla bieżącego użytkownika" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Wyrejestruj rozszerzenie powłoki tylko z bieżącego użytkownika" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Zarejestruj rozszerzenie powłoki dla Windows 11" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Wyrejestruj rozszerzenie powłoki z Windows 11" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Lista szybkiego dostępu" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Wyczyść wszystkie ostatnie elementy" #. IDS_OPTIONSPG_FOLDERCOMPARE -#: Merge.rc:2954 Merge.rc:4225 +#: Merge.rc:2964 Merge.rc:4235 msgctxt "Options dialog|Categories" msgid "Folder" msgstr "Folder" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2957 +#: Merge.rc:2967 msgid "&Compare method:" msgstr "Metoda porównania:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "Zatrzymaj po pierwszej różnicy" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoruj różnice czasu mniejsze niż 3 sekundy" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Rozwiń podfoldery po porównaniu:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Uwzględnij unikalną zawartość podfolderów" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Ignoruj punkty ponownej analizy składniowej" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Przełącz na szybkie porównywanie, gdy rozmiar przekroczy (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Przełącz na binarne porównywanie, gdy rozmiar przekroczy (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2975 +#: Merge.rc:2985 msgid "Additional comparison condi&tions:" msgstr "Dodatkowe warunki porównywania:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2978 +#: Merge.rc:2988 msgid "&Rename/move detection:" msgstr "Wykrywanie zmiany nazwy/przeniesienia:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2980 +#: Merge.rc:2990 msgid "Rename/move detection &keys:" msgstr "Klucze wykrywania zmiany nazwy/przeniesienia:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2983 +#: Merge.rc:2993 msgid "M&erge renames and moves:" msgstr "Scal zmiany nazw i przeniesienia:" #. 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 "Szablony pliku:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Niestandardowe wartości rozdzielone separatorem" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Binarny" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "Szablony pliku binarnego:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Ustawienia Free Hex Editor" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Wyświetl ustawienia..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "Tryb binarny..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "Zestaw znaków..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Obraz" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "Szablony pliku obrazu:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Włącz porównywanie obrazów w porównywanym katalogu" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Wynik OCR:" #. IDS_OPTIONSPG_WEBPAGECOMPARE -#: Merge.rc:3043 Merge.rc:4229 +#: Merge.rc:3053 Merge.rc:4239 msgid "Webpage" msgstr "Strona internetowa" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Szablon adresu URL do uwzględnienia (wyrażenie regularne):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Szablon adresu URL do wykluczenia (wyrażenie regularne):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "Lokalizacja folderu danych użytkownika:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "Oddzielne foldery danych użytkownika dla każdego panelu" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "Widok szesnastkowy" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3110 +#: Merge.rc:3120 msgid "Edit Plugin" msgstr "Edytuj wtyczkę" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:3123 +#: Merge.rc:3133 msgid "&Category:" msgstr "Kategoria:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC -#: Merge.rc:3125 +#: Merge.rc:3135 msgid "&Menu caption:" msgstr "Menu podpis:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC -#: Merge.rc:3127 +#: Merge.rc:3137 msgid "&Window type:" msgstr "Typ okna:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC -#: Merge.rc:3132 +#: Merge.rc:3142 msgid "&Unpacked file extension:" msgstr "Rozszerzenie rozpakowanego pliku:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "Wymagane argumenty" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT -#: Merge.rc:3137 +#: Merge.rc:3147 msgid "&Generate editor script" msgstr "Wygeneruj edytor skryptu" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC -#: Merge.rc:3140 +#: Merge.rc:3150 msgid "Command &line:" msgstr "Wiersz poleceń:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "Rozszerzenie pliku skryptu:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "Treść skryptu:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3154 +#: Merge.rc:3164 msgid "Font" msgstr "Czcionka" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3157 +#: Merge.rc:3167 msgid "&Font:" msgstr "Czcionka:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3163 +#: Merge.rc:3173 msgid "Font st&yle:" msgstr "Styl czcionki:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3169 +#: Merge.rc:3179 msgid "&Size:" msgstr "Rozmiar:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3175 +#: Merge.rc:3185 msgid "Effects" msgstr "Efekty" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3176 +#: Merge.rc:3186 msgid "Stri&keout" msgstr "Przekreślenie" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3177 +#: Merge.rc:3187 msgid "&Underline" msgstr "Podkreślenie" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3179 +#: Merge.rc:3189 msgid "&Color:" msgstr "Kolor:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3184 +#: Merge.rc:3194 msgid "Sample" msgstr "Przykład" #. 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 "Skrypt:" #. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK -#: Merge.rc:3194 +#: Merge.rc:3204 msgid "Show more fonts" msgstr "Pokaż więcej czcionek" #. 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 "\nNowe dokumenty (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "\nOpen (Ctrl+O)" msgstr "\nOtwórz (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "\nSave (Ctrl+S)" msgstr "\nZapisz (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Nieznany błąd podczas próby otwarcia projektu." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Nieznany błąd podczas próby zapisu projektu." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Projekt został pomyślnie wczytany." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Projekt został pomyślnie zapisany." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "\nUndo (Ctrl+Z)" msgstr "\nCofnij (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "\nRedo (Ctrl+Y)" msgstr "\nPowtórz (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nPorównaniePlików\n\n\n\nWinMerge.PorównaniePlików\nWinMerge Porównanie Plików" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nPorównywanieFolderów\n\n\n\nWinMerge.PorównywanieFolderów\nWinMerge Porównywanie Folderów" #. 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 jest dostarczany bez ABSOLUTNIE ŻADNEJ GWARANCJI. Jest to darmowe oprogramowanie i może być rozpowszechniane na warunkach Powszechnej Licencji Publicznej GNU - szczegóły znajdziesz w menu Pomoc." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "Przerwij" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "Ponów" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "Ignoruj" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Ignoruj wszystkie" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "Tak" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "Tak na wszystko" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "Nie" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Nie na wszystko" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "Kontynuuj" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "Pomiń" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Pomiń wszystko" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Nie wyświetlaj ponownie tego komunikatu." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "Aby ponownie wyświetlić ten komunikat, przejdź do Opcji programu, a następnie w zakładce Komunikaty naciśnij przycisk Resetuj." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "Porównaj/Scal" #. IDS_OPTIONSPG_SYNTAXCOLORS -#: Merge.rc:4204 Merge.rc:4208 +#: Merge.rc:4214 Merge.rc:4218 msgid "Syntax" msgstr "Składnia" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Schematy kolorów" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Porównanie folderów" #. 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 msgid "Differences" msgstr "Różnice" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Komunikaty" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Do:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Z lewej:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Do lewej:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Z prawej:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Do prawej:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Od środka:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Do środka:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Wersja %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Opcje (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Wszystkie komunikaty zostaną ponownie wyświetlone." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "Wartość w wielkości tabulatora nie może być zaakceptowana przez WinMerge.\n\nProszę użyć wartości 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Otwórz" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Pliki projektu WinMerge (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Pliki ustawień (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*||" #. IDS_REPLACELIST_FILES -#: Merge.rc:4268 +#: Merge.rc:4278 msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||" msgstr "Wartości rozdzielane tabulatorami (*.tsv;*.txt)|*.tsv;*.txt|Wszystkie pliki (*.*)|*.*||" #. IDS_TEXT_REPORT_FILES -#: Merge.rc:4274 +#: Merge.rc:4284 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Pliki tekstowe (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Wszystkie pliki (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Nie rozwijaj" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Rozwiń wszystkie podfoldery" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Rozwiń różniące się podfoldery" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Rozwiń identyczne podfoldery" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Typ pliku" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Rozszerzenie" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "Komunikat" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Odpowiedź" #. 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 "Wczytaj" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Zapisz" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Uwzględnij podfoldery" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Opcje porównania" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Ukryte elementy" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Nazwa" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Lokalizacja" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filtry" #. 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 "Opis" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Wybierz nazwę dla nowego filtru" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry plików (*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2." msgstr "Nie można odnaleźć szablonu dla filtru porównań plików!\n\nProszę skopiować plik %1 do folderu WinMerge/Filters:\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 "Nie można skopiować pliku szablonu filtra do folderu:\n%1\n\nUpewnij się, że folder istnieje i nie jest chroniony przez zapisem." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "User's filter folder is not defined!\n\nSelect filter folder in Options/System." msgstr "Folder plików filtrów użytkownika nie został zdefiniowany!\n\nProszę wybrać folder filtrów w Opcje/System." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "Failed to delete filter:\n%1\n\nFile may be read-only." msgstr "Nie można usunąć pliku filtra:\n%1\n\nMoże plik jest tylko do odczytu?" #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Lokalizacja pliku filtra do instalacji" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "Installing filter file failed.\n\nCould not copy new filter to folder." msgstr "Instalowanie pliku filtra nie powiodło się.\n\nNie można skopiować pliku do foldera filtrów." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Plik filtra już istnieje. Nadpisać?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Wyrażenia regularne" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later." msgstr "Filtry zostały zaktualizowane. Odświeżyć wszystkie otwarte okna porównania folderów?\n\nWybierz 'Nie', aby odświeżyć później." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Wyniki porównania folderów" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Porównywanie plików" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Lewy bez nazwy" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Środkowy bez nazwy" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Prawy bez nazwy" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Plik podstawowy" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Ich plik" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Mój plik" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Oryginalny plik" #. 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 "Wiersz: %s Kolumna: %d/%d Znak: %d/%d ZKL: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Wiersz: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Wiersz: %s Kolumna: %d/%d Znak: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Zaznaczono: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Scal" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Różnica %1 z %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono %1 różnic(e)" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "Znaleziono 1 różnicę" #. IDS_NO_ERR_SEL_FMT -#: Merge.rc:4389 +#: Merge.rc:4399 #, c-format msgid "%1 Errors Found" msgstr "Znaleziono %1 błędów" #. IDS_1_ERR_FOUND -#: Merge.rc:4390 +#: Merge.rc:4400 msgid "1 Error Found" msgstr "Znaleziono 1 błąd" #. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only" -#: Merge.rc:4391 +#: Merge.rc:4401 msgid "RO" msgstr "Tylko odczyt" #. IDS_DIRVIEW_STATUS_FMT_FOCUS -#: Merge.rc:4397 +#: Merge.rc:4407 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Elementy: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Porównywanie elementów..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[elementów/sek]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Wybierz dwa istniejące foldery lub pliki do porównania." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Wybierz folder" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Wybierz dwa (lub trzy) foldery bądź dwa (lub trzy) pliki do porównania." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Lewa (pierwsza) ścieżka jest nieprawidłowa!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Środkowa (druga) ścieżka jest nieprawidłowa!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Prawa (druga) ścieżka jest nieprawidłowa!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Prawa (trzecia) ścieżka jest nieprawidłowa!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Obie ścieżki są nieprawidłowe!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Lewa (pierwsza) i środkowa (druga) ścieżka jest nieprawidłowa!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Lewa (pierwsza) i prawa (trzecia) ścieżka jest nieprawidłowa!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Środkowa (druga) i prawa (trzecia) ścieżka jest nieprawidłowa!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Wszystkie ścieżki są nieprawidłowe!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Aktywne tylko w przypadku porównywania plików" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Nie można porównać pliku i folderu!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Nie rozpakowano pliku: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Nie można otworzyć pliku\n%1\n\n%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Nie udało się przeanalizować pliku konfliktu." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Plik\n%1\nnie jest plikiem konfliktu." #. 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 "Porównanie dużych plików wymaga znacznej ilości pamięci.\nWyświetlić tylko wyniki porównania (bez zawartości plików)?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Zapisz jako" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Zapisać zmiany w %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 jest tylko do odczytu. Nadpisać go? Wybierz 'Nie', aby zapisać pod nową nazwą." #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Błąd przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "Nie można wykonać kopii zapasowej oryginalnego pliku:\n%1\n\nKontynuować mimo wszystko?" #. 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 "Zapis pliku nieudany.\n%1\n%2\n\t- użyć innej nazwy pliku (OK)\n\t- przerwij bieżącą operację (Anuluj)?" -#: 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 "Wtyczka '%2' nie może spakować zmian wprowadzonych w lewym pliku do '%1'.\n\nOryginalny plik pozostał niezmieniony.\n\nZapisać rozpakowaną wersję?" -#: 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 "Wtyczka '%2' nie może spakować zmian wprowadzonych w środkowym pliku do '%1'.\n\nOryginalny plik pozostał niezmieniony.\n\nZapisać rozpakowaną wersję?" -#: 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 "Wtyczka '%2' nie może spakować zmian wprowadzonych w prawym pliku do '%1'.\n\nOryginalny plik pozostał niezmieniony.\n\nZapisać rozpakowaną wersję?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?" msgstr "Inna aplikacja dokonała zmian w pliku\n%1\npo tym jak WinMerge go wczytał.\n\nNadpisać?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "%1\nis read-only. Override?" msgstr "%1\njest tylko do odczytu. Nadpisać?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "Plik\n%1\nzostał zmodyfikowany przez inną aplikację.\n\nWczytać ponownie?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Zapisz lewy plik jako" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Zapisz środkowy plik jako" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Zapisz prawy plik jako" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "File\n%1\nnot found. Save a copy to continue." msgstr "Plik\n%1\nzostał usunięty. Proszę zapisać kopię pliku, aby móc kontynuować." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "Cannot merge unsynched documents.\n\nRefresh before continuing." msgstr "Nie można połączyć różnic, jeśli dokumenty nie są zsynchronizowane.\n\nPrzed kontynuowaniem odśwież dokumenty." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Zatrzymaj na białym znaku" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na białym znaku lub interpunkcji" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Kopiuj do środka\tAlt+Right" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Kopiuj do środka\tAlt+Left" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Kopiuj ze środka\tAlt+Shift+Right" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Kopiuj ze środka\tAlt+Shift+Left" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Kopiuj do środka i przejdź dalej\tCtrl+Alt+Right" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Kopiuj do środka i przejdź dalej\tCtrl+Alt+Left" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Kopiuj wszystko do środka" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Prawy do lewego (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Prawy do środka (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Środek do lewego (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Środek do prawego (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Lewy do prawego (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Lewy do środka (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Lewy 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 "Środek do... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Prawy do... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Obie do... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Wszystkie do... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Różnice do... (%1)" #. IDS_COPY_ONLYDIFFITEMS -#: Merge.rc:4519 +#: Merge.rc:4529 msgid "Some selected items are identical or skipped.\nCopy only items with differences?" msgstr "Niektóre zaznaczone elementy są identyczne lub zostały pominięte.\nSkopiować tylko elementy z różnicami?" #. IDS_DEL_LEFT_FMT -#: Merge.rc:4525 +#: Merge.rc:4535 #, c-format msgid "Left (%1)" msgstr "Lewy (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Środek (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Prawy (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Wszystkie (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Lewa strona - wybierz folder docelowy:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Środkowa strona - wybierz folder docelowy:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Prawa strona - wybierz folder docelowy:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objętych plików)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objętych plików)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Czy na pewno chcesz usunąć\n\n%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Czy na pewno chcesz skopiować?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Czy na pewno chcesz skopiować %d elementów?" #. 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 "Operacja przerwana!\n\nZawartość folderu na dysku została zmieniona. Ścieżka\n%1\nnie została odnaleziona.\n\nProszę odświeżyć porównanie." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Czy na pewno chcesz przenieść?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Czy na pewno chcesz przenieść %d elementów?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Potwierdź przenoszenie" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Zamknąć okno porównywania folderu?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "Zamknąć okno porównywania folderu, któremu poświęcono znaczną ilość czasu?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "Nazwa pliku lub folderu jest nieprawidłowa." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie można uruchomić zewnętrznego edytora: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "Failed to extract archive.\nCompare as text file?" msgstr "Nie udało się wyodrębnić archiwum.\nPorównać jako plik tekstowy?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Nazwa pliku" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Folder" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Wynik porównania" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Data lewego pliku" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Data prawego pliku" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Data środkowego pliku" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Rozmiar lewego pliku" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Rozmiar prawego pliku" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Rozmiar środkowego pliku" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Rozmiar prawego pliku (krótki)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Rozmiar lewego pliku (krótki)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Rozmiar środkowego pliku (krótki)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Czas utworzenia lewego pliku" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Czas utworzenia prawego pliku" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Czas utworzenia środkowego pliku" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Nowszy plik" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Wersja lewego pliku" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Wersja prawego pliku" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Wersja środkowego pliku" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Skrócony wynik" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Atrybuty lewego pliku" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atrybuty prawego pliku" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atrybuty środkowego pliku" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "Lewy znak końca linii" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "Środkowy znak końca linii" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "Prawy znak końca linii" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Lewe kodowanie" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Prawe kodowanie" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Środkowe kodowanie" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Zignorowana różnica" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Binarny" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Program rozpakowujący" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Porównywanie" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Lewy" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Środkowy" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Prawy" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Różnica" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Liczba duplikatów po lewej" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Liczba duplikatów po prawej" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Liczba duplikatów na środku" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Przesuń" #. IDS_PRPCAT_AUDIO -#: Merge.rc:4658 +#: Merge.rc:4668 msgid "Audio" msgstr "Dźwięk" #. IDS_PRPCAT_CALENDAR -#: Merge.rc:4659 +#: Merge.rc:4669 msgid "Calendar" msgstr "Kalendarz" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "Komunikacja" #. 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 "Urządzenia" #. 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 "Dom" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Dziennik" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Odnośnik" #. 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 "Muzyka" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Notatka" #. IDS_PRPCAT_PHOTO -#: Merge.rc:4672 +#: Merge.rc:4682 msgid "Photo" msgstr "Zdjęcie" #. IDS_PRPCAT_RECORDEDTV -#: Merge.rc:4673 +#: Merge.rc:4683 msgid "RecordedTV" msgstr "Nagranie TV" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Szukaj" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Bezpieczeństwo" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Oprogramowanie" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Zadanie" #. IDS_PRPCAT_VIDEO -#: Merge.rc:4678 +#: Merge.rc:4688 msgid "Video" msgstr "Wideo" #. 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 "Nie można porównać plików" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Anulowany" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Plik pominięty" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Folder pominięty" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Tylko po lewej: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Tylko na środku: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Tylko po prawej: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Nie istnieje w %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Pliki binarne są identyczne" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Pliki binarne są różne" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Pliki są różne" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Foldery są różne" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Tylko po lewej" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Tylko po prawej" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Tylko na środku" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Brak elementu po lewej" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Brak elementu po prawej" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Brak elementu na środku" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Błąd" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Pliki tekstowe są identyczne" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Środkowy i prawy są identyczne)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Lewy i prawy są identyczne)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Lewy i środkowy są identyczne)" #. IDS_PATH_MISMATCH -#: Merge.rc:4714 +#: Merge.rc:4724 msgid " (paths differ)" msgstr " (różne ścieżki)" #. IDS_TEXT_FILES_DIFF -#: Merge.rc:4715 +#: Merge.rc:4725 msgid "Text files are different" msgstr "Pliki tekstowe są różne" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Pliki obrazów są identyczne" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Pliki obrazów są różne" #. IDS_EXPR_DIFF -#: Merge.rc:4718 +#: Merge.rc:4728 #, c-format msgid "Files are different (expr: %1)" msgstr "Pliki są różne (wyrażenie: %1)" #. IDS_HASH_GROUP -#: Merge.rc:4719 +#: Merge.rc:4729 #, c-format msgid "Group%d" msgstr "Grupa%d" #. IDS_RENAME_MOVE_DETECTION_DISALBED -#: Merge.rc:4720 +#: Merge.rc:4730 msgctxt "Options dialog|Compare|Folder|Detect renames and moves" msgid "Disabled" msgstr "Wyłączony" #. IDS_RENAME_MOVE_DETECTION_RENAME -#: Merge.rc:4721 +#: Merge.rc:4731 msgid "Detect renames" msgstr "Wykryj zmiany nazw" #. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE -#: Merge.rc:4722 +#: Merge.rc:4732 msgid "Detect renames and moves" msgstr "Wykryj zmiany nazw i przeniesienia" #. IDS_RENAME_MOVE_MERGE_MODE_RENAME -#: Merge.rc:4723 +#: Merge.rc:4733 msgid "Merge renames" msgstr "Scal zmiany nazw" #. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE -#: Merge.rc:4724 +#: Merge.rc:4734 msgid "Merge renames and moves" msgstr "Scal zmiany nazw i przeniesienia" #. IDS_RENAMED -#: Merge.rc:4725 +#: Merge.rc:4735 msgid "Renamed" msgstr "Zmieniono nazwę" #. IDS_MOVED -#: Merge.rc:4726 +#: Merge.rc:4736 msgid "Moved" msgstr "Przeniesiono" #. IDS_RENAMED_MOVED -#: Merge.rc:4727 +#: Merge.rc:4737 msgid "Renamed/Moved" msgstr "Zmieniono nazwę/przeniesiono" #. IDS_RENAMED_MOVED_ITEMS -#: Merge.rc:4728 +#: Merge.rc:4738 #, c-format msgid "(%1 items)" msgstr "(%1 elementy(ów))" #. 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 "Niektóre przeniesione elementy zostały scalone.\nW trybie drzewa elementy te mogą pojawiać się w miejscach, które nie odzwierciedlają rzeczywistej struktury folderów, co może być mylące.\nPrzełączyć na tryb płaski?" #. IDS_ELAPSED_TIME -#: Merge.rc:4736 +#: Merge.rc:4746 #, c-format msgid "Elapsed time: %ld ms" msgstr "Upłynęło: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "Zaznaczono 1 element" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "Zaznaczono %1 elementy(ów)" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Nazwa pliku lub nazwa folderu." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Nazwa podfolderu, gdy podfoldery są przetwarzane." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Wynik porównania – długi formularz." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Data modyfikacji środkowej strony." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Rozszerzenie pliku." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Rozmiar środkowego pliku w bajtach." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Skrócony rozmiar lewego pliku." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Skrócony rozmiar prawego pliku." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Skrócony rozmiar środkowego pliku." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Czas utworzenia środkowej strony." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Pokazuje, która strona ma nowszą datę modyfikacji." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Wersja pliku lewej strony, tylko dla niektórych typów plików." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Wersja pliku prawej strony, tylko dla niektórych typów plików." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Wersja pliku środkowej strony, tylko dla niektórych typów plików." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Skrócony wynik porównania." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Atrybuty lewej strony." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Atrybuty prawej strony." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Atrybuty środkowej strony." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Typ znaków końca linii z lewej strony." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Typ znaków końca linii z prawej strony." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Typ znaków końca linii na środku." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Kodowanie lewej strony." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Kodowanie prawej strony." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Kodowanie środkowej strony." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "Liczba zignorowanych różnic w pliku. Różnice te zostały zignorowane przez WinMerge i nie mogą zostać połączone." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Liczba różnic w pliku. Liczba ta nie zawiera zignorowanych różnic." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdkę (*) jeśli plik jest binarny." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Nazwa pluginu rozpakowującego lub pipeline." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Nazwa wtyczki porównywającej lub pipeline." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "Porównaj %1 z %2" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "Porównaj %1 z %2 i %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Lista z przecinkami" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Lista z tabulatorami" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Prosty HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Plik raportu już istnieje. Nadpisać?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "Error creating the report:\n%1" msgstr "Błąd przy tworzeniu raportu:\n%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Raport został pomyślnie utworzony." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Nie można dodać punktu synchronizacji w tym wierszu." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Ten sam plik został otwarty w obu panelach." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Wybrane pliki są identyczne." #. IDS_FILESSAME_CURCFG -#: Merge.rc:4829 +#: Merge.rc:4839 msgid "Selected files are identical (with current settings).\r\nChecking binary identity..." msgstr "Wybrane pliki są identyczne (przy aktualnych ustawieniach).\r\nSprawdzanie tożsamości binarnej..." #. IDS_FILESSAME_BINERROR -#: Merge.rc:4830 +#: Merge.rc:4840 msgid "Selected files are identical (with current settings).\r\nBut binary comparison failed." msgstr "Wybrane pliki są identyczne (przy aktualnych ustawieniach).\r\nAle porównanie binarne nie powiodło się." #. IDS_FILESSAME_BINSAME -#: Merge.rc:4831 +#: Merge.rc:4841 msgid "Selected files are identical (binary match)." msgstr "Wybrane pliki są identyczne (zgodność binarna)." #. 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 "Wybrane pliki są identyczne (przy aktualnych ustawieniach).\r\nAle różnią się na poziomie binarnym." #. IDS_FILEERROR -#: Merge.rc:4833 +#: Merge.rc:4843 msgid "An error occurred while comparing files." msgstr "Wystąpił błąd podczas porównywania plików." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Nie można utworzyć plików tymczasowych. Sprawdź ustawienie ścieżki tymczasowej." #. 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 "Pliki używają różnych znaków końca linii.\n\nCzy traktować wszystkie znaki końca linii jako równoważne?\n\nUstaw 'Ignoruj znaki końca linii (Windows/Unix/Mac)' w Edycja/Opcje/Porównaj." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Wybrany folder jest nieprawidłowy." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Nie można otworzyć w edytorze pliku binarnego." #. 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 "Folder istnieje tylko na jednej ze stron i nie może zostać otwarty.\n\nCzy chcesz utworzyć odpowiedni folder:\n%1\npo drugiej stronie i otworzyć te foldery?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "Skopiować wszystkie różnice do innego pliku?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Przejść do następnego pliku?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Przejść do poprzedniego pliku?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Przejść do następnej strony?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Przejść do poprzedniej strony?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Przejść do pierwszego pliku?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Przejść do ostatniego pliku?" -#: 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 "Różne strony kodowe: lewa (cp%d), prawa (cp%d).\nWyświetlić w stronie kodowej (lepszy wynik) czy w domyślnej stronie kodowej Windows (bezpieczne scalanie)?\n(Zalecane: domyślna strona kodowa Windows)" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Utracono informacje z powodu błędów kodowania: oba pliki" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Utracono informacje z powodu błędów kodowania: pierwszy plik" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Utracono informacje z powodu błędów kodowania: drugi plik" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Utracono informacje z powodu błędów kodowania: trzeci plik" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Brak różnic" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Różniące się wiersze" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Zastąpiono %1 sekwencję(i) znaków." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Nie znaleziono ciągu znaków \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Przechodzisz do trybu scalania. Naciśnij F9, aby go wyłączyć." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "Automatic merges: %1\nUnresolved conflicts: %2" msgstr "Liczba automatycznie scalonych zmian: %1\nLiczba nierozwiązanych konfliktów: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Zmiana strony kodowej została scalona." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Zmiana strony kodowej powoduje konflikt." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Zmiana znaku końca linii została scalona." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Zmiany znaków końca linii powodują konflikt." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Panel lokalizacji" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Panel różnic" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Łatka została utworzona." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "Pierwszy element nie został znaleziony!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "Drugi element nie został znaleziony!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Plik łatki już istnieje. Nadpisać?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[Wybrano %1 plik(ów)]" #. IDS_DIFF_NORMAL -#: Merge.rc:4913 +#: Merge.rc:4923 msgid "Normal" msgstr "Normalny" #. IDS_DIFF_CONTEXT -#: Merge.rc:4914 +#: Merge.rc:4924 msgid "Context" msgstr "Kontekst" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Ujednolicony" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Nie można zapisać do pliku %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Wybrana ścieżka docelowa nie jest absolutna: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Określ plik wyjściowy." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Nie można utworzyć łatki z plików binarnych." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "Save all files first.\n\nCreating a patch requires no unsaved changes." msgstr "Najpierw zapisz wszystkie pliki.\n\nAby utworzyć łatkę, konieczne jest, aby w plikach nie było żadnych niezapisanych zmian." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Folder nie istnieje." #. 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 "Obsługa archiwów nie została włączona.\nNie znaleziono wszystkich potrzebnych komponentów (7-Zip i/lub Merge7z*.dll) do obsługi archiwów.\nWięcej informacji na temat obsługi archiwów i sposobu jej włączania znajdziesz w podręczniku." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Wybierz plik do eksportu" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Wybierz plik do importu" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Zaimportowano opcje z pliku." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Wyeksportowano opcje do pliku." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Błąd podczas importu opcji z pliku." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Błąd podczas eksportu opcji do pliku." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "Close multiple compare windows?\n\nContinue?" msgstr "Zamierzasz zamknąć wiele okien porównywania.\n\nKontynuować?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Mieszany" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Binarny" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Brak" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Kolor markera %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Nowy szablon" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Typ" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Edytor skryptu" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "\nDifference in Current Line (F4)" msgstr "\nRóżnica w bieżącym wierszu (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "\nOptions" msgstr "\nOpcje" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "\nRefresh (F5)" msgstr "\nOdśwież (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "\nPrevious Difference (Alt+Up)" msgstr "\nPoprzednia różnica (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "\nNext Difference (Alt+Down)" msgstr "\nNastępna różnica (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "\nPoprzedni konflikt (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "\nNastępny konflikt (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "\nFirst Difference (Alt+Home)" msgstr "\nPierwsza różnica (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "\nCurrent Difference (Alt+Enter)" msgstr "\nBieżąca różnica (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "\nLast Difference (Alt+End)" msgstr "\nOstatnia różnica (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "\nCopy to Right (Alt+Right)" msgstr "\nKopiuj do prawej (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "\nCopy to Left (Alt+Left)" msgstr "\nKopiuj do lewej (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)" msgstr "\nKopiuj do prawej i przejdź dalej (Ctrl+Alt+Right)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)" msgstr "\nKopiuj do lewej i przejdź dalej (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "\nCopy All to Right" msgstr "\nKopiuj wszystko do prawej" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "\nCopy All to Left" msgstr "\nKopiuj wszystko do lewej" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "\nAutomatyczne scalanie (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "\nFirst File" msgstr "\nPierwszy plik" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "\nNext File (Ctrl+F8)" msgstr "\nNastępny plik (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "\nLast File" msgstr "\nOstatni plik" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "\nPrevious File (Ctrl+F7)" msgstr "\nPoprzedni plik (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "Program rozpakowujący zostanie uruchomiony dla obu plików (tylko jeden plik wymaga rozszerzenia)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Bez porównywania (normalne)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Sugerowane wtyczki" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Wszystkie wtyczki" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Twoje oprogramowanie jest aktualne." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "WinMerge update available.\n%1 available (you have %2). Download now?" msgstr "Dostępna aktualizacja WinMerge.\nWersja %1 jest już dostępna (posiadasz %2). Pobrać teraz?" #. IDS_ALLRIGHTS_RESERVED -#: Merge.rc:5016 +#: Merge.rc:5026 msgid " - All rights reserved." msgstr " - wszelkie prawa zastrzeżone." #. IDS_CHECKFORUPDATES_FAILED -#: Merge.rc:5021 +#: Merge.rc:5031 msgid "Failed to download latest version information" msgstr "Nie udało się uzyskać informacji o dostępności nowszej wersji" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Ustawienia wtyczki" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH – skrypty .sct wyłączone" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Idź do wiersza %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Idź do przeniesionego wiersza\tCtrl+Shift+G" #. IDS_AUTOCOMPLETE_DISABLED -#: Merge.rc:5049 +#: Merge.rc:5059 msgctxt "Options dialog|General|Open dialog Auto completion" msgid "Disabled" msgstr "Wyłączony" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Z systemu plików" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Z listy ostatnio używanych" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Bez podświetlenia" #. IDS_COLORSCHEME_BATCH -#: Merge.rc:5063 +#: Merge.rc:5073 msgid "Batch" msgstr "Program wsadowy" #. IDS_COLORSCHEME_PO -#: Merge.rc:5090 +#: Merge.rc:5100 msgid "Portable Object" msgstr "Obiekt przenośny" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Zasoby" #. IDS_COLORSCHEME_SH -#: Merge.rc:5098 +#: Merge.rc:5108 msgid "Shell" msgstr "Powłoka" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "Zamknij karty po lewej" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Zamknij karty po prawej" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Zamknij inne karty" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Włącz automatyczną szerokość kart" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "Strona internetowa" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Zawijaj tekst" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 msgid "%1 is not installed." msgstr "%1 nie został zainstalowany." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 nie istnieje. Utworzyć go?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Nie udało się utworzyć folderu." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "Parameters:\n$file: Current file path\n$linenum: Current cursor line number" msgstr "Możesz podać następujące parametry ścieżki:\n$file: Nazwa ścieżki do bieżącego pliku\n$linenum: Numer wiersza dla aktualnej pozycji kursora" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "Domyślny" #. IDS_DIFF_ALGORITHM_MINIMAL -#: Merge.rc:5155 +#: Merge.rc:5165 msgid "minimal" msgstr "Minimalny" #. IDS_DIFF_ALGORITHM_PATIENCE -#: Merge.rc:5156 +#: Merge.rc:5166 msgid "patience" msgstr "Cierpliwy" #. 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 "Brak" #. 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 Domyślny" #. 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 Klasyczny" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "DirectWrite GDI Naturalny" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "DirectWrite Naturalny" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "DirectWrite Naturalny Symetryczny" #. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED -#: Merge.rc:5174 +#: Merge.rc:5184 msgctxt "Options dialog|General|Close windows with Esc" msgid "Disabled" msgstr "Wyłączony" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "Okno podrzędne lub okno główne" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Tylko okno podrzędne" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Zamknij okno główne, jeśli istnieje tylko jedno okno podrzędne" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Różnica" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Podświetl" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Mrugaj" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Rozmiar bloku" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Przezroczystość bloku" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Próg CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Wykrywanie Ins/Del" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Brak" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Pionowe" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Poziome" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Nakładka" #. IDS_OVERLAY_ALPHA -#: Merge.rc:5193 +#: Merge.rc:5203 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha" msgstr "Przezroczystość" #. 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 "Przenikanie" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Animacja" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Powiększenie" #. IDS_PAGE -#: Merge.rc:5199 +#: Merge.rc:5209 msgctxt "ImgMergeFrame|LocationPane" msgid "Page:" msgstr "Strona:" #. IDS_IMGCMP_STATUS_PT_RGBA_FMT -#: Merge.rc:5200 +#: Merge.rc:5210 #, c-format msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) " msgstr "Poz: (%d, %d) RGBA: (%d, %d, %d, %d) " #. IDS_IMGCMP_STATUS_DIST1_FMT -#: Merge.rc:5201 +#: Merge.rc:5211 #, c-format msgid "Dist: %g " msgstr "Odległość: %g " #. IDS_IMGCMP_STATUS_DIST2_FMT -#: Merge.rc:5202 +#: Merge.rc:5212 #, c-format msgid "Dist: %g, %g " msgstr "Odległość: %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 "Strona: %d/%d Powiększenie: %d%% %dx%dpx %dbpp " #. 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 "Odbicie: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Obrót: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Wszystkie strony" #. 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 "Nie znaleziono różnic, które można by zaznaczyć" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Nie znaleziono różnic, które można by dodać jako filtr zamiany" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Ta para jest już obecna na liście filtrów zamiany" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Dodać tę zmianę do filtrów zamiany?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Tylko tekst" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Pozycja i tekst wiersz-po-wierszu" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Pozycja i tekst słowo-po-słowie" #. IDS_USERDATAFOLDER_APPDATA -#: Merge.rc:5228 +#: Merge.rc:5238 msgid "AppData (Roaming) folder" msgstr "Folder AppData (Roaming)" #. IDS_USERDATAFOLDER_INSTALL -#: Merge.rc:5229 +#: Merge.rc:5239 msgid "Install folder" msgstr "Folder instalacji" #. IDS_USERDATAFOLDER_DOCUMENTS -#: Merge.rc:5230 +#: Merge.rc:5240 msgid "Documents folder" msgstr "Folder Dokumenty" #. IDS_SINGLEINSTANCE_DISABLED -#: Merge.rc:5235 +#: Merge.rc:5245 msgctxt "Options dialog|General|Single instance mode" msgid "Disabled" msgstr "Wyłączony" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Zezwól na uruchomienie tylko jednej instancji programu" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Zezwól na uruchomienie tylko jednej instancji i poczekaj, aż zakończy pracę" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Wyłączony" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Tylko w aktywnym oknie" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Natychmiast" #. IDS_PLUGIN_ALL -#: Merge.rc:5249 +#: Merge.rc:5259 msgid "Al&l" msgstr "Wszystkie" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "Pozostałe" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Brakująca nazwa wtyczki we wtyczce pipeline: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Brakujący cudzysłów we wtyczce pipeline: %1" #. IDS_PLUGIN_NAME_ALREADY_EXISTS -#: Merge.rc:5255 +#: Merge.rc:5265 #, c-format msgid "Plugin name '%1' already exists." msgstr "Wtyczka o nazwie '%1' już istnieje." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Określ argumenty wtyczki" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Nie znaleziono wtyczki lub jest ona nieprawidłowa: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' nie jest wtyczką rozpakowującą" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' nie jest wtyczką porównującą" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "Błąd porównywania '%1' z '%2'. Porównywanie wyłączone." #. IDS_PLUGIN_CIRCULAR_REFERENCE -#: Merge.rc:5263 +#: Merge.rc:5273 #, c-format msgid "Circular reference in plugin pipeline: %1" msgstr "Odwołanie cykliczne we wtyczce pipeline: %1" #. IDS_PLUGIN_TYPE1 -#: Merge.rc:5264 +#: Merge.rc:5274 msgid "URL Handler" msgstr "Obsługa adresu URL" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Program do rozpakowywania plików" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Program do rozpakowywania plików lub folderów" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Alias dla programu rozpakowującego" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "Alias dla porównywania" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Alias dla edytora skryptu" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "Alias dla wtyczki pipeline '%1'" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Opis nowej wtyczki" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Wszystko" #. 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 i 2" #. IDS_PLUGIN_TARGETS_1ST_3RD -#: Merge.rc:5278 +#: Merge.rc:5288 msgid "1st and 3rd" msgstr "1 i 3" #. IDS_PLUGIN_TARGETS_2ND_3RD -#: Merge.rc:5279 +#: Merge.rc:5289 msgid "2nd and 3rd" msgstr "2 i 3" #. IDS_FILTER_APPLIED -#: Merge.rc:5284 +#: Merge.rc:5294 msgid "Filter applied" msgstr "Zastosowano filtr" #. IDS_FILTERMENU_COMPARE -#: Merge.rc:5289 +#: Merge.rc:5299 #, c-format msgid "Compare %1" msgstr "Porównaj %1" #. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN -#: Merge.rc:5290 +#: Merge.rc:5300 msgid "&Filter by This Column" msgstr "Filtruj według tej kolumny #. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2 -#: Merge.rc:5291 +#: Merge.rc:5301 msgid "&Filter by This Column..." msgstr "Filtruj według tej kolumny..." #. IDS_CLIPBOARDHISTORY_TIME -#: Merge.rc:5296 +#: Merge.rc:5306 #, c-format msgid "Clipboard at %s" msgstr "Schowek w %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on." msgstr "Historia schowka jest wyłączona.\r\nAby włączyć historię schowka, naciśnij klawisz logo Windows + V, a następnie kliknij przycisk Włącz." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Ten system nie obsługuje historii schowka." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "32-bitowa wersja programu WinMerge nie obsługuje funkcji porównywania schowka" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "WebView2 Runtime nie został zainstalowany. Pobrać go?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Porównaj nowy tekst" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Porównaj nową tabelę" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Porównaj nowe pliki binarne" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Porównaj nowy obraz" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Porównaj nową stronę internetową" +#. 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 "Porównaj schowek" #. IDS_PREVIEWBAR_PRINT -#: Merge.rc:5321 +#: Merge.rc:5332 msgid "&Print..." msgstr "Drukuj..." #. IDS_PREVIEWBAR_PREVPAGE -#: Merge.rc:5323 +#: Merge.rc:5334 msgid "Pre&v Page" msgstr "Poprzednia strona" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "Dwie strony" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "Jedną stronę" #. IDS_PREVIEWBAR_ZOOMIN -#: Merge.rc:5326 +#: Merge.rc:5337 msgid "Zoom &In" msgstr "Powiększ" #. IDS_PREVIEWBAR_ZOOMOUT -#: Merge.rc:5327 +#: Merge.rc:5338 msgid "Zoom &Out" msgstr "Pomniejsz" #. IDS_WEBPAGE_COMPARING -#: Merge.rc:5333 +#: Merge.rc:5344 msgid "Comparing..." msgstr "Porównywanie..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Powiększenie:" #. IDS_COPY_GRANULARITY_DIFFHUNK -#: Merge.rc:5339 +#: Merge.rc:5350 msgid "Diff hunk" msgstr "Fragment różnicy" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Różnica w linii" #. IDS_COPY_GRANULARITY_LINE -#: Merge.rc:5341 +#: Merge.rc:5352 msgid "Line" msgstr "Wiersz" -#: Merge.rc:5342 +#: Merge.rc:5353 msgid "Character" msgstr "Znak" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "\nPoprzednia różnica (Alt+Klawisz w górę)\n(Prawy przycisk+Kółko w górę)\n(Alt+Kółko w górę)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "\nNastępna różnica (Alt+Klawisz w dół)\n(Prawy przycisk+Kółko w dół)\n(Alt+Kółko w dół" #. 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 "\nKopiuj do prawej (Alt+Prawo)\n(Prawy przycisk+Kółko w prawo)\n(Alt+Kółko w prawo)\n(Alt+Shift+Kółko w dół)" #. 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 "\nKopiuj do lewej (Alt+Lewo)\n(Prawy przycisk+Kółko w lewo)\n(Alt+Kółko w lewo)\n(Alt+Shift+Kółko w górę)" #. 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 "\nKopiuj do prawej i przejdź dalej (Ctrl+Alt+Prawo)\n(Ctrl+Alt+Kółko w prawo)\n(Ctrl+Alt+Shift+Kółko w dół)" #. 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 "\nKopiuj do lewej i przejdź dalej (Ctrl+Alt+Lewo)\n(Ctrl+Alt+Kółko w lewo)\n(Ctrl+Alt+Shift+Kółko w górę)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "Porównywanie %1 z %2" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "Porównywanie %1 z %2 i %3" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "Porównywanie zakończone" #. IDS_LOG_COMPARE_ERROR_2 -#: Merge.rc:5365 +#: Merge.rc:5376 #, c-format msgid "Failed to compare %1 with %2: " msgstr "Nie udało się porównać %1 z %2: " #. IDS_LOG_COMPARE_ERROR_3 -#: Merge.rc:5366 +#: Merge.rc:5377 #, c-format msgid "Failed to compare %1 with %2 and %3: " msgstr "Nie udało się porównać %1 z %2 i %3: " #. IDS_LOG_FILE_SAVED -#: Merge.rc:5367 +#: Merge.rc:5378 msgid "File saved" msgstr "Plik został zapisany" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "Kopiowanie plików..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "Przenoszenie plików..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "Usuwanie plików..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Kosz" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Trwale usunięty" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Operacja na pliku zakończona pomyślnie" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Operacja na pliku została anulowana" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Brak błędu" #. IDS_FILTER_ERROR_EMPTY_EXPRESSION -#: Merge.rc:5380 +#: Merge.rc:5391 msgid "Filter expression is empty" msgstr "Wyrażenie filtrujące jest puste" #. IDS_FILTER_ERROR_UNKNOWN_CHAR -#: Merge.rc:5381 +#: Merge.rc:5392 msgid "Unknown character in filter expression" msgstr "Nieznany znak w wyrażeniu filtrującym" #. IDS_FILTER_ERROR_UNTERMINATED_STRING -#: Merge.rc:5382 +#: Merge.rc:5393 msgid "Unterminated string literal" msgstr "Niezakończony literał łańcuchowy" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Błąd składni w wyrażeniu filtrującym" #. IDS_FILTER_ERROR_PARSE_FAILURE -#: Merge.rc:5384 +#: Merge.rc:5395 msgid "Failed to parse filter expression" msgstr "Nie udało się przeanalizować wyrażenia filtrującego" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Nieprawidłowa wartość literału" #. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION -#: Merge.rc:5386 +#: Merge.rc:5397 msgid "Invalid regular expression" msgstr "Nieprawidłowe wyrażenie regularne" #. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER -#: Merge.rc:5387 +#: Merge.rc:5398 msgid "Undefined identifier" msgstr "Nieokreślony identyfikator" #. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT -#: Merge.rc:5388 +#: Merge.rc:5399 msgid "Invalid number of arguments" msgstr "Nieprawidłowa liczba argumentów" #. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND -#: Merge.rc:5389 +#: Merge.rc:5400 msgid "Filter name not found" msgstr "Nie znaleziono nazwy filtra" #. IDS_FILTER_ERROR_DIVIDE_BY_ZERO -#: Merge.rc:5390 +#: Merge.rc:5401 msgid "Division by zero in filter expression" msgstr "Dzielenie przez zero w wyrażeniu filtrującym" #. IDS_FILTER_ERROR_UNKNOWN_ERROR -#: Merge.rc:5391 +#: Merge.rc:5402 msgid "Unknown error" msgstr "Nieznany błąd" #. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME -#: Merge.rc:5392 +#: Merge.rc:5403 msgid "Invalid property name" msgstr "Nieprawidłowa nazwa właściwości" #. IDS_FILTER_ERROR_INVALID_DIRECTIVE -#: Merge.rc:5393 +#: Merge.rc:5404 msgid "Invalid directive" msgstr "Nieprawidłowa dyrektywa" #. IDS_FILTER_OP_EQUALS -#: Merge.rc:5398 +#: Merge.rc:5409 msgid "Equals" msgstr "Równe" #. IDS_FILTER_OP_NOT_EQUALS -#: Merge.rc:5399 +#: Merge.rc:5410 msgid "Does not equal" msgstr "Nierówne" #. IDS_FILTER_OP_LESS_THAN -#: Merge.rc:5400 +#: Merge.rc:5411 msgid "Less than" msgstr "Mniejsze niż" #. IDS_FILTER_OP_LESS_EQUAL -#: Merge.rc:5401 +#: Merge.rc:5412 msgid "Less than or equal to" msgstr "Mniejsze lub równe" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Większe lub równe" #. IDS_FILTER_OP_GREATER_THAN -#: Merge.rc:5403 +#: Merge.rc:5414 msgid "Greater than" msgstr "Większe niż" #. IDS_FILTER_OP_BETWEEN -#: Merge.rc:5404 +#: Merge.rc:5415 msgid "Between" msgstr "Między" #. IDS_FILTER_OP_NOT_BETWEEN -#: Merge.rc:5405 +#: Merge.rc:5416 msgid "Not Between" msgstr "Nie między" #. IDS_FILTER_OP_CONTAINS -#: Merge.rc:5406 +#: Merge.rc:5417 msgid "Contains" msgstr "Zawiera" #. IDS_FILTER_OP_NOT_CONTAINS -#: Merge.rc:5407 +#: Merge.rc:5418 msgid "Not Contains" msgstr "Nie zawiera" #. IDS_FILTER_OP_RECONTAINS -#: Merge.rc:5408 +#: Merge.rc:5419 msgid "Contains (regex)" msgstr "Zawiera (wyrażenie regularne)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "Nie zawiera (wyrażenie regularne)" #. IDS_FILTER_OP_LIKE -#: Merge.rc:5410 +#: Merge.rc:5421 msgid "Match (wildcard)" msgstr "Dopasuj (symbol wieloznaczny)" #. IDS_FILTER_OP_NOT_LIKE -#: Merge.rc:5411 +#: Merge.rc:5422 msgid "Not match (wildcard)" msgstr "Nie dopasuj (symbol wieloznaczny)" #. IDS_FILTER_OP_MATCHES -#: Merge.rc:5412 +#: Merge.rc:5423 msgid "Match (regex)" msgstr "Dopasuj (wyrażenie regularne)" #. IDS_FILTER_OP_NOT_MATCHES -#: Merge.rc:5413 +#: Merge.rc:5424 msgid "Not match (regex)" msgstr "Nie dopasuj (wyrażenie regularne)" #. IDS_COLORMODE_LIGHT -#: Merge.rc:5418 +#: Merge.rc:5429 msgid "Light" msgstr "Jasny" #. IDS_COLORMODE_DARK -#: Merge.rc:5419 +#: Merge.rc:5430 msgid "Dark" msgstr "Ciemny" #. IDS_COLORMODE_FOLLOWSYSTEM -#: Merge.rc:5420 +#: Merge.rc:5431 msgid "Follow system" msgstr "Systemowy" #. IDS_EXAMPLE -#: Merge.rc:5425 +#: Merge.rc:5436 #, c-format msgid "e.g. %1" msgstr "np. %1" #. IDS_DETECTED_PREVIOUS_CRASH -#: Merge.rc:5430 +#: Merge.rc:5441 msgid "WinMerge detected a previous crash. Please report this if possible." msgstr "WinMerge wykrył błąd krytyczny podczas ostatniej sesji. Prosimy o zgłoszenie tego faktu, jeśli to możliwe." #. 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 zastąpionych wyrażeń regularnych\r\n# Format: wyrażenie regularnezastąpienie\r\n# Obsługiwane są odwołania wsteczne, takie jak $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 "# Lista zastąpionych\r\n# Format: szukajzastąpienie\r\n# Linie zaczynające się od # są ignorowane\r\n\r\nfrom1\tto1\r\nfrom2\tto2\r\n" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index f57c0f17c99..bf90a1fcf58 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -24,7 +24,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" @@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Copiar diferença selecionada (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 diferenças da linha\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 "Co&piar" @@ -149,19 +149,19 @@ msgid "&Paste" msgstr "Co&lar" #. 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" @@ -181,27 +181,27 @@ msgid "Op&en" msgstr "&Abrir" #. 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 a aplicação ®istada" #. 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 da localização..." #. 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 de contexto" @@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Deteção de Ins&erção/Eliminaçã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 "&Nenhum" @@ -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á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" @@ -267,42 +267,42 @@ msgid "&Active Pane" msgstr "Painel &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 "Rodar 90° 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 "Rodar 90° 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 "Rodar 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 "Rodar 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+*" @@ -327,27 +327,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" @@ -382,37 +382,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 "Capturas de ecrã" #. 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 "Capturas de ecrã em tamanho total" #. 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 "Tamanho" @@ -427,27 +427,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 "&Ativado" #. 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 "&Introduzir" #. 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" @@ -477,3607 +477,3613 @@ msgid "&All Profiles" msgstr "Todo o perfil" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Ficheiro" #. 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 web" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Ab&rir ficheiro 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 "&Guardar 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 "&Ficheiros 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 "S&air\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 "&Colar\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çõ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 separadores" #. 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 separadores" #. 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 resultad&os" #. 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 esta&do" #. 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 "&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 "&Gerar correção..." #. 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 "Definições de P&lugins..." #. 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 manual" #. 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 "Fechar &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 "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 "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 "A&juda" #. 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 da versão" #. 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 "&Configuraçã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 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 "Acerca do WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "Apenas-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 "Apenas-leitura o da &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 "Apenas-leitura o do &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 "Apenas-leitura o da &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 "Codificação de ficheiro..." #. 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 apenas itens da esquerda" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Mostrar apenas itens do meio" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Mostrar apenas itens da direita" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Mostrar itens ignorados" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Mostrar ficheiros &binários" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "Comparação de 3 vias" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Mostrar apenas itens diferentes" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Mostrar apenas itens diferentes do meio" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Mostrar apenas itens diferentes da direita" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Mostrar apenas itens em falta na esquerda" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Mostrar apenas itens em falta no meio" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Mostrar apenas itens em falta na direita" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Mostrar itens 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 "&Todas 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 "&Fechar todas as subpastas" #. 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 "Selecionar &tipo de letra..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Usar tipo de letra pre&definida" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Troc&ar 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 "Mostra&r barra de filtros\tCtrl+Shift+L" #. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS -#: Merge.rc:518 +#: Merge.rc:522 msgid "Com&pare Statistics..." msgstr "Comparar estatísticas..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Atualizar\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "&Atualizar seleção\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "&Fundir" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Comparar\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+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+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 atual\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "Última 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 esquerda\tAlt+Esquerda" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "&Eliminar\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 "&Guardar\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Gu&ardar" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Guardar 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 "Guardar 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 "Guardar o da &direita" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Guardar &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 "Guardar 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 "Guardar 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 "Guardar o da &direita 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 "Con&figuração da página..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Pré-&visualizar..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "Converter os fins de linha para" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Mod&o de Fusã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 "Recomparar como" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "&Anular\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Z" #. 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 "Localizar...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Substituir...\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 "&Marcadores" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Alternar marcadores\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 &anterior\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 da sintaxe" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Contexto de 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 Linhas" #. 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 "B&loquear 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 fim de linha" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Ver diferenças da linha" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Ver números da 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 su&periores" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Mudança de linha" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Dividir v&erticalmante" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "Painel de diferenças" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Painel de localização" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Painel de resultados" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "Conflito seguinte\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Conflito anterior\tAlt+Shift+Up" #. 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 entre o da esquerda e o do 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 entre o da esquerda e o do 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 entre o da esquerda e o da 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 entre o da esquerda e o da 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 entre o do meio e o da 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 entre o do meio e o da 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 o do 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 o do 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 "&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 "&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 "&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 linha(s) selecionada(s) da es&querda para" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Copiar linha(s) selecionada(s) do m&eio para" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Copiar linha(s) selecionada(s) da dir&eita 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 "Copiar tudo para a &esquerda" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "Fundir a&utomaticamente\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 pontos de sincronização" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Descompactador" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "Pré-diferenciar" #. 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 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 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 "Comparar" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED -#: Merge.rc:922 +#: Merge.rc:929 msgid "Compar&e with Renamed/Moved Items" msgstr "Com¶r com itens 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 horizontalmente" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Primeiro item da esquerda com o segundo item da esquerda" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Primeiro item da direita com o segundo item da direita" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "Primeiro item da esquerda com o segundo item da direita" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Segundo item da esquerda com o primeiro item da 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 "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 "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 "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 "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 "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 "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 "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 "Eliminar" #. 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 da &esquerda" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Abrir o do &meio" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Abrir o da &direita" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Copiar &nomes de localização" #. 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 "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 "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 "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 "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 "Tudo (%1 de %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Co&piar nomes de ficheiro" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Copiar itens para a área de trans&ferência" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Copiar toda&s as colunas exibidas" #. 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 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 "Tudo 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 de contexto da esquerda" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Menu de contexto do meio" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Menu de contexto da direita" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Ambos os menus Shell" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Todos os menus 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 localização completa" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Co&piar nome de ficheiro" #. 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 "Editar &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 "Definiçõ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 "Definições de pré-diferenciação" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Ir para Diferença" #. 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 bloco movido" #. 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 "Espaç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 "Comparar" #. 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 linhas 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 diferentes tipos de ficheiros (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 nas páginas 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 diferenças nos c&omentários" #. 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 presença ou ausência de um carácter de nova linha no fim do ficheiro" #. 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 &quebras 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 essencial" #. 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} - O 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} - O 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} - O 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} - O 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} - O 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} - O 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} - O 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} - O 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} - O 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} - Ficheiro da 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} - Pasta da 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} - URL da 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} - Protocolo do URL da 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} - Sufixo do URL da 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} - Ficheiro 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} - Diretório da pasta pessoal 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} - Ficheiro script" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Adicionar plugin de &descompactação..." #. 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 "Plugin de &uplicação..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "Limp&ar 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 "Repor para predefinição (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Adicionar ficheiro e&xcluído" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "Ficheiros de &sistema" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "Ficheiros de backup do &editor" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "Ficheiros binários &compilados" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Ficheiros de ®isto" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "Ficheiros &temporários ou de cache" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Adicionar pasta excl&uída" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "Controlo de &versão" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "Artefactos 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 ficheiro" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Tamanho do ficheiro" #. 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 "Valores personalizados..." #. 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 "Última 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 "Há mais de 1 hora" #. 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 "Valores personalizados..." #. 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 "Ficheiros apenas para 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 "Ficheiros não apenas de 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 "Ficheiros ocultos" #. 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 "Não são ficheiros ocultos" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Ficheiros 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 "Não são ficheiros do sistema" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "&Conteúdo dos ficheiros" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Contém a sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "Não contém sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "A primeira linha contém sequência de caracteres..." #. 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 primeira linha não contém sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "As primeiras 10 linhas contêm sequência de caracteres..." #. 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 "As primeiras 10 linhas não contêm sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "As últimas 10 linhas contêm sequência de caracteres..." #. 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 "As últimas 10 linhas não contêm sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "A última linha contém sequência de caracteres..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS -#: Merge.rc:1451 +#: Merge.rc:1461 msgid "Last line does not contain string..." msgstr "A última linha não contém sequência de caracteres..." #. 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 "&Ficheiros" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0 -#: Merge.rc:1515 +#: Merge.rc:1525 msgid "0 files" msgstr "0 ficheiros" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1 -#: Merge.rc:1516 +#: Merge.rc:1526 msgid "1 file or more" msgstr "1 ficheiro 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 "&Alvo: 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 &diferenç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 "Menor 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 "Menor 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 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 "Menor que 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 "Menor que 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: &Tudo" #. 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 "&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 teclas" #. 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 "" #. 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 &substituir() função" #. 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 regexReplace()" #. 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 "Reconhecer maiúsculas/minúsculas" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1801 +#: Merge.rc:1811 msgid "Text &Normalization" msgstr "Texto &normalização" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER -#: Merge.rc:1803 +#: Merge.rc:1813 msgid "&Lowercase" msgstr "&Minúsculas" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER -#: Merge.rc:1804 +#: Merge.rc:1814 msgid "&Uppercase" msgstr "M&aiúsculas" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH -#: Merge.rc:1805 +#: Merge.rc:1815 msgid "&Half-width" msgstr "&Meia largura" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH -#: Merge.rc:1806 +#: Merge.rc:1816 msgid "&Full-width" msgstr "&Largura total" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1807 +#: Merge.rc:1817 msgid "&Chinese Conversion" msgstr "Conversão &chinesa" #. 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 &japonesa" #. 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 "" #. IDD_ABOUTBOX -#: Merge.rc:1932 +#: Merge.rc:1942 msgid "About WinMerge" msgstr "Acerca do 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 "Selecione Ficheiros ou Pastas" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "&1º Ficheiro ou Pasta" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Apen&as-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 "&Explorar..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "&2º Ficheiro ou Pasta" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Apenas-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 "Explora&r..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "&3º Ficheiro ou Pasta (Opcional)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Apenas-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 "Explorar..." #. 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 " Ficheiro: Plugin de Pré-diferenciação" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Ficheiro: Plugin 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 "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 "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 "Localizar" #. 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 "Localizar 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 "Apenas palavras 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 "Expressão regular" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Não ultrapassar o fim de ficheiro" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "&Não feche 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 "Localizar &seguinte" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Localizar &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 "Substituir &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 ultrapassar o fim de ficheiro" #. 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 "Ficheiro completo" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Localizar &anterior" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Substituir" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Substituir 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 "Ativar 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 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 "Ativar filtros de linha" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Expressões regulares (um 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 "As alterações que aparecem nos painéis como os pares listados abaixo serão ignoradas ou marcadas como insignificantes. As correções não são afetadas." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Ativar" #. 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 "Ir 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 "Ir automati&camente 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 "Fechar janela c&om 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Verificar automaticamente localização na janela de abertura" #. 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 ao 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 data do ficheiro na comparação 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 janela \"Pastas ou Ficheiros selecionados\" 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 janela \"Selecionar Ficheiros 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 "Abrir janela de auto-conclusão:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "&Recarregar automaticamente ficheiros 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 "Predefiniçõ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 de modo &claro:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2131 +#: Merge.rc:2141 msgid "&Dark mode scheme:" msgstr "Esquema de modo &escuro:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2133 +#: Merge.rc:2143 msgid "Your custom schemes" msgstr "Os seus esquemas personalizados" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE -#: Merge.rc:2134 +#: Merge.rc:2144 msgid "&Save current scheme..." msgstr "&Guardar esquema atual..." #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE -#: Merge.rc:2135 +#: Merge.rc:2145 msgid "Delete ¤t scheme..." msgstr "Guardar 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 "Fundo" #. 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 "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 "Movida:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Selecionada movida:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Como os seguintes (3 painéis):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Como os seguintes (Selecionados):" #. 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 "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 das funções:" #. 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 "Frases originais:" #. 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 "Utilizador 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Utilizador 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 "Utilizar cores de texto personalizadas" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Espaço:" #. 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 "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 "Procurar marcador:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Marcador 1 definido pelo utilizador:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Marcador 2 definido pelo utilizador:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Marcador 3 definido pelo utilizador:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "&Utilizar pasta de comparar cores" #. 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 "Os itens não existem todos:" #. 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 (Alguns elementos da interface podem não se aplicar)" #. 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 ficheiro&s eliminados para a Reciclagem" #. 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 dados do utilizador em:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2313 +#: Merge.rc:2323 msgid "&Filter folder:" msgstr "&Filtro de pasta:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Pasta de ficheiros temporários" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Pasta de ficheiros de s&istema" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Pasta p&ersonalizada:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "L&ocalizar..." #. 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ço" #. 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 linhas 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 "Ignorar diferenças de 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 nas páginas de código" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignorar diferenças nos c&omentários" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "Ignorar presença ou ausência de um carácter de nova linha no fim do ficheiro" #. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK -#: Merge.rc:2343 +#: Merge.rc:2353 msgid "Ignore line &breaks (treat as spaces)" msgstr "Ignorar &quebras 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 "Ativar deteção de bloco movido" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Alinhar linhas &semelhantes" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "Diff &algoritmo:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Ativar travessão &heurístico" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Desmarcar completamente as 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 sintaxe" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "Manter carateres EOL originais" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Separadores" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "Tamanho do separador:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Inserir separadores" #. 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 "Re-análise automática" #. 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 "Cor da diferença da linha" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Ver diferenças da linha" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "A nível do caráter" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "A nível da palavra:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Carateres da 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 "O WinMerge permite ocultar mensagens predefinidas. Prima o botão Repor para visualizar novamente todas as mensagens." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Repor" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Gerador de correção" #. 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 "&Troca" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "Copiar 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 a 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 "Explorar..." #. 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 "Est&ilo:" #. 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 "Incluir linha &de comandos" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Abrir em editor e&xterno" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Mostrar 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 "Ficheiros de &destino:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2482 Merge.rc:3117 +#: Merge.rc:2492 Merge.rc:3127 msgid "Extensions list:" msgstr "Lista de 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 predefinidos:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Mostrar todos os plugins, não verifica a 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 ficheiros no mesmo tipo de janela depois de desempacotar" #. 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 "&Abreviatura..." #. 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 "Pausa" #. 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 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 "&Ir para:" #. 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 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 ficheiros" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "&Máscara / Filtrar Expressão" #. 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 "Eliminar..." #. 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 di&reito:" #. 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 "" #. 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 "Idêntico" #. 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 "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 predefinida" #. 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 predefinida quando carregar ficheiros non-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 "A mesma que o interface de utilizador 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\n" "Restart required." @@ -4086,7 +4092,7 @@ msgstr "" "Necessário para reiniciar sessão." #. 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 +4101,769 @@ msgstr "" "Necessário para reiniciar sessão." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Suporte de arquivos" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Ativar suporte de arquivos" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "Detetar tipo de arquivo pela assinatura" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Itens guardados ou restaurados a partir do ficheiro do projeto:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Guardar ficheiros modificados?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Ficheiro da esquerda" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Guardar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "Rejeitar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Ficheiro do meio" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Gu&ardar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Rejei&tar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Ficheiro da direita" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Guardar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Rejeitar alterações" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Rejei&tar tudo" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Relatório de comparação de ficheiros" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Ficheiro 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 ficheiros" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Filtro partilhado ou privado" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Qual o tipo de filtro que deseja criar?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Filtro partilhado (para todos os utilizadores deste computador)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Filtro privado (apenas para o utilizador atual)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Comparar 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 "Ficheiros:" #. 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 "Em falta à esquerda:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Em falta ao meio:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Em falta à direita:" #. 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 "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 "Carregar &ficheiro:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Guardar &ficheiro:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "Utilizar 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 "A testar filtro:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "Inserir texto a 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 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 &delimitador personalizado" #. 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áter 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 "&Permitir novas linhas entre aspas" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "&Citar caráter:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Cópia de ficheiros" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Criar cópia de ficheiros em:" #. 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 "Comparação de ficheiros" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Criar cópia de ficheiros para:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Pasta de ficheiros originais" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Cópia geral de pastas:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Nome da cópia do ficheiro:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "&Anexar extenção .bak" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "A&nexar data" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Confirmar 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 a certeza que deseja 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 voltar a perguntar." #. 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 "&Ativar 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 ficheiro:" #. 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 "Ativar a descompactação/pré-diferenciação &automática para o plugin" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integração do contexto" #. 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 "&Adicionar ao menu de contexto" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Ativar menu avançado" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Ativar o menu &Comparar como" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "&Registar a extensão do contexto" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "Extensão do contexto não registada" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Registar a extensão do contexto apenas para o utilizad&or atual" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Anular o registo da extensão do contexto apenas para o utilizador atua&l" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Registar a extensão do contexto 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 "Cancelar o registo da extensão do contexto para W&indows 11 ou posterior" #. 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 "Parar após 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 "Ignorar diferenças 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 as 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 conteúdos exclusivos da subpastas" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Ignorar pontos de &análise" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Limite para trocar para comparação &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 "Limite para trocar para comparação &binária (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2975 +#: Merge.rc:2985 msgid "Additional comparison condi&tions:" msgstr "Com&dições adicionais de comparação:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2978 +#: Merge.rc:2988 msgid "&Rename/move detection:" msgstr "Deteção de &renomear/movimentar:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2980 +#: Merge.rc:2990 msgid "Rename/move detection &keys:" msgstr "&Teclas de deteção de renomear/movimentar:" #. 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ões de ficheiros:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Valores separados por &delimitador personalizado" #. 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 ficheiro Binário:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Definições Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Ver &Definiçõ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 "A preparar caráter..." #. 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 imagem do ficheiro:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "&Ativar comparação de imagem na comparação de pasta" #. 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 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 &utilizador:" #. 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 utilizador 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 "Extensão de ficheiro &descompactado:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "Argumentos &necessários" #. 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 comandos:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "Extensão de ficheiro &script:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "&Corpo do script:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3154 +#: Merge.rc:3164 msgid "Font" msgstr "Tipo de letra" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3157 +#: Merge.rc:3167 msgid "&Font:" msgstr "&Tipo de letra:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3163 +#: Merge.rc:3173 msgid "Font st&yle:" msgstr "Estilo de t&ipo de letra:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3169 +#: Merge.rc:3179 msgid "&Size:" msgstr "Tama&nho:" #. 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 "Ris&cado" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3177 +#: Merge.rc:3187 msgid "&Underline" msgstr "S&ublinhado" #. 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 "Exemplo" #. 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 tipos de letra" #. 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 +4872,7 @@ msgstr "" "Novos documentos (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4875,7 +4881,7 @@ msgstr "" "Abrir (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4884,27 +4890,27 @@ msgstr "" "Guardar (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Erro desconhecido ao abrir projeto." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Erro desconhecido ao guardar projeto." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Projeto carregado com sucesso." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Projeto guardado com sucesso." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4913,7 +4919,7 @@ msgstr "" "Anular (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4922,7 +4928,7 @@ msgstr "" "Refazer (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4941,7 +4947,7 @@ msgstr "" "Comparação de ficheiros do WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4960,164 +4966,164 @@ msgstr "" "Comparação de pastas 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 não possui ABSOLUTAMENTE NENHUMA GARANTIA. É um software livre e pode ser redistribuído sob as condições da Licença Pública Geral GNU - consulte o menu Ajuda para obter " "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 novamente" #. 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 a 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 a tudo" #. 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 "Ignorar" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Ignorar tudo" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Não voltar a mostrar esta mensagem." -#: 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 mensagens visível, prima Repor na página Caixas de mensagens em Opções." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "Comparar/Fundir" #. 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 "Esquema 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 "Projecto" #. 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 mensagens estão novamente disponíveis." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5126,156 +5132,156 @@ msgstr "" "Utilize os valores 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 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 do Projeto WinMerge (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Opções de ficheiros (*.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 "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 ficheiro" #. 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 "Guardar" #. 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 "Comparar opções" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Itens 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 "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 "Selecionar nome de ficheiro para novo filtro" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros de ficheiros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5288,7 +5294,7 @@ msgstr "" "Copie o ficheiro %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5301,7 +5307,7 @@ msgstr "" "\n" "Certifique-se de que a pasta existe e é gravável." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5311,7 +5317,7 @@ msgstr "" "\n" "Selecione a pasta de filtros em Opções/Sistema." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5325,11 +5331,11 @@ msgstr "" "O ficheiro pode ser de apenas-leitura." #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Localizar filtro a instalar" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5340,17 +5346,17 @@ msgstr "" "Não foi possível copiar o novo filtro de ficheiro para a pasta de filtros." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "O filtro de ficheiro já existe. Substituir filtro existente?" #. 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" "\n" @@ -5361,217 +5367,217 @@ msgstr "" "Se não quiser atualizar todas as comparações agora, pode selecionar 'Não' e atualizar a comparação mais tarde." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Relatório de comparação de pastas" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Comparação de ficheiros" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Esquerdo 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 "Direito sem 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 ficheiro deles" #. 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 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 "Linha: %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 " Sel: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Fundir" #. 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 "AL" #. 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 "A comparar 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 pastas existentes ou ficheiros para comparar." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Seleção de pasta" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Selecione duas (ou três) pastas ou dois (ou três) ficheiros para comparar." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Pasta esquerda (1º) não é válida!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Pasta do meio (2º) não é válida!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Pasta direita (2º) não é válida!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Pasta direita (3º) não é válida!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino são inválidas!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Pasta esquerda (1º) e do meio (2º) não são válidas!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Pasta esquerda (1º) e direita (3º) não são válidas!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Pasta do meio (2º) e direita (3º) não são válidas!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Todos as pastas de destino são inválidas!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Apenas ativado para comparações de ficheiros" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Não é possível comparar ficheiro ou pasta!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Ficheiro não encontrado: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro não descompactado: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5585,12 +5591,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Erro ao analisar ficheiro em conflito." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "" "The file\n" @@ -5602,7 +5608,7 @@ msgstr "" "não está em conflito." #. 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 +5617,28 @@ msgstr "" "Mostrar apenas os resultados da comparação (não o conteúdo do ficheiro)?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Guardar como" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Guardar 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 é de apenas-leitura. Deseja substituir o ficheiro de apenas-leitura? (não, para guardar com novo nome.)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Erro ao criar cópia de segurança" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5646,7 +5652,7 @@ msgstr "" "Continuar mesmo assim?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5662,7 +5668,7 @@ msgstr "" "\t- usar um nome diferente para o ficheiro (Prima OK)\n" "\t- abortar a ação atual (Prima Cancelar)?" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5675,7 +5681,7 @@ msgstr "" "\n" "Deseja guardar a versão não compactada num outro ficheiro?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5688,7 +5694,7 @@ msgstr "" "\n" "Quer guardar a versão compactada noutro ficheiro?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5702,7 +5708,7 @@ msgstr "" "Deseja guardar a versão não compactada em outro ficheiro?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5718,7 +5724,7 @@ msgstr "" "Substituir o ficheiro modificado?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5728,7 +5734,7 @@ msgstr "" "é de apenas-leitura. Deseja substituir o item de apenas-leitura?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5744,22 +5750,22 @@ msgstr "" "Deseja recarregar o ficheiro?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Guardar o ficheiro da esquerda como" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Guardar o ficheiro do meio como" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Guardar o ficheiro da direita como" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5771,7 +5777,7 @@ msgstr "" "desapareceu. Guarde uma cópia do ficheiro para continuar." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5782,124 +5788,124 @@ msgstr "" "Atualizar documentos antes de continuar." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Quebra de linha nos espaços em branco" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaços 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+Direita" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Copiar para a &esquerda\tAlt+Esquerda" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Copiar do meio\tAlt+Shift+Direita" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Copiar do meio\tAlt+Shift+Esquerda" #. 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+Direita" #. 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+Esquerda" #. 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" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Do meio para a esquerda" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Do meio para a direita" #. 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" #. 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..." #. 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 "Ambos para... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Tudo 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.\n" "Copy only items with differences?" @@ -5908,64 +5914,64 @@ msgstr "" "Pretende copiar 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 (%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 - selecione pasta de destino:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Do meio - selecione pasta de destino:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Lado direito - selecione pasta de destino:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afetados)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afetados)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5977,18 +5983,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Tem a certeza que deseja 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 a certeza que deseja copiar %d itens?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6007,46 +6013,46 @@ msgstr "" "\\Recarregue para comparar." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Tem a certeza que deseja 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 a certeza que deseja mover %d itens?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Confirmar" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Está prestes a fechar a janela que está a comparar as pastas. Tem a certeza de que pretende fechar a janela?" -#: 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 demorou muito 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 ficheiro ou pasta é inválido." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Formato de ficheiro desconhecido" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6055,752 +6061,752 @@ msgstr "" "Quer 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 "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 "Lado esquerdo" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Lado direito" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Do meio" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Lado direito (Curto)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Meio (Curto)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Data de criação - Esquerda" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Data de criação - Direita" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Data de criação - Meio" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Ficheiro mais recente" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Versão do ficheiro da esquerda" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Versão do ficheiro da direita" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Versão do ficheiro do meio" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Resultado resumido" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Atributos esquerda" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atributos direita" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atributos meio" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "EOL Esquerda" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "EOL Meio" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "EOL Direita" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Codificação esquerda" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Codificação direita" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Codificação 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é-diferenciar" #. 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 "Diferença" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Contagem em duplicado à esquerda" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Contagem em duplicado à direita" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Contagem em duplicado ao meio" #. 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 "Á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 "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" # Context of the word "Home"? #. IDS_PRPCAT_HOME -#: Merge.rc:4664 +#: Merge.rc:4674 msgid "Home" msgstr "Casa" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Jornal" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Ligação" #. IDS_PRPCAT_MEDIA -#: Merge.rc:4668 +#: Merge.rc:4678 msgid "Media" msgstr "Multimé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 "Pesquisa" #. 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 "Não é possível comparar ficheiros" #. 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 "Ficheiro ignorado" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Pasta ignorada" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Apenas da esquerda: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Apenas do meio: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Apenas da 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 no %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Os ficheiros binários são idênticos" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Os ficheiros binários são diferentes" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Os ficheiros 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 "Apenas o da esquerda" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Apenas o da direita" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Apenas o do meio" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Sem itens à esquerda" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Sem itens à direita" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Sem itens 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 ficheiros 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 "" #. IDS_TEXT_FILES_DIFF -#: Merge.rc:4715 +#: Merge.rc:4725 msgid "Text files are different" msgstr "Os ficheiros de texto são diferentes" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Os ficheiros de imagem são idênticos" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Os ficheiros de imagem são diferentes" #. IDS_EXPR_DIFF -#: Merge.rc:4718 +#: Merge.rc:4728 #, c-format msgid "Files are different (expr: %1)" msgstr "Os ficheiros 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 "Desativada" #. IDS_RENAME_MOVE_DETECTION_RENAME -#: Merge.rc:4721 +#: Merge.rc:4731 msgid "Detect renames" msgstr "Detetar renomeações" #. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE -#: Merge.rc:4722 +#: Merge.rc:4732 msgid "Detect renames and moves" msgstr "Detetar renomeações e movimentações" #. 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 "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 "" #. 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 ficheiro ou pasta." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Nome da subpasta quando as subpastas estão incluídas." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Resultado da comparação, forma extensa." #. 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 meio." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Extensão do ficheiro." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Tamanho do ficheiro do meio em bytes." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Tamanho do ficheiro do meio abreviado." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Data de criação do lado esquerdo." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Data de criação do lado direito." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Data de criação do meio." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificação mais recente." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Versão do ficheiro do lado esquerdo, apenas para alguns tipos de ficheiro." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Versão do ficheiro do lado direito, apenas para alguns tipos de ficheiro." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Versão do ficheiro do meio, apenas para alguns tipos de ficheiro." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Resultado resumido 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 meio." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Tipo de ficheiro EOL do lado esquerdo." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Tipo de ficheiro EOL do lado direito." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Tipo de ficheiro EOL 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 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 ficheiro. Estas diferenças são ignoradas pelo WinMerge e não podem ser fundidas." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Número de diferenças no ficheiro. Este número não inclui diferenças ignoradas." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binário." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Desempacotar nome de plugin ou pipeline." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Nome ou pipeline do plugin da 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 de separadores" #. 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 ficheiro de relatório já existe. Pretende substituir o ficheiro existente?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6810,27 +6816,27 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "O relatório foi 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 ficheiro está aberto em ambos os painéis." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Os ficheiros selecionados são idênticos." #. IDS_FILESSAME_CURCFG -#: Merge.rc:4829 +#: Merge.rc:4839 msgid "" "Selected files are identical (with current settings).\r\n" "Checking binary identity..." @@ -6839,7 +6845,7 @@ msgstr "" "A verificar a identidade binária..." #. 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 +6854,12 @@ msgstr "" "Mas a comparação binária falhou." #. IDS_FILESSAME_BINSAME -#: Merge.rc:4831 +#: Merge.rc:4841 msgid "Selected files are identical (binary match)." msgstr "Os ficheiros 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\n" "But differ at the binary level." @@ -6862,17 +6868,17 @@ msgstr "" "Mas diferem ao 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 ficheiros." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Não é possível criar ficheiros temporários. Verifique as suas definições de ficheiros temporários." #. IDS_SUGGEST_IGNOREEOL -#: Merge.rc:4835 +#: Merge.rc:4845 msgid "" "Files use different EOL.\n" "\n" @@ -6887,17 +6893,17 @@ msgstr "" "Defina 'Ignorar diferenças de EOL (Windows/Unix/Mac)' na secçã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 ficheiro binário no editor." #. IDS_CREATE_PAIR_FOLDER -#: Merge.rc:4838 +#: Merge.rc:4848 #, c-format msgid "" "Create matching folder:\n" @@ -6911,41 +6917,41 @@ msgstr "" "para o outro lado e abrir essas pastas?" #. 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 ficheiro?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Deseja seguir para o próximo ficheiro?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Deseja retroceder para o ficheiro anterior?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Deseja seguir para a próxima página?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Deseja retroceder para a página anterior?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Quer passar para o primeiro ficheiro?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Quer passar para o último ficheiro?" -#: Merge.rc:4856 +#: Merge.rc:4866 #, c-format msgid "" "Different codepages: left (cp%d), right (cp%d).\n" @@ -6956,51 +6962,51 @@ msgstr "" "Apresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\\Deseja tratar os dois ficheiros como tendo as páginas de código " "predefinidas para as janelas?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Informações perdidas devido a erros de codificação: ambos os ficheiros" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Informações perdidas devido a erros de codificação: primeiro ficheiro" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Informações perdidas devido a erros de codificação: segundo ficheiro" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Informações perdidas devido a erros de codificação: terceiro ficheiro" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Sem diferenças" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Diferença de linha" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituída(s) %1 frase(s)." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Não é possível localizar frase \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Está a entrar no Modo de Fusão. Se pretende desligar o Modo de Fusão, prima a tecla F9." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -7010,99 +7016,99 @@ msgstr "" "Número de conflitos não resolvidos: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "A alteração da página de código foi fundida." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "As alterações da página de código estão em conflito." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "A alteração de EOL foi fundida." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "As alterações de 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 diferenças" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Ficheiro de correção gravado com sucesso." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1. item não encontrado!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2. item não encontrado!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "O ficheiro de correção já existe. Deseja substituí-lo?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens 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 é possível gravar para o ficheiro %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "A localização de destino não é uma localização absoluta: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Especifique o ficheiro de destino." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Não é possível criar um ficheiro de correção a partir de ficheiros binários." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7113,12 +7119,12 @@ msgstr "" "Criar um ficheiro de correção requer a inexistência de alterações por guardar nos ficheiros." #. 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.\n" "7-Zip and/or Merge7z*.dll not found.\n" @@ -7129,37 +7135,37 @@ msgstr "" "Ver manual para mais informações sobre suporte de arquivo e como o ativar." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Selecione ficheiro a exportar" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Selecione ficheiro a importar" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Opções importadas do ficheiro." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Opções exportadas para o ficheiro." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Falha ao importar opções do ficheiro." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Falha ao gravar opções para o ficheiro." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7170,44 +7176,44 @@ msgstr "" "Deseja continuar?" #. 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 de edição" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7216,7 +7222,7 @@ msgstr "" "Diferenças na linha atual (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7225,7 +7231,7 @@ msgstr "" "Opções" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7234,7 +7240,7 @@ msgstr "" "Recarregar (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7243,7 +7249,7 @@ msgstr "" "Diferença anterior (Alt+Cima)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7252,7 +7258,7 @@ msgstr "" "Diferença seguinte (Alt+Baixo)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7261,7 +7267,7 @@ msgstr "" "Conflito Anterior (Alt+Shift+Cima)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7270,7 +7276,7 @@ msgstr "" "Conflito Seguinte (Alt+Shift+Baixo)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7279,7 +7285,7 @@ msgstr "" "Primeira diferença (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7288,7 +7294,7 @@ msgstr "" "Diferença atual (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7297,7 +7303,7 @@ msgstr "" "Última diferença (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7306,7 +7312,7 @@ msgstr "" "Copiar para a direita (Alt+Direita)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7315,7 +7321,7 @@ msgstr "" "Copiar para a esquerda (Alt+Esquerda)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7324,7 +7330,7 @@ msgstr "" "Copiar para a direita e avançar (Ctrl+Alt+Direita)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7333,7 +7339,7 @@ msgstr "" "Copiar para a esquerda e avançar (Ctrl+Alt+Esquerda)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7342,7 +7348,7 @@ msgstr "" "Copiar tudo para a direita" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7351,7 +7357,7 @@ msgstr "" "Copiar tudo para a esquerda" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7360,7 +7366,7 @@ msgstr "" "Fundir automaticamente (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7369,7 +7375,7 @@ msgstr "" "Primeiro ficheiro" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7378,7 +7384,7 @@ msgstr "" "Ficheiro seguinte (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7387,7 +7393,7 @@ msgstr "" "Último ficheiro" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7396,37 +7402,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 descompactador adotado aplica-se em ambos os ficheiros (apenas um ficheiro necessita 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 "O WinMerge está atualizado com a última versão." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7436,126 +7442,126 @@ msgstr "" "%1 está disponível (versão instalada %2). Pretende transferir 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 ao transferir informações mais recentes sobre a versão" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Definições de plugins" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "WSH não encontrado - scripts .sct desativados" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Ir para linha %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Ir para 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 "Desativado" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Do sistema de ficheiros" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Da lista MRU" #. 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 "Quantidade" #. 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 "Contexto" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "Fechar separadores da e&squerda" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Fechar separadores da d&ireita" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Fechar &outros separadores" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Ativar largura 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 "M&udança de linha" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 #, c-format msgid "%1 is not installed." msgstr "O %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. Deseja criar?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Erro ao criar pasta." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7566,486 +7572,486 @@ msgstr "" "$linenum: Número da linha da posição atual do cursor" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "predefiniçã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 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 "Desativado" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "Sub-janela MDI ou janela principal" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Apenas sub-janela MDI" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Fecha a janela principal se houver apenas uma sub-janela MDI" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Diferença" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Destaque" #. 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 "Bloco Alfa" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Limiar do CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Deteção Ins/Eli" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Nenhum" #. 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 Alfa" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Animação 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 "Rodado: %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 a selecionar encontrada" #. 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á presente 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 "Apenas texto" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Posição e texto linha a 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 de Documentos" #. IDS_SINGLEINSTANCE_DISABLED -#: Merge.rc:5235 +#: Merge.rc:5245 msgctxt "Options dialog|General|Single instance mode" msgid "Disabled" msgstr "Desativado" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Permitir apenas uma execução" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Permitir apenas executar uma instância e esperar que a instância termine" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Desativado" #. 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 de plugin ausente no pipeline do plugin: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Marca de cotação em falta 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 do plugin '%1' já existe." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Especificar argumentos de 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 descompactação" #. 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 na pré-diferenciação de '%1' com '%2'. Pré-diferenciação desativada." #. 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 "Gestor de URL" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Descompactador de ficheiros" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Desempacotador de ficheiros ou pastas" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Abreviatura para desempacotador" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "Abreviatura para pé-diferenciação" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Abreviatura para editor de scripts" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "Abreviatura para pipeline do plugin '%1'" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Nova descrição do plugin" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Tudo" #. 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 "" #. 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 "Área de transferência em %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "" "Clipboard history disabled.\r\n" "Enable: Windows logo key + V, then Turn on." @@ -8053,110 +8059,115 @@ msgstr "" "O histórico da área de transferência está desativado.\r\n" "Para ativar o histórico da área de transferência, prima a tecla do logotipo do Windows + V e clique no botão Ativar." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Este sistema não suporta o histórico da área de transferência." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "A versão de 32 bits do WinMerge 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 runtime WebView2 não está instalado. Quer transferi-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 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 "Pré-&visualizar página" #. 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 "A comparar..." #. 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 "Diferenciar pedaço" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Diferença 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 "Caráter" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "" "\n" "Previous Difference (Alt+Up)\n" @@ -8169,7 +8180,7 @@ msgstr "" "(Alt+Roda para cima)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8182,7 +8193,7 @@ msgstr "" "(Alt+Roda para baixo)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8197,7 +8208,7 @@ msgstr "" "(Alt+Shift+Roda para baixo)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8212,7 +8223,7 @@ msgstr "" "(Alt+Shift+Roda para cima)" #. ID_MICE_L2RNEXT -#: Merge.rc:5351 +#: Merge.rc:5362 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)\n" @@ -8225,7 +8236,7 @@ msgstr "" "(Ctrl+Alt+Shift+Roda para baixo)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8238,262 +8249,262 @@ msgstr "" "(Ctrl+Alt+Shift+Roda para cima)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "A comparar %1 com %2" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "A comparar %1 com %2 e %3" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "Comparação concluída" #. 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 "Ficheiro guardado" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "A copiar ficheiros..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "A mover ficheiros..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "A eliminar ficheiros..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Reciclagem" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Eliminado permanentemente" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Operação de ficheiros concluída com sucesso" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Operação de ficheiros cancelada" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Sem erros" #. 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 "Sequência de caracteres sem terminação" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Erro de sintaxe na expressão do 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 do filtro" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Valor 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 em 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 "" #. 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 ou igual a" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Maior 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 "" #. 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 "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 "por exemplo, %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 detetou uma falha anterior. Se possível, informe-nos sobre isso." #. 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/Romanian.po b/Translations/WinMerge/Romanian.po index 529a1e0d468..164b875a283 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -22,7 +22,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_ROMANIAN, 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 "Selectează &diferențele din rând\tF4" @@ -137,7 +137,7 @@ msgid "Cu&t" msgstr "&Taie" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Copiază" @@ -147,19 +147,19 @@ msgid "&Paste" msgstr "Li&pește" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Script-uri" #. 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 "< Gol >" #. 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 "&Mergi la...\tCtrl+G" @@ -179,27 +179,27 @@ msgid "Op&en" msgstr "D&eschide" #. 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 "Cu aplicația în®istrată" #. 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 "Cu editorul &extern\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 "&Cu..." #. 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 "Deschide directorul &părinte..." #. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU -#: Merge.rc:137 Merge.rc:1239 +#: Merge.rc:137 Merge.rc:1249 msgid "S&hell Menu" msgstr "Meniul s&hell" @@ -234,8 +234,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Detectare ins&erare/ștergere" #. 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 "&Deloc" @@ -250,12 +250,12 @@ msgid "&Horizontal" msgstr "&Orizontal" #. 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 &precedentă" #. 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 următoare" @@ -265,42 +265,42 @@ msgid "&Active Pane" msgstr "Panoul activ" #. 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 "Rotește la dreapta cu 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 "Rotește la stânga cu 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 "Reflectă &vertical" #. 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 "Reflectă orizontal" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "Mărime te&xt" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "&Mărește\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Micș&orează\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+*" @@ -325,27 +325,27 @@ msgid "Dragging &Mode" msgstr "&Mod de glisare" #. 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 "&Mută" #. 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 "&Ajustează decalajul" #. 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 "Ștergere &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 "Ștergere &orizontală" #. 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 "&Selectează dreptunghi" @@ -380,37 +380,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Compară &textul extras din imagini" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "Co&mpară" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "Capturi de ecran" #. 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 "Capturi de ecran în mărime completă" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS -#: Merge.rc:276 Merge.rc:1249 +#: Merge.rc:276 Merge.rc:1259 msgid "&HTMLs" msgstr "&HTML-uri" #. 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 "Arbori de &resurse" #. 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ărime" @@ -425,27 +425,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 "" @@ -475,2668 +475,2674 @@ msgid "&All Profiles" msgstr "Toate profilurile" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Fișier" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 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 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&abel" #. 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 "&Binar" #. 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 "&Imagine" #. 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 "Pagină &web" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Neu (&3 panouri)" #. 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 "D&eschide...\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 "Deschide fișierul cu conflic&te..." #. 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 "Deschide c&lipboard" #. 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 "Deschide pro&iectul...\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&vează proiectul..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Proiecte recente" #. 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&ișiere sau directoare recente" #. 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 "Ieșir&e\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 "&Editare" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "Li&pește\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țiuni...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "&Vizualizare" #. 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 "&Bara de file" #. 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 "Bară de unel&te" #. 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 "&Mic" #. 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 "Ma&re" #. 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 "Uriaș" #. 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 "Bară de &stare" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "Unel&te" #. 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 "&Filtre..." #. 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 "&Generează petic..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "&Plugin-uri" #. 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 "Setări p&lugin-uri..." #. 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 "Precomparator 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 "Precomparator a&utomat" #. 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 "Dezarhivare &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 "Dezarhivare &automată" #. 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 "&Reîncarcă plugin-urile" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 msgid "&Window" msgstr "Ferea&stră" #. 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 "Închi&de\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 "Închid&e toate" #. 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 "Schimbă &panou\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 "Alătură &orizontal" #. 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 "Alătură &vertical" #. 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 "&Cascadă" #. 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&jutor" #. 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 "Ajutor &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&e de versiune" #. 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 "&Traduceri" #. 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&onfigurare" #. 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 Publică Generală &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 "&Despre WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "P&rotejat la scriere" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Protejat la scri&ere în stânga" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "Protejat la scr&iere în mijloc" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "Protejat la scriere în dreapta" #. 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 "Codar&e caractere fișiere..." #. 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 "Selecte&ază tot\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Arată elementele &identice" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Arată elementele &diferite" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Arată elementele unic&e din stânga" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Arată elementele unice din mij&loc" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Arată elementele unice d&in dreapta" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Arată elementele omise" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Arată fișierele binare" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "Comparare în &3" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Arată în stânga doar elementele diferite" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Arată în mijloc doar elementele diferite" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Arată în dreapta doar elementele diferite" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Arată în stânga doar elementele lipsă" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Arată în mijloc doar elementele lipsă" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Arată în dreapta doar elementele lipsă" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Arată elementele ascunse" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "&Mod arbore" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "E&xpandează subdirectoarele" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "Toate subdirectoarele" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "Subdirectoarele &diferite" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "Subdirectoarele &identice" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "&Colapsează toate subdirectoarele" #. 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 "Selectează &font..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Utilizează font im&plicit" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Interschimbă p&anourile" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Interschimbă &1 | 2" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Interschimbă &2 | 3" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Interschimbă &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 "Statistici de compa&rare..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Reîmpro&spătare\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "&Reîmprospătare selectate\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "&Fuziune" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Co&mparare\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "Difere&nța următoare\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Diferența precedentă\tAlt+Up" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "&Prima diferență\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 curentă\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "U<ima diferență\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 "Copiază la d&reapta\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 "Copi&e la stânga\tAlt+Left" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "Ș&terge\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "Personalizare &coloane..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Generare &raport..." #. 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 "&Editează cu dezarhivatorul.." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Salvează\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Salv&ează" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Sa&lvează stânga" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Salvează &mijloc" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Salvează d&reapta" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Salvează c&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 "Salvează stânga ca..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Salvează mijlocul ca..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Salvează dreapta ca..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "Ti&părire...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Aranjare în pa&gină..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Pre&vizualizare tipărire..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "Convertește sfârșiturile de rând la" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "&Modul fuziune\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Reîncarcă\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "Recompară ca" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "An&ulează\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "&Refă\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "&Taie\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 "&Copiază\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "&Găsește...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Înlo&cuiește...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "&Marcator...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Avansat" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiază cu numărul de rând\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "Semne de &carte" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Comută semn de carte\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "Sem&n de carte următor\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "Semn de carte &precedent\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Șterge toate semnele de &carte" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Evidențiere sintaxă" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Context de &diferențiere" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "To&ate rândurile" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 rânduri" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 rând" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 rânduri" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 rânduri" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 rânduri" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 rânduri" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Comu&tă între \"toate\" și \"0-9 rânduri\"\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "&Inversează (ascunde rândurile diferite)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "B&lochează panourile" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "Afișează blanc&urile" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Afișează E&OL" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Afișea&ză diferențele din rând" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Afișează numărul rândului" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Afișează &marginile" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Afișează marginile de sus" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Infășoa&ră rândurile lungi" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Divide pe v&erticală" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "&Panoul cu diferențe" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Panoul cu lo&cația" #. 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 "Conflictul următor\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Conflictul precedent\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Avansat" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Diferența următoare între stânga și mijloc\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Diferența precedentă între stânga și mijloc\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Diferența următoare între stânga și dreapta\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Diferența precedentă între stânga și dreapta\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Diferența următoare între mijloc și dreapta\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Diferența precedentă între mijloc și dreapta\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Diferența următoare doar în stânga\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Diferența precedentă doar în stânga\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Diferența următoare doar în mijloc\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Diferența precedentă doar în mijloc\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Diferența următoare doar în dreapta\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Diferența precedentă doar în dreapta\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Copiază din stânga în" #. 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 "&Mijloc" #. 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&reapta" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Copiază din &mijloc în" #. 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 "Stâ&nga" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Copiază din d&reapta în" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Copiază rândurile selectate din stânga în" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Copiază rândurile selectate din mijloc în" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Copiază rândurile selectate din dreapta în" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Copiază din stânga\tAlt+Shift+Right" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Copiază din dreapta\tAlt+Shift+Left" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "C&opiază în dreapta și avansează\tCtrl+Alt+Right" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Copiază în s&tânga și avansează\tCtrl+Alt+Left" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Copiază tot în dre&apta" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Copia&ză tot în stânga" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "Fuzionare a&utomată\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Adaugă punct de &sincronizare\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Șterge punctele de sincronizare" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Dezarhivator" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "&Prediferențiator" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Aplică pre&diferențiator..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "&Transformă cu script editor..." #. 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 "Divide" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "Comp&ară" #. 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 "Compară în fereastră nouă" #. 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 "Compară neorizontal..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "Compară neorizontal" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Primul element din stânga cu al doilea element din stânga" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Primul element din dreapta cu al doilea element din dreapta" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "Primul element din stânga cu al doilea element din dreapta" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Al doile element din stânga cu primul element din dreapta" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "Co&mpară ca" #. 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 "Stânga cu mijlocul (%1 din %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 "De la stânga la dreapta (%1 din %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 "Stânga la... (%1 din %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 "Mijlocul cu stânga (%1 din %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 "Mijlocul cu dreapta (%1 din %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 "Mijlocul cu... (%1 from %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 "Dreapta cu mijlocul (%1 din %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 la dreapta la stânga (%1 din %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 "Dreapta la... (%1 din %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "Ș&terge" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "Am&bele" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "Toate" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "&Selecție" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Rede&numește" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "Ascunde e&lementele" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "Deschide stâ&nga" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Deschide mij&loc" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Deschide drea&pta" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Cop&ie căile de fișier" #. 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 "Stânga (%1 din %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 "Mijloc (%1 din %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 "Dreapta (%1 din %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 "Ambele (%1 din %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 "Toate (%1 din %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Copiază numele de &fișier" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Copiază elementele în clipboard" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Copiază toate coloanele afișate" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1020 +#: Merge.rc:1028 msgid "&Zip" msgstr "Arhivea&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 "Ambele în... (%1 din %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 "Toate în... (%1 of %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țele în... (%1 din %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Meniul shell stânga" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Meniul shell mijloc" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Meniul shell dreapta" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Meniul shell ambele" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Meniul shell toate" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Copiază" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "&Copiază calea întreagă" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Copiază numele de &fișier" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "Editează descrierea\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 "&Deschide..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Setări dezarhivator" #. 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 "&Selectează..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Setări prediferențiator" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Mergi la difere&nță" #. 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 "Fără blocuri &mutate" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "To&ate blocurile mutate" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Blancur&i" #. 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&pară" #. 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&gnoră schimbări" #. 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&noră tot" #. 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 "Ignoră rânduri goale" #. 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 "Ignoră minus&cule/majuscule" #. 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&ră diferențele sfârșitului de rând (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 "Ignoră &diferențele de pagină de codare" #. 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 "Ignoră numerele" #. 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 "Ignoră diferențele de c&omentarii" #. 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 "&Include subdirectoare" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "Metoda de &comparare" #. 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 "Conținut 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 "Conținut rapid" #. 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 "Conținut binar" #. 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 "Dată modificare" #. 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 "Dată modificare și mărime" #. 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 "Mărime" #. 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 "Încarcă proiect..." #. 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 "Respectă minuscule/majuscule" #. 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 "Despre WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Vizitează pagina de bază 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 "Colaboratori" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Selectează fișiere sau directoare" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "Fișierul sau directorul 1" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Num&ai-citire" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Interschimbă 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 "Răsf&oiește..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "Fișierul sau directorul 2" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Protejat la scriere" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Interschimbă 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ăsfoiește..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "Fișierul sau directorul 3 (opțional)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Protejat la scriere" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Interschimbă 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 "Răsfoiește..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Director: filtru" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "&Include subdirectoare" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Fișier: Plugin prediferențiator" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Fișier: plugin dezarhivator" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Se&lectează..." #. 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 "Renunță" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Stare:" #. 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 "Ajutor" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "&Opțiuni..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Găsește" #. 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 "Ce a&nume:" #. 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 "Potrivește doar cu&vinte întregi" #. 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 "&Expresie regulată" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Nu relua de la începutul fișierului" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "Nu închide această fereastră de dialog" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "&Găsește următorul" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Găsește precedentul" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Înlocuiește" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "C&u ce:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "Nu relua de la începutul &fișierului" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Înlocuiește în" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "Între&gul fișier" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Găsește precedentul" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Înlocuieș&te" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Înlocuiește t&ot" #. 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 "Activează &marcatorii" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Nou" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Culoare fundal:" #. 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 "&Aplică" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Filtre de rând" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Activează filtrele de rând" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Expresii regulate (câte una pe rând):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Editează" #. 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 "Înlătură" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Filtre de substituție" #. 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,548 +3151,548 @@ msgstr "" "ignorate sau marcate ca nesemnificative. Peticele nu sunt afectate." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Activează" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Adaugă" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Șterge" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Opțiuni" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Importă..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Exportă..." #. 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 "General" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "De&sfășoară automat la prima diferență" #. 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 "Desfășoară automat la prima diferență în cadrul rândului" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Închide ferestrele cu tasta 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Verifică automat căile în dialogul de deschidere" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Mod instanță unică:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "Întreabă înainte de a închide fereste multiple" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Păstrează data și ora fișierului pentru compararea fișierelor" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Afișează la start dialogul \"Selectează fișiere sau directoare\"" #. 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 "" "Închide dialogul \"Selectează fișiere sau directoare\" la apăsarea butonului " "Compară" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Auto-completare în dialogul de deschidere:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "&Reîncarcă automat fișierele modificate:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Limba:" #. 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 "Implicite" #. 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 "" #. 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 "Fundal" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Șters" #. 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 "Text" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Diferență:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Diferență selectată:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Diferență ignorată:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Mutat:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Selecție mutată:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "La fel ca următorul (3 panouri):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "La fel ca următorul (selectate):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Diferență cuvânt:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Diferență cuvânt selectată:" #. 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 "Dialog" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Cuvinte cheie:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Nume de funcții:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Comentarii:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Numere:" #. 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 "Șiruri de caractere:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Preprocesor:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Utilizator 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Utilizator 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 "Aldine" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "Folosește c&ulori ale textului personalizate" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Blancuri:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Text normal:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Selecție:" #. 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 "Marcatorul de căutare:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Marcatorul definit utilizator 1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Marcatorul definit utilizator 2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Marcatorul definit utilizator 3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "&Utilizează culorile de comparare a directoarelor" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Elemente egale:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Elemente diferite:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Elemente nu există toate:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Elemente filtrate:" #. 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 "Sistem" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "Trimite fișierele șterse către Recycle Bin" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 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 msgid "&Filter folder:" msgstr "Directorul cu &filtre:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Directorul cu fișiere temporare" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Direc&torul cu fișiere temporare al sistemului" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Director personali&zat:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Ră&sfoiește..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Comparare" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Blanc" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "&Compară" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "&Ignoră schimbare" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "I&gnoră tot" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Ignoră rânduri goale" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Ignoră minus&cule/majuscule" #. 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 "Ignoră numerele" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Ignoră &diferențele de pagină de codare" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignoră diferențele de c&omentarii" #. 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 "Activea&ză detecție blocuri mutate" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Aliniază rândurile &similare" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "&Algoritm de diferențiere:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Activează euristica de indentare" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Demarchează complet diferențele 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&vidențiere sintaxă" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "&Păstrează caracterele EOL originale" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "File" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "Mărime &filă:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "&Inserează file" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "In&serează blancuri" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "Mod de &randare:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Rescanare &automată" #. 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 "Colorarea diferențelor din rând" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Arată diferențele din rând" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "La nivel de &caracter" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "La nivel de cu&vânt:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Caractere de despărțire cuvinte:" #. 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." @@ -3695,399 +3701,399 @@ msgstr "" "Reinițializare pentru a afișa din nou toate căsuțele de mesaj." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Reinițializare" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Generator petice" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "&Fișier 1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "F&ișier 2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "Interschim&bă" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "&Copiază în memorie" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Adaugă la fișier existent" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Rezultat:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Răsf&oiește..." #. 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 "S&til:" #. 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 "Inclu&de linia de comandă" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Deschide în editor e&xtern" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Afișează coloanele" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Mută mai s&us" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Mută mai &jos" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "Proprietăți suplimentare" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Proprietăți suplimentare" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Selectează plugin" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "&Nume 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 "Listă extensii:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 msgid "Description:" msgstr "Descriere:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2486 Merge.rc:3121 +#: Merge.rc:2496 Merge.rc:3131 msgid "Default arguments:" msgstr "Argumente implicite:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Afișează toate plugin-urile, nu verifica extensia" #. 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 "Deschide fișierele în același tip de fereastră după dezarhivare" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "Lanțul de &plugin-uri:" #. 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 "Stop" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Pauză" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Continuă" #. 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 "&Numărul de procesoare de utilizat:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Elemente total:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Elemente comparate:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "În&chide" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Mergi la" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "&La:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Fișier" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Mergi la" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Râ&nd" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Diferență" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "&Mergi la" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Filtre de fișiere" #. 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 "Testează..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Instalează..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Nou..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Editează..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Șterge..." #. 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 "Identice" #. 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 "Diferite" #. 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 "Codare caractere" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Codare caractere implicită" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "" "Selectează codarea caracterelor folosită implicit la încărcarea fișierelor " "non-Unicode:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Codarea sistemului" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Conform cu interfața WinMerge" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Pagină de codare particularizată:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4097,7 +4103,7 @@ msgstr "" "Sesiunea trebuie restartată." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "" "Detect codepage for files with mlang.dll\n" "Restart required." @@ -4106,769 +4112,769 @@ msgstr "" "Sesiunea trebuie restartată." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Suport arhivare" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Activ&ează suportul pentru fișierele arhivă" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Detectează tipul arhivei după semnătura fișierului" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Elemente salvate sau restaurate din fișierul proiect:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Salvare fișiere modificate?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Fișier stânga" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Salvează modificările" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "Renunță la mo&dificări" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Fișierul din partea de mijloc" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Sal&vează modificările" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Renunță la modificări" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Fișier dreapta" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "S&alvează modificările" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Renunță la s&chimbări" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "&Renunță la toate" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Raport comparare directoare" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "&Fișier raport:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "&Stil:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "&Include raportul de comparare fișiere" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Filtru public sau privat" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Ce tip de filtru doriți să creați?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Filtru public (pentru toți utilizatorii de pe mașina curentă)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Filtru privat (doar pentru utilizatorul curent)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Statistici ale comparării" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Directoare:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 msgid "Files:" msgstr "Fișiere:" #. 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 "Binare:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Unice" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Stânga:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Dreapta:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "În total:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Închide" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Mijloc:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Lipsă stânga:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Lipsă mijloc:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Lipsă dreapta:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Afectează" #. 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 "(Afectează)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Selectează codare caractere pentru" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "Încărcare &fișier:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "&Salvare fișier:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "Aceeași codare caractere pentr&u ambele" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "&Renunță" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Testează filtru" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Testare filtru:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "Introduc&eți textul pentru testare:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "Nu&me director" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Rezultat:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "&Testează" #. 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 "Tip fișier" #. 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 separate cu delimitator personalizat" #. 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 "Caracterul d&elimitator:" #. 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 "Permite sfârșituri de rând în ghilimele" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Caracterul de citare:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Copii de siguranță" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Crează copii de siguranță pentru:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "Comparare &directoare" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Comparare fiși&ere" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Crează copii de siguranță în:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Directorul &original al fișierului" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Directorul de siguranță &global:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Numele fișierului de siguranță:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "&Adaugă extensia .bak" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Adaugă ora" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Confirmă copierea" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Sunteți sigur că vreți să copiați XXX elemente?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "De la stânga" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "De la dreapta" #. 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 "Nu î&ntreba din nou." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Da" #. IDD_CONFIRM_COPY, IDNO -#: Merge.rc:2904 +#: Merge.rc:2914 msgid "No" msgstr "Nu" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Plugin-uri" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "Activ&ează plugin-uri" #. 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 "Filtre fișiere:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Argumente &plugin-uri:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Acrivează dezarhivarea/prediferențierea &automată pentru plugin" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integrare în shell" #. 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 "&Adaugă la meniul contextual" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Activează me&niul contextual avansat" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Activează meniul &Compară ca" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "În®istrează extensia shell" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "Deînregistrează extensia shell" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Înregistrează extensia shell d&oar pentru utilizatorul curent" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Deînregistrează extensia shell doar pentru uti&lizatorul curent" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Înregistrează extensia shell pentru &Windows 11 ori mai nou" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Deînregistrează extensia shell pentru W&indows 11 ori mai nou" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Lista de salturi" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Șterge toate elementele recente" #. IDS_OPTIONSPG_FOLDERCOMPARE -#: Merge.rc:2954 Merge.rc:4225 +#: Merge.rc:2964 Merge.rc:4235 msgctxt "Options dialog|Categories" msgid "Folder" msgstr "Director" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2957 +#: Merge.rc:2967 msgid "&Compare method:" msgstr "Metoda de &comparare:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "Opreș&te după prima diferență" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&oră diferențe de timp mai mici de 3 secunde" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Expandează &automat subdirectoarele după comparare:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Include conținutul &unic al subdirectoarelor" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Ignoră punctele de reparsare" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Prag pentru trecerea la compararea rapidă (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Prag pentru trecerea la compararea binară (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 "Modele de fișiere:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Valori separate cu delimitator personalizat" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Binar" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "Modele de fișiere binare:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Setări Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "&Setări vizualizare..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "Mod &binar..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "Set &caractere..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Imagine" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "Modele fișiere imagine:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Activ&ează compararea imaginilor la compararea directoarelor" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Rezultat OCR:" #. IDS_OPTIONSPG_WEBPAGECOMPARE -#: Merge.rc:3043 Merge.rc:4229 +#: Merge.rc:3053 Merge.rc:4239 msgid "Webpage" msgstr "Pagină web" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Model URL de &inclus (expresie regulată):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Model URL de &exclus (expresie regulată):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "Locația directorului de date utilizator:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "&Separă directoarele de date utilizator pentru fiecare panou" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "Afișare &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 "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)" @@ -4877,7 +4883,7 @@ msgstr "" "Documente noi (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4886,7 +4892,7 @@ msgstr "" "Deschide (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4895,27 +4901,27 @@ msgstr "" "Salvează (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Eroare necunoscută la încercarea de deschidere a fișierului proiect." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Eroare necunoscută la încercarea de salvare a fișierului proiect." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Fișierul proiect a fost încărcat cu succes." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Fișierul proiect a fost salvat cu succes." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4924,7 +4930,7 @@ msgstr "" "Anulează (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4933,7 +4939,7 @@ msgstr "" "Refă (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4952,7 +4958,7 @@ msgstr "" "WinMerge Comparare fișiere" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4971,7 +4977,7 @@ msgstr "" "WinMerge Comparare directoare" #. 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 vine fără ABSOLUT NICIO GARANȚIE. Acesta este software liber și " @@ -4979,159 +4985,159 @@ msgstr "" "Licența Publică Generală GNU în meniul Ajutor pentru detalii." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "Re&nunță" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Reîncearcă" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "&Ignoră" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Ignoră to&ate" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "&Da" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "D&a la toate" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "&Nu" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Nu la to&ate" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "&Continuă" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "O&mite" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Omite to&ate" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Nu afișa acest &mesaj din nou." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "" "Pentru a face vizibilă din nou această fereastră de dialog, apăsați butonul " "Reinițializare din pagina Ferestre mesaj a dialogului Opțiuni." #. 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 "Sintaxă" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Scheme culori" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Comparare directoare" #. IDS_OPTIONSPG_PROJECT -#: Merge.rc:4215 +#: Merge.rc:4225 msgid "Project" msgstr "Proiect" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Diferențe" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Ferestre mesaj" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Către:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "De la stânga:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Către stânga:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "De la dreapta:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Către dreapta:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Din mijloc:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Către mijloc:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Versiunea %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Opțiuni (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Toate casetele de mesaj vor fi de acum afișate din nou." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5141,37 +5147,37 @@ msgstr "" "Vă rugăm folosiți valorile 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Deschide" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programe|*.exe;*.bat;*.cmd|Toate fișierele (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Toate fișierele (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fișiere proiect WinMerge (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fișiere opțiuni (*.ini)|*.ini|Toate fișierele (*.*)|*.*||" #. 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 (*.*)|" "*.*||" @@ -5180,121 +5186,121 @@ msgstr "" "fișierele (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fișiere HTML (*.htm,*.html)|*.htm;*.html|Toate fișierele (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fișiere XML (*.xml)|*.xml|Toate fișierele (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Nu expanda" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Expandează toate subdirectoarele" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Expandează subdirectoarele diferite" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Expandează subdirectoarele identice" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Tip fișier" #. 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 "Mesaj" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Răspuns" #. 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 "Încarcă" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Salvează" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Include subdirectoare" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Opțiuni comparare" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Elemente ascunse" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Nume" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Locație" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filtre" #. 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 "Descriere" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Selectează numele fișierului pentru noul filtru" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fișiere filtru (*.flt)|*.flt|Toate fișierele (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5307,7 +5313,7 @@ msgstr "" "Vă rugăm copiați fișierul %1 în directorul WinMerge/Filters :\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5320,7 +5326,7 @@ msgstr "" "\n" "Vă rugăm verificați că fișierul există și este editabil." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5330,7 +5336,7 @@ msgstr "" "\n" "Vă rugăm selectați directorul filtru în Opțiuni.../Sistem." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5344,11 +5350,11 @@ msgstr "" "Este posibil ca fișierul să fie protejat la scriere?" #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Selectați fișierul filtru pentru instalare" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5359,17 +5365,17 @@ msgstr "" "Nu s-a putut copia noul fișier filtru în directorul filtru." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Fișierul filtru deja există. Suprascrie?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Expresie regulată" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "Filters updated. Refresh all open folder compares?\n\nSelect 'No' to refresh later." msgstr "" "Filtrele au fost actualizate. Doriți să reîmprospătați toate comparările de " @@ -5379,219 +5385,219 @@ msgstr "" "reîmprospătați comparările mai târziu." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Rezultate comparare directoare" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Comparare fișiere" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Nedenumit stânga" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Nedenumit mijloc" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Nedenumit dreapta" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Fișierul bază" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Fișierul lor" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Fișierul meu" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Fișierul 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 "Rd: %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 "Rând: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rd: %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 "Fuziune" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Deferența %1 din %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "%1 diferențe găsite" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "O diferență găsită" #. 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 "Element %1 din %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Elemente: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Comparare elemente..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[elem/sec]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Selectați două directoare sau fișiere existente pentru comparare." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Selectare directoare" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "" "Selectați două (sau trei) directoare ori două (sau trei) fișiere pentru " "comparare." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Calea din stânga (1) este invalidă!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Calea din mijloc (2) este invalidă!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Calea din dreapta (2) este invalidă!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Calea din dreapta (3) este invalidă!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Ambele căi sunt nevalide!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Căile din stânga (1) și mijloc (2) sunt invalide!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Căile din stânga (1) și dreapta (3) sunt invalide!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Căile din mijloc (2) și dreapta (3) sunt invalide!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Toate căile sunt invalide!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Activat doar pentru comparare de fișiere" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Nu se poate compara un fișier cu un director!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Fișier negăsit: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Fișier nedezarhivat: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5605,12 +5611,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Analizarea fișierului de conflicte a eșuat." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" @@ -5619,7 +5625,7 @@ msgstr "" "nu e un fișier de conflicte." #. 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 "" "Sunteți pe cale să comparați fișiere foarte mari.\n" @@ -5629,18 +5635,18 @@ msgstr "" "\n" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Salvează ca" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Salvează schimbările în %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 "" @@ -5648,11 +5654,11 @@ msgstr "" "citire? (Apăsați nu ca să forțați redenumirea.)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Eroare la salvarea copiei de siguranță a fișierului" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5666,7 +5672,7 @@ msgstr "" "Continuați oricum?" #. 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 "" @@ -5677,7 +5683,7 @@ msgstr "" "\t- folosiți un alt nume de fișier (apăsați OK)\n" "\t- renunțați la operația curentă (apăsați Renunță)?" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "Plugin '%2' cannot pack changes to left file into '%1'.\n\nOriginal unchanged. Save unpacked version?" msgstr "" @@ -5688,7 +5694,7 @@ msgstr "" "\n" "Doriți să salvați versiunea nearhivată în alt fișier?" -#: 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 "" @@ -5699,7 +5705,7 @@ msgstr "" "\n" "Doriți să salvați versiunea nearhivată în alt fișier?" -#: 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 "" @@ -5711,7 +5717,7 @@ msgstr "" "Doriți să salvați versiunea nearhivată în alt fișier?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5727,7 +5733,7 @@ msgstr "" "Suprascrieți fișierul modificat?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5738,7 +5744,7 @@ msgstr "" "protejat la scriere?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "" @@ -5749,22 +5755,22 @@ msgstr "" "Doriți să reîncărcați fișierul?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Salvează fișierul din stânga ca" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Salvează fișierul din mijloc ca" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Salvează fișierul din dreapta ca" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5776,7 +5782,7 @@ msgstr "" "a dispărut. Vă rog salvați o copie a fișierului pentru a continua." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5787,186 +5793,186 @@ msgstr "" "Reîmprospătați documentele înainte de a continua." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Întrerupe la blanc" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Întrerupe la blanc sau semn de punctuație" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Copiază în &mijloc\tAlt+Right" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Copiază în &mijloc\tAlt+Left" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Copiază din mijloc\tAlt+Shift+Right" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Copiază din mijloc\tAlt+Shift+Left" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Copiază în mijloc și avansează\tCtrl+Alt+Right" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Copiază în mijloc și avansează\tCtrl+Alt+Left" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Copiază tot în mijloc" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Din dreapta în stânga (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Din dreapta în mijloc (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Din mijloc în stânga (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Din mijloc în dreapta (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Din stânga în dreapta (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Din stânga în mijloc (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Din stânga în... (%1)" #. IDS_MOVE_MIDDLE_TO -#: Merge.rc:4508 Merge.rc:4540 +#: Merge.rc:4518 Merge.rc:4550 #, c-format msgid "Middle to... (%1)" msgstr "Din mijloc în... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Din dreapta în... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Ambele în... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Toate în... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Diferențele în... (%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 "Stânga (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Mijloc (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Dreapta (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Ambele (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Tot (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Partea stângă - selectare director destinație:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Partea din mijloc - selectare director destinație:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Partea dreaptă - selectare director destinație:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fișiere afectate)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 din %2 fișiere afectate)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5978,18 +5984,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Sunteți sigur că vreți să copiați?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Sunteți sigur că vreți să copiați %d elemente?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6009,48 +6015,48 @@ msgstr "" "Vă rugăm reîmprospătați compararea." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Sunteți sigur că vreți să mutați?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Sunteți sigur că vreți să mutați %d elemente?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Confirmați mutarea" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "" "Sunteți pe cale să închideți fereastra care compară directoarele. Sunteți " "sigur?" -#: 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 "Numele fișierului sau al directorului este invalid." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Execuția editorului extern a eșuat: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Format arhivă necunoscut" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6059,754 +6065,754 @@ msgstr "" "Doriți să comparați arhivele ca fișiere text?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Nume fișier" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Director" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Rezultat comparare" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Dată stânga" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Dată dreapta" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Dată mijloc" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Mărime stânga" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Mărime dreapta" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Mărime mijloc" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Mărime dreapta (scurt)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Mărime stânga (scurt)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Mărime mijloc (scurt)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Timp creare stânga" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Timp creare dreapta" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Timp creare mijloc" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Fișier mai nou" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Versiune fișier stânga" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Versiune fișier dreapta" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Versiune fișier mijloc" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Rezultat scurt" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Atribute stânga" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atribute dreapta" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atribute mijloc" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "EOL stânga" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "EOL mijloc" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "EOL dreapta" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Set de caractere stânga" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Set de caractere dreapta" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Set de caractere mijloc" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Diferențe ignorate" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Binar" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Dezarhivator" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Prediferențiator" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Stânga" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Mijloc" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Dreapta" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Diferență" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Număr duplicate stânga" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Număr duplicate dreapta" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Număr duplicate mijloc" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Mută" #. 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 "Calendar" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "Comunicare" #. 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 "Dispozitive" #. 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 "Acasă" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Jurnal" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Legătură" #. 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 "Muzică" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Notă" #. 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 "Căutare" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Securitate" #. 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 "Sarcină" #. 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 "Imposibil de comparat fișierele" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Element întrerupt" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Fișier omis" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Director omis" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Numai stânga: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Numai mijloc: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Numai dreapta: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Nu există în %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Fișierele binare sunt identice" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Fișierele binare sunt diferite" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Fișierele sunt diferite" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Directoarele sunt diferite" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Numai stânga" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Numai dreapta" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Numai mijloc" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Niciun element în stânga" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Niciun element în dreapta" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Niciun element în mijloc" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Eroare" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Fișierele text sunt identice" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Mijlocul și stânga sunt identice)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Stânga și dreapta sunt identice)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Stânga și mijlocul sunt identice)" #. 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 "Fișierele text sunt diferite" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Fișierele imagine sunt identice" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Fișierele imagine sunt diferite" #. 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 "Timp scurs: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "Un element selectat" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 elemente selectate" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Nume de fișier sau director." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Nume subdirector când subdirectoarele sunt incluse." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Rezultate comparare, forma lungă." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Data modificării părții stângi." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Data modificării părții drepte." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Data modificării părții din mijloc." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Extensia fișierului." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Dimensiune fișier stânga în octeți." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Dimensiune fișier dreapta în octeți." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Dimensiune fișier mijloc în octeți." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Dimensiune fișier stânga prescurtată." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Dimensiune fișier dreapta prescurtată." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Dimensiune fișier mijloc prescurtată." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Timp creare stânga." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Timp creare dreapta." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Timp creare mijloc." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Raportează care parte are o dată a modificării mai recentă." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Versiune fișier stânga, numai pentru unele tipuri de fișiere." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Versiune fișier dreapta, numai pentru unele tipuri de fișiere." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Versiune fișier mijloc, numai pentru unele tipuri de fișiere." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Rezultat comparare pe scurt." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Atribute partea stângă." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Atribute partea dreaptă." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Atribute mijloc." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Tip EOL fișier partea stângă." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Tip EOL fișier partea dreaptă." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Tip EOL fișier mijloc." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Set de caractere partea stângă." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Set de caractere partea dreaptă." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Set de caractere mijloc." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "" "Număr de diferențe ignorate în fișier. Aceste diferențe sunt ignorate de " "WinMerge și nu pot fi fuzionate." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "" "Număr de diferențe în fișier. Acest număr nu include diferențele ignorate." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Afișează un asterisc (*) dacă fișierul este binar." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Nume sau lanț plugin dezarhivator." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Nume sau lanț plugin prediferențiator." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "Compară %1 cu %2" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "Compară %1 cu %2 și %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Listă separată-prin-virgule" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Listă separată-prin-tab-uri" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "HTML simplu" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "XML simplu" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Fișierul raport există deja. Doriți să suprascrieți fișierul existent?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6816,52 +6822,52 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Raportul a fost creat cu succes." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Nu se poate adăuga un punct de sincronizare la acest rând." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Același fișier este deschis în ambele panouri." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Fișierele selectate sunt identice." #. 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 "A fost întâlnită o eroare în timpul comparării fișierelor." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "" "Could not create temporary files. Check your temporary path settings." msgstr "" @@ -6869,7 +6875,7 @@ msgstr "" "locația temporară." #. 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 "" "Aceste fișiere folosesc caractere de sfârșit de rând (EOL) diferite.\n" @@ -6883,17 +6889,17 @@ msgstr "" "opțiuni (disponibilă sub meniul Editare/Opțiuni)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Directorul selectat este invalid." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Nu se poate deschide în editor un fișier binar." #. 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 "" @@ -6904,42 +6910,42 @@ msgstr "" "în partea cealaltă și să deschideți ambele directoare?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "" "Sunteți sigur că doriți să copiați toate diferențele în celelalt fișier?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Doriți să treceți la fișierul următor?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Doriți să treceți la fișierul precedent?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Doriți să treceți la pagina următoare?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Doriți să treceți la pagina precedentă?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Doriți să treceți la primul fișier?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Doriți să treceți la ultimul fișier?" -#: 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 "" @@ -6950,53 +6956,53 @@ msgstr "" "Doriți tratarea ambelor fișiere ca și cum ar fi în pagina de codare " "implicită din Windows (recomandat)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Pierdere de informație datorită erorilor de codificare: ambele fișiere" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Pierdere de informație datorită erorilor de codificare: fișierul 1" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Pierdere de informație datorită erorilor de codificare: fișierul 2" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Pierdere de informație datorită erorilor de codificare: fișierul 3" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Nicio diferență" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Diferență din rând" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "S-a(u) înlocuit %1 șir(uri)." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Nu s-a găsit șirul \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "" "Intrați acum în modul fuziune. Dacă doriți să ieșiți din modul fuziune, " "apăsați tasta F9." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -7006,99 +7012,99 @@ msgstr "" "Număr conflicte nerezolvate: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Modificarea paginii de codare a fost fuzionată." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Modificările paginii de codare sunt în conflict." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Modificarea EOL a fost fuzionată." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Modificările EOL sunt în conflict." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Panou locație" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Panou diferențe" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Fișierul petic a fost scris cu succes." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "Elementul 1 nu a fost găsit!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "Elementul 2 nu a fost găsit!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Fișierul petic deja există. Doriți suprascrierea lui?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 fișier(e) selectat(e)]" #. 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 "Unificat" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Nu s-a reușit scrierea în fișierul %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Calea destinație specificată nu este o cale absolută: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Specificați un fișier destinație." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Nu s-a reușit crearea unui fișier petic din fișiere binare." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7109,12 +7115,12 @@ msgstr "" "Crearea unui petic necesită ca fișierele să nu aibă modificări nesalvate." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Directorul nu există." #. 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 "" "Suportul de dezarhivare nu este activat.\n" @@ -7124,37 +7130,37 @@ msgstr "" "și despre cum să-l activați." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Selectați fișierul pentru export" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Selectați fișierul pentru import" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Opțiuni importate din fișier." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Opțiuni exportate către fișier." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "A eșuat importul opțiunilor din fișier." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "A eșuat scrierea opțiunilor către fișier." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7165,44 +7171,44 @@ msgstr "" "Doriți să continuați?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Amestecat" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Binar" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Nici unul" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Culoare marcator %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Model nou" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Tip" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Script editor" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7211,7 +7217,7 @@ msgstr "" "Diferențe în rândul curent (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7220,7 +7226,7 @@ msgstr "" "Opțiuni" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7229,7 +7235,7 @@ msgstr "" "Reîmprospătare (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7238,7 +7244,7 @@ msgstr "" "Diferența precedentă (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7247,7 +7253,7 @@ msgstr "" "Diferența următoare (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7256,7 +7262,7 @@ msgstr "" "Conflictul precedent (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7265,7 +7271,7 @@ msgstr "" "Conflictul următor (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7274,7 +7280,7 @@ msgstr "" "Prima diferență (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7283,7 +7289,7 @@ msgstr "" "Diferența curentă (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7292,7 +7298,7 @@ msgstr "" "Ultima diferență (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7301,7 +7307,7 @@ msgstr "" "Copiază în dreapta (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7310,7 +7316,7 @@ msgstr "" "Copiază în stânga (Alt+Right)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7319,7 +7325,7 @@ msgstr "" "Copiază în dreapta și avansează (Ctrl+Alt+Right)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7328,7 +7334,7 @@ msgstr "" "Copiază în stânga și avansează (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7337,7 +7343,7 @@ msgstr "" "Copiază tot la dreapta" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7346,7 +7352,7 @@ msgstr "" "Copiază tot la stânga" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7355,7 +7361,7 @@ msgstr "" "Fuzionează automat (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7364,7 +7370,7 @@ msgstr "" "Primul fișier" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7373,7 +7379,7 @@ msgstr "" "Fișierul următor (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7382,7 +7388,7 @@ msgstr "" "Ultimul fișier" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7391,39 +7397,39 @@ msgstr "" "Fișierul precedent (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "" "Dezarhivatorul potrivit este aplicat la ambele fișiere (este suficient ca " "doar un fișier să conțină extensie)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Nu folosi prediferențiatorul (normal)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Plugin-uri sugerate" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Toate plugin-urile" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Număr de asamblare privat: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Software-ul dvs. este la zi." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7433,125 +7439,125 @@ msgstr "" "%1 este acum disponibilă (dvs. aveți %2). Doriți să o descărcați acum?" #. 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 "Descărcarea informațiilor despre ultima versiune a eșuat" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Setări pentru plugin-uri" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "Nu s-a găsit WSH - scripturile .sct sunt dezactivate" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "&Mergi la rândul %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Mergi la rândul mutat\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 "Din sistemul de fișiere" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Din lista de recent utilizate" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Fără evidențiere" #. 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 "Resurse" #. 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 "Închide filele din stânga" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Închide filele din dreapta" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Închide celelalte file" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Activează mărime maximă &automatp" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "Pagină &web" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Înfășoa&ră textul" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 msgid "%1 is not installed." msgstr "%1 nu este instalat." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 nu există. Doriți să-l creați?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Eroare creare director." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7562,882 +7568,887 @@ msgstr "" "$linenum: Numărul rândului unde se află cursorul" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "implicit" #. 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 "niciunul" #. 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 implicit" #. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED -#: Merge.rc:5165 +#: Merge.rc:5175 msgid "DirectWrite Aliased" msgstr "DirectWrite aliasat" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC -#: Merge.rc:5166 +#: Merge.rc:5176 msgid "DirectWrite GDI Classic" msgstr "DirectWrite GDI clasic" #. 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 simetric" #. 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 "Fereastră copil MDI sau fereastră principală" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Doar fereastră copil MDI" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Închide fereastra principală dacă există doar o fereastră copil MDI" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Diferență" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Evidențiere" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Clipire" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Mărime bloc" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Alpha bloc" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Prag CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Detectare taste Ins/Del" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Nimic" #. 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 "Suprapunere" #. 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 "Amestec Alpha" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Animație Alpha" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Mărire" #. 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 "Pagină: %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 "Reflectat: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Rotit: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Toate paginile" #. 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 "Nu au fost găsite diferențe de selectat" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Nu au fost găsite diferențe de adăugat ca filtru de substituție" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Perechea se află deja în lista filtrelor de substituție" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Adaug această modificare la filtrele de substituție?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Doar text" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Poziție și text rând cu rând" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Poziție și text cuvânt cu cuvânt" #. 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 "Directorul de instalare" #. 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 "Permite rularea unei singure instanțe" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "" "Permite rularea unei singure instanțe și așteaptă ca instanța să 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 "" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Doar în fereastră activată" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Imediat" #. 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 "Altele" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Numele fișierului plugin lipsește în lanțul de plugin-uri: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Ghilimele lipsă în lanțul de plugin-uri: %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 "Specificați argumente plugin" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Plugin inexistent sau invalid: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' nu este plugin dezarhivator" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' nu este plugin prediferențiator" -#: 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 "Filtru 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 "Clipboard la %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "Clipboard history disabled.\r\nEnable: Windows logo key + V, then Turn on." msgstr "" "Istoricul clipboard-ului este deactivat.\r\n" "Pentru a activa istoricul clipboard-ului, apăsați tasta logo Windows + V, " "apoi apăsați butonul Porniți." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Acest sistem nu suportă istoricul clipboard-ului." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "Versiunea pe 32 biți WinMerge nu suportă Comparare clipboard" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "Runtime-ul WebView2 nu este instalat. Doriți să-l descărcați?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Comparare text nouă" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Comparare tabel nouă" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Comparare binară nouă" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Comparare imagine nouă" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Comparare pagină web nouă" +#. 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 "Comparare clipboard" #. 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/Russian.po b/Translations/WinMerge/Russian.po index 84d00244acb..1490a0a3f03 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -25,7 +25,7 @@ msgstr "" "X-Poedit-Country: RUSSIAN FEDERATION\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_RUSSIAN, SUBLANG_DEFAULT" @@ -110,7 +110,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" @@ -140,7 +140,7 @@ msgid "Cu&t" msgstr "Вы&резать" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Копировать" @@ -150,19 +150,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" @@ -182,27 +182,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 "Меню оболочки" @@ -237,8 +237,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 "&Нет" @@ -253,12 +253,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 "Следующая страница" @@ -268,42 +268,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+*" @@ -328,27 +328,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 "&Прямоугольный выбор" @@ -383,37 +383,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 "&Размер" @@ -428,27 +428,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 "Назад/Вперед" @@ -478,7582 +478,7593 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 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..." #. 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 "Отображать панель фильтров\tCtrl+Shift+L" #. 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_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 "Показывать конец строки (EOL)" #. 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 "Копировать налево и перейти\tCtrlAlt++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 "&Заархивировать" #. 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 "Изменить путь\tCtrl+L" #. 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 "Игнорировать концы строк (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 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 "Игнорировать пропущенный завершающий 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 "Игнорировать разрывы строк (считать их пробелами)" #. 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} - Протокол 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 "Добавить плагин распаковщика..." #. 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 "&IDE" #. 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 "Менее 1КБ" #. 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КБ или более" #. 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 "Менее 10КБ" #. 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КБ или более" #. 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 "Менее 100КБ" #. 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КБ или более" #. 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 "Менее 1МБ" #. 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МБ или более" #. 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 "Менее 10МБ" #. 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МБ или более" #. 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 "Менее 100МБ" #. 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МБ или более" #. 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 "Менее 1ГБ" #. 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ГБ или более" #. 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 "Более 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 "День" #. 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 "Первые 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 "Количество строк" #. 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 "Добавить условие папки" #. 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 "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 "Элементы" #. 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 "Общий размер" #. 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 "Хэш (MD5)" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE -#: Merge.rc:1780 +#: Merge.rc:1790 msgid "Insert &replace() Function" msgstr "Вставить функцию &replace()" #. 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()" #. 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 "&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 "&Применить" #. 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 "Игнорировать пропущенный завершающий EOL" #. 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 "&Файлы 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 "Удаление расширений оболочки для W&indows 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 "Результат распознавания:" #. 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 "16-ричный вид" #. 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 "\nNew Documents (Ctrl+N)" msgstr "\nСоздать документы (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "\nOpen (Ctrl+O)" msgstr "\nОткрыть (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "\nSave (Ctrl+S)" msgstr "\nСохранить (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 "\nUndo (Ctrl+Z)" msgstr "\nОтменить (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "\nRedo (Ctrl+Y)" msgstr "\nВернуть (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 Сравнение Файлов" #. 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 Сравнение Папок" #. 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 General Public License в меню Помощь для более подробной информации." #. 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 "Размер отступа выходит за границы приемлемых значений.\n\nИспользуйте значения 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\nCopy %1 to WinMerge/Filters Folder:\n%2." msgstr "Не удается найти файл шаблона фильтра!\n\nСкопируйте файл %1 в папку с фильтрами:\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%1\n\nУбедитесь, что папка существует и доступна для записи." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "User's filter folder is not defined!\n\nSelect filter folder in Options/System." msgstr "Папка с фильтрами пользователя не определена!\n\nУкажите папку с фильтрами на вкладке Система в Настройках." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "Failed to delete filter:\n%1\n\nFile may be read-only." msgstr "Не удается удалить файл фильтра:\n%1\n\nВозможно, файл только для чтения?" #. 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 "Сбой установки файла фильтра.\n\nНе удается скопировать файл фильтра в папку с фильтрами." #. 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\nЕсли не хотите обновлять сейчас, нажмите \"Нет\"." #. 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 "Найдено всего одно отличие" #. 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 "Выберите для сравнения 2 существующих папки или файла." #. 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 "Выберите для сравнения 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 "Оба пути указаны неверно!" -#: 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%1\n\n%2" msgstr "Не удается открыть файл\n%1\n\n%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 "Файл\n%1\nне является файлом конфликтов." #. 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Отображение содержимого этих файлов требует много памяти.\nХотите увидеть только результаты сравнения, а не содержимое файлов?\n\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%1\n\nContinue anyway?" msgstr "Не удается создать копию исходного файла:\n%1\n\nПродолжить в любом случае?" #. 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 "Сбой сохранения файла.\n%1\n%2\nХотите:\n\t- использовать другое имя файла (Нажмите OK)\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 "Плагин '%2' не может упаковать ваши изменения из левого файла обратно в '%1'.\n\nИсходный файл не будет изменен.\n\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 "Плагин '%2' не может упаковать ваши изменения из центрального файла обратно в '%1'.\n\nИсходный файл не будет изменен.\n\nСохранить распакованную версию в другой файл?" -#: 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 "Плагин '%2' не может упаковать ваши изменения из правого файла обратно в '%1'.\n\nИсходный файл не будет изменен.\n\nСохранить распакованную версию в другой файл?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "Another application updated\n%1\nsince WinMerge loaded it.\n\nOverwrite?" msgstr "Другое приложение обновило файл\n%1\nуже загруженный в WinMerge .\n\nПерезаписать измененный файл?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "%1\nis read-only. Override?" msgstr "%1\nпомечен как только для чтения. Перезаписать файл только для чтения?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "Другое приложение обновило файл\n%1\nуже проверенный WinMerge.\n\nПерезагрузить файл?" #. 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 "Файл\n%1\nутрачен. Для продолжения сохраните копию файла." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "Cannot merge unsynched documents.\n\nRefresh before continuing." msgstr "Не удается объединить отличия, если документы не синхронизированы.\n\nОбновите документы, прежде чем продолжить." #. 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 "Справа налево (%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 "Некоторые выбранные элементы идентичны или пропущены.\nХотите скопировать только элементы с отличиями?" #. 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\n%1 ?" msgstr "Хотите удалить\n\n%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\nFolder contents changed, path\n%1\nnot found.\n\nRefresh the compare." msgstr "Операция прервана!\n\nСодержимое папки изменено, путь\n%1\nне был найден.\n\nОбновите сравнение." #. 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 "Не удалось извлечь архивные файлы.\nВы хотите сравнить архивные файлы как текстовые файлы?" #. 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 "Файлы отличаются (выражение: %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.\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В режиме дерева эти элементы могут отображаться в позициях, не соответствующих фактической структуре папок, что может вызывать путаницу.\nПереключиться в плоский режим?" #. 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 "Тип 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 "Список с разделителем Запятая" #. 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%1" msgstr "Ошибка создания отчета:\n%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 "Выбранные файлы идентичны (с текущими настройками).\r\nПроверка идентичности двоичных данных..." #. 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 "Выбранные файлы идентичны (с текущими настройками).\r\nНо отличаются на двоичном уровне." #. 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 "В файлах используются различные типы конца строки.\n\nСчитать все концы строк в этом сравнении равнозначными?\n\nЕсли Вас не интересуют отличия EOL, установите параметр 'Игнорировать концы строк (Win/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%1\non the other side and open?" msgstr "Папка существует только на одной стороне и не может быть открыта.\n\nСоздать подходящую папку:\n%1\nна другой стороне и открыть эти папки?" #. 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 "Различные кодировки: слева - (cp%d), справа - (cp%d). \nКаждый из файлов может быть отображен в своей кодировке, но их объединение или копирование может повредить информацию.\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\nUnresolved conflicts: %2" msgstr "Количество автоматически объединяемых изменений: %1\nКоличество неразрешенных конфликтов: %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 "Панель сравнения" #. 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\nCreating a patch requires no unsaved changes." msgstr "Сначала сохраните все файлы.\n\nДля создания патча необходимо, чтобы в файлах не было несохраненных изменений." #. 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Не найдены необходимые компоненты (7-Zip и/или Merge7z*.dll) для поддержки архивов.\nДополнительную информацию о поддержке архивов и ее включении смотрите в руководстве." #. 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 "Вы собираетесь закрыть сразу несколько окон сравнения.\n\nПродолжить?" #. 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 "\nDifference in Current Line (F4)" msgstr "\nОтличие в текущей строке (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "\nOptions" msgstr "\nНастройки" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "\nRefresh (F5)" msgstr "\nОбновить (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "\nPrevious Difference (Alt+Up)" msgstr "\nПредыдущее отличие (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "\nNext Difference (Alt+Down)" msgstr "\nСледующее отличие (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "\nПредыдущий конфликт (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "\nСледующий конфликт (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "\nFirst Difference (Alt+Home)" msgstr "\nПервое отличие (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "\nCurrent Difference (Alt+Enter)" msgstr "\nТекущее отличие (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "\nLast Difference (Alt+End)" msgstr "\nПоследнее отличие (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 "\nAuto Merge (Ctrl+Alt+M)" msgstr "\nАвто объединение (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "\nFirst File" msgstr "\nПервый файл" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "\nNext File (Ctrl+F8)" msgstr "\nСледующий файл (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "\nLast File" msgstr "\nПоследний файл" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "\nPrevious File (Ctrl+F7)" msgstr "\nПредыдущий файл (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%1 available (you have %2). Download now?" msgstr "Доступна более новая версия WinMerge.\nДоступна версия %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 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 "Можно указать следующие параметры пути:\n$file: Имя пути текущего файла\n$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 "Прямая запись по умолчанию" #. 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 "Прямая запись GDI Classic" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "Прямая запись GDI Natural" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "Прямая запись Natural" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "Прямая запись 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 "Обнаружение Ins/Del" #. 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 "Папка 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 "Все" #. 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 "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 "Фильтр по этому столбцу" #. 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\nEnable: Windows logo key + V, then Turn on." msgstr "История буфера обмена отключена.\r\nЧтобы включить историю буфера обмена, нажмите Win+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 "Печать..." #. 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 "\nПредыдущее отличие (Alt+Up)\n(Правая кнопка+Колесо вверх)\n(Alt+Колесо вверх)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "\nСледующее отличие (Alt+Down)\n(Правая кнопка+Колесо вниз)\n(Alt+Колесо вниз)" #. 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 "\nКопировать направо (Alt+Right)\n(Правая кнопка+Колесо вправо)\n(Alt+Колесо вправо)\n(Alt+Shift+Колесо вниз)" #. 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 "\nКопировать налево (Alt+Left)\n(Правая кнопка+Колесо влево)\n(Alt+Колесо влево)\n(Alt+Shift+Колесо вверх)" #. 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 "\nКопировать направо и перейти (Ctrl+Alt+Right)\n(Ctrl+Alt+Колесо вправо)\n(Ctrl+Alt+Shift+Колесо вниз)" #. 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 "\nКопировать налево и перейти (Ctrl+Alt+Left)\n(Ctrl+Alt+Колесо влево)\n(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 "Содержит (regex)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "Не содержит (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 "Совпадение (regex)" #. IDS_FILTER_OP_NOT_MATCHES -#: Merge.rc:5413 +#: Merge.rc:5424 msgid "Not match (regex)" msgstr "Несовпадение (regex)" #. 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# Backreferences like $1, $2 are supported\r\n\r\n(\\d{4})-(\\d{2})-(\\d{2})\t$1_$2_$3\r\n" msgstr "# Список замены регулярных выражений\r\n# Формат: регулярное выражениезамена\r\n# Поддерживаются обратные ссылки типа $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 "# Список замены\r\n# Формат: поискзамена\r\n# Строки, начинающиеся с #, игнорируются\r\n\r\nот1\tдо1\r\nот2\tдо2\r\n" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 35da11de817..58dae772e85 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.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_SERBIAN, SUBLANG_SERBIAN_CYRILLIC" @@ -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 "Cа др&угим уређивачем\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,4868 +501,4874 @@ 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 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Сачувај ра&злике..." #. 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_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 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 "Занемари &разлике ознака завршетка реда (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 "Укључи и потфасцикле" #. 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 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 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 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 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 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 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 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 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 #, 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 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 #, 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 "Створене разлике" #. 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 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 #, 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 "Одабери подразумевану кодну страницу кад учитана Уникод датотека није прихваћена:" #. 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 "" "Дај обавештења кодне стране за ове датотеке:.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 "" #. 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 "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 "Непозната грешка при отварању поређења." #. 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" @@ -5382,7 +5388,7 @@ msgstr "" "WinMerge упореди датотеку" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5402,183 +5408,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 "" @@ -5587,177 +5593,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|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 #, 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|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/Филтер фасциклу:\n%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5770,7 +5776,7 @@ msgstr "" "\n" "Молим, проверите да ли постоји фасцикла и њену доступност" -#: Merge.rc:4343 +#: Merge.rc:4353 #, c-format msgid "" "User's filter folder is not defined!\n" @@ -5781,7 +5787,7 @@ msgstr "" "\n" "Молим, изаберите фасциклу филтера у /Поставке/Систем/" -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5795,12 +5801,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" @@ -5812,19 +5818,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\nSelect 'No' to refresh later." msgstr "" "Фитери су освежени. Да ли желите освежити сва отворена поређења?\n" @@ -5832,232 +5838,232 @@ 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 "" #. 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 "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 "" #. 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 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 #, c-format 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 #, 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" @@ -6071,13 +6077,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 "" @@ -6086,35 +6092,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" @@ -6128,7 +6134,7 @@ msgstr "" "Наставитe?" #. 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 "" @@ -6139,7 +6145,7 @@ msgstr "" "\t- je запамтите под другим именом, притисните /У реду/\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 "" @@ -6149,12 +6155,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 "" @@ -6165,7 +6171,7 @@ msgstr "" "Да ли желите да сачувате нераспаковано издање као датотеку?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -6181,7 +6187,7 @@ msgstr "" "Замените измењену датотеку?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6191,7 +6197,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 "" @@ -6200,25 +6206,25 @@ msgstr "" "од задњег прегледа WinMerge-а. Желите ли поново учитати датотеку?" #. 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" @@ -6230,7 +6236,7 @@ msgstr "" "је нестала. Молимо Вас да сачувате умножену датотеку да бисте наставили." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 #, c-format msgid "" "Cannot merge unsynched documents.\n" @@ -6242,191 +6248,191 @@ msgstr "" "Освежи документе пре наставка." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 #, c-format msgid "Break at whitespace" msgstr "Стани на размаку" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 #, c-format 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" @@ -6438,18 +6444,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" @@ -6469,878 +6475,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 "Само десна: %" #. 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 "Величина леве датотеке у бајтима" #. 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 "Број занемарених разлика у датотеци. Ове разлике је занемарио 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" @@ -7350,62 +7356,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" @@ -7415,19 +7421,19 @@ msgstr "" "Напомена:Желите ли увек задржати различите преласка у други ред, одаберите 'Занемари разлике ознака завршетка реда (Windows/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 "" @@ -7438,206 +7444,206 @@ 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 "" -#: 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 "Датотека разлика је успешно сачувана." #. 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 "Датотека разлика већ постоји. Да ли желите да je замените?" #. 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" @@ -7649,13 +7655,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.\n7-Zip and/or Merge7z*.dll not found.\nSee manual for archive support." msgstr "" "Рад са архивама је онемогућен.\n" @@ -7663,43 +7669,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" @@ -7711,1213 +7717,1218 @@ msgstr "" "Да ли желите наставити?" #. 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 "Бинарни" #. 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 "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 "Из MRU списка" #. 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 "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 "Дозволи само једну покренуту надлежност" #. 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/Sinhala.po b/Translations/WinMerge/Sinhala.po index 60e1358d268..1f6e0fe22b3 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -21,7 +21,7 @@ msgstr "" "X-Poedit-Country: SRI LANKA\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_SINHALESE, 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 #, fuzzy, c-format msgid "Select Line &Difference\tF4" msgstr "Select Line &Difference\tF4" @@ -141,7 +141,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 "පිටපත් කිරීම" @@ -153,21 +153,21 @@ msgid "&Paste" msgstr "ඇලවීම" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 #, fuzzy, 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 "< හිස් >" #. 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" @@ -188,27 +188,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 "" @@ -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 "කිසිත් නැත" @@ -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 "විශාල කරන්න" #. 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+*" @@ -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 "ගෙන යන්න" #. 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,4882 +502,4888 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Open Conflic&t File..." #. 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 "Ta&b Bar" #. 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 "&Status Bar" #. 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 "&Filters..." #. 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 "&Generate 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 "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 "&වසන්න\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 "Change &Pane\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 #, fuzzy, c-format msgid "Tile &Horizontally" msgstr "Tile &Horizontally" #. IDR_MERGEDOCTYPE, ID_WINDOW_TILE_VERT -#: Merge.rc:393 Merge.rc:568 Merge.rc:901 +#: Merge.rc:395 Merge.rc:572 Merge.rc:908 #, fuzzy, c-format msgid "Tile &Vertically" msgstr "Tile &Vertically" #. 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 "&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 #, 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 #, fuzzy, c-format msgid "R&elease Notes" msgstr "R&elease Notes" #. 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 #, fuzzy, c-format 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 #, 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 "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 #, fuzzy, c-format msgid "L&eft Read-Only" msgstr "L&eft Read-Only" #. 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 #, fuzzy, c-format msgid "Ri&ght Read-Only" msgstr "Ri&ght Read-Only" #. 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 "S&kipped අයිතම දක්වන්න" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 #, c-format msgid "S&how Binary Files" msgstr "Binary දක්වන්න" #. 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 "Use Default Font" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 #, fuzzy, c-format msgid "Sw&ap Panes" msgstr "Sw&ap Panes" #. 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 #, fuzzy, c-format msgid "Co&mpare\tEnter" msgstr "Co&mpare\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 #, fuzzy, c-format msgid "&Customize Columns..." msgstr "&Customize Columns..." #. 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 #, fuzzy, c-format msgid "&Convert Line Endings to" msgstr "&Convert Line Endings to" #. 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_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 #, fuzzy, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Toggle Bookmark\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 "&Lock Panes" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 #, fuzzy, c-format msgid "&View Whitespace" msgstr "&View Whitespace" #. 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 #, fuzzy, c-format msgid "W&rap Lines" msgstr "W&rap Lines" #. 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 #, fuzzy, c-format msgid "Diff &Pane" msgstr "Diff &Pane" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 #, fuzzy, c-format msgid "Lo&cation Pane" msgstr "Lo&cation Pane" #. 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 #, fuzzy, 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 "සසඳන්න" #. 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 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 "වම ට... (%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 "" #. 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 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 "දකුණ ට ... (%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 "මකා දමන්න" #. 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 "D&issimuler l'élément(s)" #. 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 "Copier le c&hemin complet" #. 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 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 "" #. 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 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 "දෙකම (%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 "" #. 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 #, fuzzy, 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 "Left 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 "Right 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 #, fuzzy, c-format msgid "&Copy Full Path" msgstr "&Copy Full Path" #. 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 #, fuzzy, c-format msgid "Prediffer Settings" msgstr "Prediffer Settings" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "G&oto 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 #, fuzzy, c-format msgid "&No Moved Blocks" msgstr "&No Moved Blocks" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 #, fuzzy, c-format msgid "&All Moved Blocks" msgstr "&All Moved Blocks" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 #, fuzzy, c-format msgid "W&hitespaces" msgstr "W&hitespaces" #. 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 #, fuzzy, c-format msgid "Ignore &Case" msgstr "Ignore &Case" #. IDR_POPUP_PROJECT_DIFF_OPTIONS, ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL -#: Merge.rc:1102 Merge.rc:1135 +#: Merge.rc:1110 Merge.rc:1143 #, fuzzy, c-format msgid "Igno&re EOL Differences (Windows/Unix/Mac)" msgstr "Igno&re EOL Differences (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 "" #. 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 #, fuzzy, c-format msgid "Regular &expression" msgstr "Regular &expression" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 #, fuzzy, c-format msgid "D&on't wrap end of file" msgstr "D&on't wrap end of file" #. 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 #, fuzzy, c-format msgid "&Don't wrap at end of file" msgstr "&Don't wrap at end of file" #. 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 #, fuzzy, c-format msgid "Enable Line Filters" msgstr "Enable Line Filters" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 #, fuzzy, c-format msgid "Regular Expressions (one per line):" msgstr "Regular Expressions (one per line):" #. 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 "&Automatically verify paths in Open dialog" #. 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 #, fuzzy, c-format msgid "&Preserve file time in file compare" msgstr "&Preserve file time in file compare" #. 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 "Afficher la boîte de dialogue d'ouverture 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 "" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 #, c-format msgid "Op&en dialog Auto completion:" msgstr "Op&en dialog Auto completion:" #. 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 #, fuzzy, c-format msgid "Defaults" msgstr "Defaults" #. 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 #, fuzzy, c-format msgid "Dialog" msgstr "Dialog" #. 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 "Strings:" #. 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 #, fuzzy, c-format msgid "Bold" msgstr "Bold" #. 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 #, fuzzy, c-format msgid "&Use Recycle Bin" msgstr "&Use Recycle Bin" #. 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 #, fuzzy, c-format msgid "C&ustom folder:" msgstr "C&ustom folder:" #. 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 #, fuzzy, c-format msgid "E&nable moved block detection" msgstr "E&nable moved block detection" #. 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 #, fuzzy, c-format msgid "&Preserve original EOL" msgstr "&Preserve original EOL" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 #, fuzzy, c-format msgid "Tabs" msgstr "Tabs" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 #, fuzzy, c-format msgid "&Tab size:" msgstr "&Tab size:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 #, fuzzy, c-format msgid "&Insert tabs" msgstr "&Insert tabs" #. 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 "" #. 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 #, fuzzy, 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 "ගොනුව 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 #, fuzzy, c-format msgid "&Copy to clipboard" msgstr "&Copy to clipboard" #. 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 "Inclu&de command line" #. 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 #, fuzzy, c-format msgid "Extensions list:" msgstr "Extensions list:" #. 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 "පිහිටුවන්නr..." #. 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 #, fuzzy, c-format msgid "Default Codepage" msgstr "Default Codepage" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 #, fuzzy, c-format msgid "Select the default codepage for non-Unicode files:" msgstr "Select the default codepage for non-Unicode files:" #. 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 #, fuzzy, c-format msgid "Custom codepage:" msgstr "Custom codepage:" #. 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 "" #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 #, fuzzy, c-format msgid "Archive Support" msgstr "Archive Support" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 #, fuzzy, c-format msgid "&Enable archive file support" msgstr "&Enable archive file support" #. 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 #, fuzzy, c-format msgid "Report &file:" msgstr "Report &file:" #. 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 #, fuzzy, c-format msgid "Shared Filter (for all users)" msgstr "Shared Filter (for all users)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 #, fuzzy, c-format msgid "Private Filter (current user only)" msgstr "Private Filter (current user only)" #. 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 "ලෝක ව්‍යාප්ත රක්ෂිත පත්‍රිකාවl:" #. 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 #, fuzzy, c-format msgid "A&ppend timestamp" msgstr "A&ppend timestamp" #. 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 "EXT" #. ID_INDICATOR_CAPS -#: Merge.rc:4119 +#: Merge.rc:4129 #, c-format msgid "CAP" msgstr "MAJ" #. 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 "විවෘත කරනලද ව්‍යාපෘති ගොනුවල හඳුනාගත නොහැකි වැරදි හඳුනා ගන්න" #. 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" @@ -5397,7 +5403,7 @@ msgstr "" "WinMerge ගොනුව සසඳන්න" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 #, c-format msgid "" "\n" @@ -5417,183 +5423,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 #, fuzzy, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5602,177 +5608,177 @@ msgstr "" "Please use values 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 ව්‍යාපෘති ලිපි (*.කවුළු මුසු කරන්න)|*.කවුළු මුසු කරන්න||" #. 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|සියලුම ලිපිගොනු (*.*)|*.*||" #. 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\nCopy %1 to WinMerge/Filters Folder:\n%2." msgstr "" -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5785,7 +5791,7 @@ msgstr "" "\n" "කරුණාකර ෆෝල්ඩරයේ පවතින බව සහ එය ලේඛ්‍ය බව තහවුරු කර ගන්න." -#: Merge.rc:4343 +#: Merge.rc:4353 #, c-format msgid "" "User's filter folder is not defined!\n" @@ -5796,7 +5802,7 @@ msgstr "" "\n" "කරුණාකර විකල්ප පෙරහන් ෆෝල්ඩර තෝරන්න/පද්ධතිය." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5810,12 +5816,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" @@ -5827,257 +5833,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 "" #. 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 "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 #, 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 "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 "" #. 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" @@ -6091,13 +6097,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 "" @@ -6106,35 +6112,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 "" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 #, fuzzy, c-format msgid "Error backing up file" msgstr "Erreur lors du backup du fichier" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -6148,7 +6154,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 "" @@ -6159,7 +6165,7 @@ msgstr "" "\t- වෙනස් නමක් ගොනුවට භාවිතා කිරීමට(Press OK)\n" "\t- දැන් ක්‍රියත්මක වන ක්‍රියාව නැවත් වීමට? (Press Cancel)?" -#: 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 "" @@ -6169,12 +6175,12 @@ msgstr "" "\n" "Do you want to save the unpacked version to another file?" -#: 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 "" @@ -6185,7 +6191,7 @@ msgstr "" "Do you want to save the unpacked version to another file?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -6201,7 +6207,7 @@ msgstr "" "Overwrite?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -6211,7 +6217,7 @@ msgstr "" "is read-only. Override?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "" @@ -6222,25 +6228,25 @@ msgstr "" "Reload?" #. 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" @@ -6252,7 +6258,7 @@ msgstr "" "නොපෙනී ගොස් ඇත.ඉදිරියට යෑමට අනුපිටපතක් සුරක්ෂිත කරන්න." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 #, c-format msgid "" "Cannot merge unsynched documents.\n" @@ -6264,189 +6270,189 @@ msgstr "" "Refresh before continuing." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Break at whitespace" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Break at whitespace or punctuation" #. 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 "Left Side - Select Destination Folder:" #. 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 "Right Side - Select Destination Folder:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Files Affected)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 of %2 Files Affected)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -6458,18 +6464,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 "" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6489,878 +6495,878 @@ msgstr "" "Refresh the compare." #. 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 #, 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 "Failed to execute external editor: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 #, c-format msgid "Unknown archive format" msgstr "Unknown archive format" -#: 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 "වම් 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 "දකුණු EOL" #. 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 #, fuzzy, c-format msgid "Unpacker" msgstr "Unpacker" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 #, fuzzy, 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 "ලිපිගොනු සංසන්දනය කිරීමට නොහැකිය" #. 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 "Text files are identical" #. 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 "Text files are different" #. 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 "Elapsed time: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 #, c-format msgid "1 item selected" msgstr "1 item selected" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 items selected" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 #, c-format msgid "Filename or folder name." msgstr "Filename or folder name." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Subfolder name when subfolders are included." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 #, c-format msgid "Comparison result, long form." msgstr "Comparison result, long form." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 #, c-format msgid "Left side modification date." msgstr "Left side modification date." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 #, c-format msgid "Right side modification date." msgstr "Right side modification date." #. 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 "File's extension." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 #, c-format msgid "Left file size in bytes." msgstr "Left file size in bytes." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 #, c-format msgid "Right file size in bytes." msgstr "Right file size in 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 "Left file size abbreviated." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 #, c-format msgid "Right file size abbreviated." msgstr "Right file size abbreviated." #. 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 "Left side creation time." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 #, c-format msgid "Right side creation time." msgstr "Right side creation time." #. 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 "Tells which side has newer modification date." #. 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 "Short comparison result." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 #, c-format msgid "Left side attributes." msgstr "Left side attributes." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 #, c-format msgid "Right side attributes." msgstr "Right side attributes." #. 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 "Left side file EOL type." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Right side file 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 "Left side encoding." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 #, c-format msgid "Right side encoding." msgstr "Right 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 "Number of ignored differences in file. Ignored and cannot be merged." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 #, c-format msgid "Number of differences in file (excluding ignored)." msgstr "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 "Shows an asterisk (*) if the file is binary." #. 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 "Compare %1 with %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 "Comma-separated list" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 #, c-format msgid "Tab-separated list" msgstr "Tab-separated list" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 #, c-format msgid "Simple HTML" msgstr "Simple HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 #, c-format msgid "Simple XML" msgstr "Simple XML" -#: Merge.rc:4809 +#: Merge.rc:4819 #, c-format msgid "Report file already exists. Overwrite?" msgstr "Report file already exists. Overwrite?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -7370,79 +7376,79 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 #, c-format msgid "Report created successfully." msgstr "Report created successfully." #. 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 "Same file is opened in both panes." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 #, c-format msgid "Selected files are identical." msgstr "Selected files are identical." #. 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 "An error occurred while comparing files." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 #, c-format msgid "Could not create temporary files. Check your temporary path settings." msgstr "Could not create temporary files. Check your temporary path settings." #. 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 "Le répertoire sélectionné est invalide." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 #, c-format msgid "Cannot open a binary file in Editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." #. 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 "" @@ -7453,45 +7459,45 @@ msgstr "" "à l'autre côté et ouvrir ces répertoires" #. 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 "" @@ -7499,163 +7505,163 @@ msgstr "" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" "Désirez-vous traiter les deux fichiers avec la page de code windows par défaut (recommandé)?" -#: Merge.rc:4858 +#: Merge.rc:4868 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information lost due to encoding errors: both files" -#: 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 "No difference" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 #, c-format msgid "Line difference" msgstr "Line difference" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Replaced %1 string(s)." #. 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 #, c-format msgid "Location Pane" msgstr "Location Pane" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 #, c-format msgid "Diff Pane" msgstr "Diff Pane" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 #, c-format msgid "Patch file written." msgstr "Patch file written." #. 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 file already exists. Overwrite?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 files selected]" #. 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 "Unified" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Could not write to file %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Output path is not absolute: %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 "Cannot create patch from binary files." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 #, c-format msgid "" "Save all files first.\n" @@ -7667,7 +7673,7 @@ msgstr "" "Creating a patch requires no unsaved changes." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 #, c-format msgid "Folder does not exist." msgstr "" @@ -7676,7 +7682,7 @@ msgstr "" "Creating a patch requires no unsaved changes." #. 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 "" "Archive support not enabled.\n" @@ -7684,43 +7690,43 @@ msgstr "" "See manual for archive support." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 #, c-format msgid "Select file for export" msgstr "Select file for export" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 #, c-format msgid "Select file for import" msgstr "Select file for import" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 #, c-format msgid "Options imported from file." msgstr "Options imported from file." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 #, c-format msgid "Options exported to file." msgstr "Options exported to file." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 #, c-format msgid "Failed to import options from file." msgstr "Failed to import options from file." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 #, c-format msgid "Failed to write options to file." msgstr "Failed to write options to file." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 #, c-format msgid "" "Close multiple compare windows?\n" @@ -7732,128 +7738,128 @@ msgstr "" "Continue?" #. 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 "" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 #, c-format msgid "None" msgstr "None" #. 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 "" "\n" "Copy All to Right" @@ -7862,7 +7868,7 @@ msgstr "" "සියල්ල දකුණු පසට කොපිකරන්" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7871,1082 +7877,1087 @@ msgstr "" "සියල්ල වම් පසට කොපිකරන්න" #. 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 "No Prediffer (Normal)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 #, c-format msgid "Suggested Plugins" msgstr "Suggested 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 "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%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 Settings" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH not found - .sct scripts disabled" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "G&o to Line %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 "From file system" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 #, c-format msgid "From Most Recently Used list" msgstr "From Most Recently Used list" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 #, c-format msgid "No Highlighting" msgstr "No Highlighting" #. 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 "එක් දෘෂ්ටාන්තයක් පමණක් සිදු වීමට ඉඩ හරින්න" #. 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/Slovak.po b/Translations/WinMerge/Slovak.po index b080d6a5fcd..411a593a63b 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -23,7 +23,7 @@ msgstr "" "X-Generator: Poedit 3.0.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_SLOVAK, 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 msgid "Select Line &Difference\tF4" msgstr "Vybrať riadky roz&dielov\tF4" @@ -138,7 +138,7 @@ msgid "Cu&t" msgstr "V&ystrihnúť" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Kopírovať" @@ -148,19 +148,19 @@ msgid "&Paste" msgstr "&Prilepiť" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Skripty" #. 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 "< Prázdne >" #. 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 "&Prejsť na...\tCtrl+G" @@ -180,27 +180,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 "&Registrovanou aplikáciou" #. 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 editorom\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 "Čí&m..." #. 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 "Otvoriť &nadradený priečinok..." #. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU -#: Merge.rc:137 Merge.rc:1239 +#: Merge.rc:137 Merge.rc:1249 msgid "S&hell Menu" msgstr "&Vzhľad ponuky" @@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Detekcia vloženia/odstránenia" #. 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 "Žiad&na" @@ -251,12 +251,12 @@ msgid "&Horizontal" msgstr "&Horizontálne" #. 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 "&Predošlá stránka" #. 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 "Ď&alšia stránka" @@ -266,42 +266,42 @@ msgid "&Active Pane" msgstr "&Aktívny 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 "Otočiť v&pravo o 90 stupňov" #. 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 "Otočiť v&ľavo o 90 stupňov" #. 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 "Preklopiť v&ertikálne" #. 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 "Preklopiť h&orizontálne" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "&Priblíženie" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "&Priblížiť\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "&Oddialiť\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 "&Normálna veľkosť\tCtrl+*" @@ -326,27 +326,27 @@ msgid "Dragging &Mode" msgstr "Režim pre&tiahnutie" #. 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 "&Presunúť" #. 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 "&Upraviť posuv" #. 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 "&Vertikálne stieranie" #. 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 "&Horizontálne stieranie" #. 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 "&Vybrať obdĺžnik" @@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Porovnať extrahovaný &text z obrázka" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "Po&rovnať" #. 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 "" @@ -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,3607 +476,3613 @@ 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 "&Súbor" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 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 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 "&Karta" #. 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árne" #. 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 "&Obrázok" #. 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Nový (&3 panely)" #. 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 "&Otvoriť...\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ť kon&fliktný súbor..." #. 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 "Otvoriť &schránku" #. 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 "O&tvoriť projekt...\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 "Uložiť &projekt..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Naposledy otvorené projekty" #. 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 "Naposledy otvorené sú&bory alebo projekty" #. 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 "&Koniec\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 "&Upraviť" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "&Prilepiť\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 "&Nastavenia...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "&Zobraziť" #. 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 "Lišta &záložiek" #. 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 "Lišta &nástrojov" #. 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 "&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 msgid "&Big" msgstr "&Veľká" #. 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 "&Obrovská" #. 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 "&Stavový riadok" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 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 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 msgid "&Generate Patch..." msgstr "&Vygenerovať opravnú záplatu..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "&Rozšírenia" #. 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 "&Nastavenia rozšírení..." #. 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 "Ma&nuálny predbežný spracovateľ rozdielov" #. 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&utomatický predbežný spracovateľ rozdielov" #. 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 "&Manuálne rozbalenie" #. 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 "&Automatické rozbalenie" #. 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 "&Znovu načítať rozšírenia" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 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 "&Zatvoriť\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 "Zatvoriť &všetky" #. 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 "Zmeniť &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 "Dlaždice &horizontálne" #. 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 "Dlaždice &vertikálne" #. 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 "&Kaskáda" #. 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 "&Pomoc" #. 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 "Pomocník &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 "&Poznámky k vydaniu" #. 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 "&Preklady" #. 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&onfigurácia" #. 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 "&O aplikácii WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "&Len na čítanie" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Ľ&avý len na čítanie" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "&Stredný len na čítanie" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "&Pravý len na čítanie" #. 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 "&Kódovanie súboru..." #. 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 "Vybr&ať všetko\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Zobraziť &zhodné položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Zobraziť &rozdielne položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Zobraziť jedinečné položky &vľavo" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Zobraziť jedinečné položky v &strede" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Zobraziť jedinečné položky vp&ravo" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Zobraziť pres&kočené položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Z&obraziť binárne súbory" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "&3-cestné porovnanie" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Zobraziť &vľavo len rozdielne položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Zobraziť v &strede len rozdielne položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Zobraziť vp&ravo len rozdielne položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Zobraziť vľ&avo len chýbajúce položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Zobraziť v s&trede len chýbajúce položky" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Zobraziť vprav&o len chýbajúce položky" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Zobraziť &skryté položky" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "Režim &stromu" #. 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 "&Zvinúť všetky podpriečinky" #. 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 "Vybrať &písmo..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Použiť &predvolené písmo" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "&Prehodiť panely" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Prehodiť &1. | 2." #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Prehodiť &2. | 3." #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Prehodiť 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 "Štatistika po&rovnania..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "&Obnoviť\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "O&bnoviť vybrané\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "&Zlúčiť" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Po&rovnať\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "&Nasledujúci rozdiel\tAlt+↓" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "&Predchádzajúci rozdiel\tAlt+↑" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "Pr&vý rozdiel\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuány rozdiel\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "Posledný &rozdiel\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 "Skopírovať v&pravo\tAlt+→" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "Skopírovať &vľavo\tAlt+←" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "&Odstrániť\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "&Vlastné stĺpce..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Vystvoriť &správu..." #. 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 "&Upraviť program Unpacker..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Uložiť\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "U&ložiť" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Uložiť ľ&avý" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Uložiť &stredný" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Uložiť &pravý" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Uložiť &ako" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "Uložiť ľa&vý ako..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Uložiť s&tredný ako..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Uložiť p&ravý ako..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "&Tlačiť...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Nastavenie s&tránky..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Náhľad p&red tlačou..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "&Konvertovať konce riadkov na" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Režim &zlučenia\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Znovanačítať\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "&Znovu porovnať ako" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "&Späť\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "&Vpred\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "Vy&strihnúť\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 "&Kopírovať\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "&Hľadať...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "&Nahradiť...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "&Značka ...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Rozšírené" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopírovať s číslami riadkov\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "&Záložky" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Prepnúť záložku\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "&Ďalšia záložka\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "&Predošlá záložka\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "&Zmazať všetky záložky" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Zvýrazňovanie syntaxe" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Súvislosť &rozdielov" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "&Všetky riadky" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 riadkov" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 riadok" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 riadky" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 riadkov" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 riadkov" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 riadkov" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Prepnúť všetky a 0-9 riadkov\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "&Invertovať (Skryť rozdielne riadky)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "&Zamknúť panely" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "&Zobraziť prázdne miesto" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Zobraziť znak konca riadkov &EOL" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Zobraz&iť riadky rozdielov" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Zobraziť čísla &riadkov" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Zobraziť &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 msgid "W&rap Lines" msgstr "&Zvinúť riadky" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Oddeliť &vertikálne" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "&Panel rozdielov" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Panel &polohy" #. 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 "Ďa&lší konflikt\tAlt+Shift+↓" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Pre&došlý konflikt\tAlt+Shift+↑" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Po&kročilé" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Ďalší rozdiel medzi ľavým a stredným\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Predošlý rozdiel medzi ľavým a stredným\tAlt+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Ďalší rozdiel medzi ľavým a pravým\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Predošlý rozdiel medzi ľavým a pravým\tAlt+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Ďalší rozdiel medzi stredným a pravým\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Predošlý rozdiel medzi stredným a pravým\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Ďalší rozdiel len ľavý\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Predošlý rozdiel len ľavý\tAlt+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Ďalší rozdiel len stredný\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Predošlý rozdiel len stredný\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Ďalší rozdiel len pravý\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Predošlý rozdiel len pravý\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Kopírovať z &ľava do" #. 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 "&stredného" #. 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 "&pravého" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Kopírovať z &stredného do" #. 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 "&ľavého" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Kopírovať z &prava do" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Kopíruje vybrané riadky z ľa&vého do" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Kopíruje vybrané riadky zo stred&ného do" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Kopíruje vybrané riadky z p&ravého do" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Kopírovať zľava\tAlt+Shift+→" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopírovať sprava\tAlt+Shift+←" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Kopírovať vpravo a ísť ďalej\tCtrl+Alt+→" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Kopírovať vľavo a ísť ďalej\tCtrl+Alt+←" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Kopírovať všetko v&pravo" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Kopírovať všetko vľ&avo" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "&Automaticky zlúčiť\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Pridať &synchronizačný bod\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Vymazať sync&hronizačné body" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "&Rozbaľovač" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "&Predbežný spracovateľ rozdielov" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Použiť pre&dbežného spracovateľa rozdielov..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "&Transformovať so skriptom editora..." #. 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 "Od&deliť" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "Porovn&ať" #. 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 "Porovnať v novom &okne" #. 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 "Porovnať ne&horizontálne..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "Porovnať ne&horizontálne" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Prvá ľ&avá položka s druhou ľavou položkou" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Prvá p&ravá položka s druhou pravou položkou" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "&Prvá ľavá položka s druhou pravou položkou" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "&Druhá ľavá položka s prvou pravou položkou" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "Po&rovnať ako" #. 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 "Ľavý do stredu (%1 z %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 "Ľavý vpravo (%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 "Ľavý 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 "Stredný vľavo (%1 z %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 "Stredný vpravo (%1 z %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 "Stredný do... (%1 z %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 "Pravý do stredu (%1 z %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 "Pravý vľavo (%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 "Pravý do... (%1 z %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "&Odstrániť" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "&Oba" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "&Všetky" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "&výber" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Pre&menovať" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "&Skryť položky" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "&Otvoriť ľavý" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Otvoriť &stredný" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Otvoriť &pravý" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Kopírovať názvy &ciest" #. 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 "Ľavý (%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 "Stredný (%1 z %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 "Pravý (%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 "Oba (%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 "Všetky (%1 z %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Kopírovať názvy &súborov" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Kopírovať položky do &schránky" #. 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 "&Zbaliť 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 "Oba do... (%1 z %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 "Všetky do... (%1 z %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 "Rozdiely do... (%1 z %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Vzhľad ľavej ponuky" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Vzhľad strednej ponuky" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Vzhľad pravej ponuky" #. 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 "Kopírovať" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "&Kopírovať plnú cestu" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Kopírovať názov &súboru" #. 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 "Nastavenia rozbaľovača" #. 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 "<Žiadny>" #. 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 "&Vybrať..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Nastavenia predbežného spracovateľa rozdielov" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Ch&oď na rozdiel" #. 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 "&Nepresúvať bloky" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "Presunúť &všetky bloky" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "&Netlačiteľné znaky" #. 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 "&Porovnať" #. 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&gnorovať zmeny" #. 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&norovať všetko" #. 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 "Ignorovať prázdne riad&ky" #. 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 "Ignorovať m&alé/VEĽKÉ" #. 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&rovať rozdiely v zakončení riadkov (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 "Ignorovať rozdiely kódových stránok" #. 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 "Ignorovať čí&sla" #. 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 "Ignorovať rozdielne &komentáre" #. 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 "&Zahrnúť podpriečinky" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "Metóda &porovnania" #. 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 "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 msgid "Quick Contents" msgstr "Rýchly 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 msgid "Binary Contents" msgstr "Binárny obsah" #. 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 "Dátum zmeny" #. 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 "Dátum zmeny a veľkosť" #. 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 "Veľkosť" #. 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 "&Načítať 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 "" #. 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 "Rozlišovať &veľké/malé" #. 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 "O aplikácii WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Navštívte domovskú programu 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 "Prispievatelia" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Vybrať súbory alebo priečinky" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "&1. súbor alebo priečinok" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Len na čít&anie" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Prehodiť 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 "&Prehľadávať..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "&2. súbor alebo priečinok" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Iba na čí&tanie" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Prehodiť 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 "P&rehľadávať..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "&3. súbor alebo priečinok (voliteľné)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Iba na číta&nie" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Prehodiť 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 "Prehľadávať..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Priečinok: Filter" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "&Zahrnúť podpriečinky" #. 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 " File: Rozšírenie rozbaľovača" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Vy&brať..." #. 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 "Zrušiť" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Stav:" #. 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 "Pomoc" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "&Nastavenia..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Hľadať" #. 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 "&Hľadať:" #. 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 "Iba celé &slová" #. 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 "&Regulárny výraz" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "&Nezalamovať koniec súboru" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "&Nezatvárať toto dialógové okno" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "Nájsť ďalší" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Nájsť &predošlý" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Nahradiť" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Nahradiť čím:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "&Nezalamovať koniec súboru" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Nahradiť v" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "&celý súbor" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Nájsť pre&došlý" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Nahraďiť" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Nahraďiť všetko" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "Značky" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "Povoliť &značky" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Nový" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Farba &pozadia:" #. 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 "&Použiť" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Filtre riadkov" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Povoliť riadkové filtre" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Regulárne výrazy (jeden na riadok):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Upraviť" #. 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 "Odstrániť" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Filtre nahradenia" #. 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 "Zmeny, ktoré sa na paneloch zobrazia ako nižšie uvedené dvojice, sa budú ignorovať alebo označia ako nevýznamné. Záplaty nie sú ovplyvnené." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Povoliť" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Sčítanie" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Vyčistiť" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Možnosti" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Importovať..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Exportovať..." #. 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 "Všeobecné" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Automaticky &rolovať na prvý rozdiel" #. 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 "&Automatické rolovať na prvý rozdiel v riadku" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Zat&várať okná klávesou 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "&Automaticky overovať cestu v dialógu Otvoriť" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Režim jednej inštancie:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "&Pýtať sa pred zatvorením viacerých okien" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "&Zachovávať čas súboru pri porovnaní" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Zobraziť pri spustení dialóg „Vybrať súbory alebo priečinky“" #. 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 "Kliknutím na tlačidlo Porovnať zatvoriť dialógové okno „Vybrať súbory alebo priečinky“" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Automatické dopĺňanie v dialógu &Otvoriť:" #. 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 "Jazyk:" #. 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 "Predvolené" #. 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 "Farby" #. 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 "Pozadie" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Odstránené" #. 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 "Text" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Rozdiel:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Vybraný rozdiel:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Ignorovaný rozdiel:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Presunutý:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Presunutý výber:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Rovnaké ako ďalšie (3 panely):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Rovnaké ako ďalšie (vybrané):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Rozdiel slova:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Rozdiel vybraného slova:" #. 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 "Dialóg" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Kľúčové slová:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Názvy funkcií:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Komentáre:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Čísla:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Operátory:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Reťazce:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Preprocesor:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Užívateľ 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Užívateľ 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 "Tučné" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "&Použiť prispôsobené farby textu" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Netlačiteľné znaky:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Bežný text:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Výber:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Okraj:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Značka hľadania:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Užívateľom definovaná značka1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Užívateľom definovaná značka2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Užívateľom definovaná značka3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "&Použiť priečinky porovnania farieb" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Rovnaké položky:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Rozdielne položky:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Všetky neexistujúce položky:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Filtrované položky:" #. 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 "Systém" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "&Posielať odstránené súbory do koša" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 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 msgid "&Filter folder:" msgstr "Priečinok &filtrov:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Priečinok dočasných súborov" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Priečinok dočasných súborov s&ystému" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "&Vlastný priečinok:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Pre&hľadávať..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Porovnať" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Netlačiteľné znaky" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "Porovnávať &netlačiteľné znaky" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "&Ignorovať zmeny" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "I&gnorovať všetko" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Ignorovať prázdne riad&ky" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Ignorovať m&alé/VEĽKÉ" #. 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 "Ignorovať čí&sla" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Ignorovať rozdiely kódových stránok" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignorovať rozdielne &komentáre" #. 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 "Povoliť &zisťovanie presunu bloku" #. 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 "&Algoritmus rozdielov:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Povoliť &heuristické odsadenie" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Úplne odlíšiť ignorované rozdiely" #. 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 "Zvýrazňovanie syntaxe" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "&Zachovávať pôvodné znaky zakončenia riadkov" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Tabelátory" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "&Nastavenie tabelátorov:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Vkladať &tabelátory" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Vkladať &medzery" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "&Režim vytvárania prevodu:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Automatické p&reskenovanie" #. 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 "Farebné odlíšenie riadkových rozdielov" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Zobrazovať rozdiely riadkov" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "Úroveň &znaku" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "Úroveň &slova:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Zalam&ovať slová:" #. 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 umožňuje skryť niektoré bežné okienka so správami. Stlačením tlačidla Obnoviť znova zviditeľníte všetky okienka správ." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Vynulovať" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Generátor opravných záplat" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Súbor&1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Súbor&2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "&Prehodiť" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "&Kopírovať do schránky" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Rozšíriť existujúci súbor" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Výsledok:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "&Prechádzať..." #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2423 +#: Merge.rc:2433 msgid "&Format" msgstr "&Formát" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2424 +#: Merge.rc:2434 msgid "St&yle:" msgstr "Š&týl:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "&Kontext:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Zahrnúť príkazový ria&dok" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Otvoriť v e&xternom editore" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Zobrazovať stĺpce" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Posunúť &hore" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Posunúť &dole" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "&Prídavné vlastnosti" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Prídavné vlastnosti" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Vybrať rozšírenie" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "&Názov rozšírenia:" #. 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 "Zoznam prípon:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 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 "Predvolené argumenty:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Zobrazí všetky rozšírenia, nekontroluje príponu" #. 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 "Po rozbalení &otvoriť súbory v rovnakom type okna" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "Rozšírenie &potrubia:" #. 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 "Zastaviť" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Pozastaviť" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Pokračovať" #. 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 "Položky celkom:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Porovnané položky:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "&Zatvoriť" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Prejsť na" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "&Prejsť na:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Súbor" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Prejsť na čo" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Riad&ok" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Rozdiel" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "&Prejsť na" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Filtre súborov" #. 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 "Testovať..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Inštalovať..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Nový..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Upravovať..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Zmazať..." #. 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 "Identické" #. 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 "Rozdielne" #. 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 "Kódová stránka" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Predvolená kódová stránka" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Zvoľte predvolenú kódovú stránku, ktorá sa použije pri načítaní ne-Unicode súborov:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Systémová kódová stránka" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Podľa užívateľského rozhrania WinMerge" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Vlastná kódová stránka:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4085,7 +4091,7 @@ msgstr "" "Potrebný reštart relácie." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "" "Detect codepage for files with mlang.dll\n" "Restart required." @@ -4094,769 +4100,769 @@ msgstr "" "Potrebný reštart relácie." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Podpora archívov" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "&Zapnúť podporu archívov" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Detekovať typ archívu z hlavičky súboru" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Položky uložené do súboru projektu alebo obnovené zo súboru projektu:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Uložiť zmenené súbory?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Súbor vľavo" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Uložiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Zahodiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Súbor v stredne" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "U&ložiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Za&hodiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Súbor vpravo" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Ul&ožiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Z&ahodiť zmeny" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Zahodiť &všetky" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Správa o porovnaní priečinkov" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "&Súbor správy:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "&Štýl:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "&Zahrnúť správu o porovnaní súborov" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Zdieľaný alebo súkromný filter" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Aký typ filtra chcete vytvoriť?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Zdieľaný filter (pre všetkých užívateľov tohto počítača)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Súkromný filter (len pre aktuálneho užívateľa)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Štatistika porovnania" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Priečinky:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 msgid "Files:" msgstr "Súbory:" #. 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árne:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Jedinečné" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Ľavý:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Pravý:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Celkom:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Zatvoriť" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Stredný:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Chýbajúce vľavo:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Chýbajúce v strede:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Chýbajúce vpravo:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Ovplyvniť" #. 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 "(Ovplyvniť)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Vybrať kódovú stránku pre" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "&Načítanie súboru:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "&Uloženie súboru:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "&Použiť pre obe rovnakú kódovú stránku" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "&Zrušiť" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Test filtra" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Testovanie filtra:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "&Zadajte testovací reťazec:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "&Názov priečinka" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Výsledok:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "&Testovať" #. IDS_OPTIONSPG_TABLECOMPARE -#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228 +#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238 msgid "Table" msgstr "Karta" #. IDD_OPEN_TABLE, IDC_STATIC -#: Merge.rc:2854 +#: Merge.rc:2864 msgid "File type" msgstr "Typ súboru" #. 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 "Vlastné &obmedzovačom oddelené hodnoty" #. 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 "Znak o&bmedzovača:" #. 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 "&Povoliť nové riadky v úvodzovkách" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Znak ú&vodzovky:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Záložné súbory" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Vytvárať záložné súbory v:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "Porovnávanie &priečinkov" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Porovnávanie &súborov" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Vytvárať záložné súbory do:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Priečinok &originálneho súboru" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "&Globálny priečinok pre zálohy:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Názov záložného súboru:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "&Pripojiť príponu .bak" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "P&ripojiť časovú pečiatku" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Potvrdiť kopírovanie" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Ste si istý, že chcete skopírovať XXX položiek?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Zľava" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Doprava" #. 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 "Už sa túto otázku nepýtať." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Áno" #. IDD_CONFIRM_COPY, IDNO -#: Merge.rc:2904 +#: Merge.rc:2914 msgid "No" msgstr "Nie" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Rozšírenia" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "&Povoliť rozšírenia" #. 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 "Filtre súborov:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Argumenty &rozšírenia:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Povoliť &automatické rozbalenie/predspracovanie rozdielov pre rozšírenie" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integrácia prostredia" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "Prieskumník" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "Prid&ať do ponuky súvislosti" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Po&voliť rozšírenú ponuku" #. 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 "Za®istrovať rozšírenie prostredia" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "&Zrušiť registráciu rozšírenia prostredia" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Zaregistruje rozšírenie prostredia iba pre aktuálneho užívateľa" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Zruší registráciu rozšírenia prostredia pre súčasného užívateľa" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Registrovať rozšírenia vzhľadu pre &Windows 11 alebo novšie" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Zrušenie registrácie rozšírenia vzhľadu pre W&indows 11 alebo novšie" #. 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 "Priečinok" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2957 +#: Merge.rc:2967 msgid "&Compare method:" msgstr "Metóda &porovnania:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "&Zastaviť po prvom rozdiele" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orovať časové rozdiely menšie ako 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 msgid "Include &unique subfolders contents" msgstr "&Zahrnúť jedinečný obsah podpriečinkov" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Ignorovať &opravné body" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Prahová hodnota pre prepnutie pre &rýchle porovnanie (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Prahová hodnota pre prepnutie na &binárne porovnanie (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 "Vzory súborov:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Vlastné &obmedzovačom oddelené hodnoty" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Binárny" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "Vzory &binárnych súborov:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Nastavenia Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Nastavenia &zobrazenia..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "&Binárny režim..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "&Znaková sústava..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Obrázok" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "Vzory súborov &obrázkov:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "&Povoliť porovnanie obrázkov pri porovnaní priečinkov" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Výsledok 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 "Zobraziť &hexadecimálne" #. 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)" @@ -4865,7 +4871,7 @@ msgstr "" "Nové dokumenty (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4874,7 +4880,7 @@ msgstr "" "Otvoriť (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4883,27 +4889,27 @@ msgstr "" "Uložiť (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Neznáma chyba pri pokuse otvoriť súbor projektu." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Neznáma chyba pri pokuse uložiť súbor projektu." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Súbor projektu úspešne načítaný." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Súbor projektu úspešne uložený." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4912,7 +4918,7 @@ msgstr "" "Späť (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4921,7 +4927,7 @@ msgstr "" "Vpred (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4940,7 +4946,7 @@ msgstr "" "Porovnanie súborov WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4959,162 +4965,162 @@ msgstr "" "Porovnanie priečinkov 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 sa dodáva BEZ AKEJKOĽVEK ZÁRUKY. Toto je slobodný softvér a môžete ho ďalej šíriť za určitých podmienok; podrobnosti nájdete v menu pomocníka pod GNU General Public License." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "&Zrušiť" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Zopakovať" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "&Ignorovať" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Ignorovať &všetky" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "Á&no" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "Áno &pre všetky" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "&Nie" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Nie pre &všetky" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "Po&kračovať" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "Pre&skočiť" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Preskočiť vš&etky" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Už túto správu nezobrazovať." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "Ak chcete, aby sa toto okno správ opäť zobrazilo, stlačte tlačidlo Obnoviť na stránke Okienka správ v dialógovom okne Možnosti." #. 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 "Syntax" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Farebné schémy" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Porovnávanie priečinkov" #. IDS_OPTIONSPG_PROJECT -#: Merge.rc:4215 +#: Merge.rc:4225 msgid "Project" msgstr "Premietnuť" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Rozdiely" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Okienka správ" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Do:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Zľava:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Vľavo:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Sprava:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Vpravo:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Zo stredu:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Na stred:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Verzia %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Vlastnosti (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Znova sa zobrazujú všetky okná so správami." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5123,156 +5129,156 @@ msgstr "" "Použite hodnoty 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Otvoriť" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všetky súbory (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Všetky súbory (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Súbory s nastavením (*.ini)|*.ini|Všetky súbory (*.*)|*.*||" #. 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 "Textové súbory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Všetky súbory (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML súbory (*.htm,*.html)|*.htm;*.html|Všetky súbory (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*||" #. 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 "Typ súboru" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Prípona" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "Správa" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Odpoveď" #. IDS_PROJECT_ITEM -#: Merge.rc:4317 +#: Merge.rc:4327 msgid "Item" msgstr "Položka" #. IDS_PROJECT_LOAD -#: Merge.rc:4319 +#: Merge.rc:4329 msgid "Load" msgstr "Načítať" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Uložiť" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Zahrnúť podpriečinky" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Možnosti porovnania" #. 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 "Názov" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Umiestnenie" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filtre" #. 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 "Popis" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Zvoľte názov súboru pre nový filter" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtre súborov (*.flt)|*.flt|Všetky súbory (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "Cannot find filter template!\n\nCopy %1 to WinMerge/Filters Folder:\n%2." msgstr "" @@ -5281,7 +5287,7 @@ msgstr "" "Skopírujte, prosím, súbor %1 do priečinka WinMerge/Filters :\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5294,7 +5300,7 @@ msgstr "" "\n" "Uistite sa, prosím, že priečinok existuje a dá sa doňho zapisovať." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5304,7 +5310,7 @@ msgstr "" "\n" "Vyberte, prosím, priečinok pre filtre v dialógu Nastavenia/Systém." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5318,11 +5324,11 @@ msgstr "" "Možno je súbor len na čítanie?" #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Nájsť súbor filtra pre nainštaláciu" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5333,17 +5339,17 @@ msgstr "" "Nepodarilo sa skopírovať nový súbor do priečinka s filtrami." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Filter už existuje. Prepísať existujúci filter?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Regulárny výraz" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "" "Filters updated. Refresh all open folder compares?\n" "\n" @@ -5354,217 +5360,217 @@ msgstr "" "Ak nechcete teraz obnovovať všetky porovnania, môžete zvoliť možnosť „Nie“ a obnoviť porovnania neskôr." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Výsledok porovnania priečinkov" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Porovnávanie súborov" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Nepomenovaný ľavý" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Nepomenovanmý stredný" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Nepomenovaný pravý" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Základný súbor" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Ich súbor" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Môj súbor" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Pôvodný súbor" #. 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 "Riad: %s Stĺ: %d/%d Zn: %d/%d EOL: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Riadok: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Riad: %s Stĺ: %d/%d Zn: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Vyb: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Zlúčiť" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "nájdených %1 rozdielov" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "nájdený jeden rozdiel" #. 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 "Položka %1 of %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Položky: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Porovnávanie položiek..." #. 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 dva existujúce priečinky alebo súbory na porovnanie." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Výber priečinka" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Vyberte dva (alebo tri) priečinky alebo dva (alebo tri) súbory na porovnanie." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Ľavá (1.) cesta je neplatná!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Stredná (2.) cesta je neplatná!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Pravá (2.) cesta je neplatná!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Pravá (3.) cesta je neplatná!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Obe cesty sú neplatné!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Ľavá (1.) a stredná (2.) cesta sú neplatné!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Ľavá (1.) a pravá (3.) cesta sú neplatné!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Stredná (2.) a pravá (3.) cesta sú neplatné!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Všetky cesty sú neplatné!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Povolené iba na porovnanie súborov" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Nemožno porovnať súbor a priečinok!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Súbor nenájdený: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Súbor nerozbalený: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5578,12 +5584,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Nepodarilo sa spracovať súbor konfliktov." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" @@ -5592,7 +5598,7 @@ msgstr "" "nie je súbor konfliktov." #. 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 "" "Chystáte sa porovnať veľmi veľké súbory.\n" @@ -5601,28 +5607,28 @@ msgstr "" "\n" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Uložiť ako" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Uložiť zmeny 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ý iba na čítanie. Prajete si prepísať súbor iba na čítanie? (Nie, ak chcete uložiť ako nový názov súboru.)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Chyba pri zálohovaní súboru" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5636,7 +5642,7 @@ msgstr "" "Pokračovať napriek tomu?" #. 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 "" @@ -5647,7 +5653,7 @@ msgstr "" "- použiť iný názov súboru (stlačte tlačidlo OK)\n" "- prerušiť aktuálnu operáciu (stlačte Zrušiť)?" -#: 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 "" @@ -5657,7 +5663,7 @@ msgstr "" "\n" "Želáte si uložiť rozbalenú verziu do iného súboru?" -#: 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 "" @@ -5667,7 +5673,7 @@ msgstr "" "\n" "Chcete rozbalenú verziu uložiť do iného súboru?" -#: 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 "" @@ -5678,7 +5684,7 @@ msgstr "" "Želáte si uložiť rozbalenú verziu do iného súboru?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5694,7 +5700,7 @@ msgstr "" "Prepísať zmenený súbor?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5704,7 +5710,7 @@ msgstr "" "je označený len na čítanie. Želáte si prepísať položku len na čítanie?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "" @@ -5715,22 +5721,22 @@ msgstr "" "Chcete znovu načítať súbor?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Uložiť ľavý súbor ako" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Uložiť stredný súbor ako" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Uložiť pravý súbor ako" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5742,7 +5748,7 @@ msgstr "" "sa stratil. Pokračujte, prosím, uložením kópie súboru." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5753,186 +5759,186 @@ msgstr "" "Obnovte dokumenty, než budete pokračovať." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Prerušiť na netlačiteľnom znaku" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Prerušiť na netlačiteľnom znaku alebo vetnej diakritike" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Kopírovať do &stredného\tAlt+→" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Kopírovať do &stredného\tAlt+←" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Kopírovať zo stredného\tAlt+Shift+→" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Kopírovať zo stredného Alt+Shift+←" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Kopírovať do stredného a posunúť\tCtrl+Alt+→" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Kopírovať do stredného a posunúť\tCtrl+Alt+←" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Kopírovať všetko do stredu" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Z pravého do ľavého (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Z pravého do stredného (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Zo stredného do ľavého (% 1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Zo stredného do pravého (% 1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Z ľavého do pravého (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Z ľavého do stredého (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Z ľavého 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 "Zo stredného do... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Z pravého do... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Z oboch do... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Všetky do... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Rozdiely do... (%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 "Ľavého (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Stredného (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Pravého (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Oboch (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Všetkých (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Ľavá strana - vyberte cieľový priečinok:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Stredný - vyberte cieľový priečinok:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Pravá strana - vyberte cieľový priečinok:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnených súborov)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnených súborov z %2)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5944,18 +5950,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Naozaj chcete kopírovať?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Naozaj chcete skopírovať %d položky?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -5975,795 +5981,795 @@ msgstr "" "Obnovte, prosím, porovnanie." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Naozaj chcete presunúť?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Naozaj chcete presunúť %d položiek?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Potvrdiť presun" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Chystáte sa zavrieť okno s porovnaním priečinkov. Naozaj chcete zavrieť okno?" -#: 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 "Nepodarilo sa spustiť externý editor: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Neznámy formát archívu" -#: 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 "Názov súboru" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Priečinok" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Výsledok porovnania" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Dátum ľavého" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Dátum pravého" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Dátum stredného" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Veľkosť ľavého" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Veľkosť pravého" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Veľkosť stredného" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Veľkosť pravého (krátka)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Veľkosť ľavého (krátka)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Veľkosť stredného (krátka)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Čas vzniku ľavého" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Čas vzniku pravého" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Čas vzniku stredného" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Novší súbor" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Verzia ľavého súboru" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Verzia pravého súboru" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Verzia stredného súboru" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Krátky výsledok" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Atribúty ľavého" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atribúty pravého" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atribúty stredného" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "Znak konca riadku ľavého" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "Znak konca riadku stredného" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "Znak konca riadku pravého" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Kódovanie ľavého" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Kódovanie pravého" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Kódovanie stredného" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Ignorovaný rozdiel" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Binárny" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Rozbaľovač" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Predbežný spracovateľ rozdielov" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "←" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Stred" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "→" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Rozdiel" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Počet vytvorených kópií vľavo" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Počet vytvorených kópií vpravo" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Počet vytvorených kópií v strede" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Presunúť" #. 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 "Kalendár" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "Komunikácia" #. 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 "Zariadenia" #. 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 "Domov" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Denník" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Odkaz" #. 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 "Hudba" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Poznámka" #. IDS_PRPCAT_PHOTO -#: Merge.rc:4672 +#: Merge.rc:4682 msgid "Photo" msgstr "Fotografia" #. IDS_PRPCAT_RECORDEDTV -#: Merge.rc:4673 +#: Merge.rc:4683 msgid "RecordedTV" msgstr "Prehrávaná TV" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Hľadať" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Ochrana" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Softvér" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Úloha" #. 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 "Haš súčet" #. IDS_CANT_COMPARE_FILES -#: Merge.rc:4685 +#: Merge.rc:4695 msgid "Unable to compare files" msgstr "Nemožno porovnať súbory" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Položka zrušená" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Súbor preskočený" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Priečinok preskočený" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Iba ľavý: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Iba stredný: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Iba pravý: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Neexistuje v %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Binárne súbory sú identické" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Binárne súbory sú rozdielne" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Súbory sú rozdielne" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Priečinky sú rozdielne" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Len ľavý" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Len pravý" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Len stredný" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Žiadna položka vľavo" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Žiadna položka vpravo" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Žiadna položka v strede" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Chyba" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Textové súbory sú identické" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Stredný a pravý sú identické)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Ľavý a pravý sú identické)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Ľavý a stredný sú identické)" #. 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 "Textové súbory sú rozdielne" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Súbory obrázkov sú identické" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Súbory obrázkov sú rozdielne" #. 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 "Skupina%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 "Uplynulý čas: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "1 vybraná položka" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 vybraných položiek" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Názov súboru alebo priečinka." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Názov podpriečinka, keď obsahuje aj podpriečinky." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Výsledok porovnania, dlhá forma." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Dátum poslednej zmeny ľavého." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Dátum poslednej zmeny pravého." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Dátum poslednej zmeny stredného." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Prípona súboru." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Veľkosť ľavého súboru v bajtoch." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Veľkosť pravého súboru v bajtoch." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Veľkosť stredného súboru v bajtoch." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Veľkosť ľavého súboru skrátená." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Veľkosť pravého súboru skrátená." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Veľkosť streného súboru skrátená." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Dátum vytvorenia ľavého." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Dátum vytvorenia na pravého." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Dátum vytvorenia na stredného." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Hovorí, na ktorej strane je novší dátum zmeny." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Verzia súboru ľavého, iba pre niektoré typy súborov." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Verzia súboru pravého, iba pre niektoré typy súborov." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Verzia súboru stredného, iba pre niektoré typy súborov." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Krátky výsledok porovnania." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Atribúty ľavého." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Atribúty pravého." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Atribúty stredného." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Typ znaku zakončenia riadka ľavého súboru." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Typ znaku zakončenia riadka pravého súboru." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Typ znaku zakončenia riadka stredného súboru." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Kódovanie ľavého." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Kódovanie pravého." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Kódovanie stredného." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "Počet ignorovaných rozdielov v súbore. Tieto rozdiely WinMerge ignoruje a nemožno ich zlúčiť." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Počet rozdielov v súbore. V tomto čísle nie sú zahrnuté ignorované rozdiely." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobrazí hviezdičku (*) ak je súbor binárny." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Názov rozšírenia rozbaľovača alebo potrubia." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Názov rozšírenia predbežného spracovateľa rozdielov alebo potrubia." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "Porovnať %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 msgid "Comma-separated list" msgstr "Zoznam oddelený čiarkami" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Zoznam oddelený tabulátormi" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Jednoduché HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Jednoduché XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Súbor so správou už existuje. Chcete prepísať existujúci súbor?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6773,57 +6779,57 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Správa bola úspešne vytvorená." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Na tento riadok nemožno pridať synchronizačný bod." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Na oboch paneloch sa otvorí rovnaký súbor." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Vybraté súbory sú identické." #. 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 "Počas porovnávania sa vyskytla chyba." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Dočasné súbory sa nepodarilo vytvoriť. Skontrolujte dočasné nastavenia cesty." #. 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 "" "Tieto súbory používajú rôzne typy návratov vozíka.\n" @@ -6833,17 +6839,17 @@ msgstr "" "Poznámka: Ak chcete vždy zaobchádzať so všetkými typmi návratov vozíka ako s ekvivalentnými, nastavte možnosť „Ignorovať rozdiely návratov vozíka (Windows/Unix/Mac)“ na karte Porovnať v dialógovom okne možností (k dispozícii v časti Upraviť/Možnosti)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Vybraný priečinok je neplatný." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Nemožno otvoriť binárny súbor v editore." #. 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 "" @@ -6854,41 +6860,41 @@ msgstr "" "na druhej strane a otvoriť tieto priečinky?" #. 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 "Chcete prejsť na nasledujúci súbor?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Chcete prejsť na predošlý súbor?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Chcete prejsť na ďalšiu stránku?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Chcete prejsť na predošlú stránku?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Chcete prejsť na prvý súbor?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Chcete prejsť na posledný súbor?" -#: 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 "" @@ -6896,51 +6902,51 @@ msgstr "" "Zobrazenie každého súboru na jeho kódovej stránke zabezpečí lepšie zobrazenie, ale zlúčenie/kopírovanie bude nebezpečné.\n" "Prajete si, aby sa s obidvomi súbormi zaobchádzalo ako s predvolenou kódovou stránkou systému Windows (odporúčané)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Informácie sa stratili kvôli chybám v kódovaní: oba súbory" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Informácie stratené v dôsledku chýb kódovania: prvý súbor" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Informácie stratené v dôsledku chýb kódovania: druhý súbor" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Informácie stratené v dôsledku chýb kódovania: tretí súbor" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Bez rozdielu" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Rozdiely v riadkoch" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradených %1 reťazcov." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Nemožno nájsť reťazec „%s“." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Teraz vstupujete do režimu zlúčenia. Ak chcete vypnúť režim zlúčenia, stlačte kláves F9." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -6950,99 +6956,99 @@ msgstr "" "Počet nevyriešených konfliktov: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Zmena kódovej stránky bola zlúčená." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Zmeny kódovej stránky sú konfliktné." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Zmena znaku EOL bola zlúčená." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Zmeny znakov EOL sú protichodné." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Panel polohy" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Panel rozdielu" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Súbor so záplatou bol úspešne zapísaný." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1. položka sa nenašla!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2. položka sa nenašla!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Súbor so záplatou už existuje. Chcete ho prepísať?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[vybrané %1 súbory]" #. IDS_DIFF_NORMAL -#: Merge.rc:4913 +#: Merge.rc:4923 msgid "Normal" msgstr "Normálny" #. IDS_DIFF_CONTEXT -#: Merge.rc:4914 +#: Merge.rc:4924 msgid "Context" msgstr "Kontextový" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Zjednotený" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Nepodarilo sa zapísať do súboru %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Zadaná výstupná cesta nie je absolútna cesta: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Zadajte výstupný súbor." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Nemožno vytvoriť súbor so záplatou z binárnych súborov." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7053,12 +7059,12 @@ msgstr "" "Vytvorenie záplaty vyžaduje, aby v súboroch neboli žiadne neuložené zmeny." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Priečinok neexistuje." #. 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" @@ -7069,37 +7075,37 @@ msgstr "" "V príručke nájdete ďalšie informácie o podpore archívov a o tom, ako ich povoliť." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Vyberte súbor pre export" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Vyberte súbor pre import" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Možnosti importované zo súboru." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Možnosti exportované do súboru." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Nepodarilo sa importovať nastavenia zo súboru." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Nepodarilo sa zapísať nastavenia do súboru." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7110,44 +7116,44 @@ msgstr "" "Chcete pokračovať?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Zmiešaný" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Binárny" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Žiadny" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Farba značky %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Nový vzor" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Typ" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Skript editora" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7156,7 +7162,7 @@ msgstr "" "Rozdiel v aktuálnom riadku (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7165,7 +7171,7 @@ msgstr "" "Možnosti" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7174,7 +7180,7 @@ msgstr "" "Obnoviť (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7183,7 +7189,7 @@ msgstr "" "Predchádzajúci rozdiel (Alt+↑)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7192,7 +7198,7 @@ msgstr "" "Ďalší rozdiel (Alt+­↓)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7201,7 +7207,7 @@ msgstr "" "Predošlý konflikt (Alt+Shift+↑)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7210,7 +7216,7 @@ msgstr "" "Ďalší konflikt (Alt+Shift+↓)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7219,7 +7225,7 @@ msgstr "" "Prvý rozdiel (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7228,7 +7234,7 @@ msgstr "" "Aktuálny rozdiel (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7237,45 +7243,45 @@ msgstr "" "Posledný rozdiel (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "\nCopy to Right (Alt+Right)" msgstr "" "\n" "Kopírovať vpravo (Alt+→)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "\nCopy to Left (Alt+Left)" msgstr "" "\n" "Kopírovať doľava (Alt+←)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)" msgstr "" "\n" "Kopírovať vpravo a dopredu (Ctrl+Alt+→)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)" msgstr "" "\n" "Kopírovať vľavo a dopredu (Ctrl+Alt+←)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "\nCopy All to Right" msgstr "\nKopírovať všetko vpravo" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "\nCopy All to Left" msgstr "\nKopírovať všetko vľavo" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7284,7 +7290,7 @@ msgstr "" "Automatické zlúčenie (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7293,7 +7299,7 @@ msgstr "" "Prvý súbor" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7302,7 +7308,7 @@ msgstr "" "Ďalší súbor (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7311,7 +7317,7 @@ msgstr "" "Posledný súbor" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7320,37 +7326,37 @@ msgstr "" "Predošlý súbor (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "Rozbaľovač sa použije na oba súbory (pri jednom súbore stačí prípona)" #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Bez predspracovania rozdielov (bežné)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Odporúčané rozšírenia" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Všetky rozšírenia" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Súkromná zostava: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Váš softvér je aktuálny." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7360,125 +7366,125 @@ msgstr "" "Teraz je k dispozícii %1 (máte %2). Prajete si ho stiahnuť teraz?" #. 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 "Nepodarilo sa stiahnuť informácie o najnovšej verzii" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Nastavenia rozšírení" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenájdené - .sct skripty sú zakázané" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Ch&oď na riadok %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Prejsť na presunutý riadok\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 "Zo súborového systému" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Zo zoznamu nedávno otvorených" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Bez zvýrazňovania" #. IDS_COLORSCHEME_BATCH -#: Merge.rc:5063 +#: Merge.rc:5073 msgid "Batch" msgstr "Dávkový" #. IDS_COLORSCHEME_PO -#: Merge.rc:5090 +#: Merge.rc:5100 msgid "Portable Object" msgstr "Prenosný objekt" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Zdroje" #. IDS_COLORSCHEME_SH -#: Merge.rc:5098 +#: Merge.rc:5108 msgid "Shell" msgstr "Vzhľad prostredia" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "Zavrieť karty vľ&avo" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Zavrieť karty v&pravo" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Zavrieť ďa&lšie karty" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Povoliť &automaticky maximalizovať šírku" #. 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 nie je nainštalovaný." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 neexistuje. Chcete ho vytvoriť?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Priečinok sa nepodarilo vytvoriť." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7489,486 +7495,486 @@ msgstr "" "$ linenum: Číslo riadku aktuálnej polohy kurzora" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "pôvodné" #. IDS_DIFF_ALGORITHM_MINIMAL -#: Merge.rc:5155 +#: Merge.rc:5165 msgid "minimal" msgstr "minimálne" #. IDS_DIFF_ALGORITHM_PATIENCE -#: Merge.rc:5156 +#: Merge.rc:5166 msgid "patience" msgstr "trpezlivosť" #. 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 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 okno potomka alebo hlavné okno" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Iba MDI okno potomka" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Zatvorí hlavné okno, ak existuje len jedno okno potomka MDI" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Rozdiel" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Zvýrazniť" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Blikať" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Veľkosť bloku" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Blokovať alfa" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Prahová hodnota CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Detekcia Insert/Delete" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Žiadny" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Vertikálna" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Horizontálna" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Prekrytie" #. 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 zmiešavanie" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Alfa animácia" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Priblíženie" #. IDS_PAGE -#: Merge.rc:5199 +#: Merge.rc:5209 msgctxt "ImgMergeFrame|LocationPane" msgid "Page:" msgstr "Stránka:" #. 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 "Vzdialenosť: %g " #. IDS_IMGCMP_STATUS_DIST2_FMT -#: Merge.rc:5202 +#: Merge.rc:5212 #, c-format msgid "Dist: %g, %g " msgstr "Vzdialenosť: %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 "Stránka: %d/%d Priblíženie: %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 "Preklopené: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Otočené: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Všetky stránky" #. 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 "Neboli nájdené žiadne rozdiely" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Nenašli sa žiadne rozdiely, ktoré by sa dali pridať ako filter nahradenia" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Táto dvojica sa už nachádza v zozname filtrov nahradenia" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Pridať túto zmenu do položky Filtre nahradenia?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Len text" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Pozícia po riadkoch a text" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Pozícia a text po slovách" #. 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 "Povoliť spustenie iba jednej inštancie" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Povolí spustenie iba jednej inštancie a počká, kým sa inštancia ukončí" #. 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 "Al&l" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "&Ostatné" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Chýbajúci názov rozšírenia v potrubí rozšírení: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Chýbajúca úvodzovka v rozšírení: %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 "Určenie argumentov rozšírenia" -#: 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 "Použitý filter" #. 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 "Schránka na %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "" "Clipboard history disabled.\r\n" "Enable: Windows logo key + V, then Turn on." @@ -7976,395 +7982,400 @@ msgstr "" "História schránky je vypnutá.\r\n" "Ak chcete zapnúť históriu schránky, stlačte kláves s logom Windows + V a potom kliknite na tlačidlo Zapnúť." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Tento systém nepodporuje históriu schránky." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "32-bitová verzia WinMerge nepodporuje porovnávanie schránky" #. 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/Slovenian.po b/Translations/WinMerge/Slovenian.po index bb4d3dc4635..e6b9c1aec7a 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -23,7 +23,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 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" msgstr "LANG_SLOVENIAN, SUBLANG_SLOVENIAN" @@ -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 msgid "Select Line &Difference\tF4" msgstr "Izberi &razliko vrstice\tF4" @@ -138,7 +138,7 @@ msgid "Cu&t" msgstr "Izrež&i" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Kopiraj" @@ -148,19 +148,19 @@ msgid "&Paste" msgstr "&Prilepi" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Skripti" #. 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 "< Prazno >" #. 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 "Pojdi &na...\tCtrl+G" @@ -180,27 +180,27 @@ msgid "Op&en" msgstr "&Odpri" #. 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 "Z re&gistrirano aplikacijo" #. 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 "Z zu&nanjim urejevalnikom\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 "&Z..." #. 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 "Odpri nad&rejeno mapo..." #. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU -#: Merge.rc:137 Merge.rc:1239 +#: Merge.rc:137 Merge.rc:1249 msgid "S&hell Menu" msgstr "Meni &lupine" @@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Zaznavanje vstavljanja/brisanja" #. 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 "&Brez" @@ -251,12 +251,12 @@ msgid "&Horizontal" msgstr "Vo&doravno" #. 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 "&Prejšnja stran" #. 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 "&Naslednja stran" @@ -266,42 +266,42 @@ msgid "&Active Pane" msgstr "&Aktivno podokno" #. 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 "Obrni v &desno za 90 stopinj" #. 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 "Obrni v &levo za 90 stopinj" #. 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 "Zasuči nav&pično" #. 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 "Zasuči &vodoravno" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "Po&večava" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "&Povečaj\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Po&manjšaj\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 "&Običajno\tCtrl+*" @@ -326,27 +326,27 @@ msgid "Dragging &Mode" msgstr "Način v&lečenja" #. 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 "Pre&makni" #. 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 "Prila&godi odmik" #. 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 "Na&vpično izbriši" #. 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 "Vodo&ravno izbriši" #. 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 "Izberi pra&vokotnik" @@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Primerjaj razširjeno &besedilo s slike" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "Pri&merjaj" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "&Posnetki zaslona" #. 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 "&Celozaslonski posnetki zaslona" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS -#: Merge.rc:276 Merge.rc:1249 +#: Merge.rc:276 Merge.rc:1259 msgid "&HTMLs" msgstr "&HTML-ji" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS -#: Merge.rc:277 Merge.rc:1250 +#: Merge.rc:277 Merge.rc:1260 msgid "&Texts" msgstr "&Besedila" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES -#: Merge.rc:278 Merge.rc:1251 +#: Merge.rc:278 Merge.rc:1261 msgid "&Resource Trees" msgstr "&Drevesa virov" #. 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 "&Velikost" @@ -426,27 +426,27 @@ msgid "&Event Sync" msgstr "Sinhronizacija do&godkov" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED -#: Merge.rc:291 Merge.rc:1259 +#: Merge.rc:291 Merge.rc:1269 msgid "&Enabled" msgstr "O&mogočeno" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL -#: Merge.rc:293 Merge.rc:1261 +#: Merge.rc:293 Merge.rc:1271 msgid "&Scroll" msgstr "&Pomakni" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK -#: Merge.rc:294 Merge.rc:1262 +#: Merge.rc:294 Merge.rc:1272 msgid "&Click" msgstr "&Klik" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT -#: Merge.rc:295 Merge.rc:1263 +#: Merge.rc:295 Merge.rc:1273 msgid "&Input" msgstr "&Vnos" #. 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 "Po&jdi nazaj/naprej" @@ -476,3607 +476,3613 @@ msgid "&All Profiles" msgstr "Vsi pro&fili" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Datoteka" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 msgid "&New" msgstr "&Nova" #. 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 "&Besedilo" #. 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 "&Dvojiško" #. 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 "S&lika" #. 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 "SP&letna stran" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Nova (&3 okna)" #. 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 "&Odpri... \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 "Od&pri datoteko v sporu..." #. 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 "Odpri od&ložišče" #. 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 "Odpri 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 "S&hrani projekt..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Nedavni projekti" #. 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 "Ne&davne datoteke ali mape" #. 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&zhod\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 "&Uredi" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "&Prilepi\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 "&Možnosti...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "&Prikaz" #. 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 "Ta&bulatorska vrstica" #. 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 "&Orodna vrstica" #. 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 "&Male" #. 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 "&Velike" #. 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 "O&gromne" #. 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 "&Statusna vrstica" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "&Orodja" #. 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 "Us&tvari popravek..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "&Vtičniki" #. 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 "Nasta&vitve vtičnika..." #. 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 "Roč&ni predpregled razlik" #. 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 "Sa&modejni predpregled razlik" #. 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 "&Ročno razpakiranje" #. 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 "&Samodejno razpakiranje" #. 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 "Znova na&loži vtičnike" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 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 "Z&apri\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 "Zapri &vse" #. 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 "Spremeni pod&okno\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 "Vodoravna &okna" #. 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 "&Navpična okna" #. 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 "&Kaskadna okna" #. 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 "&Pomoč" #. 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 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 msgid "R&elease Notes" msgstr "Opombe ob i&zdaji" #. 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 "P&revodi" #. 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 "Nas&tavitve" #. 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 "Javna licenca &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 "&Vizitka..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "S&amo-za-branje" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "L&evo 'samo-za-branje'" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "S&rednja 'samo-za-branje'" #. 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&sno samo-za-branje" #. 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 "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 msgid "Select &All\tCtrl+A" msgstr "Izberi &vse\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Prikaži &enake vnose" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Prikaži &različne vnose" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Prikaži l&eve unikatne vnose" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Prikaži edinstvene vnose na s&rednji" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Prikaži d&esne unikatne vnose" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Prikaži &preskočene vnose" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Prikaži &dvojiške datoteke" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "&3. način primerjave" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Prikaži le različne vnose v &levi" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Prikaži le različne vnose v &srednji" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Prikaži le različne vnose v &desni" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Prikaži le manjkajoče vnos&e v levi" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Prikaži le manjkajoče vnose v sre&dnji" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Pri&kaži le manjkajoče vnose v desni" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Prikaži skri&te vnose" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "&Drevesni način" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "&Razširi podmape" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "&Vse podmape" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "Raz&lične podmape" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "&Enake podmape" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "S&trni vse 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 msgid "Select &Font..." msgstr "Izberi &pisavo..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Uporabi privzeto pi&savo" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Zam&enjaj podokni" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Zamenjaj &1-vo | 2-go" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Zamenjaj &2-go | 3-tjo" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Zamenjaj 1-vo | &3-tjo" #. 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 "&Statistika primerjave..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Osv&eži\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osveži izbrano\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "Z&druži" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Pr&imerjaj\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "&Naslednja razlika\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Pre&jšnja razlika\tAlt+Up" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 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 msgid "&Current Difference\tAlt+Enter" msgstr "&Trenutna razlika\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 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 msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj v de&sno\tAlt+Desno" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj v &levo\tAlt+Levo" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "I&zbriši\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "Prilagodi s&tolpce..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Ustvari &poročilo..." #. 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 "&Uredi z razpakovalcem.." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Shrani\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "S&hrani" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Shrani &levo datoteko" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Shrani sre&dnjo" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Shrani &desno" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Shrani &kot" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "Shrani &levo kot..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Shrani sredn&jo kot..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Shrani l&evo kot..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "&Natisni...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Nastavitev &strani..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "&Predogled tiskanja..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "&Pretvori konce vrstic v" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Združevalni način\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Znova nal&oži\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "Znova primerjaj kot" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "&Razveljavi\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "Po&vrni\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "Iz&reži\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 "&Kopiraj\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "&Najdi... \tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Zamen&jaj... \tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "Ozn&ačevalec...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Napredno" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj s številkami vrstic\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "&Zaznamki" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamenjaj zaznamke\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "&Naslednji zaznamek\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "&Prejšnji zaznamek\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Počis&ti vse zaznamke" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Označevanje sintakse" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Razlika vse&bine" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "Vse vrs&tice" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 vrstica" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 vrstice" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Preklopi vse in 0-9 vrstic\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "O&brni (Skrij različne vrstice)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "Za&kleni podokna" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "&Prikaz presledkov" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Prikaz &EOL" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Prikaz razl&ik vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Prikaz številk &vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Prikaz &robov" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Prikaz z&gornjih robov" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Pr&elomi vrstic" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Razdeli na&vpično" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "Podokno &razlik" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Podokno loka&cije" #. 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 "Nas&lednji spor\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Pre&jšnj ispor\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Na&predno" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Naslednja razlika med levo in srednjo\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Prejšnja razlika med levo in srednjo\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Naslednja razlika med levo in desno\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Prejšnja razlika med levo in desno\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Naslednja razlika med srednjo in desno\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Prejšnja razlika med srednjo in desno\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Samo naslednja leva razlika\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Samo prejšnja leva razlika\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Samo naslednja srednja razlika\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Samo prejšnja srednja razlika\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Samo naslednja desna razlika\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Samo prejšnja desna razlika\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Kopiraj iz &leve v" #. 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 "Sre&dnjo" #. 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 "&Desno" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Kopiraj iz &srednje v" #. 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 "&Levo" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Kopiraj iz &sesne v" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Kopiraj izbrane vrstice iz le&ve v" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Kopiraj izbrane vrstice iz s&rednje v" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Kopiraj izbrane vrstice iz &desne v" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Kopiraj iz leve\tAlt+Shift+Desno" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopiraj iz desne\tAlt+Shift+Levo" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "K&opiraj v desno in naprej\tAlt+Ctrl+Desno" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Kopiraj v le&vo in naprej\tAlt+Ctrl+Levo" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Kopiraj vse v &desno" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Kopiraj vse v &levo" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "Samodejno združi\t(Ctrl+Alt+M)" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Dodaj &sinhronizacijsko točko\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Počisti sin&hronizacijske točke" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Razpako&valec" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "&Predpregled razlik" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Uporabi Prediffer..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "P&reoblikuj z urejevalnikom skriptov..." #. 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 "Ra&zdeli" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "P&rimerjaj" #. 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 "Primerjaj v &novem oknu" #. 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 "Pr&imerjaj ne-vodoravno..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "Pr&imerjaj ne-vodoravno" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Pr&vi levi vnos z drugim levim vnosom" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Prvi&desni vnos z drugim desnim vnosom" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "P&rvi levi vnos z drugim desnim vnosom" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "&Drugi levi vnos s prvim desnim vnosom" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "Pri&merjaj kot" #. 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 "Iz leve v srednjo (%1 od %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 "Z leve proti desni (%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 "Levo v... (%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 "Iz srednje v levo (%1 od %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 "Iz srednje v desno (%1 od %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 "Srednjo v... (%1 od %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 "Iz desne v srednjo (%1 od %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 "Z desne proti levi (%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 v... (%1 od%2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "&Izbriši" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "&Oboje" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "&Vse" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "&Izbor" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "P&reimenuj" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "&Skrij vnose" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "&Odpri levo" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Odpri s&rednjo" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Odpri desno" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Kopiraj &imena poti" #. 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 "Leva (%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 "Srednja (%1 od %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 "Desna (%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 "Obe (%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 "Vse (%1 od %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Kopiraj &imena datotek" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Kopiraj vnose v o&dložišče" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Kopiraj vse &prikazane stolpce" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1020 +#: Merge.rc:1028 msgid "&Zip" msgstr "Arhiv &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 "Obe v... (%1 od %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 "Vse v... (%1 od %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 "Razlike v... (%1 od %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Levi meni lupine" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Srednji meni lupine" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Meni lupine desne" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Oba menija Shell" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Celoten meni Shell" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Kopiraj" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "&Kopiraj celotno pot" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Kopiraj &ime datoteke" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "&Uredi napis\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 "&Odpri..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Nastavitve razpakovalca" #. 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 "&Izberi..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Nastavitve predogleda razlik" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Pojdi &na razliko" #. 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 "&Brez premaknjenih blokov" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "&Vsi premaknjeni bloki" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "&Prazni znaki" #. 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 "&Primerjaj" #. 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 "Prezri &spremembe" #. 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 "Prezri &vse" #. 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 "Prezri prazne &vrstice" #. 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 "Prezri &velikost znakov" #. 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 "&Prezri različnost vrste znakov za konec vrstice (EOL)" #. 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 "P&rezri razlike kodnih strani" #. 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 "Prezri š&tevilke" #. 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 "Prezri razlike v k&omentarjih" #. 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 "&Vključi podmape" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "&Način primerjave" #. 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 "Popolna vsebina" #. 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 "Hitra vsebina" #. 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 "Dvojiška vsebina" #. 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 "Spremenjen datum" #. 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 "Spremenjen datum in 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 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 msgid "&Load Project..." msgstr "Na&lož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 "" #. 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 "Ujemaj m/V črke" #. 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 "Vizitka" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Obišči domačo stran 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 "Vredu" #. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS -#: Merge.rc:1939 +#: Merge.rc:1949 msgid "Contributors" msgstr "Sodelavci" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Izberi datoteke ali mape" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "&1. datoteka je mapa" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Sa&mo-za-branje" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Zamenjaj 1-vo | 2-go" #. 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 "Pre&brskaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "&2. datoteka ali mapa" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Sam&o-za-&branje" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Zamenjaj 2-go | 3-tjo" #. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE -#: Merge.rc:1960 Merge.rc:2315 +#: Merge.rc:1970 Merge.rc:2325 msgid "B&rowse..." msgstr "Preb&rskaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "&3. datoteka ali mapa (neobvezno)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Samo-za-&branje" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Zamenjaj 1-vo | 3-tjo" #. 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 "Prebrskaj..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Mapa: Filter" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "&Vključi podmape" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Datoteka: Prediffer vtičnik" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Datoteka: Vtičnik razpakovalca" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Iz&beri..." #. 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 "Prekliči" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Stanje:" #. 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 "Pomoč" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "&Možnosti..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Najdi" #. 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 "&Kaj naj iščem:" #. 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 "Ujemaj le &cele besede" #. 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 "&Regularni izraz" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "&Po koncu datoteke ne nadaljuj na začetku" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "&Ne zapri tega pogovornega okna" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "&Najdi naslednje" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Najdi pre&jšnje" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Zamenjaj" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Zamenjaj z:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "&Po koncu datoteke ne nadaljuj na začetku" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Zamenjaj v" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "&Celotna datoteka" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Zamenjaj pre&jšnjo" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "&Zamenjaj" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Zamenjaj &vse" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "Označevalci" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "Omogoči oz&načevalce" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Nov" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Bar&va ozadja:" #. 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 "&Vredu" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199 +#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209 msgid "&Apply" msgstr "&Uporabi" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Filtri vrstic" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Omogoči filtre vrstic" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Regularni izrazi (1 na vrstico):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Uredi" #. 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 "Odstrani" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Nadomestni filtri" #. 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 "Spremembe, ki se v podoknih pojavijo kot spodaj navedeni pari, bodo prezrte ali označene kot nepomembne. Popravki ne vplivajo." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Omogoči" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Dodaj" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Počisti" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Možnosti" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Uvozi..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Izvozi..." #. 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 "Splošno" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Samodejno &pojdi na prvo razliko" #. 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 "Samodejno se pomakni na prvo razliko v vrstici" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Zapri okna s tipko '&Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "&Samodejno preverjaj pot v pogovornem oknu Odpri" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Način za en primerek:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "&Vprašaj pred zapiranjem več oken" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "O&hrani čas datoteke v primerjavi datoteke" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Ob zagonu prikaži okno 'Izberi datoteke ali 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 "Zapri okno 'Izberi datoteke ali mape' s klikom na gumb 'Primerjaj'" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Odpri pogovorno okno &Samodejno dokončanje:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Samodejno &znova naloži spremenjene datoteke:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Jezik:" #. 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 "Privzeto" #. 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 "Barve" #. 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 "Ozadje" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Izbrisano" #. 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 "Besedilo" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Razlika:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Izbrane razlike:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Prezrta razlika:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Premaknjeno:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Izbrano premaknjeno:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Enako kot naslednje (3 okna):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Enako kot naslednje (izbrano):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Besedne razlike:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Izbrane razlike besed:" #. 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 "Pogovorno okno" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Ključne besede:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Imena funkcij:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Komentarji:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Številke:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Operatorji:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Nizi:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Predobdelano:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Uporabnik 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Uporabnik 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 "Krepko" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "&Uporabi prilagojene barve besedila" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Prazen znak:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Redno besedilo:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Izbor:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Rob:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Iskalni označev.:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Uporabn. določen1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Uporabn. določen2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Uporabn. določen3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "&Uporabi barve primerjav map" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Enakih vnosov:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Različnih vnosov:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Vseh neobstoječih vnosov:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Filtriranih vnosov:" #. 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 "Sistem" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "&Pošlji izbrisane datoteke v Koš" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "Zu&nanji urejevalnik:" #. 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 "Mapa &filtrov:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Mapa začasnih datotek" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "S&istemska začasna mapa" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "&Mapa po meri:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Prebr&skaj..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Primerjaj" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Prazen znak" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "Primer&jaj" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "&Prezri spremembe" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "P&rezri vse" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Prezri prazne &vrstice" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Prezri &velikost znakov" #. 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 "Prezri š&tevilke" #. 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 "Prezri razlike v k&omentarjih" #. 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 "Omogoči zazna&vanje premaknjenih blokov" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Poravnaj po&dobne črte" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "Al&goritem razlik:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Omogoči &hevristični zamik" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Popolnoma odstrani poudarek prezrtih razlik" #. IDS_OPTIONSPG_EDITOR -#: Merge.rc:2357 Merge.rc:4201 +#: Merge.rc:2367 Merge.rc:4211 msgid "Editor" msgstr "Urejevalnik" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "Ozn&ači sintakso" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "Ohrani izvorne znake za konec vrstice (EOL)" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Tabulatorji" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "&Velikost tabulatorja:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "&Vstavi tabulatorje" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "&Vstavi presledke" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "Način upodab&ljanja:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "&Samodejni ponovni pregled" #. 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 "Barvanje razlike v vrstici" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Prikaz razlik vrstic na" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "Z&nakovna raven" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "&Besedilna raven:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "&Znaki za prelom besed:" #. 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 omogoča skrivanje nekaterih skupnih sporočilnih oken. Pritisnite 'Ponastavi', da bodo postala vsa sporočilna okna spet vidna." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Ponastavi" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Ustvarjalec popravkov" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Datoteka&1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Datoteka&2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "&Zamenjaj" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "&Kopiraj v odložišče" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Dodaj v obstoječo datoteko" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Rezultat:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Prebrs&kaj..." #. 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 "S&log:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "&Skladnost:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "&Vključi ukazno vrstico" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Odpri v zu&nanjem urejevalniku" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Prikaži stolpce" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Premakni navz&gor" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Premakni navz&dol" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "&Dodatne lastnosti" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Dodatne lastnosti" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Izberi vtičnik" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "I&me vtičnita:" #. 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 "Seznam končnic:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 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 "Privzeti argumenti:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Prikaži vse vtičnike, ne preverjaj končnico" #. 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 razpakiranju odpri datoteke v isti vrsti okna" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "Cevovo&d vtičnika:" #. 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 "Ustavi" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Pavza" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Nadaljuj" #. 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 "Š&tevilo jeder CPE za uporabo:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Skupaj vnosov:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Primerjanih vnosov:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "&Zapri" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Pojdi na" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "Pojdi &na:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Datoteka" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Pojdi na kaj" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "&Vrstico" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Razlika" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "Pojdi &na" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Filtri datotek" #. 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 "Preizkusi..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Namesti..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Nova..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Uredi..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Izbriši..." #. 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 "Enako" #. 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 "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 msgid "Codepage" msgstr "Kodna stran" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Privzeta kodna stran" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Izberite privzeto dodeljeno kodno stran pri nalaganju ne-Unicode datotek:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Sistemska kodna stran" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Glede na uporabniški vmesnik WinMerge" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Poljubna kodna stran:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4085,7 +4091,7 @@ msgstr "" "Zahtevan je ponovni zagon seje." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "" "Detect codepage for files with mlang.dll\n" "Restart required." @@ -4094,769 +4100,769 @@ msgstr "" "Zahtevan je ponovni zagon seje." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Podpora arhivov" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Omogoči podporo &arhivskih datotek" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "Zaznaj vrs&to arhiva iz podpisa datoteke" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Vnosi, shranjeni v datoteko projekta ali obnovljeni iz nje:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Shranim spremenjene datoteke?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Leva stran datoteke" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Shrani spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Zavrzi spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Datoteka na sredini" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "S&hrani spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Za&vrzi spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Datoteka na desni strani" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Shrani spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Z&avrzi spremembe" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Zav&rzi vse" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Poročilo primerjanja datotek" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Datoteka &poročila:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "S&log:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "Vključi &poročilo o primerjavi datoteke" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Deljen ali zasebni filter" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Katero vrsto filtra želite ustvariti?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Deljen filter (za vse uporabnike na tem računalniku)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Zasebni filter (le za trenutnega uporabnika)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Statistika primerjave" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Mape:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 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 msgid "Binary:" msgstr "Dvojiško:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Unikat" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Levo:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Desno:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Skupaj:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Zapri" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Srednjo:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Manjka leva:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Manjka srednja:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Manjka desna:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Vpliva" #. 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 "(Vpliva)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Izberi kodno stran za" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "&Nalaganje datoteke:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "&Shranjevanje datoteke:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "&Uporabi isto kodno tabelo za oboje" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "Pre&kliči" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Preizkusi filter" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Preizkus filtra:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "&Vnesi besedilo za preizkus:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "&Ime mape" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Rezultat:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "P&reizkusi" #. 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 "Vrsta datoteke" #. 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 "Ločilo &po meri-Ločene vrednosti" #. 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 "Znak &ločila:" #. 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 "&Dovoli nove vrstice v narekovajih" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Z&nak narekovaja:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Datoteke varnostnih kopij" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Ustvari datoteke varnostnih kopij v:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "Primerjava &map" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Primerjava &datotek" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Ustvari datoteke varnostnih kopij v:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "&Mapi izvorne datoteke" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "&Globalni mapi varnostnih kopij:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Ime datoteke varnostne kopije:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "&Dodaj končnico '.bak'" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Dodaj ča&sovni žig" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Potrdi kopiranje" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Ali ste prepričani, da želite kopirati XXX vnosov?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Z leve" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Na desno" #. 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 "Tega ne &sprašuj več." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Da" #. 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 "Vtičniki" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "&Omogoči vtičnike" #. 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 "Filtri datotek:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Ar&gumenti vtičnika:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Omogočite samodejno razpakiranje/predrazlikovanje vtičnika" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integracija v lupino" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "Raziskovalec" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "&Dodaj v priročni meni" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Omogoči &napredni meni" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Omogoči 'P&rimerjaj' kot meni" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "&Registriraj končnico lupine" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "&Odstrani registracijo končnice lupine" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Registriraj končnico lupine le za &trenutnega uporabnika" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Odstrani registracijo končnice lupine &le za trenut. uporabnika" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Registriraj razširitev lupine za &Windows 11 ali novejši" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Odstrani razširitev lupine za W&indows 11 ali novejši" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Seznam skokov" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Počisti vse nedavne vnose" #. 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 "&Način primerjave:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "&Ustavi po prvi razliki" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "&Prezri razlike manjše od 3 sekund" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "S&amodejno razširi podmape po primerjavi:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "&Vključi unikatne vsebine podmap" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "P&rezri točke ponovne razčlenitve" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Prag za preklop na &hitro primerjavo (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Prag za preklop na &dvojiško primerjavo (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 "Vzorci datotek:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Ločilo po meri-Ločene vrednosti" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Dvojiško" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "Vzorci &dvojiških datotek:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Nastavitve Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Nas&tavitve prikaza..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "&Dvojiški način..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "Nabor z&nakov..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Slika" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "V&zorci slikovnih datotek:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Omogoči primerjavo &slik v primerjanju map" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Rezultat OCR:" #. IDS_OPTIONSPG_WEBPAGECOMPARE -#: Merge.rc:3043 Merge.rc:4229 +#: Merge.rc:3053 Merge.rc:4239 msgid "Webpage" msgstr "Domača stran" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Vzorec URL-ja za v&ključitev (regularni izraz):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Vzorec URL-ja za &izključitev (regularni izraz):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "&Mesto mape z uporabniškimi podatki:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "&Ločene mape z uporabniškimi podtaki za vsako podokno" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "16-tiški prikaz" #. 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 "KON" #. 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 "ZAP" #. ID_FILE_NEW -#: Merge.rc:4129 +#: Merge.rc:4139 msgid "" "\n" "New Documents (Ctrl+N)" @@ -4865,7 +4871,7 @@ msgstr "" "Novi dokumenti (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4874,7 +4880,7 @@ msgstr "" "Odpri (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4883,27 +4889,27 @@ msgstr "" "Shrani (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Neznana napaka pri poskusu odpiranja projektne datoteke." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Neznana napaka pri poskusu shranjevanja projektne datoteke." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Datoteka projekta je uspešno naložena." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Datoteka projekta je uspešno shranjena." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4912,7 +4918,7 @@ msgstr "" "Razveljavi (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4921,7 +4927,7 @@ msgstr "" "Povrni (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4940,7 +4946,7 @@ msgstr "" "WinMerge Primerjava datotek" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4959,162 +4965,162 @@ msgstr "" "WinMerge Primerjava map" #. 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 prihaja POPOLNOMA BREZ GARANCIJE. To je brezplačen program. Dobrodošli ste za njegovo razširjanje pod določenimi pogoji. Več o tem poglejte v GNU licenci v meniju Pomoč." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "Pre&kini" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Poskusi zmova" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "&Prezri" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Prezri &vse" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "&Da" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "Da za &vse" #. 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 za &vse" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "&Nadaljuj" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "&Preskoči" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Preskoči &vse" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Tega sporočila ne kaži več." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "Za ponovno vidnost tega sporočilnega okna pritisnite gumb 'Ponastavi' na strani 'Sporočilna okna' v pogovornem oknu 'Možnosti'." #. 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 "Sintaksa" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Barvne sheme" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Primerjava map" #. 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 msgid "Differences" msgstr "Razlike" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Sporočilna okna" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Na:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Iz leve:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "V levo:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Iz desne:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Na desno:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Od sredine:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "V sredino:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Različica %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 msgid "All message boxes are now displayed again." msgstr "Vsa sporočilna polja so zdaj znova prikazana." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5123,156 +5129,156 @@ msgstr "" "Prosimo, uporabite vrednosti 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Odpri" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Vse datoteke (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Datoteke z možnostmi (*.ini)|*.ini|Vse 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 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Besedilne datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vse datoteke (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Datoteke XML (*.xml)|*.xml|Vse datoteke (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Ne razširi" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Razširi vse podmape" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Razširi različne podmape" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Razširi enake podmape" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Vrsta datoteke" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Končnica" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "Sporočilo" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Odgovor" #. IDS_PROJECT_ITEM -#: Merge.rc:4317 +#: Merge.rc:4327 msgid "Item" msgstr "Vnos" #. IDS_PROJECT_LOAD -#: Merge.rc:4319 +#: Merge.rc:4329 msgid "Load" msgstr "Naloži" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Shrani" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Vključi podmape" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Možnosti primerjave" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Skriti vnosi" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Ime" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Lokacija" #. 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 "Opis" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Izberite ime datoteke za nov filter" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5285,7 +5291,7 @@ msgstr "" "Kopirajte datoteko %1 v mapo \"WinMerge/Filters\\:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5298,7 +5304,7 @@ msgstr "" "\n" "Prosimo, preverite, če mapa obstaja in je zapisljiva." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5308,7 +5314,7 @@ msgstr "" "\n" "Izberite mapo filtrov v Možnosti/Sistem." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5322,11 +5328,11 @@ msgstr "" "Morda je datoteka zaščitena 'samo-za-branje'?" #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Poiščite datoteko filtra za namestitev" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5337,17 +5343,17 @@ msgstr "" "Ni mogoče kopirati nove datoteke filtrov v mapo filtrov." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Filter datoteka že obstaja. Prepišem obstoječi filter?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Regularni izraz" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "" "Filters updated. Refresh all open folder compares?\n" "\n" @@ -5357,217 +5363,217 @@ msgstr "" "Če jih ne želite osvežiti sedaj, lahko izberete 'Ne' in osvežite primerjave kasneje." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Rezultati primerjave map" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Primerjava map" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Leva neimenovana" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Srednja neimenovana" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Desna neimenovana" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Osnovna datoteka" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Njihova datoteka" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Vaša datoteka" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Izvirna datoteka" #. 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 "Vr: %s St: %d/%d Zn: %d/%d EOL: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Vrstica: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Vr: %s St: %d/%d Zn: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Izb: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Združi" #. 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 "%1 najdenih razlik" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "1 najdena razlika" #. 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 "SZB" #. IDS_DIRVIEW_STATUS_FMT_FOCUS -#: Merge.rc:4397 +#: Merge.rc:4407 #, c-format msgid "Item %1 of %2" msgstr "Vnos %1 od %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Vnosov: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Primerjava vnosov..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[vnosov/sek.]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Za primerjavo izberite dve obstoječi mapi ali datoteki." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Izbira map" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Za primerjavo izberite dve (ali tri) mape ali dve (ali tri) datoteke." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Leva (prva) pot je neveljavna!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Srednja (druga) pot je neveljavna!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Desna (druga) pot je neveljavna!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Desna (tretja) pot je neveljavna!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Obe poti sta neveljavni!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Leva (prva) in srednja (druga) pot sta neveljavni!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Leva (prva) in desna (tretja) pot sta neveljavni!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Srednja (druga) in desna (tretja) pot sta neveljavni!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Vse poti so neveljavne!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Omogočeno je le za primerjave datotek" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Ni mogoče primerjati datoteke in mape!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Datoteka ni bila najdena: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka ni razpakirana: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5581,12 +5587,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Ni uspela razčlenitev datoteke v sporu." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" @@ -5595,7 +5601,7 @@ msgstr "" "ni datoteka v sporu." #. 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 "" "Primerjate zelo velike datoteke.\n" @@ -5604,28 +5610,28 @@ msgstr "" "\n" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Shrani kot" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Želite shraniti spremembe v %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 Samo-za- branje. Ali želite preglasiti datoteko Samo-za- branje? ('Ne', za shranjevanje pod novim imenom)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Napaka pri varnostnem kopiranju datoteke" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5639,7 +5645,7 @@ msgstr "" "Želite vseeno nadaljevati?" #. 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 "" @@ -5650,7 +5656,7 @@ msgstr "" "\t- uporabiti drugačno ime datoteke (Pritisnite 'Vredu')\n" "\t- prekiniti trenutno operacijo (Pritisnite 'Prekliči')?" -#: 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 "" @@ -5660,7 +5666,7 @@ msgstr "" "\n" "Ali želite shraniti nepakirano različico v drugo datoteko?" -#: 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 "" @@ -5670,7 +5676,7 @@ msgstr "" "\n" "Ali želite razpakirano različico shraniti v drugo datoteko?" -#: 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 "" @@ -5681,7 +5687,7 @@ msgstr "" "Ali želite shraniti nepakirano različico v drugo datoteko?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5697,7 +5703,7 @@ msgstr "" "Želite prepisati spremenjeno datoteko?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5707,7 +5713,7 @@ msgstr "" "je označena 'samo-za-branje'. Ali želite preglasiti vnos 'samo-za-branje'?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "Another application updated\n%1\nsince last scan.\n\nReload?" msgstr "" @@ -5717,22 +5723,22 @@ msgstr "" "Ali želite znova naložiti datoteko?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Shrani levo datoteko kot" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Shrani srednjo datoteko kot" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Shrani desno datoteko kot" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5744,7 +5750,7 @@ msgstr "" "je izginila. Za nadaljevanje shranite kopijo datoteke." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5755,186 +5761,186 @@ msgstr "" "Osvežite dokumente pred nadaljevanjem." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Prelom na praznem znaku" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Prelom na praznem znaku ali ločilu" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Kopiraj v s%rednjo\tAlt+Desno" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Kopiraj v s%rednjo\tAlt+Levo" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Kopiraj iz srednje\tAlt+Shift+Desno" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Kopiraj iz srednje\tAlt+Shift+Levo" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Kopiraj v sredino in naprej\tCtrl+Alt+Desno" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Kopiraj v srednjo in naprej\tCtrl+Alt+Levo" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Kopiraj vse v srednjo" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Z desne proti levi (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Iz desne v srednjo (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Iz srednje v levo (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Iz srednje v desno (%1 od %2)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Z leve proti desni (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Iz leve v srednjo (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Leva 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 "Srednjo v.... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Desno v... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Obe v... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Vse v... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Razlike v... (%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 "Leva (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Srednja (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Desna (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Obe (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Vse (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Leva stran - izberite ciljno mapo:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Srednje okno - izberite ciljno mapo:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Desna stran - izberite ciljno mapo:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 vpletenih datotek)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 vpletenih datotek)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5946,18 +5952,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Ali ste prepričani, da želite kopirati?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Ali ste prepričani, da želite kopirati %d vnosov?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -5977,46 +5983,46 @@ msgstr "" "Osvežite primerjavo." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Ali ste prepričani, da želite premakniti?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Ali ste prepričani, da želite premakniti: %d vnosov?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Potrdi premik" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Zaklenili boste okno za primerjavo map. Ali ste prepričani, da želite zapreti okno?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "Zaprli boste primerjalno okno map, ki je vzelo precej časa. Ali ste prepričani, da želite zapreti okno?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "Ime datoteke ali mape ni veljavno." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Ni bilo mogoče zagnati zunanjega urejevalnika: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Neznan format arhiva" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6025,751 +6031,751 @@ msgstr "" "Ali želite primerjati arhivske datoteke kot besedilne datoteke?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Ime 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 msgid "Comparison Result" msgstr "Rezultat primerjave" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Levi datum" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Datum desne" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Datum srednje" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Leva velikost" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Velikost desne" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Velikost srednje" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Velikost desne (kratko)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Leva velikost (kratko)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Velikost srednje (Kratko)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Čas ustvarjanja leve" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Čas ustvarjanja desne" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Čas ustvarjanja srednje" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Novejša datoteka" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Različica leve datoteke" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Različica desne datoteke" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Različica srednje datoteke" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Kratek rezultat" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Levi atributi" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atributi desne" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atributi srednje" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "Konci vrstic v levi" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "Konci vrstic v srednji" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "Konci vrstic v desni" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Kodiranje leve" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Kodiranje desne" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Kodiranje srednje" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Prezrte razlike" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Dvojiško" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Razpakovalec" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Predpregled razlik" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Levo" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Sredina" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Desno" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Razlika" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Število levih dvojnikov" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Število desnih dvojnikov" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Število srednjih dvojnikov" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Premakni" #. IDS_PRPCAT_AUDIO -#: Merge.rc:4658 +#: Merge.rc:4668 msgid "Audio" msgstr "Samodejno" #. IDS_PRPCAT_CALENDAR -#: Merge.rc:4659 +#: Merge.rc:4669 msgid "Calendar" msgstr "Koledar" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "Komunikacija" #. IDS_PRPCAT_CONTACT -#: Merge.rc:4661 +#: Merge.rc:4671 msgid "Contact" msgstr "Stik" #. IDS_PRPCAT_DEVICES -#: Merge.rc:4662 +#: Merge.rc:4672 msgid "Devices" msgstr "Naprave" #. 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 "Domov" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Žurnal" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Poveži" #. IDS_PRPCAT_MEDIA -#: Merge.rc:4668 +#: Merge.rc:4678 msgid "Media" msgstr "Medij" #. IDS_PRPCAT_MUSIC -#: Merge.rc:4670 +#: Merge.rc:4680 msgid "Music" msgstr "Glasba" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Opomba" #. 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 "Posneta TV" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Poišči" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Varnost" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Program" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Opravilo" #. IDS_PRPCAT_VIDEO -#: Merge.rc:4678 +#: Merge.rc:4688 msgid "Video" msgstr "Videoposnetek" #. 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 "Datotek ni mogoče primerjati" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Prekinjen vnos" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Preskočena datoteka" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Preskočena mapa" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Samo leva: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Samo srednja: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Samo desna: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Ne obstaja v %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Dvojiški datoteki sta enaki" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Dvojiški datoteki sta različni" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Datoteke so različne" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Mapi sta različni" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Samo leva" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Samo desna" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Samo srednja" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Noben vnos v levi" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Noben vnos v desni" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Noben vnos v srednji" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Napaka" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Besedilne datoteke so enake" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Srednja in desna sta enaki)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Leva in desno sta enaki)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Leva in srednja sta enaki)" #. 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 "Besedilne datoteke so različne" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Slikovne datoteke so enake" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Slikovne datoteke so različne" #. 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 "Skupina %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 "Potekel čas: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "1 izbran vnos" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 označenih predmetov" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Ime datoteke ali mape." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Imena podmap, ko so vključene podmape." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Rezultat primerjave, dolga oblika." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Čas spremembe na levi strani." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Čas spremembe na desni strani." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Datum ustvarjanja na sredini." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Končnica datoteke." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Velikost leve datoteke v bajtih." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Velikost desne datoteke v bajtih." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Velikost srednje datoteke v bajtih." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Skrajšana velikost leve datoteke." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Skrajšana velikost desne datoteke." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Velikost srednje datoteke je skrajšana." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Čas ustvarjanja na levi strani." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Čas ustvarjanja na desni strani." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Čas ustvarjanja na sredini." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Pove, katera stran ima novejši datum spremembe." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Različica leve datoteke, le za nekatere vrste datotek." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Različica desne datoteke, le za nekatere vrste datotek." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Različica srednje datoteke, le za nekatere vrste datotek." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Rezultat kratke primerjave." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Atributi leve strani." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Atributi desne strani." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Atributi srednje." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Vrsta znakov koncev vrstic v levi datoteki." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Vrsta znakov koncev vrstic v desni datoteki." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Vrsta znakov koncev vrstic v srednji datoteki." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Kodna stran leve strani." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Kodna stran desne strani." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Kodiranje v sredini." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "Število prezrtih razlik v datoteki. Te razlike je WinMerge prezrl in jih ni mogoče združiti." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Število razlik v datoteki. Ta številka ne vsebuje prezrtih razlik." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaže zvezdico (*), če je datoteka dvojiška." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Ime vtičnika razpakovalca ali cevovod." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Ime vtičnika predrazlikovalca ali cevovod." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "Primerjaj %1 z %2" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "Primerjaj %1 z %2 in %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Seznam, ločen z vejicami" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Seznam, ločen s tabulatorji" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Enostavni HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Enostavni XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Datoteka poročila že obstaja. Ali jo želite prepisati?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6779,57 +6785,57 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Poročilo je bilo uspešno izdelano." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "V tej vrstici ni mogoče dodati točke sinhronizacije." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Ista datoteka je odprta v obeh podoknih." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Izbrani datoteki sta enaki." #. 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 "Prišlo je do napake med primerjavo datotek." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Začasnih datotek ni bilo mogoče ustvariti. Preverite nastavitve začasne poti (PATH)." #. 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 "" "Ti datoteki imata različno vrsto znakov za konec vrstic.\n" @@ -6839,17 +6845,17 @@ msgstr "" "Opomba: Če jih želite vedno obravnavati kot enaki, nastavite možnost 'Prezri različnost vrste znakov za koncev vrstic' na zavihku 'Primerjava' pogovornega okna 'Nastavitve' (dostopen pod Urejanje/Možnosti)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Izbrana mapa ni veljavna." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "V urejevalniku ni mogoče odpreti dvojiške datoteke." #. 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 "" @@ -6861,41 +6867,41 @@ msgstr "" "na drugi strani in jo odpreti?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "Ali ste prepričani, da želite kopirati vse razlike v drugo datoteko?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Ali se želite premakniti na naslednjo datoteko?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Ali se želite premakniti na prejšnjo datoteko?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Ali se želite premakniti na naslednjo stran?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Ali se želite premakniti na prejšnjo stran?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Ali se želite premakniti v prvo datoteko?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Ali se želite premakniti na zadnjo datoteko?" -#: 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 "" @@ -6903,51 +6909,51 @@ msgstr "" "Prikaz vsake datoteke v svoji kodni strani bo omogočil boljši prikaz, vendar bo nevarno združevanje/kopiranje.\n" "Ali želite obe datoteke obravnavati v privzeti kodni strani sistema Windows (priporočeno)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Izgubljeni podatki pri kodiranju: obe datoteki" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Izgubljeni podatki zaradi napak pri kodiranju: prva datoteka" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Izgubljeni podatki zaradi napak pri kodiranju: druga datoteka" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Izgubljeni podatki zaradi napak pri kodiranju: tretja datoteka" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Ni razlik" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Razlika v vrstici" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamenjano %1 nizov." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Ni mogoče najti niza \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Zdaj vstopate v združevalni način. Če želite izklopiti združevalni način, pritisnite tipko F9." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -6957,99 +6963,99 @@ msgstr "" "Število nerešenih sporov: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Sprememba kodne strani je bila združena." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Spremembe kodne strani so v sporu." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Sprememba konca vrstice (EOL) je bila združena." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Spremembe koncev vrstic (EOL) so v sporu." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Podokno lokacije" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Podokno razlik" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Datoteka popravka je bila uspešno zapisana." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1. vnos ni bil najden!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2. vnos ni bil najden!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Datoteka s popravki že obstaja. Ali jo želite prepisati?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 izbranih datotek]" #. IDS_DIFF_NORMAL -#: Merge.rc:4913 +#: Merge.rc:4923 msgid "Normal" msgstr "Običajno" #. IDS_DIFF_CONTEXT -#: Merge.rc:4914 +#: Merge.rc:4924 msgid "Context" msgstr "Skladnost" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Poenoteno" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Ni mogoče pisati v datoteko %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Navedena izhodna pot ni absolutna pot: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Določite izhodno datoteko." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Iz dvojiških datotek ni mogoče ustvariti datoteke s popravki." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7060,12 +7066,12 @@ msgstr "" "Ustvarjanje datoteke s popravki zahteva, da v datoteki ni ne shranjenih sprememb." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Mapa ne obstaja." #. 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" @@ -7076,37 +7082,37 @@ msgstr "" "Za več informacij o podpori za arhiviranje in kako jo omogočiti si oglejte priročnik." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Izberite datoteko za izvoz" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Izberite datoteko za uvoz" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Možnosti so uvožene iz datoteke." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Možnosti so izvožene v datoteko." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Ni uspel uvoz možnosti iz datoteke." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Ni uspelo izvažanje možnosti v datoteko." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7117,44 +7123,44 @@ msgstr "" "Ali želite nadaljevati?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Mešano" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Dvojiško" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Brez" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Barva označevalca %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Nov vzorec" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Vrsta" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Urejevalnik skriptov" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7163,7 +7169,7 @@ msgstr "" "Razlika v trenutni vrstici (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7172,7 +7178,7 @@ msgstr "" "Možnosti" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7181,7 +7187,7 @@ msgstr "" "Osveži (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7190,7 +7196,7 @@ msgstr "" "Prejšnja razlika (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7199,7 +7205,7 @@ msgstr "" "Naslednja razlika (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7208,7 +7214,7 @@ msgstr "" "Prejšnji spor (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7217,7 +7223,7 @@ msgstr "" "Naslednji spor (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7226,7 +7232,7 @@ msgstr "" "Prva razlika (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7235,7 +7241,7 @@ msgstr "" "Trenutna razlika (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7244,7 +7250,7 @@ msgstr "" "Zadnja razlika (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7253,7 +7259,7 @@ msgstr "" "Kopiraj desno (Alt+Desno)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7262,7 +7268,7 @@ msgstr "" "Kopiraj levo (Alt+Levo)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7271,7 +7277,7 @@ msgstr "" "Kopiraj desno in naprej (Ctrl+Alt+Desno)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7280,7 +7286,7 @@ msgstr "" "Kopiraj levo in naprej (Ctrl+Alt+Levo)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7289,7 +7295,7 @@ msgstr "" "Kopiraj vse v desno" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7298,7 +7304,7 @@ msgstr "" "Kopiraj vse v levo" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7307,7 +7313,7 @@ msgstr "" "Samodejno združi (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7316,7 +7322,7 @@ msgstr "" "Prva datoteka" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7325,7 +7331,7 @@ msgstr "" "Naslednja datoteka (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7334,7 +7340,7 @@ msgstr "" "Zadnja datoteka" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7343,37 +7349,37 @@ msgstr "" "Prejšnja datoteka (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "Prilagojen razpakovalec se uporablja za obe datoteki (samo ena datoteka potrebuje končnico)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Brez predpregleda razlik (običajno)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Priporočeni vtičniki" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Vsi vtičniki" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Zasebna gradnja:%1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Vaša program je posodobljen." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7383,125 +7389,125 @@ msgstr "" "%1 je zdaj na voljo (vi imate %2). Ali jo želite zdaj prenesti?" #. 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 "Ni bilo mogoče prenesti podatkov o najnovejši različici" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Nastavitve vtičnika" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "WSH ni najden - skripti '.sct' so onemogočeni" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Pojdi &na vrstico %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Pojdi na premaknjeno vrstico\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 "Iz datotečnega sistema" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Iz seznama nedavnih (MRU)" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Brez označevanja" #. IDS_COLORSCHEME_BATCH -#: Merge.rc:5063 +#: Merge.rc:5073 msgid "Batch" msgstr "Paket" #. IDS_COLORSCHEME_PO -#: Merge.rc:5090 +#: Merge.rc:5100 msgid "Portable Object" msgstr "Prenosni predmet" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Viri" #. IDS_COLORSCHEME_SH -#: Merge.rc:5098 +#: Merge.rc:5108 msgid "Shell" msgstr "Lupina" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "Zapri &leve zavihke" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Zapri &desne zavihke" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Zapri d&ruge zavihke" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Omogoči sa&modejno največjo širino" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "&Spletna stran" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Pre&lom besedila" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 msgid "%1 is not installed." msgstr "%1 ni nameščen." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 ne obstaja. Ali jo želite ustvariti?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Ni bilo mogoče ustvariti mape." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7512,486 +7518,486 @@ msgstr "" "$linenum: številka vrstice trenutnega položaja kazalca" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "privzeto" #. IDS_DIFF_ALGORITHM_MINIMAL -#: Merge.rc:5155 +#: Merge.rc:5165 msgid "minimal" msgstr "najmanj" #. IDS_DIFF_ALGORITHM_PATIENCE -#: Merge.rc:5156 +#: Merge.rc:5166 msgid "patience" msgstr "potrpežljivo" #. 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 "brez" #. 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 "Privzeti DirectWrite" #. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED -#: Merge.rc:5165 +#: Merge.rc:5175 msgid "DirectWrite Aliased" msgstr "Kratko DirectWrite" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC -#: Merge.rc:5166 +#: Merge.rc:5176 msgid "DirectWrite GDI Classic" msgstr "Klasičen DirectWrite GDI" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "Naravni DirectWrite GDI" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "Naravni DirectWrite" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "Naravno simetričen 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 "Podrejeno ali glavno okno MDI" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Le podrejeno okno MDI" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Zapri glavno okno, če je samo eno podrejeno okno MDI" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Razlika" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Označi" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Utripaj" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Velikost bloka" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Blok Alfa" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Prag CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Zaznavanje Ins/Del" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Brez" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Navpično" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Vodoravno" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Prekrivanje" #. 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 mešanje" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Alfa animacija" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Povečava" #. IDS_PAGE -#: Merge.rc:5199 +#: Merge.rc:5209 msgctxt "ImgMergeFrame|LocationPane" msgid "Page:" msgstr "Stran:" #. 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č: (%d, %d) RGBA: (%d, %d, %d, %d) " #. IDS_IMGCMP_STATUS_DIST1_FMT -#: Merge.rc:5201 +#: Merge.rc:5211 #, c-format msgid "Dist: %g " msgstr "Razdalja: %g " #. IDS_IMGCMP_STATUS_DIST2_FMT -#: Merge.rc:5202 +#: Merge.rc:5212 #, c-format msgid "Dist: %g, %g " msgstr "Razdalja: %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 "Stran: %d/%d Povečava: %d%% %dx%dpx %dbpp " #. IDS_IMGCMP_STATUS_RC_FMT -#: Merge.rc:5204 +#: Merge.rc:5214 #, c-format msgid "Rc: (%d, %d) " msgstr "Zapis: (%d, %d) " #. IDS_IMGCMP_STATUS_FLIPPED_FMT -#: Merge.rc:5205 +#: Merge.rc:5215 #, c-format msgid "Flipped: %s " msgstr "Zasukano: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Obrnjeno: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Vse strani" #. 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 "Ni najdenih nobenih razlik za izbiro" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Ni najdenih razlik za dodajanje kot Nadomestni filter" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Par je že prisoten na seznamu nadomestnih filtrov" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Dodam to spremembo med Nadomestne filtre?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Samo besedilo" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Položaj vrstico po vrstico in besedilo" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Položaj besedo po besedo in besedilo" #. 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 "Namestitvena mapa" #. 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 "Dovoli zagon samo enega primerka programa" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Dovoli zagon le enega primerka, in počakaj, da se primerek dokonča" #. 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 "Aktivirano samo na oknu" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Takoj" #. IDS_PLUGIN_ALL -#: Merge.rc:5249 +#: Merge.rc:5259 msgid "Al&l" msgstr "V&se" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "&Drugo" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Manjkajoče ime vtičnika v cevovodu vtičnika:%1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Manjka narekovaj v cevovodu vtičnika: %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 "Določi argumente vtičnika" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Vtičnika ni bilo mogoče najti ali je neveljaven: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' ni vtičnik razpakirnika" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' ni vtičnik preddifereja" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "Med preddifiranjem datoteke '%1' z vtičnikom '%2' je prišlo do napake. Prednastavitev se ne uporablja več." #. 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 "Filter je uporabljen" #. 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 "Odložišče na %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "" "Clipboard history disabled.\r\n" "Enable: Windows logo key + V, then Turn on." @@ -7999,395 +8005,400 @@ msgstr "" "Zgodovina odložišča je onemogočena.\r\n" "Za omogočanje zgodovine odložišča, pritisnite tipko z logotipom Windows + V in nato kliknite gumb Vklopi." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Ta sistem ne podpira zgodovine odložišča." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "32-bitna različica WinMerge ne podpira primerjave odložišča" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "Izvajalski čas WebView2 ni nameščen. Ali ga želite prenesti?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Primerjava novega besedila" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Primerjava nove tabele" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Primerjava nove dvojiške" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Primerjava nove slike" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Primerjava nove spletne strani" +#. 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 "Primerjava odložišča" #. IDS_PREVIEWBAR_PRINT -#: Merge.rc:5321 +#: Merge.rc:5332 msgid "&Print..." msgstr "Na&tisni..." #. IDS_PREVIEWBAR_PREVPAGE -#: Merge.rc:5323 +#: Merge.rc:5334 msgid "Pre&v Page" msgstr "Pre&jšnja stran" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "&Dve strani" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "&Ena stran" #. IDS_PREVIEWBAR_ZOOMIN -#: Merge.rc:5326 +#: Merge.rc:5337 msgid "Zoom &In" msgstr "Po&večaj" #. IDS_PREVIEWBAR_ZOOMOUT -#: Merge.rc:5327 +#: Merge.rc:5338 msgid "Zoom &Out" msgstr "Pom&njšaj" #. IDS_WEBPAGE_COMPARING -#: Merge.rc:5333 +#: Merge.rc:5344 msgid "Comparing..." msgstr "Primerjanje..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Povečava:" #. 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/Spanish.po b/Translations/WinMerge/Spanish.po index cceae551e5f..d2882952549 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -26,7 +26,7 @@ msgstr "" "X-Generator: Poedit 3.2.2\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_SPANISH, SUBLANG_SPANISH_MODERN" @@ -111,7 +111,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Copiar diferencia seleccionada (derecho) al portapapeles\tCtrl+&3" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "Seleccionar &diferencia de línea\tF4" @@ -141,7 +141,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" @@ -151,19 +151,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 "< Vacío >" #. 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" @@ -183,27 +183,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 ®istrada (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 "Con &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 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" @@ -238,8 +238,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 "&Ninguno" @@ -254,12 +254,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ági&na siguiente" @@ -269,42 +269,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 el derecho 90 grados" #. 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 el izquierdo 90 grados" #. 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\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "&Reducir\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+*" @@ -329,27 +329,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 "&Ajustar desplazamiento" #. 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" @@ -384,37 +384,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Comparar &texto extraído de las imágenes" #. 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 "Árboles 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&amaño" @@ -429,27 +429,27 @@ msgid "&Event Sync" msgstr "Sincronización 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 "Des&prazar" #. 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/Adiante" @@ -479,3607 +479,3613 @@ msgid "&All Profiles" msgstr "Todos &los perfiles" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Archivo" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 msgid "&New" msgstr "&Nuevo" #. 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&abla" #. 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 "&Imagen" #. 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Nuevo (&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 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 archivo de conflic&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 portapape&les" #. 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&yecto...\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 "Guar&dar proyecto..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Proyectos recientes" #. 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 "Arch&ivos o carpetas recientes" #. 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 "&Salir\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 pestañas" #. 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 pestañas" #. 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 "En la barra de títul&o" #. 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 herramien&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 "&Pequeña" #. 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 "&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&ús" #. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR -#: Merge.rc:365 Merge.rc:515 +#: Merge.rc:367 Merge.rc:519 msgid "&Output Pane" msgstr "Panel de sa&lida" #. 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 "&Herramientas" #. 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 "&Generar parche..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "&Complementos" #. 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 "Ven&tana" #. 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 "&Cerrar\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 "Cerrar 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 "&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 msgid "&Help" msgstr "A&yuda" #. 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 "Ayuda 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 de la versió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 "&Traducciones (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 "Registro 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 "Licencia Pública General &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 "Solo 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 "Izqui&erdo solo 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 solo 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 "Derec&ho solo 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 "Seleccion&ar 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 en el izquierdo" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Mostrar e&lementos únicos en el central" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Mostrar elementos únicos en el &derecho" #. 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 archivos &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 so&lo las diferencias del izquierdo" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "&Mostrar solo las diferencias del central" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Most&rar solo las diferencias del derecho" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Mostrar solo &elementos faltantes del izquierdo" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Mostrar solo elementos &faltantes del central" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Mostrar solo elementos faltantes del derec&ho" #. 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 árbol" #. 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 las 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 &idénticas" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "&Contraer todas las subcarpetas" #. 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 &fuente..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Usar fuente predeterminada" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Interc&ambiar paneles" #. 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 "Estadísticas de la 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 "Diferencia siguie&nte\tAlt+Abajo" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Diferencia &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 "Primer di&ferencia\tAlt+Inicio" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "Diferencia 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 "Ú<ima diferencia\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 "Copiar al de&recho\\tAlt+Derecha" #. 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 al izqui&erdo\\tAlt+Izquierda" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "&Eliminar\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 "Gene&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 con desempaquetador..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Gua&rdar" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Guardar &lado izquierdo" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Guardar ¢ral" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Gua&rdar lado derecho" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Guardar 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 "Guardar &lado izquierdo 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 "Guardar 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 "Gua&rdar lado derecho 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ágina..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "&Vista previa de la impresión..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "&Convertir finales de línea 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_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "Des&hacer\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "&Rehacer\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 "&Buscar...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "R&eemplazar...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "&Marcador...\tCtrl+Mayú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 con números de línea\tCtrl+Shift+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 siguie&nte\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "Marcador &anterior\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Quitar todos los mar&cadores" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Resaltar sintaxis" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Contexto de &diferencias" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "Tod&as las líneas" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 líneas" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 línea" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 líneas" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 líneas" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 líneas" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 líneas" #. 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 y las líneas 0-9\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "Invertir (ocultar líneas diferentes)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "B&loquear paneles" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "Mostrar &espacios en blanco" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "M&ostrar finales de línea" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "M&ostrar diferencias de línea" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Mostrar &números de línea" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Mostrar &márgenes" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Mostrar márgenes su&periores" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "&Ajuste de líneas" #. 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 diferencias" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Panel de lo&calización" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Panel de salida" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "Conflicto si&guiente\tAlt+Mayús+Abajo" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Conflicto &anterior\tAlt+Mayú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 "Diferencia siguiente entre el izquierdo y el central\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Diferencia anterior entre el izquierdo y el central\tAlt+Mayús+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Diferencia siguiente entre el izquierdo y el derecho\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Diferencia anterior entre el izquierdo y el derecho\tAlt+Mayús+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Diferencia siguiente entre el central y el derecho\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Diferencia anterior entre el central y el derecho\tAlt+Mayús+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Diferencia siguiente del izquierdo\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Diferencia anterior del izquierdo\tAlt+Mayús+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Diferencia siguiente del central\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Diferencia anterior del central\tAlt+Mayús+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Diferencia siguiente del derecho\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Diferencia anterior del derecho\tAlt+Mayús+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Copiar desde e&l izquierdo 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 "&Derecho" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Co&piar desde el 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 "&Izquierdo" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Copiar desde el de&recho a" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Copiar línea(s) seleccionada(s) desde el iz&quierdo a" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Copiar línea(s) seleccionada(s) &desde el central a" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Copiar lín&ea(s) seleccionada(s) desde el derecho a" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Copiar desde el izquierdo\\tAlt+Mayús+Derecha" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Copiar desde el derecho\\tAlt+Mayús+Izquierda" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "C&opiar al derecho y avanzar\\tCtrl+Alt+Derecha" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Copiar al iz&quierdo y avanzar\\tCtrl+Alt+Izquierda" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Copiar todo &al lado derecho" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Co&piar todo al lado izquierdo" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "A&utocombinar\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Añadir punto de &sincronización\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Limpiar 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 "Instrucciones para &copiar" #. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING -#: Merge.rc:886 +#: Merge.rc:893 msgid "Select &Editor Script..." msgstr "Seleccionar &editor de instrucciones..." #. 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 "Com¶r" #. 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 en nueva &ventana" #. 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 "No comparar &horizontalmente..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "No comparar hor&izontalmente" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Primer e&lemento izquierdo con segundo elemento izquierdo" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Prime&r elemento derecho con segundo elemento derecho" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "&Primer elemento izquierdo con segundo elemento derecho" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "&Segundo elemento izquierdo con primer elemento derecho" #. 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 "Izquierdo al 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 "Izquierdo al derecho (%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 "Izquierdo 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 al izquierdo (%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 "Central al derecho (%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 "Derecho al 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 "Derecho al izquierdo (%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 "Derecho 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 "&Eliminar" #. 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 "&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&nombrar" #. 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 archiv&o izquierdo" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Abrir archivo centra&l" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Abrir archivo &derecho" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Copiar nombres de &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 "Izquierdo (%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 "Derecho (%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 nombres de &archivos" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Copiar elementos al &portapapeles" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Copiar toda&s las 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 "Diferencias 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 izquierdo" #. 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 derecho" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Los dos menúes contextuales" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Todos los menúes contextuales" #. 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 &nombre de archivo" #. 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 "Opciones de 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 a la &diferencia" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK -#: Merge.rc:1083 +#: Merge.rc:1091 msgid "Move Cursor on &Click" msgstr "Mover el cursor al hacer &clic" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE -#: Merge.rc:1085 +#: Merge.rc:1093 msgid "&No Moved Blocks" msgstr "&No mostrar bloques desplazados" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "Todos los bloques despl&azados" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Espacios en &blanco" #. 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 &líneas en blanco" #. 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 MAYÚSCULAS y 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 diferencias en los saltos de línea (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 &diferencias 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 diferencias en 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 "I&gnorar el final de línea faltante" #. 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 "&Incluir 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 los contenidos" #. 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 "Contenidos 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 "Contenidos 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 "Fecha 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 "Fecha de modificación y 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 proyecto..." #. 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 los 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} - Primer 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} - Tercer 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} - Cuarto 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éptimo 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} - Octavo 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} - Noveno 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} - Archivo de origen" #. 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} - Carpeta de origen" #. 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 origen" #. 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 de URL de origen" #. 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} - Sufijo de URL de origen" #. 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} - Archivo 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} - Carpeta 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 de 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} - Sufijo de 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} - Ruta principal 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} - Archivo de instrucciones" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Añadir complemento desempaq&uetador..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER -#: Merge.rc:1319 +#: Merge.rc:1329 msgid "Add &Prediffer Plugin..." msgstr "Añadir complemento &precomparador..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE -#: Merge.rc:1320 +#: Merge.rc:1330 msgid "&Duplicate Plugin..." msgstr "&Duplicar complemento..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "Borr&ar todo" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR -#: Merge.rc:1352 +#: Merge.rc:1362 msgid "&Clear All" msgstr "Borrar &todo" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST -#: Merge.rc:1353 +#: Merge.rc:1363 msgid "Remove Last Filter &Group" msgstr "Eliminar el último &grupo de filtros" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL -#: Merge.rc:1354 +#: Merge.rc:1364 msgid "R&eset to Default (*.*)" msgstr "R&establecer valores predeterminados (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Añadir archivo &excluido" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "Archivos del &sistema" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "Archivos de copia de seguridad del &editor" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "Archivos binarios &compilados" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Archi&vos de registro" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "Archivos &temporales o de caché" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Añadir carpeta &excluida" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "Control de &versiones" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "Crear arte&factos" #. 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 "Añadir condición de arc&hivo" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Tamaño d&el archivo" #. 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 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 o más" #. 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 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 o más" #. 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 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 o más" #. 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 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 o más" #. 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 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 o más" #. 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 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 o más" #. 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 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 o más" #. 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 "Rango 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 "&Última modificación" #. 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 "Hace más de 1 hora" #. 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 "En menos 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 "&Día" #. 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 hoy" #. 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 "Hoy" #. 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 "Anteayer" #. 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 "Ayer" #. 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 ayer" #. 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 "Se&mana" #. 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 de esta 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 de la semana pasada" #. 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 semana pasada" #. 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 la semana pasada" #. 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 "&Mes" #. 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 de este mes" #. 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 mes" #. 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 del mes pasado" #. 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 "El mes pasado" #. 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 el mes pasado" #. 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 "Añ&o" #. 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 de este año" #. 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 año" #. 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 del año pasado" #. 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 "El año pasado" #. 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 el año pasado" #. 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 "Rango 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 "Archivos de solo lectura" #. 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 "Archivos de no solo lectura" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN -#: Merge.rc:1435 Merge.rc:1609 +#: Merge.rc:1445 Merge.rc:1619 msgid "Hidden files" msgstr "Archivos ocultos" #. 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 "No son archivos ocultos" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Archivos del 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 "No son archivos del sistema" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "&Contenido del archivo" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Contiene la cadena..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "No contiene la cadena..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "La primera línea contiene la cadena..." #. 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 primera línea no contiene la cadena..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "Las primeras 10 líneas contienen la cadena..." #. 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 "Las primeras 10 líneas no contienen la cadena..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "Las últimas 10 líneas contienen la cadena..." #. 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 "Las últimas 10 líneas no contienen la cadena..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "La última línea contiene la cadena..." #. 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 última línea no contiene la cadena..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1453 +#: Merge.rc:1463 msgid "&Line Count" msgstr "Recuento de &líneas" #. 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 o más" #. 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 o más" #. 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 o más" #. 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 o más" #. 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 o más" #. 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 "Añadir c&ondición de carpeta" #. 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 "Objetivo: cu&alquiera (izquierdo/central/derecho)" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT -#: Merge.rc:1545 +#: Merge.rc:1555 msgid "Target: &Left" msgstr "Objetivo: i&zquierdo" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE -#: Merge.rc:1546 +#: Merge.rc:1556 msgid "Target: &Middle" msgstr "Objetivo: centra&l" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT -#: Merge.rc:1547 +#: Merge.rc:1557 msgid "Target: &Right" msgstr "Objetivo: de&recho" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1549 +#: Merge.rc:1559 msgid "Add &Difference Condition" msgstr "Añadir condición de &diferencia" #. 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 "No 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 "" #. 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 "Menos de 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 o más" #. 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 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 o más" #. 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 o más" #. 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 o más" #. 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 o más" #. 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 un día" #. 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 día o más" #. 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 una 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 "Una semana o más" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT -#: Merge.rc:1596 +#: Merge.rc:1606 msgid "Target: &Left and Right" msgstr "Objetivo: iz&quierdo y derecho" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE -#: Merge.rc:1597 +#: Merge.rc:1607 msgid "Target: Left and &Middle" msgstr "Objetivo: izquierdo y c&entral" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT -#: Merge.rc:1598 +#: Merge.rc:1608 msgid "Target: Middle and &Right" msgstr "Objetivo: central y de&recho" #. 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 MAYÚSCULAS/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 la 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 archivos o carpetas" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "&1er archivo o carpeta" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Solo 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º archivo o carpeta" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Solo lec&tura" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Intercambiar 2º por 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º archivo o carpeta (opcional)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "S&olo 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 "&Incluir 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 descompresor" #. 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 "Ayuda" #. 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 "Qué &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 "Solo 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 "Detenerse al final archiv&o" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "No cerrar este cua&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 "&Siguiente" #. 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 "Reemplazar" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Reem&plazar con:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "&Detenerse al final del archivo" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Reemplazar en" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "T&odo el archivo" #. 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 "&Reemplazar" #. 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 "Nuevo" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Color 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 línea" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Habilitar Filtros de línea" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Expresiones regulares (una por línea):" #. 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 sustitució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 "Los cambios que aparecen en los paneles, como los pares listados a continuación, serán ignorados o marcados como insignificantes. Los parches no se verán afectados." #. 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 "General" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "De&splazarse automáticamente a la primera diferencia" #. 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 "Desplazarse automáti&camente a la primera diferencia de línea" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Cerrar ventanas 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 rutas &automáticamente en el 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 cerrar múltiples ventanas" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Mantener la hora del archivo en la com¶ción de archivos" #. 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 archivos o carpetas\" al 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 "Cerrar \"Seleccione archivos o carpetas\" al hacer clic en Comparar" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "A&utocompletar en el diálogo Abrir:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Recarga automática de archivos 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 "Colores" #. 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 "Eliminada" #. 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 "Diferencia:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Diferencia seleccionada:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Diferencia 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 "Igual que el siguiente (3 paneles):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Igual que el siguiente (seleccionado):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Diferencia de palabra:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Diferencia 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 "Funciones:" #. 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 "Cadenas:" #. 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 "Negrita" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "&Usar colores personalizados para el texto" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Espacio:" #. 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 "Margen:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Marcador de búsqueda:" #. 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 colores para comparar carpetas" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Elementos iguales:" #. 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 "&Usar colores personalizados del 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 "Enviar archivo&s eliminados a la Papelera de reciclaje" #. 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 archivos temporales" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Carpeta temporal del 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 "Espacios en blanco" #. 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 todos" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Ignorar &líneas en blanco" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Ignorar MAYÚSCULAS y minús&culas" #. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE -#: Merge.rc:2335 +#: Merge.rc:2345 msgid "Igno&re EOL differences (Windows/Unix/Mac)" msgstr "Igno&rar las diferencias de fin de línea (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 &diferencias de codificación" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignorar diferencias en c&omentarios" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "I&gnorar el final de línea faltante" #. 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 desplazados" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Alinear líneas &simliares" #. 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 la &heurística de indentación" #. 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 las diferencias 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 la sinta&xis" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "&Preservar caracteres EOL originales" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Tabulaciones" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "&Tamaño de tabulación:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "&Insertar tabulaciones" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Insertar e&spacios" #. 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 "Copiar &granularidad de las diferencias seleccionadas:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP -#: Merge.rc:2379 +#: Merge.rc:2389 msgid "Line Difference Coloring" msgstr "Colorear la diferencia de líneas" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Ver diferencias de líneas" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "A nivel de &carácter" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "A nivel de 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 algunos mensajes de uso frecuente. Pulse 'Restablecer' para hacerlos visibles de nuevo." #. 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 "Generar parche" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Archivo &1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Archivo &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 al portapapeles" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Anexar a archivo 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 "Incluir línea de coman&dos" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Abrir en 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 "&Bajar" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "Propiedades &adicionales" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Propiedades adicionales" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Elija complemento" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "&Nombre:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC -#: Merge.rc:2480 +#: Merge.rc:2490 msgid "&Target files:" msgstr "Archivos 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 de extensiones:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 msgid "Description:" msgstr "Descripció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 los complementos, no comprobar 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 archiv&os en la misma ventana despué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 "Canales de com&plementos:" #. 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 "Detener" #. 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 "Reanudar" #. 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 usar:" #. 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 "&Cerrar" #. 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 "Archivo" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Ir a la" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Lí&nea" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Diferencia" #. 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 archivo" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "Expresión 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 "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 "Nuevo..." #. 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 "Eliminar..." #. IDD_FILTERS_CONDITION -#: Merge.rc:2573 +#: Merge.rc:2583 msgid "Filter Condition" msgstr "Condición del filtro" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2576 +#: Merge.rc:2586 msgid "&Left-hand side:" msgstr "&Lado izquierdo:" #. 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 de&recho:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2586 +#: Merge.rc:2596 msgid "Expression:" msgstr "Expresión:" #. 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 "Iguales" #. 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 la codificación predeterminada a usar cuando se carguen archivos no Unicode:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Codificación del sistema" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Según la interfaz 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." @@ -4088,7 +4094,7 @@ msgstr "" "Necesita reiniciar 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." @@ -4097,769 +4103,769 @@ msgstr "" "Necesita reiniciar sesión." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Soporte de archivos" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Habilitar soport&e de archivos" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Detectar tipo de archivo por su firma" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Elementos guardados o restaurados del archivo de proyecto:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "¿Guardar archivos modificados?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Archivo izquierdo" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "Guardar cambio&s" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Descartar cambios" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Archivo central" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Guar&dar cambios" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Descartar ca&mbios" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Archivo derecho" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Gu&ardar cambios" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Des&cartar cambios" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Desca&rtar todo" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Informe de comparación de carpetas" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Archivo de in&forme:" #. 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 "&Incluir informe de comparación de archivos" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Filtro compartido o privado" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "¿Qué tipo de filtro quiere crear?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Filtro compartido (para todos los usuarios de este ordenador)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Filtro privado (solo para el usuario actual)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Estadísticas de 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 "Archivos:" #. 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 "Izquierdo:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Derecho:" #. 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 "Cerrar" #. 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 "Faltante en el izquierdo:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Faltante en el central:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Faltante en el derecho:" #. 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 codificación para" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "&cargar el archivo:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "&guardar el archivo:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "&Usar la misma 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 "Prueba 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 "Introduzca t&exto para probar:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "&Nombre de 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 "Tabla" #. IDD_OPEN_TABLE, IDC_STATIC -#: Merge.rc:2854 +#: Merge.rc:2864 msgid "File type" msgstr "Tipo de archivo" #. 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 nuev&as líneas entre comillas" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Ca&rácter de comilla:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Copias de seguridad" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Crear copias de:" #. 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 d&e archivos" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Crear copias en:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Carpeta del archivo &original" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Carpeta &global para las copias de seguridad:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Nombre del archivo de la copia de seguridad:" #. 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 &fecha y hora" #. 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 "¿Está seguro de que quiere copiar XXX elementos?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Del izquierdo" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Al derecho" #. 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 "No &preguntar de nuevo." #. 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 "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 "&Tipo de complemento:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2916 +#: Merge.rc:2926 msgid "File filters:" msgstr "Filtros de archivo:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "&Argumentos:" #. 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 desempaquetado/precomparación automática para el complemento" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Integración con Windows" #. 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 al 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 "&Registrar extensión de shell" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "An&ular registro de la 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 "Registrar extensión de shell para el 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 registro de la extensión shell para el usuario actual" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Registrar extensión shell para &Windows 11 o más reciente" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Anular registro de extensión shell para &Windows 11 o más reciente" #. 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 los elementos recientes" #. 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&tener después de la primera diferencia" #. 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 diferencias de tiempo menores de 3 segundos" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Expandir &automáticamente todas las subcarpetas después de la comparación:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Incl&uir contenidos únicos de subcarpetas" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Igno&rar los 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 "Lí&mite 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 "Límite 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 "Patrones de archivo:" #. 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 "&Patrones de archivos binarios:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Ajustes de Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Ver aju&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 "&Conjunto 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 "Imagen" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "&Patrones de archivo de imagen:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Activar la comparación de imág&enes en la 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 "Pagina Web" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Patrón URL a &incluir (expresión regular)" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Patrón URL a &excluir (expresión regular)" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "&Ubicación de la carpeta de datos de 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 de 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 "Editar complemento" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:3123 +#: Merge.rc:3133 msgid "&Category:" msgstr "&Categoría:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC -#: Merge.rc:3125 +#: Merge.rc:3135 msgid "&Menu caption:" msgstr "Título del &menú:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC -#: Merge.rc:3127 +#: Merge.rc:3137 msgid "&Window type:" msgstr "Tipo de &ventana:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC -#: Merge.rc:3132 +#: Merge.rc:3142 msgid "&Unpacked file extension:" msgstr "Extensión de archivo descom&primido:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "&Requerir argumentos" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT -#: Merge.rc:3137 +#: Merge.rc:3147 msgid "&Generate editor script" msgstr "&Generar editor de instrucciones" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC -#: Merge.rc:3140 +#: Merge.rc:3150 msgid "Command &line:" msgstr "&Línea de comandos:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "Exten&sión de archivo de instrucciones:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "Cuer&po del script:" #. 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 "NUM" #. 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 "GRB" #. ID_FILE_NEW -#: Merge.rc:4129 +#: Merge.rc:4139 msgid "" "\n" "New Documents (Ctrl+N)" @@ -4868,7 +4874,7 @@ msgstr "" "Nuevo documento (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4877,7 +4883,7 @@ msgstr "" "Abrir (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4886,27 +4892,27 @@ msgstr "" "Guardar (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Error desconocido al intentar abrir el archivo de proyecto." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Error desconocido al intentar guardar el archivo de proyecto." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Archivo de proyecto cargado con éxito." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Archivo de proyecto guardado con éxito." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4915,7 +4921,7 @@ msgstr "" "Deshacer (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4924,7 +4930,7 @@ msgstr "" "Rehacer (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4943,7 +4949,7 @@ msgstr "" "Comparación de archivos de WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4962,162 +4968,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 no concede ABSOLUTAMENTE NINGUNA GARANTÍA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia Pública GNU en el menú Ayuda para más detalles." #. 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 "&Reintentar" #. 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 todos" #. 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 todo" #. 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 &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 "No mostrar este &mensaje de nuevo." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "Para ver de nuevo este diálogo de mensaje, pulse el botón Restablecer en la opción Cuadros de mensajes de Configuración." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "Comparar/Combinar" #. IDS_OPTIONSPG_SYNTAXCOLORS -#: Merge.rc:4204 Merge.rc:4208 +#: Merge.rc:4214 Merge.rc:4218 msgid "Syntax" msgstr "Sintaxis" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Esquemas de colores" #. 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 "Proyecto" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Diferencias" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Cuadros de mensajes" #. 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 "Del izquierdo:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Al izquierdo:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Del derecho:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Al derecho:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Desde el central:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Al 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 "Se mostrarán de nuevo todos los diálogos de mensajes." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5126,156 +5132,156 @@ msgstr "" "Por favor, use valores entre 1 y %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 los archivos (*.*) |*.*| |" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*) |*.*| |" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Archivos de proyecto de WinMerge (*.WinMerge) |*.WinMerge| |" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Archivos de opciones (*.ini) |*.ini| Todos los archivos (*.*) |*.*| |" #. 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 "Archivos de texto (*.csv; *.asc; *.rpt; *.txt) | *.csv; *.asc; *.rpt; *.txt | Todos los archivos (*.*) |*.*| |" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Archivos HTML (*.htm, *.html) | *.htm;* .html | Todos los archivos (*.*) |*.*| |" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml) |*.xml | Todos los archivos (*.*) |*.*| |" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "No expandir" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Expandir todas las subcarpetas" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Expandir las subcarpetas diferentes" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Expandir las subcarpetas idénticas" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Tipo de archivo" #. 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 "Mensaje" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Respuesta" #. 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 "Guardar" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Incluir subcarpetas" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Opciones 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 "Nombre" #. 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 "Descripción" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Seleccione un nombre de archivo para el nuevo filtro" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Archivo de filtros (*.flt) |*.flt | Todos los archivos (*.*) |*.*| |" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5288,7 +5294,7 @@ msgstr "" "Copie el archivo %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5301,7 +5307,7 @@ msgstr "" "\n" "Compruebe que la carpeta existe y que tiene permisos de escritura en ella." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5311,7 +5317,7 @@ msgstr "" "\n" "Seleccione la carpeta de filtros en Configuración/Sistema." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5325,11 +5331,11 @@ msgstr "" "El archivo puede ser de solo lectura." #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Localice el archivo de filtro a instalar" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5340,17 +5346,17 @@ msgstr "" "No se pudo copiar el nuevo archivo de filtro a la carpeta de filtros." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "El archivo de filtro ya existe. ¿Desea sobrescribirlo?" #. 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" @@ -5361,217 +5367,217 @@ msgstr "" "Si no desea actualizar todas las comparaciones ahora, puede seleccionar 'No' y actualizarlas más tarde." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Resultado de la comparación de carpetas" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Comparación de archivos" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Izquierdo sin título" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Central sin título" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Derecho sin título" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Archivo base" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Su archivo" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Mi archivo" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Archivo 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ínea: %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 "Línea: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Línea: %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 "Combinar" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "%1 diferencias encontradas" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "1 diferencia encontrada" #. IDS_NO_ERR_SEL_FMT -#: Merge.rc:4389 +#: Merge.rc:4399 #, c-format msgid "%1 Errors Found" msgstr "%1 errores encontrados" #. IDS_1_ERR_FOUND -#: Merge.rc:4390 +#: Merge.rc:4400 msgid "1 Error Found" msgstr "1 error 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 "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 dos carpetas o archivos 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 "Seleccionar dos (o tres) carpetas o dos (o tres) archivos para comparar." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "¡La ruta del izquierdo (1º) no es válida!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "¡La ruta del central (2º) no es válida!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "¡La ruta del derecho (2º) no es válida!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "¡La ruta del derecho (3º) no es válida!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "¡Ninguna ruta es válida!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "¡Las rutas del izquierdo (1º) y central (2º) no son válidas!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "¡Las rutas del izquierdo (1º) y derecho (3º) no son válidas!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "¡Las rutas del central (2º) y derecho (3º) no son válidas!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "¡Ninguna ruta es válida!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Activar solo para comparar archivos" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "¡No se puede comparar un archivo con una carpeta!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5585,12 +5591,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Error al analizar el archivo de conflicto." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "" "The file\n" @@ -5602,7 +5608,7 @@ msgstr "" "no es conflictivo." #. 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 +5618,28 @@ msgstr "" "¿Desea mostrar solo los resultados de la comparación y no el contenido de los archivos?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Guardar como" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "¿Guardar los 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 solo lectura. ¿Desea anular el modo de solo lectura? (Seleccione 'No' para guardarlo con un nuevo nombre de archivo)." #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5647,7 +5653,7 @@ msgstr "" "¿Continuar de todas formas?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5663,7 +5669,7 @@ msgstr "" "\t- usar un nombre diferente (Aceptar)\n" "\t- cancelar la operación (Cancelar)" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5676,7 +5682,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5689,7 +5695,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5703,7 +5709,7 @@ msgstr "" "¿Desea guardar la versión sin empaquetar en otro archivo?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5719,7 +5725,7 @@ msgstr "" "¿Desea sobrescribir el archivo cambiado?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5729,7 +5735,7 @@ msgstr "" "es de solo lectura. ¿Desea anular esa opción y sobrescribirlo?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5745,22 +5751,22 @@ msgstr "" "¿Desea recargarlo?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Guardar archivo izquierdo como" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Guardar archivo central como" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Guardar archivo derecho como" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5772,7 +5778,7 @@ msgstr "" "ha desaparecido. Por favor, guarde una copia para continuar." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5783,124 +5789,124 @@ msgstr "" "Actualícelos antes de continuar." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Detener en espacio en blanco" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Detener en espacio en blanco o puntuación" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Copiar al cen&tral\\tAlt+Derecha" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Copiar al ¢ral\\tAlt+Izquierda" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Copiar desde el central\\tAlt+Mayús+Derecha" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Copiar desde el central\\tAlt+Mayús+Izquierda" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Copiar al central y avanzar\\tCtrl+Alt+Derecha" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Copiar al central y avanzar\\tCtrl+Alt+Izquierda" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Copiar todo en el central" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Derecho a izquierdo (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Derecho a central (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Central a izquierdo (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Central a derecho (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Izquierdo a derecho (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Izquierdo a 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 "Izquierdo 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 "Central 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 "Derecho a... (%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 "Diferencias 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?" @@ -5909,64 +5915,64 @@ msgstr "" "¿Copiar solo los elementos con diferencias?" #. IDS_DEL_LEFT_FMT -#: Merge.rc:4525 +#: Merge.rc:4535 #, c-format msgid "Left (%1)" msgstr "Izquierdo (%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 "Derecho (%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 "Izquierdo - 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 "Derecho - Seleccione carpeta de destino:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 archivos afectados)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 archivos afectados)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5978,18 +5984,18 @@ msgstr "" "%1?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "¿Está seguro de que quiere copiar?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "¿Está seguro de que quiere copiar %d elementos?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6009,46 +6015,46 @@ msgstr "" "Actualice la comparación." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "¿Está seguro de que quiere mover?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "¿Está seguro de que quiere mover %d elementos?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Confirmar movimiento" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Va a cerrar la ventana que está comparando carpetas. ¿Seguro que quiere cerrarla?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "Va a cerrar la ventana de comparación de carpetas que necesitó de una gran cantidad de tiempo. ¿Seguro que quiere cerrarla?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "El nombre del archivo o carpeta no es válido." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6057,751 +6063,751 @@ msgstr "" "¿Quiere comparar los ficheros del archivo como ficheros de texto?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Nombre de archivo" #. 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 de la comparación" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Fecha del izquierdo" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Fecha del derecho" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Fecha del central" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Tamaño del izquierdo" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Tamaño del derecho" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Tamaño del central" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Tamaño del dcho. (corto)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Tamaño del izq. (corto)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Tamaño del central (corto)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Fecha de creación del izquierdo" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Fecha de creación del derecho" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Fecha de creación del central" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Archivo más reciente" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Versión del archivo izquierdo" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Versión del archivo derecho" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Versión del archivo central" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Resultado abreviado" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Atributos del izquierdo" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Atributos del derecho" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Atributos del central" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "EOL del Izquierdo" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "EOL del central" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "EOL del derecho" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Codificación del izquierdo" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Codificación del derecho" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Codificación del 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 "Izquierdo" #. 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 "Derecho" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Diferencia" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Contador de duplicados en el izquierdo" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Contador de duplicados en el derecho" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Contador de duplicados en el 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 "Enlace" #. 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 grabada" #. 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 "Seguridad" #. 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 "Tarea" #. 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 "No se pueden comparar los archivos" #. 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 "Archivo 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 "Solo izquierdo: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Solo central: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Solo derecho: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "No existe en %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Los archivos son diferentes" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Las carpetas son diferentes" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Solo izquierdo" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Solo derecho" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Solo central" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Izquierdo vacío" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Derecho vacío" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Central vacío" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Error" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Los archivos de texto son idénticos" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Central y derecho son idénticos)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Izquierdo y derecho son idénticos)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Izquierdo y 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 "Los archivos de texto son diferentes" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Los archivos de imagen son idénticos" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Las archivos de imagen 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 "Tiempo transcurrido: %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 "Nombre de archivo o carpeta." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Resultados de la comparación, formato largo." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Fecha de modificación del izquierdo." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Fecha de modificación del derecho." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Fecha de modificación del central." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Extensión del archivo." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Tamaño del archivo izquierdo en bytes." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Tamaño del archivo derecho en bytes." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Tamaño del archivo central en bytes." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Tamaño abreviado del archivo izquierdo." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Tamaño abreviado del archivo derecho." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Tamaño abreviado del archivo central." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Fecha de creación del izquierdo." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Fecha de creación del derecho." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Fecha de creación del central." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Indica qué lado tiene la fecha de modificación más reciente." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Versión del archivo izquierdo, solo para algunos tipos de archivo." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Versión del archivo derecho, solo para algunos tipos de archivo." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Versión del archivo central, solo para algunos tipos de archivo." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Resultados abreviados de la comparación." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Atributos del izquierdo." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Atributos del derecho." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Atributos del central." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Tipo de EOL del archivo izquierdo." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Tipo de EOL del archivo derecho." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Tipo de EOL del archivo central." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Codificación del izquierdo." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Codificación del derecho." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Codificación del 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 diferencias ignoradas en el archivo. Son ignoradas por WinMerge y no se pueden combinar." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Número de diferencias en el archivo. No incluye las diferencias ignoradas." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Nombre del complemento desempaquetador o pipeline." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Nombre del complemento de precomparación o 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 y con %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Lista separada por comas" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Lista separada por tabulaciones" #. 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 "El archivo de informe ya existe. ¿Desea sobrescribir el archivo?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6811,57 +6817,57 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "El informe se ha creado correctamente." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "No se puede añadir un punto de sincronización en esta línea." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "El mismo archivo está abierto en ambos paneles." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Los archivos seleccionados son iguales." #. 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 "Ocurrió un error cuando se estaban comparando los archivos." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "No se han podido crear los archivos temporales. Compruebe la ruta para archivos temporales." #. IDS_SUGGEST_IGNOREEOL -#: Merge.rc:4835 +#: Merge.rc:4845 msgid "" "Files use different EOL.\n" "\n" @@ -6876,17 +6882,17 @@ msgstr "" "Nota: si desea tratar siempre todos los tipos de saltos de línea como equivalentes, seleccione la opción 'Ignorar saltos de línea diferentes (Windows/Unix/Mac)' en la pestaña Comparar del dialogo Configuración (disponible en Editar/Configuración)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "La carpeta seleccionada no es válida." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "No se puede abrir un archivo binario en el editor." #. IDS_CREATE_PAIR_FOLDER -#: Merge.rc:4838 +#: Merge.rc:4848 #, c-format msgid "" "Create matching folder:\n" @@ -6900,41 +6906,41 @@ msgstr "" "con la anterior y abrir ambas carpetas?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "¿Seguro que quiere copiar todas las diferencias al otro fichero?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "¿Quiere ir al siguiente archivo?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "¿Quiere volver al archivo anterior?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "¿Quiere ir a la siguiente página?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "¿Quiere volver a la página anterior?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "¿Quiere ir al primer archivo?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "¿Quiere ir al último archivo?" -#: Merge.rc:4856 +#: Merge.rc:4866 #, c-format msgid "" "Different codepages: left (cp%d), right (cp%d).\n" @@ -6945,51 +6951,51 @@ msgstr "" "Mostrar cada archivo en su codificación dará una mejor visualización, pero combinar/copiar sería peligroso.\n" "¿Le gustaría tratar ambos archivos con la codificación predeterminada de Windows (recomendado)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Información perdida debido a errores de codificación: ambos ficheros" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Información perdida debido a errores de codificación: primer fichero" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Información perdida debido a errores de codificación: segundo fichero" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Información perdida debido a errores de codificación: tercer fichero" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "No hay diferencia" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Diferencia de línea" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Imposible encontrar la cadena \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Va a activar el modo de combinación. Si desea desactivarlo presione la tecla F9." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -6999,99 +7005,99 @@ msgstr "" "Número de conflictos sin resolver: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "El cambio de codificación se ha combinado." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Los cambios de codificación generan conflictos." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "El cambio de EOL se ha combinado." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Los cambios de EOL son conflictivos." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Panel de localización" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Panel de diferencias" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Archivo de parche escrito correctamente." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1 - Fichero no encontrado!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2 - Fichero no encontrado!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "El archivo de parche ya existe. ¿Desea sobrescribirlo?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivos 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 "No se puede escribir en el archivo %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "La ruta de salida especificada no es absoluta: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Especifique un archivo de salida." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "No se puede crear un archivo de parche a partir de archivos binarios." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7102,12 +7108,12 @@ msgstr "" "Para crear un parche es necesario que no haya cambios sin guardar." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "La carpeta no 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" @@ -7118,37 +7124,37 @@ msgstr "" "Consulte el manual para más información acerca del soporte de archivos y cómo habilitarlo." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Seleccione archivo a exportar" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Seleccione archivo a importar" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Opciones importadas desde el archivo." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Opciones exportadas al archivo." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Error al importar opciones del archivo." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Error al escribir las opciones en el archivo." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7159,44 +7165,44 @@ msgstr "" "¿Desea continuar?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Mezclado" #. 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 "Ninguno" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Color del marcador %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Nuevo patró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)" @@ -7205,7 +7211,7 @@ msgstr "" "Diferencia en la línea actual (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7214,7 +7220,7 @@ msgstr "" "Configuración" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7223,7 +7229,7 @@ msgstr "" "Actualizar (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7232,7 +7238,7 @@ msgstr "" "Diferencia anterior (Alt+Arriba)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7241,7 +7247,7 @@ msgstr "" "Diferencia siguiente (Alt+Abajo)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7250,7 +7256,7 @@ msgstr "" "Conflicto anterior (Alt+Mayús+Arriba)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7259,7 +7265,7 @@ msgstr "" "Conflicto siguiente (Alt+Mayús+Abajo)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7268,7 +7274,7 @@ msgstr "" "Primera diferencia (Alt+Inicio)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7277,7 +7283,7 @@ msgstr "" "Diferencia actual (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7286,7 +7292,7 @@ msgstr "" "Última diferencia (Alt+Fin)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7295,7 +7301,7 @@ msgstr "" "Copiar al derecho (Alt+Derecha)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7304,7 +7310,7 @@ msgstr "" "Copiar al izquierdo (Alt+Izquierda)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7313,7 +7319,7 @@ msgstr "" "Copiar al derecho y avanzar (Ctrl+Alt+Derecha)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7322,7 +7328,7 @@ msgstr "" "Copiar al izquierdo y avanzar (Ctrl+Alt+Izquierda)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7331,7 +7337,7 @@ msgstr "" "Copiar todo al derecho" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7340,7 +7346,7 @@ msgstr "" "Copiar todo al izquierdo" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7349,7 +7355,7 @@ msgstr "" "Autocombinar (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7358,7 +7364,7 @@ msgstr "" "Primer archivo" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7367,7 +7373,7 @@ msgstr "" "Siguiente archivo (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7376,7 +7382,7 @@ msgstr "" "Último archivo" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7385,37 +7391,37 @@ msgstr "" "Archivo anterior (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "El desempaquetador elegido se aplica a ambos archivos (solo un archivo necesita tener la extensión)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Sin precomparación (normal)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Complementos sugeridos" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Todos los 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 "Su aplicación está actualizada." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7425,125 +7431,125 @@ msgstr "" "Está disponible %1 (tiene %2). ¿Desea descargarla ahora?" #. 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 "Error al descargar la información de la ú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 no encontrado - Scripts .sct deshabilitados" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Ir a &línea %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Ir a la línea desplazada\tCtrl+Mayús+G" #. IDS_AUTOCOMPLETE_DISABLED -#: Merge.rc:5049 +#: Merge.rc:5059 msgctxt "Options dialog|General|Open dialog Auto completion" msgid "Disabled" msgstr "Deshabilitado" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Del sistema de archivos" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "De la lista de los más usados" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Sin 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 "Objeto 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 "Cerrar pestañas a &la izquierda" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Cerrar pe&stañas a la derecha" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Cerrar &otras pestañas" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Habilitar ancho máximo &automático" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "Página We&b" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Ajusta&r texto" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 msgid "%1 is not installed." msgstr "No está instalado %1." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 no existe. ¿Desea crearlo?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Error al crear la carpeta." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7554,486 +7560,486 @@ msgstr "" "$linenum: número de línea de la posición actual del 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 "ninguno/a" #. 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 "Deshabilitado" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "Ventana secundaria MDI o ventana principal" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Solo ventana 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 "Cerrar ventana principal solo si hay una ventana MDI secundaria" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Diferencias" #. 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 "Parpadeo" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Tamaño del bloque" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Bloque Alpha" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Límite CD" #. 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 "Ninguno" #. 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 "Superponer" #. 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 "Mezcla 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á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 "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á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 "Invertida: %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 las 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 "No se han encontrado diferencias para seleccionar" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "No se encontraron diferencias para añadirlas como filtro de sustitución" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "La pareja ya está presente en la lista de Filtros de sustitución" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "¿Añadir este cambio a los Filtros de sustitución?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Solo texto" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Posición y texto línea por línea" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Posición y 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 "Deshabilitado" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Permitir solo una instancia en ejecución" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Permitir únicamente una instancia en ejecución y esperar hasta que termine" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Deshabilitado" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Solo con la ventana 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 "&Otros" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Falta el nombre del complemento en la canalización de complementos %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Faltan comillas en la 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 "El nombre del complemento '%1' ya existe." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Especifique argumentos del complemento" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Complemento no encontrado o no válido: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' no es un complemento desempaquetador" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' no es un complemento de precomparación" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "Hubo un error al precomparar el fichero '%1' con el complemento '%2'. Ya no se va a realizar ninguna otra precomparación." #. IDS_PLUGIN_CIRCULAR_REFERENCE -#: Merge.rc:5263 +#: Merge.rc:5273 #, c-format msgid "Circular reference in plugin pipeline: %1" msgstr "Referencia circular en el canal de complementos: %1" #. IDS_PLUGIN_TYPE1 -#: Merge.rc:5264 +#: Merge.rc:5274 msgid "URL Handler" msgstr "Gestor de URL" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Descompresor de archivos" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Descompresor de archivos o carpetas" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Alias para el descompresor" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "Alias para el prediferenciador" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Alias para el editor de secuencia de comandos" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "Alias para el canal de complementos '%1'" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Nueva descripción de complemento" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Todo" #. 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.º y 2.º" #. IDS_PLUGIN_TARGETS_1ST_3RD -#: Merge.rc:5278 +#: Merge.rc:5288 msgid "1st and 3rd" msgstr "1.º y 3.º" #. IDS_PLUGIN_TARGETS_2ND_3RD -#: Merge.rc:5279 +#: Merge.rc:5289 msgid "2nd and 3rd" msgstr "2.º y 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 "" #. 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 "Portapapeles 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." @@ -8041,110 +8047,115 @@ msgstr "" "El historial del portapapeles está deshabilitado.\r\n" "Para habilitarlo, presione la tecla Windows + V y luego presione el botón Activar." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Este sistema no soporta historial del portapapeles." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "La versión de 32 bits de WinMerge no soporta comparación de portapapeles" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "WebView2 Runtime no está instalado. ¿Desea descargarlo?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Nueva comparación de texto" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Nueva comparación de tabla" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Nueva comparación binaria" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Nueva comparación de imágen" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Nueva comparación de página 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 "Nueva comparación de portapapeles" #. 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ágina an&terior" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "&Dos páginas" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "Un&a página" #. 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 "Comparando..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Ampliar:" #. IDS_COPY_GRANULARITY_DIFFHUNK -#: Merge.rc:5339 +#: Merge.rc:5350 msgid "Diff hunk" msgstr "Diferencia entre fragmentos" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Diferencia en línea" #. IDS_COPY_GRANULARITY_LINE -#: Merge.rc:5341 +#: Merge.rc:5352 msgid "Line" msgstr "Línea" -#: Merge.rc:5342 +#: Merge.rc:5353 msgid "Character" msgstr "Carácter" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "" "\n" "Previous Difference (Alt+Up)\n" @@ -8157,7 +8168,7 @@ msgstr "" "(Alt+Rueda hacia arriba)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8170,7 +8181,7 @@ msgstr "" "(Alt+Rueda hacia abajo)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8185,7 +8196,7 @@ msgstr "" "(Alt+Mayús+Rueda hacia abajo)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8200,7 +8211,7 @@ msgstr "" "(Alt+Mayús+Rueda hacia arriba)" #. ID_MICE_L2RNEXT -#: Merge.rc:5351 +#: Merge.rc:5362 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)\n" @@ -8213,7 +8224,7 @@ msgstr "" "(Ctrl+Alt+Mayús+Rueda hacia abajo)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8226,262 +8237,262 @@ msgstr "" "(Ctrl+Alt+Mayús+Rueda hacia arriba)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "Comparando %1 con %2" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "Comparando %1 con %2 y %3" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "Comparación completada" #. IDS_LOG_COMPARE_ERROR_2 -#: Merge.rc:5365 +#: Merge.rc:5376 #, c-format msgid "Failed to compare %1 with %2: " msgstr "No se pudo comparar %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 "No se pudo comparar %1 con %2 y %3: " #. IDS_LOG_FILE_SAVED -#: Merge.rc:5367 +#: Merge.rc:5378 msgid "File saved" msgstr "Archivo guardado" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "Copiando archivos..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "Moviendo archivos..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "Eliminando archivos..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Papelera de reciclaje" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Eliminado permanentemente" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Operación de archivo completada correctamente" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Operación de archivo cancelada" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Sin errores" #. IDS_FILTER_ERROR_EMPTY_EXPRESSION -#: Merge.rc:5380 +#: Merge.rc:5391 msgid "Filter expression is empty" msgstr "La expresión del filtro está vacía" #. IDS_FILTER_ERROR_UNKNOWN_CHAR -#: Merge.rc:5381 +#: Merge.rc:5392 msgid "Unknown character in filter expression" msgstr "Carácter desconocido en la expresión del filtro" #. IDS_FILTER_ERROR_UNTERMINATED_STRING -#: Merge.rc:5382 +#: Merge.rc:5393 msgid "Unterminated string literal" msgstr "Literal de cadena sin terminar" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Error de sintaxis en la expresión del filtro" #. IDS_FILTER_ERROR_PARSE_FAILURE -#: Merge.rc:5384 +#: Merge.rc:5395 msgid "Failed to parse filter expression" msgstr "No se pudo analizar la expresión del filtro" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Valor literal no válido" #. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION -#: Merge.rc:5386 +#: Merge.rc:5397 msgid "Invalid regular expression" msgstr "Expresión regular no válida" #. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER -#: Merge.rc:5387 +#: Merge.rc:5398 msgid "Undefined identifier" msgstr "Identificador no definido" #. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT -#: Merge.rc:5388 +#: Merge.rc:5399 msgid "Invalid number of arguments" msgstr "Número de argumentos no válido" #. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND -#: Merge.rc:5389 +#: Merge.rc:5400 msgid "Filter name not found" msgstr "Nombre de filtro no encontrado" #. IDS_FILTER_ERROR_DIVIDE_BY_ZERO -#: Merge.rc:5390 +#: Merge.rc:5401 msgid "Division by zero in filter expression" msgstr "División por cero en la expresión del filtro" #. IDS_FILTER_ERROR_UNKNOWN_ERROR -#: Merge.rc:5391 +#: Merge.rc:5402 msgid "Unknown error" msgstr "Error desconocido" #. 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 "Iguales" #. IDS_FILTER_OP_NOT_EQUALS -#: Merge.rc:5399 +#: Merge.rc:5410 msgid "Does not equal" msgstr "No es igual" #. 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 o igual que" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Mayor o igual que" #. IDS_FILTER_OP_GREATER_THAN -#: Merge.rc:5403 +#: Merge.rc:5414 msgid "Greater than" msgstr "Mayor 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 "No entre" #. 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 "No contiene" #. IDS_FILTER_OP_RECONTAINS -#: Merge.rc:5408 +#: Merge.rc:5419 msgid "Contains (regex)" msgstr "Contiene (regex)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "No contiene (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 "" #. 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/Swedish.po b/Translations/WinMerge/Swedish.po index 962287101c5..9e9f7069ce1 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -26,7 +26,7 @@ msgstr "" "X-Generator: Poedit 3.7\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_SWEDISH, SUBLANG_DEFAULT" @@ -111,7 +111,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Kopiera vald skillnad (Höger) till Klippbordet" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "Markera radskillnad\tF4" @@ -141,7 +141,7 @@ msgid "Cu&t" msgstr "Klipp ut" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "Kopiera" @@ -151,19 +151,19 @@ msgid "&Paste" msgstr "Klistra in" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "Skript" #. 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 "< 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å till...\tCtrl+G" @@ -183,27 +183,27 @@ msgid "Op&en" msgstr "Öppna" #. 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 registrerad applikation" #. 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 extern redigerare\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 "Öppna överordnad 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 "Skalmeny" @@ -238,8 +238,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Infogat/raderat detektering" #. 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 "Ingen" @@ -254,12 +254,12 @@ msgid "&Horizontal" msgstr "Horisontellt" #. 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 "Föregående sida" #. 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ästa sida" @@ -269,42 +269,42 @@ msgid "&Active Pane" msgstr "Aktiv ruta" #. 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 "Rotera höger 90 grader" #. 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 "Rotera vänster 90 grader" #. 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 "Spegla vertikalt" #. 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 "Spegla horisontellt" #. 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 "Zooma in\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Zooma ut\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+*" @@ -329,27 +329,27 @@ msgid "Dragging &Mode" msgstr "Dragmod" #. 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 "Flytta" #. 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 "Anpassa förskjutning" #. 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 "Vertikal rensning" #. 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 "Horisontell rensning" #. 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 "Rektangulärt val" @@ -384,37 +384,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Jämför extraherad text från bilder" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "Jämför" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "Skärmbilder" #. 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 "Skärmbilder i fullstorlek" #. 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 "Texter" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES -#: Merge.rc:278 Merge.rc:1251 +#: Merge.rc:278 Merge.rc:1261 msgid "&Resource Trees" msgstr "Resursträd" #. 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 "Storlek" @@ -429,27 +429,27 @@ msgid "&Event Sync" msgstr "Händelsesynk" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED -#: Merge.rc:291 Merge.rc:1259 +#: Merge.rc:291 Merge.rc:1269 msgid "&Enabled" msgstr "Startad" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL -#: Merge.rc:293 Merge.rc:1261 +#: Merge.rc:293 Merge.rc:1271 msgid "&Scroll" msgstr "Scrolla" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK -#: Merge.rc:294 Merge.rc:1262 +#: Merge.rc:294 Merge.rc:1272 msgid "&Click" msgstr "Klicka" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT -#: Merge.rc:295 Merge.rc:1263 +#: Merge.rc:295 Merge.rc:1273 msgid "&Input" msgstr "Mata in" #. 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å Bakåt/Framåt" @@ -479,3607 +479,3613 @@ msgid "&All Profiles" msgstr "&Allprofil" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "Arkiv" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 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 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 "Tabell" #. 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ä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 msgid "&Image" msgstr "Bild" #. 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 "&Webbsida" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Ny (3 rutor)" #. 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 "Öppna...\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 "Öppna konfliktfil..." #. 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 "Öppna urklipp" #. 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 "Öppna projekt...\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 "Spara projekt..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Senaste projekt" #. 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 "Senast använda filer eller kataloger" #. 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 "Avsluta\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 "Redigera" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "Klistra in\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 "Alternativ...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "Visa" #. 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 "Flikrad" #. 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 "Visa Tabbrad" #. 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 "På Titelraden" #. IDR_MERGEDOCTYPE -#: Merge.rc:356 Merge.rc:505 Merge.rc:749 +#: Merge.rc:358 Merge.rc:509 Merge.rc:756 msgid "&Toolbar" msgstr "Verktygsrad" #. 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 "Liten" #. 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 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 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 "Menyrad" #. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR -#: Merge.rc:365 Merge.rc:515 +#: Merge.rc:367 Merge.rc:519 msgid "&Output Pane" msgstr "Utmatningsruta" #. 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 "Statusfält" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "Verktyg" #. 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 "Filter..." #. 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 "Skapa patch..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "Programtillägg" #. 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 "Tilläggsinställningar..." #. 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 "Manuell förjämförelse/Prediffer" #. 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 "Automatisk förjämförelse" #. 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 "Manuell uppackning" #. 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 "Automatisk extrahering" #. 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 "Läs in programtillägg på nytt" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 msgid "&Window" msgstr "Fönster" #. 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 "Stäng\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 "Stäng alla" #. 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 "Växla ruta\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 "Ordna horisontellt" #. 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 "Ordna vertikalt" #. 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 "Ordna överlappande" #. 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 "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 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 msgid "R&elease Notes" msgstr "Utgivningsnotis" #. 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 "Översättningar" #. 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 "Konfiguration" #. 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 "Om WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "Skrivskydd" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Skrivskydda vänster" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "Skrivskydda mitten" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "Skrivskydda höger" #. 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 "Filkodning/teckenuppsättning..." #. 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 "Markera allt\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Visa identiska objekt" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Visa skillnader" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Visa unika skillnader i vänster" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Visa unika skillnader i mitten" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Visa unika skillnader i höger" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Visa överhoppade skillnader" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "Visa binära filer" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "3-vägsjämförelse" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Visa skillnader endast i vänster" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Visa skillnader endast i mitten" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Visa skillnader endast i höger" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Visa saknas endast i vänster" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Visa endast saknas i mitten" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Visa saknas endast i höger" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Visa dolda objekt" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "Trädläge" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "Expandera underkataloger" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "Alla underkataloger" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "Olika underkataloger" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "Identiska underkataloger" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "Veckla ihop underkataloger" #. 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 "Välj typsnitt..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Använd standardtypsnitt" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Växla rutor" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Växla första och andra" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Växla andra och tredje" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Växla första och tredje" #. 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 "Jämför statistik..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Ladda om\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "Ladda om markerad\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "Sammanfoga" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "Jämför\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "Nästa skillnad\tAlt+Ner" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Föregående skillnad\tAlt+Upp" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "Första skillnad\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "Nuvarande skillnad\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "Sista skillnad\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 "Kopiera till höger\tAlt+Höger" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiera till vänster\tAlt+Vänster" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "Radera\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "Anpassa kolumner..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Generera 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 "Redigera med uppackare..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "Spara\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Spara" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Spara vänster" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Spara mitten" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Spara höger" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Spara som" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "Spara vänster som..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "Spara mitten som..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Spara höger som..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "Skriv ut...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Utskriftsformat..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Förhandsgranska utskrift..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "Omvandla radslutsformat till" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Sammanslagningsläge\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Ladda om\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "Jämför igen som" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "Ångra\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "Gör om\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "Klipp ut\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 "Kopiera\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "Sök...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Ersätt...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "Markör...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Avancerat" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Kopiera med radnummer\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "Bokmärken" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Växla bokmärke\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "Nästa bokmärke\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "Föregående bokmärke\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "Rensa bokmärken" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Syntaxframhävning" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Innehållsskillnader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "Alla rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "0 rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "1 rad" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "3 rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "5 rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "7 rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "9 rader" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "Växla Alla och 0-9 rader\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "Invertera (Dölj skiljande rader)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "Lås rutor" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "Visa blankutrymme" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Visa radslutsformat/E&OL" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Visa radskillnader" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Visa radnummer" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Visa marginaler" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Visa toppmarginaler" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Bryt rader" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Dela vertikalt" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "Jämförelseöversikt" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Positionsruta" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Utmatningsruta" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "Nästa konflikt\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Föregående konflikt\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "Avancerat" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Nästa skillnad mellan vänster och mitten\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Föregående skillnad mellan vänster och mitten\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Nästa skillnad mellan vänster och höger\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Föregående skillnad mellan vänster och höger\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Nästa skillnad mellan mitten och höger\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Föregående skillnad mellan mitten och höger\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Nästa skillnad endast vänster\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Föregående skillnad endast vänster\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Nästa skillnad i endast mitten\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Föregående skillnad i endast mitten\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Nästa skillnad endast höger\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Föregående skillnad endast höger\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Kopiera från vänster till" #. 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 "&Mitten" #. 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 "Höger" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Kopiera från mitten till" #. 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 "Vänster" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Kopiera från höger till" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Kopiera valda rader från vänster till" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Kopiera valda rader från mitten till" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Kopiera valda rader från höger till" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Kopiera från vänster\tAlt+Shift+Right" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopiera från höger\tAlt+Shift+Left" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Kopiera till höger och gå till nästa\tCtrl+Alt+Höger" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Kopiera till vänster och gå till nästa\tCtrl+Alt+Vänster" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Kopiera allt till höger" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Kopiera allt till vänster" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "Automatisk sammanslagning\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Lägg till jämförelsepunkt\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Rensa jämförelsepunkter" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Extraherare" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "Förjämförelse/Prediffer" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Applicera förjämförelse/Prediffer..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "Transformera med redigeringsskript..." #. IDR_MERGEDOCTYPE -#: Merge.rc:880 +#: Merge.rc:887 msgid "Scripts for &Copying" msgstr "Skript för kopiereing" #. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING -#: Merge.rc:886 +#: Merge.rc:893 msgid "Select &Editor Script..." msgstr "Välj editorskript..." #. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT -#: Merge.rc:898 +#: Merge.rc:905 msgid "Sp&lit" msgstr "Dela" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "Jämför" #. 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 "Jämför i nytt fönster" #. 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 "Jämför icke-horisontalt..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "Jämför icke-horisontalt" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Första vänstra med det andra vänstra objektet" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Första högra med det andra högra objektet" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "Första vänstra med det andra högra objektet" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Andra vänstra med det första högra objektet" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "Jämför 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 "Vänster till mitten (%1 av %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 "Vänster till höger (%1 av %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 "Vänster till... (%1 av %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 "Mitten till vänster (%1 av %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 "Mitten till höger (%1 av %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 "Mitten till... (%1 av %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 "Höger till mitten (%1 av %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 "Höger till vänster (%1 av %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öger till... (%1 av %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "Radera" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "Båda" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "Alla" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "Markering" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Döp om" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "Dölj objekt" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "Öppna i vänster" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Öppna i mitten" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Öppna i höger" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Kopiera sökvägar" #. 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 "Vänster (%1 av %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 "Mitten (%1 av %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 "Höger (%1 av %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 "Båda (%1 av %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 "Samtliga (%1 av %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Kopiera filnamn" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Kopiera skillnader till urklipp" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Kopiera alla visade kolumner" #. 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 "Båda till... (%1 av %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 "Samtliga till... (%1 av %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 "Skillnader till... (%1 av %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Gränssnittsmeny vänster" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Gränssnittsmeny mitten" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Gränssnittsmeny höger" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Båda Gränssnittsmenyerna" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Alla Gränssnittsmenyer" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Kopiera" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "Kopiera hela sökvägen" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Kopiera filnamn" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "Redigera rubrik\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 "Öppna..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Inställningar för uppackare" #. 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 "Välj..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Inställningar för förjämförelse/Prediffer" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Gå till skillnad" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK -#: Merge.rc:1083 +#: Merge.rc:1091 msgid "Move Cursor on &Click" msgstr "Flytta kursor vid klickning" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE -#: Merge.rc:1085 +#: Merge.rc:1093 msgid "&No Moved Blocks" msgstr "Inga flyttade block" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "Alla flyttade block" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Blankutrymme" #. 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 "Jämfö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 "Ignorera skillnader" #. 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 "Ignorera allt" #. 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 "Ignorera tomma rader" #. 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 "Ignorera skillnader i VERSALER och gemener" #. 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 "Ignorera skillnader i radslut (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 "Ignorera skillnader i teckentabeller (ANSI/Unicode)" #. 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 "Ignorera nummer" #. 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 "Ignorera kommentarskillnader" #. 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 "Ignorera saknat avslutande radslut" #. 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 "Inkludera underkataloger" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "Jämförelsemetod" #. 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 "Fulltständigt innehåll" #. 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 "Snabbt innehåll" #. 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 "Binärt innehåll" #. 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 "Ändringsdatum" #. 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 "Ändringsdatum och storlek" #. 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 "Storlek" #. 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 "Ladda 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 "${*} - Alla argument" #. 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} - Det första argumentet" #. 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} - Det andra argumentet" #. 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} - Det tredje argumentet" #. 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} - Det fjärde argumentet" #. 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} - Det femte argumentet" #. 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} - Det sjätte argumentet" #. 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} - Det sjunde argumentet" #. 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} - Åttonde argumentet" #. 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} - Det nionde argumentet" #. 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} - Källfil" #. 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} - Källkatalogr" #. 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} - KällURL" #. 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} - KällURL-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} - KällURL-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} - Destinationsfil" #. 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} - Destinationskatalog" #. 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} - DestinationsURL" #. 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} - DestinationsURL-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} - DestinationsURL-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} - WinMerges hemkatalog" #. 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} - Skriptfil" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Lägg till uppackningsplugin..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER -#: Merge.rc:1319 +#: Merge.rc:1329 msgid "Add &Prediffer Plugin..." msgstr "Lägg till predifferplugin..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE -#: Merge.rc:1320 +#: Merge.rc:1330 msgid "&Duplicate Plugin..." msgstr "Duplicera plugin..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "Rensa allt" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR -#: Merge.rc:1352 +#: Merge.rc:1362 msgid "&Clear All" msgstr "Rensa allt" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST -#: Merge.rc:1353 +#: Merge.rc:1363 msgid "Remove Last Filter &Group" msgstr "Ta bort sista filtergruppen" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL -#: Merge.rc:1354 +#: Merge.rc:1364 msgid "R&eset to Default (*.*)" msgstr "Återställ till standard (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Lägg till uteslutfil" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "Systemfiler" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "Editor för backupfiler" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "Kompilerade binära filer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Loggfiler" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "Temporära eller cachefiler" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Lägg till uteslutkatalog" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "Versionskontroll" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "Byggartifakter" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_IDE -#: Merge.rc:1367 +#: Merge.rc:1377 msgid "&IDE" msgstr "Gränssnitt" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1370 +#: Merge.rc:1380 msgid "Add &File Condition" msgstr "Lägg till filkondition" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Filstorlek" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 ellere mer" #. 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 "Anpassad gräns..." #. 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 "Senast ändrad" #. 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 "Timme" #. 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 "Mer än 1 timme sedan" #. 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 "Inom en timme" #. 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 "Dag" #. 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 "Innan idag" #. 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 "Idag" #. 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 "Innan igår" #. 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 "Igår" #. 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 "Sedan igår" #. 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 "Vecka" #. 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 "Innan denna vecka" #. 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 "Denna vecka" #. 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 "Innan förra veckan" #. 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 "Förra veckan" #. 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 "Sedan förra veckan" #. 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ånad" #. 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 "Innan denna månad" #. 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 "Denna månad" #. 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 "Innan förra månaden" #. 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 "Förra månaden" #. 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 "Sedan förra månaden" #. 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 "År" #. 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 "Innan detta år" #. 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 "Detta år" #. 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 "Före förra året" #. 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 "Förra året" #. 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 "Sedan förra året" #. 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 "Anpassad längd..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1431 Merge.rc:1589 +#: Merge.rc:1441 Merge.rc:1599 msgid "&Attributes" msgstr "Attribut" #. 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 "Bara läsbara filer" #. 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 "Inte bara läsbara filer" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN -#: Merge.rc:1435 Merge.rc:1609 +#: Merge.rc:1445 Merge.rc:1619 msgid "Hidden files" msgstr "Dolda filer" #. 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 "Inte dolda filer" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Systemfiler" #. 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 "Inte systemfiler" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "Filinnehåll" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Innehåller text..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "Innehåller inte text..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "Första raden ionnehåller texten..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS -#: Merge.rc:1445 +#: Merge.rc:1455 msgid "First line does not contain string..." msgstr "Första raden innehåller inte texten..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "Första 10 raderna innehåller texten..." #. 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 "Första 10 raderna innehåller inte texten..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "Sista 10 raderna innehåller texten..." #. 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 "Sista 10 raderna innehåller inte texten..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "Sista raden innehåller texten..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS -#: Merge.rc:1451 +#: Merge.rc:1461 msgid "Last line does not contain string..." msgstr "Sista raden innehåller inte texten..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1453 +#: Merge.rc:1463 msgid "&Line Count" msgstr "Radantal" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10 -#: Merge.rc:1455 +#: Merge.rc:1465 msgid "Less than 10" msgstr "Mindre än 10" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10 -#: Merge.rc:1456 +#: Merge.rc:1466 msgid "10 or more" msgstr "10 eller mer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100 -#: Merge.rc:1457 +#: Merge.rc:1467 msgid "Less than 100" msgstr "Mindre än 100" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100 -#: Merge.rc:1458 +#: Merge.rc:1468 msgid "100 or more" msgstr "100 eller mer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000 -#: Merge.rc:1459 +#: Merge.rc:1469 msgid "Less than 1000" msgstr "Mindre än 1000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000 -#: Merge.rc:1460 +#: Merge.rc:1470 msgid "1000 or more" msgstr "1000 eller mer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000 -#: Merge.rc:1461 +#: Merge.rc:1471 msgid "Less than 10000" msgstr "Mindre än 10000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000 -#: Merge.rc:1462 +#: Merge.rc:1472 msgid "10000 or more" msgstr "10000 eller mer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000 -#: Merge.rc:1463 +#: Merge.rc:1473 msgid "Less than 100000" msgstr "Mindre än 100000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000 -#: Merge.rc:1464 +#: Merge.rc:1474 msgid "100000 or more" msgstr "100000 eller mer" #. 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 "Lägg till katalogkondition" #. 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 "Mål: Alla (Vänster/Mitten/Höger)" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT -#: Merge.rc:1545 +#: Merge.rc:1555 msgid "Target: &Left" msgstr "Mål: Vänster" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE -#: Merge.rc:1546 +#: Merge.rc:1556 msgid "Target: &Middle" msgstr "Mål: Mitten" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT -#: Merge.rc:1547 +#: Merge.rc:1557 msgid "Target: &Right" msgstr "Mål: Höger" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1549 +#: Merge.rc:1559 msgid "Add &Difference Condition" msgstr "Lägg till skillnadskondition" #. 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 "Lika" #. 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 "Inte lika" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 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 eller mer" #. 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 "Mindre än 1 timme" #. 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 timme eller mer" #. 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 "Mindre än 1 dag" #. 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 dag eller mer" #. 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 "Mindre än 1 vecka" #. 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 vecka eller mer" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT -#: Merge.rc:1596 +#: Merge.rc:1606 msgid "Target: &Left and Right" msgstr "Mål: Vänster och Höger" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE -#: Merge.rc:1597 +#: Merge.rc:1607 msgid "Target: Left and &Middle" msgstr "Mål: Vänster och Mitten" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT -#: Merge.rc:1598 +#: Merge.rc:1608 msgid "Target: Middle and &Right" msgstr "Må+l: Mitten och Höger" #. 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 "Matcha VERSALER/gemener" #. 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 "Om WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Besök WinMerges hemsida!" #. 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 "Medarbetare" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Välj filer eller kataloger" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "Första fil eller katalog" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Skrivskyddad" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Skifta första och andra" #. 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 "Bläddra..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "Andra fil eller katalog" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Skrivskyddad" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Skifta andra och tredje" #. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE -#: Merge.rc:1960 Merge.rc:2315 +#: Merge.rc:1970 Merge.rc:2325 msgid "B&rowse..." msgstr "Bläddra..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "Tredje fil eller katalog (valfritt)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Skrivskyddad" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Skifta första och tredje" #. 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 "Bläddra..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Mapp: Filter" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "Inkludera underkataloger" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Fil: Förjämförelse/Prediffer programtillägg" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Fil: Extraherare programtillägg" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Välj..." #. 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 "Avbryt" #. 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 "Hjälp" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "Alternativ..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Sök" #. 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 "Sök efter:" #. 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 "Matcha endast hela ord" #. 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 "Reguljärt uttryck" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Veckla inte vid slutet av filen" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "Stäng inte denna dialogruta" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "Sök nästa" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Sök föregående" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Ersätt" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Ersätt med:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "Växla inte vid slutet av filen" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Ersätt i" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "Hela filen" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Sök föregående" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Ersätt" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Ersätt allt" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "Markörer" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "Aktivera markörer" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Ny" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Bakgrundsfärg:" #. 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 "Tillämpa" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Radfilter" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Aktivera radfilter" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Reguljära uttryck (ett per rad):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Redigera" #. 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 "Ta bort" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Ersättningsfilter" #. 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 "Ändringarna som visas i rutorna som listade par nedan kommer att ignoreras och markeras som obetydliga. Patcher är ej påverkade." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Aktivera" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Lägg till" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Rensa" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Alternativ" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Importera..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Exportera..." #. 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 "Allmänt" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Skrolla automatiskt till första skillnaden" #. 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 "Skrolla automatiskt till första skillnaden på raden" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Stäng fönster med ''Esc'':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Verifiera sökvägar i Öppna-dialogen automatiskt" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Eninstansmod:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "Fråga när flera fönster stängs" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Bevara ändringsdatum i filjämförelse" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Visa \"Välj filer eller kataloger\" dialogen vid uppstart" #. 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 "Stäng \"Välj filer eller kataloger\"-dialogen när 'Jämför'-knappen klickas" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Automatisk komplettering för Öppna-dialog:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Läs in ändrade filer på nytt automatiskt:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Språk:" #. 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 "Förval" #. 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 "Färger" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2127 +#: Merge.rc:2137 msgid "Color &mode:" msgstr "Färgmod:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2129 +#: Merge.rc:2139 msgid "&Light mode scheme:" msgstr "Ljus mods schema:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2131 +#: Merge.rc:2141 msgid "&Dark mode scheme:" msgstr "Mörk mods schema:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2133 +#: Merge.rc:2143 msgid "Your custom schemes" msgstr "Dina anpassade scheman" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE -#: Merge.rc:2134 +#: Merge.rc:2144 msgid "&Save current scheme..." msgstr "Spara aktuellt schema..." #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE -#: Merge.rc:2135 +#: Merge.rc:2145 msgid "Delete ¤t scheme..." msgstr "Ta bort aktuellt schema..." #. 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 "Bakgrund" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Raderad" #. 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 "Text" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Skillnad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Markerad skillnad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Åsidosatt skillnad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Flyttad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Markerad flyttad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Samma som nästa (3 rutor):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Samma som nästa (valda):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Ordskillnad:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Vald skillnad i ord:" #. 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 "Dialog" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Nyckelord:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Funktionsnamn:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Kommentarer:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Nummer:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Operatörer:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Strängar:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Förbehandlare:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Användare 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Användare 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 "Fet" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "Använd anpassade textfärger" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Blankutrymme:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Vanlig text:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Markering:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Marginal:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Sökmarkör:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Användardefinierad markör 1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Användardefinierad markör 2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Användardefinierad markör 3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "Använd färger för katalogjämförelse" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Objekt lika:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Objekt olika:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Objekt som ej finns:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Objekt filtrerade:" #. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED -#: Merge.rc:2295 +#: Merge.rc:2305 msgid "&Use custom system colors" msgstr "Använd anpassade systemfärger" #. 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 "System" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "Flytta borttagna filer till Papperskorgen" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "Externt program:" #. 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 "Filterkatalog:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Katalog för temporära filer" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Systemets katalog för temporära filer" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Egen katalog:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Bläddra..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Jämför" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Blankutrymme" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "Jämför" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "Ignorera skillnader" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "Ignorera samtliga" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Ignorera tomma rader" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Ignorera skillnader i VERSALER och gemener" #. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE -#: Merge.rc:2335 +#: Merge.rc:2345 msgid "Igno&re EOL differences (Windows/Unix/Mac)" msgstr "Ignorera radslutsskillnader (Windows/Unix/Mac)" #. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS -#: Merge.rc:2337 +#: Merge.rc:2347 msgid "Ignore num&bers" msgstr "Ignorera nummer" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Ignorera kodnings-skillnader" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Ignorera kommentarskillnader" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "Ignorera saknat avslutande radslut" #. 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 "Aktivera detektering av flyttade block" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Injustera likartade rader" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "Jämförelsealgoritm:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Aktivera indragsstöd" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Framhäv inte ignorerade skillnader" #. IDS_OPTIONSPG_EDITOR -#: Merge.rc:2357 Merge.rc:4201 +#: Merge.rc:2367 Merge.rc:4211 msgid "Editor" msgstr "Redigerare" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "Framhäv syntax" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "Bevara ursprungliga tecken för radslut (EOL)" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Flikar" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "Tabbstorlek:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Infoga tabbar" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Infoga mellanslag" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "Renderingsmod:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Automatisk omskanning" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2377 +#: Merge.rc:2387 msgid "Copy &granularity for selected differences:" msgstr "Kopieringsnoggrannhet för valda skillnader:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP -#: Merge.rc:2379 +#: Merge.rc:2389 msgid "Line Difference Coloring" msgstr "Radskillnadsfärger" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Visa radskillnader" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "Teckennivå" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "Ordnivå:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Ordbrytningstecken:" #. 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 tillåter att vissa dialogrutor döljs. Klicka på knappen Återställ för att göra samtliga dialoger synliga igen." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Återställ" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Patchgenerator" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Fil 1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Fil 2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "Skifta" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "Kopiera till Klippbordet" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "Lägg till i befintlig fil" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "Resultat:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Bläddra..." #. 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 "Stil:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "Innehåll:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Inkludera kommandorad" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Öppna i externt program" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Visa kolumner" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Flytta upp" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Flytta ned" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "Övriga egenskaper" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Övriga egenskaper" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Välj programtillägg" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "Programtilläggets namn:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC -#: Merge.rc:2480 +#: Merge.rc:2490 msgid "&Target files:" msgstr "Målfiler:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2482 Merge.rc:3117 +#: Merge.rc:2492 Merge.rc:3127 msgid "Extensions list:" msgstr "Filändelser:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 msgid "Description:" msgstr "Beskrivning:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2486 Merge.rc:3121 +#: Merge.rc:2496 Merge.rc:3131 msgid "Default arguments:" msgstr "Standardargument:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Visa alla programtillägg, kontrollera inte filändelser" #. 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 "Öppna filer i samma fönstertyp efter uppackning" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "&Programtillägg kommandoslinga:" #. 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 "Stopp" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Paus" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Fortsätt" #. 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 "Antal CPU-kärnor att använda:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Objekt totalt:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Jämförda objekt:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "Stäng" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Gå till" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "Gå till:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Fil" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Gå till vad" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "Rad" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "Skillnad" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "Gå till" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Filfilter" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "Maskera / filuttryck" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2562 +#: Merge.rc:2572 msgid "Preset &Filters" msgstr "Förinställ filter" #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN -#: Merge.rc:2564 +#: Merge.rc:2574 msgid "Test..." msgstr "Testa..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Installera..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Ny..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Redigera..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Radera..." #. IDD_FILTERS_CONDITION -#: Merge.rc:2573 +#: Merge.rc:2583 msgid "Filter Condition" msgstr "Filterkondition" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2576 +#: Merge.rc:2586 msgid "&Left-hand side:" msgstr "Vänster sida:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2578 +#: Merge.rc:2588 msgid "&Operator:" msgstr "Operatör:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2580 +#: Merge.rc:2590 msgid "&Right-hand side:" msgstr "Höger sida:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2586 +#: Merge.rc:2596 msgid "Expression:" msgstr "Uttryck:" #. 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 "Identiska" #. 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 "Olika" #. 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 "Teckenkodning" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Förvald teckenkodning" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Ange förvald teckenkodning att använda när icke-Unicode filer öppnas:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Systemets teckenkodning" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges användargränssnitt" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Anpassad teckenkodning:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4088,7 +4094,7 @@ msgstr "" "(Omstart av WinMerge krävs)" #. 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 +4103,769 @@ msgstr "" "(Omstart av WinMerge krävs)" #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Stöf för arkiv" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "Aktivera stöd för arkiv" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "Detektera filtyp från filsignatur" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Objekt sparade till eller återskapade från projektfilen:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Spara ändrade filer?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "VFänster sidas fil" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "Spara ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "Ignorera ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Mittensidans fil" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Spara ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Ignorera ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Höger sidas fil" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Spara ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Ignorera ändringar" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Ignorera allt" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Rapport för katalogjämförelse" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Rapporteringsfil:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "Stil:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "Inkludera rapport för katalogjämförelse" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Delat eller privat filter" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Vilken typ av filter vill du skapa?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Delat filter (för alla användare på denna dator)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Privat filter (bara för den aktuella användaren)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Jämför statistik" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Kataloger:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 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 msgid "Binary:" msgstr "Binär:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Unik" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Vänster:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Höger:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Totalt:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Stäng" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Mitten:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Saknas i vänster:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Saknas i mitten:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Saknas i höger:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Påverkar" #. 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 "(Påverkar)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Välj teckenkodning för" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "Fil laddar:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Fil sparas:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "Använd samma teckenkodning för båda" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "Avbryt" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Testa filter" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Testar filter:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "Mata in text att testa:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "Katalognamn" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Resultat:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "Testa" #. IDS_OPTIONSPG_TABLECOMPARE -#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228 +#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238 msgid "Table" msgstr "Tabell" #. IDD_OPEN_TABLE, IDC_STATIC -#: Merge.rc:2854 +#: Merge.rc:2864 msgid "File type" msgstr "Filtyp" #. 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 "Egenavgränsade värden" #. 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 "Tecken för avgränsning:" #. 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 "Tillåt nya rader i citat" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Tecken för citat:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Säkerhetskopierade filer" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Skapa säkerhetskopior i:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "Katalogjämförelse" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Filjämförelse" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Skapa säkerhetskopior i:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Ursprunngsfilens katalog" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Global katalog för säkerhetskopior:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Filnamn för säkerhetskopia:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "Lägg till filändelse .bak" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Lägg till tidstämpel" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Bekräfta kopiera" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Är du säker på att du vill kopiera XXX objekt?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Från vänster" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Till höger" #. 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 "Fråga inte denna fråga igen." #. 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 "Nej" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Programtillägg" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "Aktivera programtillägg" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2913 Merge.rc:3113 +#: Merge.rc:2923 Merge.rc:3123 msgid "Plugin &type:" msgstr "Plugintyp:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2916 +#: Merge.rc:2926 msgid "File filters:" msgstr "Filfilter:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Argument för programtillägg:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Aktivera automatisk uppackning/förjämförelse för plugin" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Shellintegration" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "Utforskaren" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "Lägg till i innehållsmeny" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Visa avancerad meny" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Använd Jämför som-meny" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "Registrera shelländelse" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "Avregistrera Shelländelse" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Registrera Shelländelse endast för nuvarande användare" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Avregistrera Shelländelse endast för nuvarande användare" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Registrera filändelse för &Windows 11 eller senare" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Avregistrera filändelse för W&indows 11 eller senare" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Hopplista" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Rensa alla nyliga objekt" #. 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 "Jämförelsemetod:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "Stanna efter första skillnaden" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorera tidsskillnader mindre än 3 sekunder" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Expandera automatiskt underkataloger efter jämförelse:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Inkludera unikt innehåll i underkataloger" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Ignorera återtolkningsmarkörer" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Tröskelvärde för växling till snabbjämförelse (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Tröskelvärde för växling till binär jämförelse (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 "Filnamnsmönster:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Användaravgränsade värden" #. 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 msgid "Binary file &patterns:" msgstr "Binärt filnamnsmönster:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Frhed-inställningar" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Visa inställningar..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "Binärt läge..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "Teckenuppsättning..." #. 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 msgid "Image file &patterns:" msgstr "Filnamnsmönster för bilder:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Aktivera bildjämförelse i katalogjämförelse" #. 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 "Webbsida" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "URL mönster att &inkludera (reguljärt uttryck):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "URL mönster att &exkludera (reguljärt uttryck):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "Plats för lagring av användardata:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "Separerata kataloger för användardata i varje ruta" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "Hex-visning" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3110 +#: Merge.rc:3120 msgid "Edit Plugin" msgstr "Editera-plugin" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:3123 +#: Merge.rc:3133 msgid "&Category:" msgstr "Kategori:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC -#: Merge.rc:3125 +#: Merge.rc:3135 msgid "&Menu caption:" msgstr "Menytext:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC -#: Merge.rc:3127 +#: Merge.rc:3137 msgid "&Window type:" msgstr "Fönstertyp:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC -#: Merge.rc:3132 +#: Merge.rc:3142 msgid "&Unpacked file extension:" msgstr "Uppackade filers filändelse:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "Kräver argument" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT -#: Merge.rc:3137 +#: Merge.rc:3147 msgid "&Generate editor script" msgstr "Generera editorskript" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC -#: Merge.rc:3140 +#: Merge.rc:3150 msgid "Command &line:" msgstr "Komandorad:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "Skripts filändelse:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "Skriptkropp:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3154 +#: Merge.rc:3164 msgid "Font" msgstr "Typsnitt" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3157 +#: Merge.rc:3167 msgid "&Font:" msgstr "Typsnitt:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3163 +#: Merge.rc:3173 msgid "Font st&yle:" msgstr "Typsnittsstil:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3169 +#: Merge.rc:3179 msgid "&Size:" msgstr "Storlek:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3175 +#: Merge.rc:3185 msgid "Effects" msgstr "Effekter" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3176 +#: Merge.rc:3186 msgid "Stri&keout" msgstr "Överstruken" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3177 +#: Merge.rc:3187 msgid "&Underline" msgstr "Understruken" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3179 +#: Merge.rc:3189 msgid "&Color:" msgstr "Färg:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3184 +#: Merge.rc:3194 msgid "Sample" msgstr "Exempel" #. 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 "Script:" #. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK -#: Merge.rc:3194 +#: Merge.rc:3204 msgid "Show more fonts" msgstr "Visa mer typsnitt" #. 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)" @@ -4868,7 +4874,7 @@ msgstr "" "Nya dokument (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4877,7 +4883,7 @@ msgstr "" "Öppna (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4886,27 +4892,27 @@ msgstr "" "Spara (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Okänt fel vid försök att öppna projektfil." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Okänt fel vid försök att spara projektfil." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Projektfilen lästes in." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Projektfilen sparades." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4915,7 +4921,7 @@ msgstr "" "Ångra (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4924,7 +4930,7 @@ msgstr "" "Gör om (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4943,7 +4949,7 @@ msgstr "" "WinMerges filjämförelse" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4962,317 +4968,317 @@ msgstr "" "WinMerges katalogjämförelse" #. 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 kommer med ABSOLUT INGA GARANTIER. Detta är fri programvara och du är välkommen att vidaredistribuera den under vissa omständigheter; se GNU General Public License i Hjälp-menyn för detaljer." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "Avbryt" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "Försök igen" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "Ignorera" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Ignorera alla" #. 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 till alla" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "Nej" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Nej till alla" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "Fortsätt" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "Hoppa över" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Hoppa över alla" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Visa inte det här meddelandet igen." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "För att göra meddelanderutan synlig igen trycker du på knappen Återställ på sidan Meddelanderutor i dialogrutan Alternativ." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "Jämför/Slå ihop" #. 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 "Färgscheman" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Katalogjämförelse" #. 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 msgid "Differences" msgstr "Skillnader" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Meddelanderutor" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Till:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Från vänster:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Till vänster:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Från höger:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Till höger:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Från mitten:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Till mitten:" #. 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 "Alternativ (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Alla dialogmeddelanden visas nu igen." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "Värdet för tabbstorlek är inte inom det intervall som WinMerge godtar. Vänligen ange värden mellan 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Öppna" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla filer (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerges projektfiler (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Konfigurationsfiler (*.ini)|*.ini|Alla 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 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textfiler (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HyperText-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Expandera inte" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Expandera alla underkataloger" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Expandera olika underkataloger" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Expandera identiska underkataloger" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Filtyp" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Filändelse" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "Meddelande" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Svar" #. 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 "Ladda" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Spara" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Inkludera underkataloger" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Jämförelsealternativ" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Dolda objekt" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Namn" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Sökväg" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filter" #. 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 "Beskrivning" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Välj filnamn för nytt filter" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla filer (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5285,7 +5291,7 @@ msgstr "" "Vänligen kopiera filen %1 till WinMerges katalog för mallfilter:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5298,7 +5304,7 @@ msgstr "" "\n" "Vänligen kontrollera att katalogen finns och att den är skrivbar." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5308,7 +5314,7 @@ msgstr "" "\n" "Vänligen välj katalog i Inställningar/System." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5322,11 +5328,11 @@ msgstr "" "Filen kan vara skrivskyddad." #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Ange sökväg för filterfil att installera" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5337,17 +5343,17 @@ msgstr "" "Kunde inte kopiera filen till katalogen för filter." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Filterfilen finns redan. Vill du skriva över befintlig fil?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Reguljärt uttryck" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "" "Filters updated. Refresh all open folder compares?\n" "\n" @@ -5358,217 +5364,217 @@ msgstr "" "Om du inte vill göra detta nu kan du välja ''Nej'' och läsa in skillnader på nytt senare." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Resultat av katalogjämförelse" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Filjämförelse" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Namnlös vänster" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Namnlös mitten" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Namnlös höger" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Basfil" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Deras fil" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Min fil" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Ursprungsfil" #. 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 "Rad: %s Kolumn: %d/%d Tecken: %d/%d EOL: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Rad: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Markerat: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Sammanfoga" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "1 skillnad funnen" #. IDS_NO_ERR_SEL_FMT -#: Merge.rc:4389 +#: Merge.rc:4399 #, c-format msgid "%1 Errors Found" msgstr "&1 fel funna" #. IDS_1_ERR_FOUND -#: Merge.rc:4390 +#: Merge.rc:4400 msgid "1 Error Found" msgstr "1 fel funnet" #. 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 "Förekomst %1 av %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Förekomster: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Jämför objekt..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[objekt/s]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Välj två befintliga kataloger eller filer att jämföra." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Val av katalog" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Välj två (eller tre) filer eller kataloger att jämföra." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Vänster (1:a) sökväg är ogiltlig!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Mittens (2:a) sökväg är ogiltlig!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Höger (2:a) sökväg är ogiltlig!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Höger (3:e) sökväg är ogiltlig!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Båda sökvägarna är ogiltliga!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Vänster (1:a) och mittens (2:a) sökvägar är ogiltliga!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Vänster (1:a) och höger (3:e) sökväg är ogiltliga!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Mitten (2:a) och höger (3:e) sökvägar är ogiltliga!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Samtliga sökvägar är ogiltliga!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Endast möjligt vid filjämförelse" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Kan inte jämföra fil med en katalog!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Filen är inte uppackad: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5582,12 +5588,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Kunde inte tolka konfliktfilen." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "" "The file\n" @@ -5599,7 +5605,7 @@ msgstr "" "är inte en konfliktfil." #. 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)?" @@ -5608,28 +5614,28 @@ msgstr "" "Visa bara jämförresultat (inte filinnehåll)?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Spara som" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %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 är skrivskyddad. Vill du skriva över filen (välj Nej för att spara filen under annat namn)?" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Fel vid säkerhetskopiering av filen" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5643,7 +5649,7 @@ msgstr "" "Vill du fortsätta ändå?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5659,7 +5665,7 @@ msgstr "" "\t- använda ett annat filnamn (Tryck OK)\n" "\t- avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5672,7 +5678,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5685,7 +5691,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5699,7 +5705,7 @@ msgstr "" "Vill du spara den uppackade versionen till en annan fil?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5715,7 +5721,7 @@ msgstr "" "Vill du skriva över den ändrade filen ändå?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5725,7 +5731,7 @@ msgstr "" "är markerad som skrivskyddad. Vill du överskrida detta?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5741,22 +5747,22 @@ msgstr "" "Vill du läsa in den på nytt?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Spara vänster fil som" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Spara fil i mitten som" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Spara höger fil som" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5768,7 +5774,7 @@ msgstr "" "har försvunnit. Vänligen spara en kopia av filen för att fortsätta." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5779,124 +5785,124 @@ msgstr "" "Läs in filerna på nytt innan du fortsätter." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Bryt vid mellanslag" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Bryt vid mellanslag eller punkt" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Kopiera till &mitten\tAlt+Höger" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Kopiera till &mitten\tAlt+Vänster" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Kopiera från mitten\tAlt+Shift+Right" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Kopiera från mitten\tAlt+Shift+Left" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Kopiera till mitten och gå till nästa\tCtrl+Alt+Höger" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Kopiera till mitten och gå till nästa\tCtrl+Alt+Vänster" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Kopiera allt till mitten" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Höger till vänster (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Höger till mitten (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Mitten till vänster (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Mitten till höger (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Vänster till höger (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Vänster till mitten (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Vänster till... (%1)" #. IDS_MOVE_MIDDLE_TO -#: Merge.rc:4508 Merge.rc:4540 +#: Merge.rc:4518 Merge.rc:4550 #, c-format msgid "Middle to... (%1)" msgstr "Mitten till... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Höger till... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Båda till... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Samtliga till... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Skillnader till... (%1)" #. IDS_COPY_ONLYDIFFITEMS -#: Merge.rc:4519 +#: Merge.rc:4529 msgid "" "Some selected items are identical or skipped.\n" "Copy only items with differences?" @@ -5905,64 +5911,64 @@ msgstr "" "Vill du kopiera bara filerna med skillnader?" #. IDS_DEL_LEFT_FMT -#: Merge.rc:4525 +#: Merge.rc:4535 #, c-format msgid "Left (%1)" msgstr "Vänster (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Mitten (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Höger (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Båda (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Samtliga (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Vänster sida - välj målkatalog:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Mitten - välj målkatalog:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Höger sida - välj målkatalog:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påverkade)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påverkade)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5974,18 +5980,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Är du säker på att du vill kopiera?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Är du säker på att du vill kopiera %d objekt?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6005,46 +6011,46 @@ msgstr "" "Vänligen läs in jämförelsen på nytt." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Är du säker på att du vill flytta?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Är du säker på att du vill flytta %d objekt?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Bekräfta flytt" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Du är på väg att stänga fönstret som jämför kataloger. Är du säker på att du vill stänga fönstret?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "Du är på väg att stänga katalogjämförelsefönstret som tog mycket tid. Är du säker på att du vill stänga fönstret?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "Den angivna filen eller katalogen är ogiltig." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa redigeraren: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Okänt format för komprimerade mappar" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6053,751 +6059,751 @@ msgstr "" "Vill du jämföra de komprimerade mapparna som textfiler?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Filnamn" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Katalog" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Jämförelseresultat" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Datum vänster" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Datum höger" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Datum mitten" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Storlek vänster" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Storlek höger" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Storlek mitten" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Storlek höger (kort)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Vänster storlek (kort)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Storlek mitten (kort)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Tid skapad vänster" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Tid skapad höger" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Skapelsedatum mitten" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Nyare fil" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Vänster filversion" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Höger filversion" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Filversion i mitten" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Kort resultat" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Attribut vänster" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Attribut höger" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Attribut mitten" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "Radslutsformat vänster" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "Radslutsformat mitten" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "Radslutsformat höger" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Teckenukodning vänster" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Teckenkodning höger" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Teckenkodning mitten" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Ignorerade skillnader" #. 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 msgid "Unpacker" msgstr "Uppackare" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Förjämförelse/Prediffer" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Vänster" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Mitten" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Höger" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Skillnad" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Dubblettantal vänster" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Dubblettantal höger" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Dubblettantal i mitten" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Flytta" #. IDS_PRPCAT_AUDIO -#: Merge.rc:4658 +#: Merge.rc:4668 msgid "Audio" msgstr "Ljud" #. 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 "Enheter" #. 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 "Hem" #. 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 "Länk" #. 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 "Musik" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Anteckning" #. 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 "Inspelad TV" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Sök" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Säkerhet" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Mjukvara" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Uppgift" #. 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 "Kontrollsumma" #. IDS_CANT_COMPARE_FILES -#: Merge.rc:4685 +#: Merge.rc:4695 msgid "Unable to compare files" msgstr "Kan inte jämföra filerna" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Objekt avbrutet" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Hoppade över filen" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Hoppade över katalogen" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Bara vänster: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Bara mitten: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Bara höger: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Finns ej i %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "De binära filerna är identiska" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "De binära filerna är olika" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Filerna är olika" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Katalogerna är olika" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Endast vänster" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Endast höger" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Endast i mitten" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Inga objekt i vänster" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Inga objekt i höger" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Inga objekt i mitten" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Fel" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Textfilerna är identiska" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Mitten och höger är identiska)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Vänster och höger är identiska)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Vänster och mitten är identiska)" #. 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 "Textfilerna är olika" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Bilderna är identiska" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Bilderna är olika" #. 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 "Grupp%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 "Tidsförlopp: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "1 objekt valt" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Fil- eller katalognamn." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Namn på underkatalog när underkataloger omfattas." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Jämförelseresultat, lång version." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Ändringsdatum för vänster sida." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Ändringsdatum för höger sida." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Ändringsdatum för mitten." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Filtillägg." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Vänster fils storlek i bytes." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Höger fils storlek i bytes." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Filstorlek för mitten." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Vänster filstorlek är förkortad." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Höger filstorlek är förkortad." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Filstorlek för mitten är förkortad." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Tid för skapelse av vänster sida." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Tid för skapelse av höger sida." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Tid för skapelse av mitten." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har en senare tidpunkt för ändringar." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Filversion vänster sida, bara för några filtyper." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Filversion höger sida, bara för några filtyper." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Filversion mitten, bara för några filtyper." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Kort jämförelseresultat." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Filattribut för vänster sida." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Filattribut för höger sida." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Filattribut för mitten." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Radslutsformat för vänster sida." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Radslutsformat för höger sida." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Radslutsformat för mitten." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Filkodning/teckenuppsättning för vänster sida." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Filkodning/teckenuppsättning för höger sida." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Filkodning/teckenuppsättning för mitten." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "Antalet ignorerade skillnader i filen. Dessa skillnader ignorerades av WinMerge och kan inte sammanfogas." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Antalet skillnader i filen. Detta antal omfattar inte ignorerade skillnader." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar en asterisk (*) om filen är binär." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Namn på uppackare eller kommandoslinga." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Prediffer pluginnamn eller process." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "Jämför %1 med %2" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "Jämför %1 med %2 och %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Kommaseparerad lista" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Tabbavgränsad lista" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Enkel HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Rapportfilen finns redan. Vill du skriva över befintlig fil?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6807,57 +6813,57 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Rapporten har skapats." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Kan ej lägga till synkroniseringspunkt på denna rad." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Samma fil är öppnad i båda rutorna." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "De valda filerna är identiska." #. 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 "Ett fel inträffade under jämförelsen av filerna." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Temporära filer kunde inte skapas. Kontrollera sökvägar för temporära filer under inställningar." #. IDS_SUGGEST_IGNOREEOL -#: Merge.rc:4835 +#: Merge.rc:4845 msgid "" "Files use different EOL.\n" "\n" @@ -6872,17 +6878,17 @@ msgstr "" "Notera: Om du alltid vill behandla alla tecken för radslut som likvärdiga, markera alternativet 'Ignorera skillnader i radslut (Windows/Unix/Mac)' i Jämför-fliken i Inställningarna (finns under Redigera/Inställningar)." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Den angivna katalogen är ogiltig." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Kan inte öppna en binär fil för redigering." #. IDS_CREATE_PAIR_FOLDER -#: Merge.rc:4838 +#: Merge.rc:4848 #, c-format msgid "" "Create matching folder:\n" @@ -6896,41 +6902,41 @@ msgstr "" "på andra sidan och öppna dessa kataloger?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "Är du säker att du vill kopiera alla skillnader till den andra filen?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Vill du gå till nästa fil?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Vill du gå till föregående fil?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Vill du gå till nästa sida?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Vill du gå till föregående sida?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Vill du gå till den första filen?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Vill du gå till den sista filen?" -#: Merge.rc:4856 +#: Merge.rc:4866 #, c-format msgid "" "Different codepages: left (cp%d), right (cp%d).\n" @@ -6941,51 +6947,51 @@ msgstr "" "Att visa filerna i deras egna kodning ger en bättre visning men sammanfogning/kopiering blir farligt.\n" "Vill du att båda filer betraktas som att de är i Windows förvalda kodning (rekommenderat)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Information förlorades på grund av teckenkodningsfel i: båda filerna" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Information förlorades på grund av teckenkodningsfel i: första filen" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Information förlorades på grund av teckenkodningsfel i: andra filen" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Information förlorades på grund av teckenkodningsfel i: tredje filen" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Ingen skillnad" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Radskillnad" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 sträng(ar)." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Kan inte hitta strängen \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Du går nu in i sammanfogningsläge. Om du vill avbryta detta läge, tryck på 'F9'." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -6995,99 +7001,99 @@ msgstr "" "Antalet ouppklarade konflikter: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Ändringen av teckenkodning har gjorts." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Ändringar i teckenuppsättning är under konflikt." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Ändringar av tecken för radslut har gjorts." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Ändringar av tecken för radslut är under konflikt." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Översiktsruta" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Ruta för differensöverssikt" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Patchfilen sparades." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1. objekt hittades ej!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2. objekt hittades ej!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Patchfilen finns redan. Vill du skriva över den?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valda]" #. 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 "Innehåll" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Förenad" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte skriva till filen %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Den specificerade resultatsökvägen är inte en absolut sökväg: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Ange ett filnamn för resultatet." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Kan inte skapa en patchfil från binära filer." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7098,12 +7104,12 @@ msgstr "" "Att skapa en patch kräver att det inte finns några icke sparade ändringar i filerna." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Katalogen finns inte." #. 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" @@ -7114,37 +7120,37 @@ msgstr "" "Se manualen för mer information om hur man konfigurerar stöd för komprimerade kataloger." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Ange fil att exportera" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Ange fil att importera" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Inställningar importerades från filen." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Inställningar exporterades till filen." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Det gick inte att importera inställningar från filen." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Det gick inte att spara inställningar till filen." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7155,44 +7161,44 @@ msgstr "" "Vill du fortsätta?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Blandat" #. 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 msgid "None" msgstr "Ingen" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Markeringsfärg %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Nytt mönster" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Typ" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Editoirskript" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7201,7 +7207,7 @@ msgstr "" "Skillnad på nuvarande rad (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7210,7 +7216,7 @@ msgstr "" "Inställningar" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7219,7 +7225,7 @@ msgstr "" "Uppdatera (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7228,7 +7234,7 @@ msgstr "" "Föregående skillnad (Alt+Upp)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7237,7 +7243,7 @@ msgstr "" "Nästa skillnad (Alt+Ned)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7246,7 +7252,7 @@ msgstr "" "Föregående konflikt (Alt+Shift+Upp)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7255,7 +7261,7 @@ msgstr "" "Nästa konflikt (Alt+Shift+Ned)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7264,7 +7270,7 @@ msgstr "" "Första skillnad (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7273,7 +7279,7 @@ msgstr "" "Nuvarande skillnad (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7282,7 +7288,7 @@ msgstr "" "Sista skillnad (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7291,7 +7297,7 @@ msgstr "" "Kopiera till höger (Alt+Höger)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7300,7 +7306,7 @@ msgstr "" "Kopiera till vänster (Alt+Vänster)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7309,7 +7315,7 @@ msgstr "" "Kopiera till höger och gå till nästa (Ctrl+Alt+Höger)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7318,7 +7324,7 @@ msgstr "" "Kopiera till vänster och gå till nästa (Ctrl+Alt+Vänster)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7327,7 +7333,7 @@ msgstr "" "Kopiera allt till höger" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7336,7 +7342,7 @@ msgstr "" "Kopiera allt till vänster" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7345,7 +7351,7 @@ msgstr "" "Automatisk sammanfogning (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7354,7 +7360,7 @@ msgstr "" "Första filen" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7363,7 +7369,7 @@ msgstr "" "Nästa fil (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7372,7 +7378,7 @@ msgstr "" "Sista filen" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7381,37 +7387,37 @@ msgstr "" "Föregående fil (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "Den valda uppackaren används för båda filerna (bara en fil behöver ha filändelse)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Ingen förjämförelse (standard)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Föreslagna programtillägg" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Alla programtillägg" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Privat kompilering: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Din mjukvara är aktuell." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7421,126 +7427,126 @@ msgstr "" "%1 är nu tillgänglig (du har %2). Vill du ladda ner den nu?" #. IDS_ALLRIGHTS_RESERVED -#: Merge.rc:5016 +#: Merge.rc:5026 msgid " - All rights reserved." msgstr " - Alla rättigheter reserverade." #. IDS_CHECKFORUPDATES_FAILED -#: Merge.rc:5021 +#: Merge.rc:5031 msgid "Failed to download latest version information" msgstr "Misslyckades att ladda ner info om senaste versionen" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Inställningar för programtillägg" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct skript inaktiverade" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Gå till rad %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Gå till flyttad rad\tCtrl+Shift+G" #. IDS_AUTOCOMPLETE_DISABLED -#: Merge.rc:5049 +#: Merge.rc:5059 msgctxt "Options dialog|General|Open dialog Auto completion" msgid "Disabled" msgstr "Avstängd" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Från filsystem" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Från listan Senast använda filer" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Ingen framhävning" #. 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 "Flyttbart objekt" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Resurser" #. 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 "Stäng vänster flik" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Stäng höger flik" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Stäng andra flikar" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Aktivera automatisk högsta bredd" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "Websida" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Vänd på text" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 #, c-format msgid "%1 is not installed." msgstr "%1 är inte installerad." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 finns inte. Vill du skapa den?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Misslyckades att skapa katalog." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7551,486 +7557,486 @@ msgstr "" "$linenum: Radnumret för markörens nuvarande position" #. 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 "långvarig" #. 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 "inga" #. 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 förval" #. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED -#: Merge.rc:5165 +#: Merge.rc:5175 msgid "DirectWrite Aliased" msgstr "DirectWrite aliaserat" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC -#: Merge.rc:5166 +#: Merge.rc:5176 msgid "DirectWrite GDI Classic" msgstr "DirectWrite GDI klassisk" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "DirectWrite GDI naturlig" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "DirectWrite naturlig" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "DirectWrite naturlig symmetrisk" #. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED -#: Merge.rc:5174 +#: Merge.rc:5184 msgctxt "Options dialog|General|Close windows with Esc" msgid "Disabled" msgstr "Avstängd" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "MDI nedärvda fönster eller huvudfönster" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Bara nedärvda MDI-fönster" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Stäng huvudfönstret om det bara finns ett nedärvt MDI-fönster" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Skillnad" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Framhäv" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Blinka" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Blockstorlek" #. 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 tröskel" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Infoga/radera upptäckning" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Ingen" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Vertikalt" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Horisontellt" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Övertäckning" #. 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 transparens" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Alpha-animering" #. 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 "Sida:" #. 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 "Sida: %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 "Vriden: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Roterad: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Alla sidor" #. 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 "Inga skillnader för val funna" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Inga skillnader funna att lägga till ersättningsfilter" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Paret är redan i listan av ersättningsfilter" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Lägg till denna skillnad till ersättningsfilter?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Endast text" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Rad-för-rad position och text" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Ord-för-ord position och 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 "Installationskatalog" #. 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 "Avstängd" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Tillåt endast att en instans körs" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Tillåt bara att en instans körs; vänta på avslutning" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Avstängd" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Endast vid fönster aktvierat" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Omgående" #. IDS_PLUGIN_ALL -#: Merge.rc:5249 +#: Merge.rc:5259 msgid "Al&l" msgstr "AI&I" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "Övriga" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Saknar programtilläggets namn i kommandoslinga: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Saknar citationstecken i programtilläggets kommandoslinga: %1" #. IDS_PLUGIN_NAME_ALREADY_EXISTS -#: Merge.rc:5255 +#: Merge.rc:5265 #, c-format msgid "Plugin name '%1' already exists." msgstr "Pluginnamnet '%1' finns redan." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Ange programtilläggets kommandoalternativ" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Plugin hittades inte eller ogiltigt: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' är inte något uppackningsplugin'" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' är inte någon predifferplugin" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "Ett fel hände vid prediffing av filen '%1' med plugin '%2'. Prediffing används inte mer." #. IDS_PLUGIN_CIRCULAR_REFERENCE -#: Merge.rc:5263 +#: Merge.rc:5273 #, c-format msgid "Circular reference in plugin pipeline: %1" msgstr "Cirkulärreferens i pluginpipeline: %1" #. IDS_PLUGIN_TYPE1 -#: Merge.rc:5264 +#: Merge.rc:5274 msgid "URL Handler" msgstr "URLhanterare" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Filuppackare" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Fil- eller kataloguppackare" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Alias för uppackare" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "A lias för Prediffer" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Alias för Editorskript" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "Alias för pluginpipeline '%1'" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Ny pluginbeskrivning" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Allt" #. IDS_PLUGIN_TARGETS_1ST -#: Merge.rc:5274 +#: Merge.rc:5284 msgid "1st" msgstr "Första" #. IDS_PLUGIN_TARGETS_2ND -#: Merge.rc:5275 +#: Merge.rc:5285 msgid "2nd" msgstr "Andra" #. IDS_PLUGIN_TARGETS_3RD -#: Merge.rc:5276 +#: Merge.rc:5286 msgid "3rd" msgstr "Tredje" #. IDS_PLUGIN_TARGETS_1ST_2ND -#: Merge.rc:5277 +#: Merge.rc:5287 msgid "1st and 2nd" msgstr "Första och Andra" #. IDS_PLUGIN_TARGETS_1ST_3RD -#: Merge.rc:5278 +#: Merge.rc:5288 msgid "1st and 3rd" msgstr "Första och Tredje" #. IDS_PLUGIN_TARGETS_2ND_3RD -#: Merge.rc:5279 +#: Merge.rc:5289 msgid "2nd and 3rd" msgstr "Andra och Tredje" #. IDS_FILTER_APPLIED -#: Merge.rc:5284 +#: Merge.rc:5294 msgid "Filter applied" msgstr "Filter verkställt" #. 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 "Klippbordet vid %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "" "Clipboard history disabled.\r\n" "Enable: Windows logo key + V, then Turn on." @@ -8038,110 +8044,115 @@ msgstr "" "Klippbordshistorik är inaktiverat.\r\n" "\" För att aktivera Klippbordshistorik, tryck på Windows-tangenten + V och klicka på Aktivera.." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Det här systemet stöder inte Klippbordshistorik." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "32-bitarsversionen av WinMerge stöder inte jämförelse med Klippbordet" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "Körbara filer för WebView2 är inte installerade. Vill du ladda ned det?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Ny Textjämförelse" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Ny tabelljämförelse" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Ny binär jämförelse" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Ny bildjämförelse" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Ny Webbsidojämförelse" +#. 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 "Klippbordsjämförelse" #. IDS_PREVIEWBAR_PRINT -#: Merge.rc:5321 +#: Merge.rc:5332 msgid "&Print..." msgstr "Skriv ut..." #. IDS_PREVIEWBAR_PREVPAGE -#: Merge.rc:5323 +#: Merge.rc:5334 msgid "Pre&v Page" msgstr "Förra sidan" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "Två sidor" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "En sida" #. IDS_PREVIEWBAR_ZOOMIN -#: Merge.rc:5326 +#: Merge.rc:5337 msgid "Zoom &In" msgstr "Zooma in" #. IDS_PREVIEWBAR_ZOOMOUT -#: Merge.rc:5327 +#: Merge.rc:5338 msgid "Zoom &Out" msgstr "Zooma ut" #. IDS_WEBPAGE_COMPARING -#: Merge.rc:5333 +#: Merge.rc:5344 msgid "Comparing..." msgstr "Jämför..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Zooma:" #. IDS_COPY_GRANULARITY_DIFFHUNK -#: Merge.rc:5339 +#: Merge.rc:5350 msgid "Diff hunk" msgstr "Skillnadsmassa" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Inlineskillnad" #. IDS_COPY_GRANULARITY_LINE -#: Merge.rc:5341 +#: Merge.rc:5352 msgid "Line" msgstr "Rad" -#: Merge.rc:5342 +#: Merge.rc:5353 msgid "Character" msgstr "Tecken" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "" "\n" "Previous Difference (Alt+Up)\n" @@ -8154,7 +8165,7 @@ msgstr "" "(Alt+Hjul Upp)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8167,7 +8178,7 @@ msgstr "" "(Alt+Hjul Ner)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8182,7 +8193,7 @@ msgstr "" "(Alt+Shift+Hjul Ner)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8197,7 +8208,7 @@ msgstr "" "(Alt+Shift+Hjul Upp)" #. ID_MICE_L2RNEXT -#: Merge.rc:5351 +#: Merge.rc:5362 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)\n" @@ -8210,7 +8221,7 @@ msgstr "" "(Ctrl+Alt+Shift+Hjul Ner)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8223,262 +8234,262 @@ msgstr "" "(Ctrl+Alt+Shift+Hjul Upp)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "Jämför %1 med %2" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "Jämför %1 med %2 och %3" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "Jämförelse färdig" #. IDS_LOG_COMPARE_ERROR_2 -#: Merge.rc:5365 +#: Merge.rc:5376 #, c-format msgid "Failed to compare %1 with %2: " msgstr "Kunde inte jämföra %1 med %2: " #. IDS_LOG_COMPARE_ERROR_3 -#: Merge.rc:5366 +#: Merge.rc:5377 #, c-format msgid "Failed to compare %1 with %2 and %3: " msgstr "Kunde inte jämföra %1 med %2 och %3: " #. IDS_LOG_FILE_SAVED -#: Merge.rc:5367 +#: Merge.rc:5378 msgid "File saved" msgstr "Fil sparad" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "Kopierar filer..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "Flyttar filer..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "Tar bort filer..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Papperskorg" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Permanent borttagen" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Filoperation framgångsrikt gjord" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Filoperation avbruten" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Inget fel" #. IDS_FILTER_ERROR_EMPTY_EXPRESSION -#: Merge.rc:5380 +#: Merge.rc:5391 msgid "Filter expression is empty" msgstr "Filteruttrycket är tomt" #. IDS_FILTER_ERROR_UNKNOWN_CHAR -#: Merge.rc:5381 +#: Merge.rc:5392 msgid "Unknown character in filter expression" msgstr "Okänt tecken i filteruttryck" #. IDS_FILTER_ERROR_UNTERMINATED_STRING -#: Merge.rc:5382 +#: Merge.rc:5393 msgid "Unterminated string literal" msgstr "Oavslutad litterär text" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Syntaxfel i filteruttryck" #. IDS_FILTER_ERROR_PARSE_FAILURE -#: Merge.rc:5384 +#: Merge.rc:5395 msgid "Failed to parse filter expression" msgstr "Kunde inte tolka filteruttryck" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Ogiltigt litterärt värde" #. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION -#: Merge.rc:5386 +#: Merge.rc:5397 msgid "Invalid regular expression" msgstr "Ogiltigt reguljärt uttryck" #. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER -#: Merge.rc:5387 +#: Merge.rc:5398 msgid "Undefined identifier" msgstr "Odefinierad identifierare" #. 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 "Filternamn hittades inte" #. IDS_FILTER_ERROR_DIVIDE_BY_ZERO -#: Merge.rc:5390 +#: Merge.rc:5401 msgid "Division by zero in filter expression" msgstr "Division med noll i filteruttryck" #. IDS_FILTER_ERROR_UNKNOWN_ERROR -#: Merge.rc:5391 +#: Merge.rc:5402 msgid "Unknown error" msgstr "Okänt fel" #. 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 "Lika med" #. IDS_FILTER_OP_NOT_EQUALS -#: Merge.rc:5399 +#: Merge.rc:5410 msgid "Does not equal" msgstr "Inte lika med" #. IDS_FILTER_OP_LESS_THAN -#: Merge.rc:5400 +#: Merge.rc:5411 msgid "Less than" msgstr "Mindre än" #. IDS_FILTER_OP_LESS_EQUAL -#: Merge.rc:5401 +#: Merge.rc:5412 msgid "Less than or equal to" msgstr "Mindre än eller lika med" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Större än eller lika med" #. IDS_FILTER_OP_GREATER_THAN -#: Merge.rc:5403 +#: Merge.rc:5414 msgid "Greater than" msgstr "Större än" #. IDS_FILTER_OP_BETWEEN -#: Merge.rc:5404 +#: Merge.rc:5415 msgid "Between" msgstr "Mellan" #. IDS_FILTER_OP_NOT_BETWEEN -#: Merge.rc:5405 +#: Merge.rc:5416 msgid "Not Between" msgstr "Inte mellan" #. IDS_FILTER_OP_CONTAINS -#: Merge.rc:5406 +#: Merge.rc:5417 msgid "Contains" msgstr "Innehåller" #. IDS_FILTER_OP_NOT_CONTAINS -#: Merge.rc:5407 +#: Merge.rc:5418 msgid "Not Contains" msgstr "Innehåller inte" #. IDS_FILTER_OP_RECONTAINS -#: Merge.rc:5408 +#: Merge.rc:5419 msgid "Contains (regex)" msgstr "Innehåller (RegExp)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "Innehåller inte (RegExp)" #. 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 "Ljus" #. IDS_COLORMODE_DARK -#: Merge.rc:5419 +#: Merge.rc:5430 msgid "Dark" msgstr "Mörk" #. IDS_COLORMODE_FOLLOWSYSTEM -#: Merge.rc:5420 +#: Merge.rc:5431 msgid "Follow system" msgstr "Följ system" #. 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/Tamil.po b/Translations/WinMerge/Tamil.po index 6dcbcbc35f8..c173303d084 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.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_TAMIL, SUBLANG_TAMIL_INDIA" @@ -114,7 +114,7 @@ msgstr "" "நகலெடு\tகட்டு+&3" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "வரி வேறுபாடு தேர்ந்தெடு\tF4" @@ -144,7 +144,7 @@ msgid "Cu&t" msgstr "வெட்டு" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "நகல்" @@ -154,19 +154,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 "செல்...\tகட்டு+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 "வெளிப்புற திருத்தியுடன்\tகட்டு+மாற்று+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 "ஒடு பட்டியல்" @@ -242,8 +242,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 "இல்லை" @@ -258,12 +258,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 "அடுத்த பக்கம்" @@ -273,42 +273,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 "சுழற்று &இடதுபுறம் 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 "செங்குத்தாக புரட்டு" #. 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 "உள் பெரிதாக்க\tகட்டு++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "வெளி பெரிதாக்க\tகட்டு+-" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMNORMAL, Zoom to normal -#: Merge.rc:205 Merge.rc:704 +#: Merge.rc:205 Merge.rc:711 msgid "&Normal\tCtrl+*" msgstr "&இயல்பு\tகட்டு+*" @@ -333,27 +333,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 "செவ்வக தேர்ந்தெடு" @@ -388,37 +388,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 "அளவு" @@ -433,27 +433,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 "திரும்பிச்/முன்னோக்கி செல்" @@ -483,2669 +483,2675 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "திற...\tகட்டு+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 "திட்டத்தை திற...\tகட்டு+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 "வெளியேறு\tகட்டு+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 "ஒட்டு\tகட்டு+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 "விருப்பங்கள்...\tகட்டு+," #. 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 "மூடு\tகட்டு+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 "சாளரஒன்றிணை உதவி\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 "சாளரஒன்றிணை பற்றி..." #. 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 "அனைத்தையும் தேர்ந்தெடு\tகட்டு+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 "தேர்ந்தெடுக்கப்பட்டது புதுப்பி\tகட்டு+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 "ஒப்பிடு\tஉள்ளிடு" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "அடுத்த வேறுபாடு\tமாற்று+கீழ்" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "முந்தைய வேறுபாடு\tமாற்று+மேல்" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "முதல் வேறுபாடு\tமாற்று+வீடு" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "தற்போதைய வேறுபாடு\tமாற்று+உள்ளிடு" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "கடைசி வேறுபாடு\tமாற்று+முடி" #. IDR_MERGEDOCTYPE, ID_L2R -#: Merge.rc:534 Merge.rc:830 +#: Merge.rc:538 Merge.rc:837 msgid "Copy to &Right\tAlt+Right" msgstr "வலதுக்கு நகலெடு\tமாற்று+வலது" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "இடதுக்கு நகலெடு\tமாற்று+இடது" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "நீக்கு\tநீக்கு" #. 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 "சேமி\tகட்டு+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 "அச்சிடு...\tகட்டு+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 "மீண்டும்ஏற்று\tகட்டு+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "என மீண்டும் ஒப்பிடு" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "செயல்தவிர்\tகட்டு+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "மீண்டும்செய்\tகட்டு+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "வெட்டு\tகட்டு+X" #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_COPY -#: Merge.rc:670 Merge.rc:1342 +#: Merge.rc:677 Merge.rc:1352 msgid "&Copy\tCtrl+C" msgstr "நகலெடு\tகட்டு+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "தேடு...\tகட்டு+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "மாற்று...\tகட்டு+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "குறிப்பான்...\tகட்டு+தூக்கு+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 "வரி எண்களுடன் நகலெடு\tகட்டு+தூக்கு+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 "புத்தக்குறி புரட்டு\tகட்டு+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 "முந்தைய புத்தக்குறி\tதூக்கு+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 வரிகள்\tகட்டு+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 "அடுத்த முரண்பாடு\tமாற்று+தூக்கு+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "முன் முரண்பாடு\tமாற்று+தூக்கு+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 "அடுத்த வேறுபாடு (இடது/நடு\tமாற்று+1 " #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "முந்தைய வேறுபாடு (இடது/நடு\tமாற்று+தூக்கு+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "அடுத்த வேறுபாடு (இடது/வலது)\tமாற்று+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "முந்தைய வேறுபாடு (இடது/வலது)\tமாற்று+தூக்கு+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "அடுத்த வேறுபாடு (நடு/வலது)\tமாற்று+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "முந்தைய வேறுபாடு (நடு/வலது)\tமாற்று+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "அடுத்த இடப்புறம் மட்டும் வேறுபாடு\tமாற்று+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "முந்தைய இடது மட்டுமே வேறுபாடு\tமாற்று+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "அடுத்த நடுநிலை மட்டும் வேறுபாடு\tமாற்று+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "முந்தைய நடுவில் மட்டும் வேறுபாடு\tமாற்று+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "அடுத்த வலது மட்டும் வேறுபாடு\tமாற்று+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "முந்தைய வலது மட்டும் வேறுபாடு\tமாற்று+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 "இடது இலிருந்து நகலெடு\tமாற்று+Shift+வலது" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "வலது இலிருந்து நகலெடு\tமாற்று+Shift+Left " #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "வலதுக்கு நகலெடு மற்றும் முன்னேறு\tகட்டு+மாற்று+வலது" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "இடதுக்கு நகலெடு மற்றும் முன்னேறு\tகட்டு+மாற்று+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 "தானி ஒன்றிணை\tகட்டு+மாற்று+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "ஒத்திசைவு புள்ளி\tமாற்று+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 "இடமிருந்து நடுப்பகுதிக்கு (%2 இல் %1)" #. 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 "இடமிருந்து வலமாக (%2 இல் %1)" #. 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 "இடது... (%2 இல் %1)" #. 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 "நடுவிலிருந்து இடது (%2 இல் %1)" #. 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 "நடுவிலிருந்து வலமாக (%2 இல் %1)" #. 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 "மத்தியில் இருந்து... (%2 இல் %1)" #. 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 "வலமிருந்து நடுவிற்கு (%2 இல் %1)" #. 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 "வலமிருந்து இடமாக (%2 இல் %1)" #. 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 "வலமிருந்து... (%2 இல் %1)" #. 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 "நடுநிலை (%2 இல் %1)" #. 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 "வலது (%2 இல் %1)" #. 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 "இரண்டும் (%2 இல் %1)" #. 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 "அனைத்தும் (%2 இல் %1)" #. 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 "இரண்டுக்கும்... (%2 இல் %1)" #. 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 "அனைவருக்கும்... (%2 இல் %1)" #. 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 "இதற்கான வேறுபாடுகள்... (%2 இல் %1)" #. 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 "" "வரிமுடிவுகள் வேறுபாடுகளை புறக்கணி (சாளரங்கள்/யுனிக்சு/மேக்)" #. 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} - மூல முகவரி" #. 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} - சாளரஒன்றிணை வீடு கோப்புறை" #. 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 "சாளரஒன்றிணை பற்றி" #. 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 "&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 "இரண்டாவது | 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 "படிக்க&nly" #. 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." @@ -3155,549 +3161,549 @@ 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 "முதல் இன்லைன் வேறுபாட்டிற்கு தானாக s&croll" #. 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 "பல சாளரங்களை மூடும்போது As&k" #. 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." @@ -3706,399 +3712,399 @@ 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 "இயல்புநிலை வாதங்கள்:" #. 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\n" "Restart required." @@ -4107,7 +4113,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." @@ -4116,771 +4122,771 @@ 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 ".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 "தற்போதைய பயனருக்கான ஓடு நீட்டிப்பை பதிவுநீக்கவும்&ly" #. 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 "" "W&indows 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 "ஃபிரட் செய்யப்பட்ட அமைப்புகள்" #. 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 "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 "REC" #. ID_FILE_NEW -#: Merge.rc:4129 +#: Merge.rc:4139 msgid "" "\n" "New Documents (Ctrl+N)" @@ -4889,7 +4895,7 @@ msgstr "" "புதிய ஆவணங்கள் (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4898,7 +4904,7 @@ msgstr "" "திற (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4907,27 +4913,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)" @@ -4936,7 +4942,7 @@ msgstr "" "செயல்தவிர் (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4945,7 +4951,7 @@ msgstr "" "மீண்டும் செய் (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4964,7 +4970,7 @@ msgstr "" "சாளரஒன்றிணை கோப்பு ஒப்பிடு" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4983,7 +4989,7 @@ 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 " @@ -4994,66 +5000,66 @@ msgstr "" "உதவி பட்டியல்வில் உள்ள 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." @@ -5062,93 +5068,93 @@ 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 "" @@ -5156,37 +5162,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||" #. 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 " "(*.*)|*.*||" @@ -5195,122 +5201,122 @@ msgstr "" "கோப்புகளும் (*.*)|*.*| |" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" "உஉகுமொ கோப்புகள் (*.htm,*.html)|*.htm;*.html|அனைத்து கோப்புகளும் (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "எக்ச்எம்எல் கோப்புகள் (*.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" @@ -5323,7 +5329,7 @@ msgstr "" "% 1 கோப்பை சாளரஒன்றிணை/Filters கோப்புறைக்கு நகலெடு:\n" "% 2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5336,7 +5342,7 @@ msgstr "" "\n" "கோப்புறை உள்ளது மற்றும் எழுதக்கூடியது என்பதை உறுதிப்படுத்தவும்." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5346,7 +5352,7 @@ msgstr "" "\n" "விருப்பங்கள்/அமைப்பில் வடிகட்டி கோப்புறையைத் தேர்ந்தெடு." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5360,11 +5366,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" @@ -5375,17 +5381,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" @@ -5396,221 +5402,221 @@ 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 "வேறுபாடு %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[உருப்படிகள்/நொடி]" #. 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" @@ -5624,12 +5630,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" @@ -5641,7 +5647,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)?" @@ -5652,18 +5658,18 @@ 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 "" @@ -5671,11 +5677,11 @@ 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" @@ -5689,7 +5695,7 @@ msgstr "" "எப்படியும் தொடரலாமா?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5705,7 +5711,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" @@ -5718,7 +5724,7 @@ msgstr "" "\n" "தொகுக்கப்படாத பதிப்பை வேறொரு கோப்பில் சேமிக்க விரும்புகிறீர்களா?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5731,7 +5737,7 @@ msgstr "" "\n" "தொகுக்கப்படாத பதிப்பை வேறொரு கோப்பில் சேமிக்க விரும்புகிறீர்களா?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5745,7 +5751,7 @@ msgstr "" "தொகுக்கப்படாத பதிப்பை வேறொரு கோப்பில் சேமிக்க விரும்புகிறீர்களா?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5761,7 +5767,7 @@ msgstr "" "மாற்றப்பட்ட கோப்பை மேலெழுதவா?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5771,7 +5777,7 @@ msgstr "" "படிக்க மட்டுமே என்று குறிக்கப்பட்டுள்ளது. படிக்க மட்டுமேயான உருப்படியை மேலெழுத விரும்புகிறீர்களா?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5787,22 +5793,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" @@ -5814,7 +5820,7 @@ msgstr "" "மறைந்துவிட்டது. தொடர கோப்பின் நகலை சேமி." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5825,124 +5831,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 "நடுவிற்கு நகலெடு\tமாற்று+வலது" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "நடுவிற்கு நகலெடு\tமாற்று+இடது" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "நடுவில் இருந்து நகலெடு\tமாற்று+தூக்கு+வலது" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "நடுஇலிருந்து நகலெடு\tமாற்று+தூக்கு+இடது " #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "நடுவிற்கு நகலெடு மேலும்\tகட்டு+மாற்று+வலது" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "நடுவிற்கு நகலெடு மேலும்\tகட்டு+மாற்று+இடது" #. 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?" @@ -5951,64 +5957,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" @@ -6020,18 +6026,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" @@ -6051,48 +6057,48 @@ 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?" @@ -6101,757 +6107,757 @@ 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 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 "இடது பக்க கோப்பு வரிமுடிவு வகை." #. 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 "தாவல் பிரிக்கப்பட்ட பட்டியல்" #. 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" @@ -6861,59 +6867,59 @@ 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" @@ -6928,17 +6934,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" @@ -6952,41 +6958,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" @@ -6997,53 +7003,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 "குறியீட்டு பிழைகள் காரணமாக தகவல் இழந்தது: முதல் கோப்பு" -#: 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" @@ -7053,99 +7059,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 "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" @@ -7156,12 +7162,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" @@ -7172,37 +7178,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" @@ -7213,44 +7219,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)" @@ -7259,7 +7265,7 @@ msgstr "" "தற்போதைய வரியில் உள்ள வேறுபாடு (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7268,7 +7274,7 @@ msgstr "" "விருப்பங்கள்" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7277,7 +7283,7 @@ msgstr "" "புதுப்பித்தல் (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7286,7 +7292,7 @@ msgstr "" "முந்தைய வேறுபாடு (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7295,7 +7301,7 @@ msgstr "" "அடுத்த வேறுபாடு (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7304,7 +7310,7 @@ msgstr "" "முந்தைய மோதல் (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7313,7 +7319,7 @@ msgstr "" "அடுத்த மோதல் (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7322,7 +7328,7 @@ msgstr "" "முதல் வேறுபாடு (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7331,7 +7337,7 @@ msgstr "" "தற்போதைய வேறுபாடு (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7340,7 +7346,7 @@ msgstr "" "கடைசி வேறுபாடு (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7349,7 +7355,7 @@ msgstr "" "வலமிருந்து நகலெடு (Alt+வலது)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7358,7 +7364,7 @@ msgstr "" "இடதுக்கு நகலெடு (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7367,7 +7373,7 @@ msgstr "" "வலது மற்றும் முன்னேற்றத்திற்கு நகலெடு (Ctrl+Alt+Right)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7376,7 +7382,7 @@ msgstr "" "இடது மற்றும் முன்னேற்றத்திற்கு நகலெடு (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7385,7 +7391,7 @@ msgstr "" "அனைத்தையும் வலமாக நகலெடு" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7394,7 +7400,7 @@ msgstr "" "அனைத்தையும் இடதுபுறமாக நகலெடு" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7403,7 +7409,7 @@ msgstr "" "ஆட்டோ மெர்ச் (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7412,7 +7418,7 @@ msgstr "" "முதல் கோப்பு" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7421,7 +7427,7 @@ msgstr "" "அடுத்த கோப்பு (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7430,7 +7436,7 @@ msgstr "" "கடைசி கோப்பு" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7439,39 +7445,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 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" @@ -7481,125 +7487,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 "நகர்த்தப்பட்ட வரிக்கு செல்க\tகட்டு+தூக்கு+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 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" @@ -7610,488 +7616,488 @@ 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 "புள்: (%d, %d) சிபநீஅ: (%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 "" #. 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 "'%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 "முகவரி வர்த்தகங்கள்" #. 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 "பேரிக்காய்" #. 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 "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 "" #. 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." @@ -8099,112 +8105,117 @@ msgstr "" "இடைநிலைப்பலகை வரலாறு முடக்கப்பட்டுள்ளது.\r\n" "இடைநிலைப்பலகை வரலாற்றை இயக்க, சாளரங்கள் சின்னம் + 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-இரும பதிப்பு இடைநிலைப்பலகை ஒப்பீட்டை ஆதரிக்கவில்லை" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "" "வலைக்காட்சி2 இயக்கநேரம் நிறுவப்படவில்லை. நீங்கள் அதைப் பதிவிறக்க " "விரும்புகிறீர்களா?" #. 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 "முன் & வி பக்கம்" #. 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" @@ -8217,7 +8228,7 @@ msgstr "" "(Alt+வீல் அப்)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8230,7 +8241,7 @@ msgstr "" "(Alt+வீல் டவுன்)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8245,7 +8256,7 @@ msgstr "" "(Alt+Shift+Wheel Down)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8260,7 +8271,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" @@ -8273,7 +8284,7 @@ msgstr "" "(Ctrl+Alt+Shift+Wheel Town)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8286,262 +8297,262 @@ 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 "" #. 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/Turkish.po b/Translations/WinMerge/Turkish.po index 3b767468c81..d1c61a4135c 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -24,7 +24,7 @@ msgstr "" "X-Generator: Poedit 3.9\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_TURKISH, SUBLANG_DEFAULT" @@ -109,7 +109,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Seçilmiş farkı (sağ) panoya kopyala\tCtrl+&3" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "Satır &farkını seç\tF4" @@ -139,7 +139,7 @@ msgid "Cu&t" msgstr "&Kes" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "K&opyala" @@ -149,19 +149,19 @@ msgid "&Paste" msgstr "Ya&pıştır" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Betikler" #. 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 "< Boş >" #. 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 "&Git...\tCtrl+G" @@ -181,27 +181,27 @@ msgid "Op&en" msgstr "&Aç" #. 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 "Kayıtlı &uygulama ile" #. 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 "Dış düz&enleyici ile\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 "&Birlikte aç..." #. 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 "Üs&t klasörü aç..." #. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU -#: Merge.rc:137 Merge.rc:1239 +#: Merge.rc:137 Merge.rc:1249 msgid "S&hell Menu" msgstr "&Sağ tık menüsü" @@ -236,8 +236,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "&Ekleme/silme algılansı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 "&Yok" @@ -252,12 +252,12 @@ msgid "&Horizontal" msgstr "&Yatay" #. 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 "Ö&nceki sayfa" #. 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 "So&nraki sayfa" @@ -267,42 +267,42 @@ msgid "&Active Pane" msgstr "Etkin s&ayfa" #. 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 "&Sağa 90 derece döndü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 "S&ola 90 derece döndür" #. 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 "&Dikey çevir" #. 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 "&Yatay çevir" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "&Yakınlaştır" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "&Yakınlaştır\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "&Uzaklaştır\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 "Sürükle&me kipi" #. 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 "&Taşı" #. 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 "Sapmayı &ayarla" #. 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 "&Dikey temizlik" #. 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 "&Yatay temizlik" #. 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 "&Dikdörtgen seçim" @@ -382,37 +382,37 @@ msgid "Compare Extracted &Text from Images" msgstr "Görsellerden &ayıklanan metni karşılaştır" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "&Karşılaştır" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "&Ekran görüntüleri" #. 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 "&Tam boyutlu ekran görüntüleri" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_HTMLS -#: Merge.rc:276 Merge.rc:1249 +#: Merge.rc:276 Merge.rc:1259 msgid "&HTMLs" msgstr "&HTML dosyaları" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_TEXTS -#: Merge.rc:277 Merge.rc:1250 +#: Merge.rc:277 Merge.rc:1260 msgid "&Texts" msgstr "Me&tinler" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES -#: Merge.rc:278 Merge.rc:1251 +#: Merge.rc:278 Merge.rc:1261 msgid "&Resource Trees" msgstr "&Kaynak ağaçları" #. 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 "&Boyut" @@ -427,27 +427,27 @@ msgid "&Event Sync" msgstr "&Etkinlik eşitleme" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED -#: Merge.rc:291 Merge.rc:1259 +#: Merge.rc:291 Merge.rc:1269 msgid "&Enabled" msgstr "&Açık" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL -#: Merge.rc:293 Merge.rc:1261 +#: Merge.rc:293 Merge.rc:1271 msgid "&Scroll" msgstr "&Kaydır" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK -#: Merge.rc:294 Merge.rc:1262 +#: Merge.rc:294 Merge.rc:1272 msgid "&Click" msgstr "&Tıkla" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT -#: Merge.rc:295 Merge.rc:1263 +#: Merge.rc:295 Merge.rc:1273 msgid "&Input" msgstr "&Giriş" #. 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 "Geri/İleri gi&t" @@ -477,3607 +477,3613 @@ msgid "&All Profiles" msgstr "&Tüm profil" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Dosya" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 msgid "&New" msgstr "&Yeni" #. 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 "Me&tin" #. 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&ablo" #. 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 "&Binary" #. 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 "&Görsel" #. 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 "İnternet &sitesi" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Yeni (&3 pano)" #. 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ç...\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 "&Fark dosyası aç..." #. 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 "Pan&oyu aç" #. 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 "Pro&je dosyası aç...\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 "&Proje dosyası kaydet..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Son kullanılan projeler" #. 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 "Son dosya ya da k&lasörler" #. 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 "Çı&kış\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 "Düz&enle" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "Ya&pıştır\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 "&Ayarlar...\tCtrl+," #. IDR_MERGEDOCTYPE -#: Merge.rc:349 Merge.rc:458 Merge.rc:695 +#: Merge.rc:351 Merge.rc:462 Merge.rc:702 msgid "&View" msgstr "&Görünüm" #. 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 "&Sekme çubuğu" #. 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 "&Sekme çubuğu görüntülensin" #. 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 "&Başlık çubuğunda" #. IDR_MERGEDOCTYPE -#: Merge.rc:356 Merge.rc:505 Merge.rc:749 +#: Merge.rc:358 Merge.rc:509 Merge.rc:756 msgid "&Toolbar" msgstr "&Araç çubuğu" #. 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 "Küçük" #. 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 "&Orta" #. 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üyük" #. 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 "Çok &büyük" #. 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 "Me&nü çubuğu" #. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR -#: Merge.rc:365 Merge.rc:515 +#: Merge.rc:367 Merge.rc:519 msgid "&Output Pane" msgstr "&Çıktı bölmesi" #. 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 "&Durum çubuğu" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "&Araçlar" #. 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 "&Filtreler..." #. 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 "Ya&ma oluştur..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "E&klentiler" #. 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 "Ek&lenti ayarları..." #. 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 "El ile ö&n farklılaştırma" #. 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 "&Otomatik ön farklılaştırma" #. 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 "El ile ayıkla&ma" #. 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 "Otomatik &ayıklama" #. 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 "Eklentile&ri yeniden yükle" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 msgid "&Window" msgstr "&Pencere" #. 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 "Ka&pat\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 "&Tümünü kapat" #. 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 "&Pano değiştir\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 "&Yatay döşe" #. 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 "&Dikey döşe" #. 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 "&Basamakla" #. 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 "Ya&rdım" #. 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 yardımı\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 "Sürüm ¬ları" #. 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 "Çe&viriler" #. 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 "&Yapılandırma" #. 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 Genel Kamu Lisansı" #. 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 &hakkında..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "Salt okunu&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 "So&l salt okunur olsun" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "&Orta salt okunur olsun" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "S&ağ salt okunur olsun" #. 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 "&Dosya kodlaması..." #. 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ümünü seç\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Aynı ögeleri &görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "&Farklı ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Soldaki &eşsiz ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Ortadaki eşsiz öge&leri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Sağdaki eşsiz ö&geleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "A&tlanan ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "&Binary dosyaları görüntüle" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "&3 panolu karşılaştırma" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Yalnızca so&ldaki farklı ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Yalnızca &ortadaki farklı ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Yalnızca sağdaki fa&rklı ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Yalnızca soldaki &eksik ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Yalnızca orta&daki eksik ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "&Yalnızca sağdaki eksik ögeleri görüntüle" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Gizli ög&eleri görüntüle" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "Ağaç görünü&mü" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "Alt klasörleri &genişlet" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "&Tüm alt klasörler" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "&Farklı alt klasörler" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "A&ynı alt klasörler" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "Tüm alt klasörleri &daralt" #. IDR_DIRDOCTYPE, ID_VIEW_SHOW_EMPTY_FOLDERS -#: Merge.rc:488 +#: Merge.rc:492 msgid "Show &Empty Folders" msgstr "&Boş klasörleri göster" #. IDR_MERGEDOCTYPE, ID_VIEW_SELECTFONT -#: Merge.rc:490 Merge.rc:697 +#: Merge.rc:494 Merge.rc:704 msgid "Select &Font..." msgstr "Ya&zı türünü değiştir..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Varsayılan yazı türü kullanılsın" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "&Panoların yerini değiştir" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "1. ile 2. ögeyi değiştir" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "2. ile 3. ögeyi değiştir" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "1. ile 3. ögeyi değiştir" #. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU -#: Merge.rc:514 +#: Merge.rc:518 msgid "Displa&y Filter Bar\tCtrl+Shift+L" msgstr "Filtre Çubuğunu Görün&tüle\tCtrl+Shift+L" #. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS -#: Merge.rc:518 +#: Merge.rc:522 msgid "Com&pare Statistics..." msgstr "Karşılaştırma istatistikleri..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Yenile\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "Seçilmişi ¥ile\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "&Birleştir" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "&Karşılaştır\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "So&nraki fark\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Ön&ceki fark\tAlt+Up" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "İlk &fark\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "İmleçtek&i fark\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "&Son fark\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 "S&ağa kopyala\tAlt+Sağa" #. IDR_MERGEDOCTYPE, ID_R2L -#: Merge.rc:535 Merge.rc:831 +#: Merge.rc:539 Merge.rc:838 msgid "Copy to L&eft\tAlt+Left" msgstr "So&la kopyala\tAlt+Sola" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "&Sil\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "&Sütunları ayarla..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "&Rapor hazırla..." #. 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 "Ayıklayıcı ile düz&enle..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Kaydet\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "Panoyu kayd&et" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "So&lu kaydet" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "&Ortayı kaydet" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "&Sağı kaydet" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "F&arklı kaydet" #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_LEFT -#: Merge.rc:620 Merge.rc:1205 +#: Merge.rc:626 Merge.rc:1215 msgid "Save &Left As..." msgstr "So&lu farklı kaydet..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_MIDDLE -#: Merge.rc:621 Merge.rc:1206 +#: Merge.rc:627 Merge.rc:1216 msgid "Save &Middle As..." msgstr "&Ortayı farklı kaydet..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Sağı fa&rklı kaydet..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "&Yazdır...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "&Sayfa ayarları..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "&Yazdırma ön izleme..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "Sa&tır sonlarını dönüştür" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Birleştir&me kipi\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Yeniden yük&le\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "&Farklı karşılaştır" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "Geri a&l\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "Yi&nele\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "K&es\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 "&Kopyala\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "&Bul...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "&Değiştir...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "İşa&retleyici...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Gelişmiş" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Satır numaraları ile &kopyala\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "&Yer imleri" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Yer imi ekle/sil\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "So&nraki yer imi\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "Ön&ceki yer imi\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "&Tüm yer imlerini sil" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Söz dizimi &vurgulaması" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Fark &bağlamı" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "Tüm s&atırlar" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 satır" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Tümünü ve 0-9 satırları değiştir\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "&Tersine çevir (Farklı satırları gizle)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "Pano&lar kilitlensin" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "Beyaz b&oşluklar görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "&Satır sonları görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Satır &farklılıkları görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Satır nu&maraları görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Kenar boşlukları &görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Üst kenar &boşlukları görüntülensin" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Satı&rlar kaydırılsın" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Dik&ey bölünsün" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "Fark panos&u" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "&Konum panosu" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Çıktı panosu" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "S&onraki çelişki\tAlt+Shift+Aşağı" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Önc&eki çelişki\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "&Gelişmiş" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Sonraki sol ve orta farkı\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Önceki sol ve orta farkı\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Sonraki sol ve sağ farkı\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Önceki sol ve sağ farkı\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Sonraki orta ve sağ farkı\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Önceki orta ve sağ farkı\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Sonraki yalnızca solda farkı\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Önceki yalnızca solda farkı\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Sonraki yalnızca ortada farkı\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Önceki yalnızca ortada farkı\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Sonraki yalnızca sağda farkı\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Önceki yalnızca sağda farkı\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "So&ldan şuraya kopyala" #. 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 "&Ortaya" #. 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 "&Sağa" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Or&tadan şuraya kopyala" #. 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 "So&la" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Sağ&dan şuraya kopyala" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Seçilmiş satır(lar)ı s&oldan şuraya kopyala" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Seçilmiş satır(lar)ı o&rtadan şuraya kopyala" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Seçilmiş satır(lar)ı s&ağdan şuraya kopyala" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Sol&dan kopyala\tAlt+Shift+Sağa" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Sağdan &kopyala\tAlt+Shift+Sola" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Sağa kopyala &ve ilerle\tCtrl+Alt+Sağa" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Sola kopyala ve ile&rle\tCtrl+Alt+Sola" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Tü&münü sağa kopyala" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "&Tümünü sola kopyala" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "Otomatik &birleştir\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Eşitleme noktası &ekle\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Eşitleme noktalarını &sil" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "&Ayıklayıcı" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "Ön &farklılaştırıcı" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Ön &farklılaştırıcı uygula..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "&Düzenleyici betiği ile dönüştür..." #. IDR_MERGEDOCTYPE -#: Merge.rc:880 +#: Merge.rc:887 msgid "Scripts for &Copying" msgstr "&Kopyalama betiği" #. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING -#: Merge.rc:886 +#: Merge.rc:893 msgid "Select &Editor Script..." msgstr "&Düzenleyici betiğini seçin..." #. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT -#: Merge.rc:898 +#: Merge.rc:905 msgid "Sp&lit" msgstr "Bö&l" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "K&arşılaştır" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_WITH_MOVED_RENAMED -#: Merge.rc:922 +#: Merge.rc:929 msgid "Compar&e with Renamed/Moved Items" msgstr "Yeniden adlandırılan/taşınan ögelerle &karşılaştır" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_IN_NEW_WINDOW -#: Merge.rc:923 +#: Merge.rc:930 msgid "Compare in New &Window" msgstr "Yeni &pencerede karşılaştır" #. 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 "&Yatay olmayan karşılaştırma..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "&Yatay olmayan karşılaştırma" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Birinci so&l öge ile ikinci sol öge" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Bi&rinci sağ öge ile ikinci sağ öge" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "Birinci s&ol öge ile ikinci sağ öge" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Birinci &sağ öge ile ikinci sol öge" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "&Farklı karşılaştır" #. 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 "Soldakini ortaya (%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 "Soldakini sağa (%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 "Soldakini şuraya... (%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 "Ortadakini sola (%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 "Ortadakini sağa (%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 "Ortadakini şuraya... (%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 "Sağdakini ortaya (%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 "Sağdakini sola (%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 "Sağdakini şuraya... (%1 / %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "&Sil" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "İ&kisi de" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "&Tümü" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "&Seçilmiş bölümde" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Ye&niden adlandır" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "Ögeleri &gizle" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "S&olda aç" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "O&rtada aç" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "&Sağda aç" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "&Yol adlarını kopyala" #. 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 "Soldakini (%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 "Ortadakini (%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 "Sağdakini (%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 "İkisini de (%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 "Tümü (%1 / %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "&Dosya adlarını kopyala" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Ö&geleri panoya kopyala" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Görüntülenen tüm &sütunları kopyala" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1020 +#: Merge.rc:1028 msgid "&Zip" msgstr "&Sıkıştır" #. 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 "İkisini de... (%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 "Tümünü... (%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 "&Farklı olanları... (%1 / %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Sol pano sağ tık menüsü" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Orta pano sağ tık menüsü" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Sağ pano sağ tık menüsü" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "İki panonun sağ tık menüsü" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Tüm panoların sağ tık menüsü" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Kopyala" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "Tam yolu &kopyala" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "&Dosya adını kopyala" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "&Başlığı düzenle\tF2" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH -#: Merge.rc:1055 +#: Merge.rc:1063 msgid "Edit &Path\tCtrl+L" msgstr "&Yolu Düzenle\tCtrl+L" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE -#: Merge.rc:1056 +#: Merge.rc:1064 msgid "&Open..." msgstr "&Aç..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Ayıklayıcı ayarları" #. 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 "Seçi&n..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Ön farklılaştırıcı ayarları" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Fa&rka git" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK -#: Merge.rc:1083 +#: Merge.rc:1091 msgid "Move Cursor on &Click" msgstr "&Tıklandığında İmle&ci Taşı" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE -#: Merge.rc:1085 +#: Merge.rc:1093 msgid "&No Moved Blocks" msgstr "Taşı&nmış blok yok" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "T&aşınmış blokların tümü" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Beyaz boşl&uklar" #. 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 "&Karşılaştırılsın" #. 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 "Değişiklikler &yok sayılsın" #. 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 "Tümü y&ok sayılsı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 "Boş satırlar yo&k sayılsın" #. 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 "BÜYÜK/küçük &harf ayrımı yapılmasın" #. 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 "Satı&r sonu farklılıkları yok sayılsın (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 "Ko&d sayfası farklılıkları yok sayılsı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 "&Sayıları yok say" #. 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 "Yo&rum farklılıkları yok sayılsın" #. 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 "&Sondaki eksik satır sonu yok sayılsın" #. 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 "Satır &Sonlarını Yok Say (Boşluk Olarak Ele Al)" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK -#: Merge.rc:1109 Merge.rc:2963 +#: Merge.rc:1117 Merge.rc:2973 msgid "&Include Subfolders" msgstr "A< klasörler katılsın" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "&Karşılaştırma yöntemi" #. 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 "Tüm içerik" #. 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 "Hızlı içerik" #. 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 "Binary içerik" #. 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 "Değiştirilme tarihi" #. 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 "Değiştirilme tarihi ve boyut" #. 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 "Boyut" #. 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 "Varlık" #. IDR_POPUP_PROJECT, ID_LOAD_PROJECT -#: Merge.rc:1192 +#: Merge.rc:1202 msgid "&Load Project..." msgstr "Proje yük&le..." #. 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 "${*} - Tüm değişkenler" #. 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} - Birinci değişken" #. 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} - İkinci değişken" #. 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} - Üçüncü değişken" #. 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} - Dördüncü değişken" #. 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} - Beşinci değişken" #. 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} - Altıncı değişken" #. 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} - Yedinci değişken" #. 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} - Sekizinci değişken" #. 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} - Dokuzuncu değişken" #. 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} - Kaynak dosya" #. 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} - Kaynak klasör" #. 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} - Kaynak adres" #. 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} - Kaynak adres iletişim kuralı" #. 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} - Kaynak adres son eki" #. 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} - Hedef dosya" #. 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} - Hedef klasör" #. 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} - Hedef adres" #. 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} - Hedef adres iletişim kuralı" #. 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} - Hedef adres son eki" #. 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 ana klasö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} - Betik dosyası" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Ayıklama &eklentisi ekle..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER -#: Merge.rc:1319 +#: Merge.rc:1329 msgid "Add &Prediffer Plugin..." msgstr "Ön &farklılaştırıcı eklentisi ekle..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE -#: Merge.rc:1320 +#: Merge.rc:1330 msgid "&Duplicate Plugin..." msgstr "Çif&t eklentisi..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "&Tümünü temizle" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR -#: Merge.rc:1352 +#: Merge.rc:1362 msgid "&Clear All" msgstr "Tümünü &temizle" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST -#: Merge.rc:1353 +#: Merge.rc:1363 msgid "Remove Last Filter &Group" msgstr "Son filtre &grubunu kaldır" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL -#: Merge.rc:1354 +#: Merge.rc:1364 msgid "R&eset to Default (*.*)" msgstr "V&arsayılanlara sıfırla (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Hariç t&utma dosyası ekle" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "&Sistem dosyaları" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "&Editör yedekleme dosyaları" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "&Derlenmiş binary dosyalar" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Gün&lük dosyaları" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "&Geçici veya önbellek dosyaları" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Hariç t&utma klasörü ekle" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "&Versiyon kontrolü" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "&Yapı ögeleri" #. 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 "&Dosya koşulu ekle" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Do&sya boyutu" #. 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 "1 KB'den az" #. 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 veya daha fazla" #. 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 "10 KB'den az" #. 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 veya daha fazla" #. 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 "100 KB'den az" #. 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 veya daha fazla" #. 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 "1 MB'den az" #. 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 veya daha fazla" #. 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 "10 MB'den az" #. 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 veya daha fazla" #. 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 "100 MB'den az" #. 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 veya daha fazla" #. 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 "1 GB'den az" #. 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 veya daha fazla" #. 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 "Özel aralık..." #. 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 "Son değişik&lik" #. 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 "&Saat" #. 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 saatten fazla önce" #. 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 saat içinde" #. 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 "&Gün" #. 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 "Bugünden önce" #. 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 "Bugün" #. 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 "Dünden önce" #. 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 "Dün" #. 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 "Dünden beri" #. 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 "&Hafta" #. 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 "Bu haftadan önce" #. 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 "Bu hafta" #. 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 "Geçen haftadan önce" #. 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 "Geçen hafta" #. 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 "Geçen haftadan beri" #. 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 "&Ay" #. 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 "Bu aydan önce" #. 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 "Bu ay" #. 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 "Bu aydan önce" #. 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 "Geçen ay" #. 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 "Geçen aydan beri" #. 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ıl" #. 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 "Bu yıldan önce" #. 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 "Bu yıl" #. 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 "Geçen yıldan önce" #. 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 "Geçen yıl" #. 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 "Geçen yıldan beri" #. 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 "&Özel Aralık..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1431 Merge.rc:1589 +#: Merge.rc:1441 Merge.rc:1599 msgid "&Attributes" msgstr "&Öznitelikler" #. 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 "Salt okunur dosyalar" #. 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 "Salt okunur dosyalar değil" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN -#: Merge.rc:1435 Merge.rc:1609 +#: Merge.rc:1445 Merge.rc:1619 msgid "Hidden files" msgstr "Gizli dosyalar" #. 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 "Gizli dosyalar değil" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Sistem dosyaları" #. 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 "Sistem dosyaları değil" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "Dosya &İçeriği" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Dize içerir..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "Dize içermez..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "İlk satır dize içerir..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS -#: Merge.rc:1445 +#: Merge.rc:1455 msgid "First line does not contain string..." msgstr "İlk satır dize içermez..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "İlk 10 satır dize içerir..." #. 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 "İlk 10 satır dize içermez..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "Son 10 satır dize içerir..." #. 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 "Son 10 satır dize içermez..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "Son satır dize içerir..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS -#: Merge.rc:1451 +#: Merge.rc:1461 msgid "Last line does not contain string..." msgstr "Son satır dize içermez..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1453 +#: Merge.rc:1463 msgid "&Line Count" msgstr "&Satır Sayısı" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10 -#: Merge.rc:1455 +#: Merge.rc:1465 msgid "Less than 10" msgstr "10'dan az" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10 -#: Merge.rc:1456 +#: Merge.rc:1466 msgid "10 or more" msgstr "10 veya daha fazla" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100 -#: Merge.rc:1457 +#: Merge.rc:1467 msgid "Less than 100" msgstr "100'den az" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100 -#: Merge.rc:1458 +#: Merge.rc:1468 msgid "100 or more" msgstr "100 veya daha fazla" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000 -#: Merge.rc:1459 +#: Merge.rc:1469 msgid "Less than 1000" msgstr "1.000'den az" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000 -#: Merge.rc:1460 +#: Merge.rc:1470 msgid "1000 or more" msgstr "1.000 veya daha fazla" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000 -#: Merge.rc:1461 +#: Merge.rc:1471 msgid "Less than 10000" msgstr "10.000'den az" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000 -#: Merge.rc:1462 +#: Merge.rc:1472 msgid "10000 or more" msgstr "10.000 veya daha fazla" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000 -#: Merge.rc:1463 +#: Merge.rc:1473 msgid "Less than 100000" msgstr "100.000'den az" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000 -#: Merge.rc:1464 +#: Merge.rc:1474 msgid "100000 or more" msgstr "100.000 veya daha fazla" #. 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 "Ek &Özellikler..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1469 +#: Merge.rc:1479 msgid "Add F&older Condition" msgstr "Klasör K&oşulu Ekle" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1513 +#: Merge.rc:1523 msgid "&Files" msgstr "&Dosyalar" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0 -#: Merge.rc:1515 +#: Merge.rc:1525 msgid "0 files" msgstr "0 dosya" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1 -#: Merge.rc:1516 +#: Merge.rc:1526 msgid "1 file or more" msgstr "1 dosya veya daha fazla" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1519 +#: Merge.rc:1529 msgid "&Items" msgstr "&Ögeler" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0 -#: Merge.rc:1521 +#: Merge.rc:1531 msgid "0 items" msgstr "0 öge" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1 -#: Merge.rc:1522 +#: Merge.rc:1532 msgid "1 item or more" msgstr "1 öge veya daha fazla" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1525 +#: Merge.rc:1535 msgid "&Total Size" msgstr "&Toplam Boyut" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE -#: Merge.rc:1542 +#: Merge.rc:1552 msgid "&Recursive" msgstr "&Özyinelemeli" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY -#: Merge.rc:1544 +#: Merge.rc:1554 msgid "Target: &Any (Left/Middle/Right)" msgstr "Hedef: &Herhangi biri (Sol/Orta/Sağ)" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT -#: Merge.rc:1545 +#: Merge.rc:1555 msgid "Target: &Left" msgstr "Hedef: &Sol" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE -#: Merge.rc:1546 +#: Merge.rc:1556 msgid "Target: &Middle" msgstr "Hedef: &Orta" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT -#: Merge.rc:1547 +#: Merge.rc:1557 msgid "Target: &Right" msgstr "Hedef: &Sağ" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1549 +#: Merge.rc:1559 msgid "Add &Difference Condition" msgstr "&Fark Koşulu Ekle" #. 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 "Eşit" #. 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 "Eşit Değil" #. 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 "Daha küçük" #. 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 "Küçük veya eşit" #. 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 "Daha büyük" #. 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 "Daha büyük veya eşit" #. 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 milyardan az" #. 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 milyar veya daha fazla" #. 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 milyardan az" #. 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 milyar veya daha fazla" #. 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 saniyeden az" #. 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 saniye veya daha fazla" #. 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 dakikadan az" #. 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 dakika veya daha fazla" #. 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 saatten az" #. 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 saat veya daha fazla" #. 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 günden az" #. 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 gün veya daha fazla" #. 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 haftadan az" #. 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 hafta veya daha fazla" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT -#: Merge.rc:1596 +#: Merge.rc:1606 msgid "Target: &Left and Right" msgstr "Hedef: &sol ve sağ" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE -#: Merge.rc:1597 +#: Merge.rc:1607 msgid "Target: Left and &Middle" msgstr "Hedef: sol ve &orta" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT -#: Merge.rc:1598 +#: Merge.rc:1608 msgid "Target: Middle and &Right" msgstr "Hedef: orta ve &sağ" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL -#: Merge.rc:1599 +#: Merge.rc:1609 msgid "Target: &All" msgstr "Hedef: &tümü" #. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_BINARY_ONLY -#: Merge.rc:1620 +#: Merge.rc:1630 msgid "Binary files only" msgstr "Yalnızca binary dosyalar" #. IDR_POPUP_FILTERMENU_BINARY, ID_FILTERMENU_TEXT_ONLY -#: Merge.rc:1621 +#: Merge.rc:1631 msgid "Text files only" msgstr "Yalnızca metin dosyaları" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CLEAR -#: Merge.rc:1755 +#: Merge.rc:1765 msgid "&Clear conditions" msgstr "Koşulları &temizle" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE -#: Merge.rc:1757 +#: Merge.rc:1767 msgid "Compare &Size" msgstr "&Boyutu karşılaştır" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE -#: Merge.rc:1758 +#: Merge.rc:1768 msgid "Compare &Date" msgstr "Tarihi &karşılaştır" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR -#: Merge.rc:1759 +#: Merge.rc:1769 msgid "Compare &Attributes" msgstr "Öznitelikleri k&arşılaştır" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS -#: Merge.rc:1760 +#: Merge.rc:1770 msgid "Compare C&ontents" msgstr "&İçerikleri karşılaştır" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_CLEAR -#: Merge.rc:1769 +#: Merge.rc:1779 msgid "&Clear Keys" msgstr "&Tuşları Temizle" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NAME -#: Merge.rc:1771 +#: Merge.rc:1781 msgid "&Name" msgstr "&Ad" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_BASENAME -#: Merge.rc:1772 +#: Merge.rc:1782 msgid "&Base name (without extension)" msgstr "T&emel ad (uzantısız)" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_NORMALIZED_NAME -#: Merge.rc:1773 +#: Merge.rc:1783 msgid "Normalized &Unicode Name" msgstr "Normalleştirilmiş &Unicode Adı" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_RELPATH -#: Merge.rc:1774 +#: Merge.rc:1784 msgid "&Relative Path" msgstr "&Göreli yol" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_DATE -#: Merge.rc:1776 +#: Merge.rc:1786 msgid "&Date" msgstr "Tari&h" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_HASH_MD5 -#: Merge.rc:1777 +#: Merge.rc:1787 msgid "&Hash (MD5)" msgstr "&Sağlama toplamı (MD5)" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_REPLACE -#: Merge.rc:1780 +#: Merge.rc:1790 msgid "Insert &replace() Function" msgstr "&replace() işlevini ekle" #. 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() işlevini ekle" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1782 +#: Merge.rc:1792 msgid "Replace &Lists" msgstr "&Listeleri değiştir" #. 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 "Dize değiştirme listesi &oluştur ve ekle…" #. 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 değiştirme listesi oluştur ve ekle…" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1787 +#: Merge.rc:1797 msgid "&String Replace Lists" msgstr "&Dize değiştirme listeleri" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1791 +#: Merge.rc:1801 msgid "Re&gex Replace Lists" msgstr "Re&gex değiştirme listeleri" #. 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 "Dize değiştirme listeleri klasörünü aç…" #. 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 değiştirme listeleri klasörünü aç…" #. 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 "BÜYÜK/küçük &harfler eşleştirilsin" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1801 +#: Merge.rc:1811 msgid "Text &Normalization" msgstr "Metin &normalleştirme" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOLOWER -#: Merge.rc:1803 +#: Merge.rc:1813 msgid "&Lowercase" msgstr "&Küçük harf" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOUPPER -#: Merge.rc:1804 +#: Merge.rc:1814 msgid "&Uppercase" msgstr "&Büyük harf" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOHALFWIDTH -#: Merge.rc:1805 +#: Merge.rc:1815 msgid "&Half-width" msgstr "&Yarım genişlik" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOFULLWIDTH -#: Merge.rc:1806 +#: Merge.rc:1816 msgid "&Full-width" msgstr "Tam &genişlik" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1807 +#: Merge.rc:1817 msgid "&Chinese Conversion" msgstr "&Çince dönüştürme" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOSIMPLIFIEDCHINESE -#: Merge.rc:1809 +#: Merge.rc:1819 msgid "&Simplified Chinese" msgstr "Ba&sitleştirilmiş Çince" #. IDR_POPUP_RENAMEMOVE_MENU, ID_RENAME_MOVE_KEY_MENU_FUNC_TOTRADITIONALCHINESE -#: Merge.rc:1810 +#: Merge.rc:1820 msgid "&Traditional Chinese" msgstr "&Geleneksel Çince" #. IDR_POPUP_RENAMEMOVE_MENU -#: Merge.rc:1812 +#: Merge.rc:1822 msgid "&Japanese Conversion" msgstr "&Japonca dönüştürme" #. 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’u normalleştir" #. IDD_ABOUTBOX -#: Merge.rc:1932 +#: Merge.rc:1942 msgid "About WinMerge" msgstr "WinMerge hakkında" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "WinMerge sitesini ziyaret edin!" #. 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 "Tamam" #. IDD_ABOUTBOX, IDC_OPEN_CONTRIBUTORS -#: Merge.rc:1939 +#: Merge.rc:1949 msgid "Contributors" msgstr "Emeği Geçenler" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Dosya ya da klasör seçin" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "&1. dosya ya da klasör" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "S&alt okunur" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "1. ile 2. ögeyi değiştir" #. 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 "&Göz at..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "&2. dosya ya da klasör" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Salt &okunur" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "2. ile 3. ögeyi değiştir" #. IDD_PROPPAGE_SYSTEM, IDC_FILTER_USER_BROWSE -#: Merge.rc:1960 Merge.rc:2315 +#: Merge.rc:1970 Merge.rc:2325 msgid "B&rowse..." msgstr "Gö&z at..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "&3. dosya ya da klasör (isteğe bağlı)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Salt oku&nur" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "1. ile 3. ögeyi değiştir" #. 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 "Göz at..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Klasör: Filtre" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "A< klasörler katılsın" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Dosya: Ön farklılaştırıcı eklentisi" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Dosya: Ayıklayıcı eklentisi" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "&Seç..." #. 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 "İptal" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Durum:" #. 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 "Yardım" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "&Ayarlar..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Bul" #. 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 "&Aranacak:" #. 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özcükler &tam olarak eşleştirilsin" #. 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 "Kurallı ifad&e" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "D&osya sonundan başa dönülmesin" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "Bu &pencere kapatılmasın" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "S&onrakini bul" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Ö&ncekini bul" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Değiştir" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Şununla &değiştir:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "Dosya &sonundan başa dönülmesin" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Şurada değiştir" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "D&osyanın tümünde" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Ö&ncekini bul" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Değişti&r" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "&Tümünü değiştir" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "İşaretleyiciler" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "İşaretleyiciler &kullanılsın" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Yeni" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "A&rka plan rengi:" #. 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 "&Tamam" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:2045 Merge.rc:2525 Merge.rc:3199 +#: Merge.rc:2055 Merge.rc:2535 Merge.rc:3209 msgid "&Apply" msgstr "&Uygula" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Satır filtreleri" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Satır filtreleri kullanılsın" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Kurallı ifadeler (her satıra bir tane):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Düzenle" #. 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 "Sil" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Değişiklik filtreleri" #. 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 "Panolarda görünen, aşağıda çiftler olarak listelenmiş değişiklikler yok sayılacak veya önemsiz olarak işaretlenecek. Yamalar etkilenmez." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Etkinleştir" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Ekle" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Temizle" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Ayarlar" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "İçe aktar..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Dışa aktar..." #. 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 "Genel" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Otomatik olarak ilk &farka gidilsin" #. 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 "Otomatik olarak ilk satır arası &farka gidilsin" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "'ESC' tuşu pencereleri &kapatsın:" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "'&Aç' penceresindeki yollar doğrulansın" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Tek kopya kipi:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "&Birden fazla pencere kapatılıyorsa onay istensin" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Karşılaştırmada &dosya zamanı korunsun" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "\"Dosya veya klasör seç\" penceresini açılışta göster" #. 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 "\"Dosya veya klasör seç\" penceresini Karşılaştır düğmesi ile kapat" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Aç &penceresi otomatik olarak doldurulsun:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Değiştirilen dosyalar &otomatik yenilensin:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Dil:" #. 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 "Varsayılanlar" #. 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 "Renkler" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2127 +#: Merge.rc:2137 msgid "Color &mode:" msgstr "Renk &modu:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2129 +#: Merge.rc:2139 msgid "&Light mode scheme:" msgstr "&Aydınlık mod şeması:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2131 +#: Merge.rc:2141 msgid "&Dark mode scheme:" msgstr "&Karanlık mod şeması:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2133 +#: Merge.rc:2143 msgid "Your custom schemes" msgstr "Özel şemalarınız" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE -#: Merge.rc:2134 +#: Merge.rc:2144 msgid "&Save current scheme..." msgstr "Mevcut şemayı &kaydet..." #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE -#: Merge.rc:2135 +#: Merge.rc:2145 msgid "Delete ¤t scheme..." msgstr "&Mevcut şemayı sil..." #. 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 "Arka plan" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Silinmiş" #. 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 "Metin" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Farklılık:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Seçilmiş farklılık:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Yok sayılmış farklılık:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Taşınmış:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Seçilmiş taşınmış:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Sonraki ile aynı (3 pano):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Sonraki ile aynı (seçilmiş):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Sözcük farklılığı:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Seçilmiş sözcük farklılığı:" #. 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 "Pencere" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Anahtar sözcükler:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "İşlev adları:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Açıklamalar:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Rakamlar:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "İşlemler:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Dizgeler:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Ön işleyici:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "1. kullanıcı:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "2. kullanıcı:" #. 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 "Koyu" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "Özel metin renkleri k&ullanılsın" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Beyaz boşluk:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Normal metin:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Seçim:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Kenar boşluğu:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Arama işaretleyicisi:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "1. kullanıcı işaretleyicisi:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "2. kullanıcı işaretleyicisi:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "3. kullanıcı işaretleyicisi:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "Klasör karşılaştırma renkleri k&ullanılsın" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Aynı ögeler:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Farklı ögeler:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Artık var olmayan ögeler:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Filtrelenmiş ögeler:" #. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED -#: Merge.rc:2295 +#: Merge.rc:2305 msgid "&Use custom system colors" msgstr "Özel &sistem renkleri kullanılsın (bazı arayüz bileşenlerine uygulanmayabilir)" #. 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 "Sistem" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "&Silinen dosyalar geri dönüşüm kutusuna atılsın" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "Dış düz&enleyici:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2311 +#: Merge.rc:2321 msgid "&Store user data in:" msgstr "Kullanıcı verilerini şurada &depola:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2313 +#: Merge.rc:2323 msgid "&Filter folder:" msgstr "Filtre &klasörü:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Geçici dosya klasörü" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "&Sistemin geçici klasörü" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Ö&zel klasör:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Göz a&t..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "Karşılaştırma" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Beyaz boşluklar" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "&Karşılaştırılsın" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "&Değişiklik yok sayılsın" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "Tümü &yok sayılsın" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Boş satırlar yo&k sayılsın" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "BÜYÜK/küçük &harf ayrımı yapılmasın" #. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE -#: Merge.rc:2335 +#: Merge.rc:2345 msgid "Igno&re EOL differences (Windows/Unix/Mac)" msgstr "EOL farklılıklarını göz a&rdı et (Windows/Unix/Mac)" #. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS -#: Merge.rc:2337 +#: Merge.rc:2347 msgid "Ignore num&bers" msgstr "&Sayıları yok say" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Kod sayfası &farklılıklarını göz ardı et" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Yo&rum farklılıkları yok sayılsın" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "&Sondaki eksik satır sonu yok sayılsın" #. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK -#: Merge.rc:2343 +#: Merge.rc:2353 msgid "Ignore line &breaks (treat as spaces)" msgstr "Satır &sonlarını yok say (boşluk olarak ele al)" #. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS -#: Merge.rc:2345 +#: Merge.rc:2355 msgid "E&nable moved block detection" msgstr "Taşı&nmış blok algılaması kullanılsın" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "&Benzer satırlar hizalansın" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "&Fark algortiması:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "&Sezgisel girinti kullanılsın" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Yok sayılan farkların vurguları tamamen kaldırılsın" #. IDS_OPTIONSPG_EDITOR -#: Merge.rc:2357 Merge.rc:4201 +#: Merge.rc:2367 Merge.rc:4211 msgid "Editor" msgstr "Düzenleyici" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "Söz dizimi &vurgulansın" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "Ö&zgün satır sonu karakterleri korunsun" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Sekmeler" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "&Sekme aralığı:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "Sekme &olarak" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "&Boşluk olarak" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "Gö&rüntüleme Kipi:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Otomatik olarak yeniden t&aransın" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2377 +#: Merge.rc:2387 msgid "Copy &granularity for selected differences:" msgstr "Seçilmiş &farkların kopyalama düzeyi:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP -#: Merge.rc:2379 +#: Merge.rc:2389 msgid "Line Difference Coloring" msgstr "Satır farklılıkları renklendirilsin" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Satır farklılıkları görüntüleme düzeyi" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "&Karakter düzeyinde" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "&Sözcük düzeyinde:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "&Sözcük kesme karakterleri:" #. 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 sık karşılaşılan iletilerin gizlenmesine izin verir. Tüm iletileri yeniden görünür yapmak için Sıfırla düğmesine tıklayın." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Sıfırla" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Yama oluşturucu" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "&1. dosya:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "&2. dosya:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "&Değiştir" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "Panoya &kopyala" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Var olan bir dosyaya eklensin" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Sonuç:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "Gö&z at..." #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2423 +#: Merge.rc:2433 msgid "&Format" msgstr "&Biçim" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2424 +#: Merge.rc:2434 msgid "St&yle:" msgstr "Biç&em:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "B&ağlam:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Ko&mut satırı katılsın" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Dış düzen&leyici ile açılsın" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Sütunlar görüntülensin" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Y&ukarı taşı" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Aşağı &taşı" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "&Ek özellikler" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Ek özellikler" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Eklenti seçin" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "Eklenti &adı:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC -#: Merge.rc:2480 +#: Merge.rc:2490 msgid "&Target files:" msgstr "&Hedef dosyalar:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2482 Merge.rc:3117 +#: Merge.rc:2492 Merge.rc:3127 msgid "Extensions list:" msgstr "Uzantı Listesi:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 msgid "Description:" msgstr "Açıklama:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2486 Merge.rc:3121 +#: Merge.rc:2496 Merge.rc:3131 msgid "Default arguments:" msgstr "Varsayılan değişkenler:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Uzantıya bakılmadan tüm eklentiler görüntülensin" #. 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 "Dosyalar &ayıklandıktan sonra aynı pencerede açılsın" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "&Eklenti bağlantı yolu:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS -#: Merge.rc:2495 +#: Merge.rc:2505 msgid "&Alias..." msgstr "&Kısaltma..." #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP -#: Merge.rc:2505 +#: Merge.rc:2515 msgid "Stop" msgstr "Durdur" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Duraklat" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Sürdür" #. 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 "&Kullanılacak işlemci çekirdeği sayısı:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Toplam öge:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Karşılaştırılan öge:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "&Kapat" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Git" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "&Git:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Dosya" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Şuna git" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "&Satır" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Farklılık" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "&Git" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Dosya filtreleri" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "&Maske / filtre ifadesi" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2562 +#: Merge.rc:2572 msgid "Preset &Filters" msgstr "Ön ayarlı &filtreler" #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN -#: Merge.rc:2564 +#: Merge.rc:2574 msgid "Test..." msgstr "Sına..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Kur..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Yeni..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Düzenle..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Sil..." #. IDD_FILTERS_CONDITION -#: Merge.rc:2573 +#: Merge.rc:2583 msgid "Filter Condition" msgstr "Filtre koşulu" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2576 +#: Merge.rc:2586 msgid "&Left-hand side:" msgstr "&Sol taraf:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2578 +#: Merge.rc:2588 msgid "&Operator:" msgstr "&Operatör:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2580 +#: Merge.rc:2590 msgid "&Right-hand side:" msgstr "&Sağ taraf:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2586 +#: Merge.rc:2596 msgid "Expression:" msgstr "İfade:" #. IDD_COMPARISON_RESULT_FILTER -#: Merge.rc:2595 +#: Merge.rc:2605 msgid "Filter by Comparison Result" msgstr "Karşılaştırma sonucuna göre filtrele" #. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_INCLUDE -#: Merge.rc:2598 +#: Merge.rc:2608 msgid "&Include" msgstr "&Dahil et" #. IDD_COMPARISON_RESULT_FILTER, IDC_RADIO_EXCLUDE -#: Merge.rc:2599 +#: Merge.rc:2609 msgid "&Exclude" msgstr "&Hariç tut" #. IDD_COMPARISON_RESULT_FILTER, IDC_STATIC -#: Merge.rc:2600 +#: Merge.rc:2610 msgid "Comparison Results" msgstr "Karşılaştırma sonuçları" #. 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 "Aynı" #. 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 "Farklılık" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY -#: Merge.rc:2603 +#: Merge.rc:2613 msgid "Left only" msgstr "Yalnızca solda" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY -#: Merge.rc:2604 +#: Merge.rc:2614 msgid "Right only" msgstr "Yalnızca sağda" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_SKIPPED -#: Merge.rc:2605 +#: Merge.rc:2615 msgid "Skipped" msgstr "Atlandı" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY -#: Merge.rc:2606 +#: Merge.rc:2616 msgid "Middle only" msgstr "Yalnızca ortada" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_DIFFERENT -#: Merge.rc:2607 +#: Merge.rc:2617 msgid "Left only (different)" msgstr "Yalnızca solda (farklı)" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_DIFFERENT -#: Merge.rc:2608 +#: Merge.rc:2618 msgid "Middle only (different)" msgstr "Yalnızca ortada (farklı)" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_DIFFERENT -#: Merge.rc:2609 +#: Merge.rc:2619 msgid "Right only (different)" msgstr "Yalnızca sağda (farklı)" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_LEFT_ONLY_MISSING -#: Merge.rc:2610 +#: Merge.rc:2620 msgid "Left only (missing)" msgstr "Yalnızca solda (eksik)" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_MIDDLE_ONLY_MISSING -#: Merge.rc:2611 +#: Merge.rc:2621 msgid "Middle only (missing)" msgstr "Yalnızca ortada (eksik)" #. IDD_COMPARISON_RESULT_FILTER, IDC_CHECK_RIGHT_ONLY_MISSING -#: Merge.rc:2612 +#: Merge.rc:2622 msgid "Right only (missing)" msgstr "Yalnızca sağda (eksik)" #. IDS_OPTIONSPG_CODEPAGE -#: Merge.rc:2619 Merge.rc:2811 Merge.rc:4213 +#: Merge.rc:2629 Merge.rc:2821 Merge.rc:4223 msgid "Codepage" msgstr "Kod sayfası" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Varsayılan kod sayfası" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Unikod olmayan dosyalar için kullanılacak kod sayfası:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Sistem kod sayfası" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "WinMerge kullanıcı arayüzü kod sayfası" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Özel kod sayfası:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4086,7 +4092,7 @@ msgstr "" "Uygulamanın yeniden başlatılması gerekir." #. 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 +4101,769 @@ msgstr "" "Uygulamanın yeniden başlatılması gerekir." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Sıkıştırma desteği" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "&Sıkıştırılmış dosya desteği kullanılsın" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Arşiv türü dosya imzasından belirlensin" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Bir proje dosyasındaki ögeler kaydedildi ya da geri yüklendi:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Dosya değişiklikleri kaydedilsin mi?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Sol panodaki dosya" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "Değişiklikleri &kaydet" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Değişiklikleri yok say" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Orta panodaki dosya" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "D&eğişiklikleri kaydet" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Değişi&klikleri yok say" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Sağ panodaki dosya" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Değişiklikleri k&aydet" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Değişiklikleri &yok say" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "&Tümünü yok say" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Klasör karşılaştırma raporu" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "Rapor &dosyası:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "&Biçem:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "K&lasör karşılaştırma raporu eklensin" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Ortak ya da özel filtre" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Oluşturmak istediğiniz filtre türü nedir?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Ortak filtre (bilgisayardaki tüm kullanıcılar için)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Özel filtre (yalnızca geçerli kullanıcı için)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Karşılaştırma istatistikleri" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Klasörler:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 msgid "Files:" msgstr "Dosyalar:" #. 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 "Binary:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Eşsiz" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Sol:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Sağ:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Toplam:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Kapat" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Orta:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Solda eksik:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Ortada eksik:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Sağda eksik:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Etkilenecek pano" #. 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 "(Etkilenecek pano)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "İşlemlerde kullanılacak kod sayfası" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "Dosya &yükleme:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Dosya &kaydetme:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "İkisinde de aynı kod sayfası k&ullanılsın" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "İ&ptal" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Filtreyi sına" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Filtre sınanıyor:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "Sınanacak m&etni yazın:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "&Klasör adı" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Sonuç:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "&Sına" #. IDS_OPTIONSPG_TABLECOMPARE -#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228 +#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238 msgid "Table" msgstr "Tablo" #. IDD_OPEN_TABLE, IDC_STATIC -#: Merge.rc:2854 +#: Merge.rc:2864 msgid "File type" msgstr "Dosya türü" #. 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 "Özel &sınırlama-ayırma karakterleri" #. 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ınırlama &karakteri:" #. 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 "Tırnak içinde ¥i satır olabilsin" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "&Tırnak karakteri:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Yedekleme dosyaları" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Şunların yedeği alınsın:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "&Klasör karşılaştırma" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "Dosya karşı&laştırma" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Yedek dosyalarının konumu:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Ö&zgün dosya konumu" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "&Genel yedekleme klasörü:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Yedek dosyası adının:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "Sonun&a '.bak' uzantısı eklensin" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Sonuna tarih da&mgası eklensin" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Kopya doğrulansın" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "XXX ögeyi kopyalamak istediğinize emin misiniz?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Soldan" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Sağa" #. 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 "Bu soru ¥iden sorulmasın." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Evet" #. IDD_CONFIRM_COPY, IDNO -#: Merge.rc:2904 +#: Merge.rc:2914 msgid "No" msgstr "Hayır" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Eklentiler" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "&Eklentiler kullanılsın" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2913 Merge.rc:3113 +#: Merge.rc:2923 Merge.rc:3123 msgid "Plugin &type:" msgstr "Eklenti &türü:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2916 +#: Merge.rc:2926 msgid "File filters:" msgstr "Dosya filtreleri:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "&Eklenti değişkenleri:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Eklenti için &otomatik ayıklayıcı/ön farklılaştırıcı etkinleştirilsin" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Sağ tık menüsü" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2937 +#: Merge.rc:2947 msgid "Explorer" msgstr "WinMerge sağ tık menüsünde görüntülensin" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_CONTEXT -#: Merge.rc:2938 +#: Merge.rc:2948 msgid "&Add to context menu" msgstr "S&ağ tık menüsüne eklensin" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "Gelişmiş me&nü kullanılsın" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "&Karşılaştır menü olarak kullanılsın" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "Kabuk &eklentisi kaydını ekle" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "Kab&uk eklentisi kaydını sil" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "&Yalnızca geçerli kullanıcı için kabuk eklentisi kaydını ekle" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Yalnızca geçerli kullanıcı için kabuk ek&lentisi kaydını sil" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "&Windows 11 için kabuk eklentisi kaydını ekle" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Windows 11 için kabuk ek&lentisi kaydını sil" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Atlama listesi" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Tüm geçmiş ögeleri temizle" #. IDS_OPTIONSPG_FOLDERCOMPARE -#: Merge.rc:2954 Merge.rc:4225 +#: Merge.rc:2964 Merge.rc:4235 msgctxt "Options dialog|Categories" msgid "Folder" msgstr "Klasör" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2957 +#: Merge.rc:2967 msgid "&Compare method:" msgstr "&Karşılaştırma yöntemi:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "İlk fark&tan sonra durulsun" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "3 saniyeden az zaman farkları y&ok sayılsın" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Karşılaştırma sonrası tüm alt klasörler &otomatik genişletilsin:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Eşsiz a< klasör içerikleri katılsın" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Yeniden işleme noktala&rı yok sayılsın" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "&Hızlı karşılaştırmaya geçilecek eşik değeri (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "&Binary karşılaştırmaya geçilecek eşik değeri (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2975 +#: Merge.rc:2985 msgid "Additional comparison condi&tions:" msgstr "Ek karşılaştırma k&oşulları:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2978 +#: Merge.rc:2988 msgid "&Rename/move detection:" msgstr "&Yeniden Adlandırma/Taşıma Algılama:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2980 +#: Merge.rc:2990 msgid "Rename/move detection &keys:" msgstr "Yeniden Adlandırma/Taşıma Algılama &Tuşları:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2983 +#: Merge.rc:2993 msgid "M&erge renames and moves:" msgstr "Yeniden adlandırma ve taşıma işlemlerini &birleştir:" #. 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 "Dosya modelleri:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Özel sınırlama-ayırma karakterleri" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Binary" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "Binary dosya &uzantıları:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Frhed ayarları" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "&Görünüm ayarları..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "&Binary kipi..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "&Karakter kümesi..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Görsel" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "Görsel dosya &uzantıları:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "Klasör karşılaştırmasında görs&el karşılaştırması yapılsın" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Karakter tanıma sonucu:" #. IDS_OPTIONSPG_WEBPAGECOMPARE -#: Merge.rc:3043 Merge.rc:4229 +#: Merge.rc:3053 Merge.rc:4239 msgid "Webpage" msgstr "İnternet sitesi" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Katılacak &adres modeli (kurallı ifade):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Katılmayacak adres &modeli (kurallı ifade):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "Kullanıcı &verileri klasörü konumu:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "&Her panonun kullanıcı verileri klasörü ayrı olsun" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "Onaltılık &görünüm" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3110 +#: Merge.rc:3120 msgid "Edit Plugin" msgstr "Eklentiyi düzenle" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:3123 +#: Merge.rc:3133 msgid "&Category:" msgstr "&Kategori:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC -#: Merge.rc:3125 +#: Merge.rc:3135 msgid "&Menu caption:" msgstr "&Menü başlığı:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC -#: Merge.rc:3127 +#: Merge.rc:3137 msgid "&Window type:" msgstr "&Pencere türü:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC -#: Merge.rc:3132 +#: Merge.rc:3142 msgid "&Unpacked file extension:" msgstr "&Ayıklanmış dosya uzantısı:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "&Gerekli değişkenler" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT -#: Merge.rc:3137 +#: Merge.rc:3147 msgid "&Generate editor script" msgstr "&Düzenleyici betiği oluştur" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC -#: Merge.rc:3140 +#: Merge.rc:3150 msgid "Command &line:" msgstr "&Komut satırı:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "&Betik dosya uzantısı:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "Betik &içeriği:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3154 +#: Merge.rc:3164 msgid "Font" msgstr "Yazı tipi" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3157 +#: Merge.rc:3167 msgid "&Font:" msgstr "&Yazı tipi:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3163 +#: Merge.rc:3173 msgid "Font st&yle:" msgstr "Yazı tipi st&ili:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3169 +#: Merge.rc:3179 msgid "&Size:" msgstr "&Boyut:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3175 +#: Merge.rc:3185 msgid "Effects" msgstr "Etkiler" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3176 +#: Merge.rc:3186 msgid "Stri&keout" msgstr "Üstü &çizili" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3177 +#: Merge.rc:3187 msgid "&Underline" msgstr "&Altı çizili" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3179 +#: Merge.rc:3189 msgid "&Color:" msgstr "&Renk:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3184 +#: Merge.rc:3194 msgid "Sample" msgstr "Örnek" #. 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 "&Betik:" #. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK -#: Merge.rc:3194 +#: Merge.rc:3204 msgid "Show more fonts" msgstr "Daha fazla yazı tipi göster" #. 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 +4872,7 @@ msgstr "" "Yeni belgeler (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4875,7 +4881,7 @@ msgstr "" "Aç (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4884,27 +4890,27 @@ msgstr "" "Kaydet (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Proje dosyası açılırken bilinmeyen bir sorun çıktı." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Proje dosyası kaydedilirken bilinmeyen bir sorun çıktı." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Proje dosyası yüklendi." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Proje dosyası kaydedildi." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4913,7 +4919,7 @@ msgstr "" "Geri Al (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4922,7 +4928,7 @@ msgstr "" "Yinele (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4941,7 +4947,7 @@ msgstr "" "WinMerge Dosya Karşılaştır" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4960,164 +4966,164 @@ msgstr "" "WinMerge Klasör Karşılaştır" #. 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 size kesinlikle BİR GARANTİ VERMEZ. Bu uygulama, belirli şartlar altında serbestçe çoğaltıp dağıtabileceğiniz özgür bir yazılımdır. Ayrıntılı bilgi almak için yardım " "menüsündeki GNU Genel Kamu Lisansı bölümüne bakabilirsiniz." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "&Durdur" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Yeniden dene" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "&Yok say" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Tümünü yok s&ay" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "&Evet" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "&Tümüne evet" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "&Hayır" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Tü&müne hayır" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "&Devam" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "&Atla" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "&Tümünü atla" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Bu ileti ¥iden görüntülenmesin." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "To make this message box visible, press Reset on the Message Boxes page in Options." msgstr "Bu ileti kutusunun yeniden görüntülenmesi için Ayarlar bölümünde İleti kutuları grubu altındaki Sıfırla düğmesine tıklayın." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "Karşılaştır/birleştir" #. IDS_OPTIONSPG_SYNTAXCOLORS -#: Merge.rc:4204 Merge.rc:4208 +#: Merge.rc:4214 Merge.rc:4218 msgid "Syntax" msgstr "Söz dizimi" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Renk temaları" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "Klasör karşılaştırma" #. IDS_OPTIONSPG_PROJECT -#: Merge.rc:4215 +#: Merge.rc:4225 msgid "Project" msgstr "Proje" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Farklar" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "İleti kutuları" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Kime:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Soldan:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Sola:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Sağdan:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Sağa:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Ortadan:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Ortaya:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Sürüm %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Ayarlar (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Tüm iletiler yeniden görünür oldu." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "" @@ -5126,156 +5132,156 @@ msgstr "" "Lütfen 1 - %1 arasında bir değer yazın." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Aç" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uygulamalar|*.exe;*.bat;*.cmd|Tüm Dosyalar (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Tüm dosyalar (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge proje dosyaları (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ayar dosyaları (*.ini)|*.ini|Tüm dosyalar (*.*)|*.*||" #. IDS_REPLACELIST_FILES -#: Merge.rc:4268 +#: Merge.rc:4278 msgid "Tab-Separated Values (*.tsv;*.txt)|*.tsv;*.txt|All Files (*.*)|*.*||" msgstr "Sekmeyle Ayrılmış Değerler (*.tsv;*.txt)|*.tsv;*.txt|Tüm Dosyalar (*.*)|*.*||" #. IDS_TEXT_REPORT_FILES -#: Merge.rc:4274 +#: Merge.rc:4284 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Metin dosyaları (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tüm dosyalar (*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML dosyaları (*.htm,*.html)|*.htm;*.html|Tüm dosyalar (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML dosyaları (*.xml)|*.xml|Tüm dosyalar (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Genişletilmesin" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Tüm alt klasörler genişletilsin" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Farklı alt klasörler genişletilsin" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Aynı alt klasörler genişletilsin" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Dosya türü" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Uzantı" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "İleti" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Yanıt" #. IDS_PROJECT_ITEM -#: Merge.rc:4317 +#: Merge.rc:4327 msgid "Item" msgstr "Öge" #. IDS_PROJECT_LOAD -#: Merge.rc:4319 +#: Merge.rc:4329 msgid "Load" msgstr "Yükle" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Kaydet" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Alt klasörler katılsın" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Karşılaştırma seçenekleri" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Gizli ögeler" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Ad" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Konum" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Filtreler" #. 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 "Açıklama" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Yeni filtre için bir dosya adı yazın" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dosya filtreleri (*.flt)|*.flt|Tüm dosyalar (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5288,7 +5294,7 @@ msgstr "" "Lütfen %1 dosyasını, WinMerge/Filters klasörüne kopyalayın:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5301,7 +5307,7 @@ msgstr "" "\n" "Klasörün var ve yazılabilir olduğundan emin olun." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5311,7 +5317,7 @@ msgstr "" "\n" "Lütfen 'Ayarlar/Sistem' bölümünden filtre klasörünü belirtin." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5325,11 +5331,11 @@ msgstr "" "Dosya salt okunur olabilir." #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Kurulacak filtre dosyasını seçin" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5340,17 +5346,17 @@ msgstr "" "Yeni filtre dosyası filtre klasörüne kopyalanamadı." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Bu filtre dosyası zaten var. Üzerine yazılsın mı?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Kurallı ifade" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "" "Filters updated. Refresh all open folder compares?\n" "\n" @@ -5361,217 +5367,217 @@ msgstr "" "Şimdi yenilemek istemezseniz 'Hayır' üzerine tıklayabilir ve karşılaştırmaları daha sonra yenileyebilirsiniz." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Klasör karşılaştırma sonuçları" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "Dosya karşılaştırma" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Sol adsız" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Orta adsız" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Sağ adsız" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Temel dosya" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Başkalarının dosyası" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Benim dosyam" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Özgün dosya" #. 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 "Satır: %s Sütun: %d/%d Karakter: %d/%d Satır Sonu: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Satır: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Satır: %s Sütun: %d/%d Karakter: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Seç: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Birleştir" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Fark %1 / %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "%1 fark bulundu" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "1 fark bulundu" #. IDS_NO_ERR_SEL_FMT -#: Merge.rc:4389 +#: Merge.rc:4399 #, c-format msgid "%1 Errors Found" msgstr "%1 Hata Bulundu" #. IDS_1_ERR_FOUND -#: Merge.rc:4390 +#: Merge.rc:4400 msgid "1 Error Found" msgstr "1 Hata Bulundu" #. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only" -#: Merge.rc:4391 +#: Merge.rc:4401 msgid "RO" msgstr "SO" #. IDS_DIRVIEW_STATUS_FMT_FOCUS -#: Merge.rc:4397 +#: Merge.rc:4407 #, c-format msgid "Item %1 of %2" msgstr "Öge %1 / %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Ögeler: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Ögeler karşılaştırılıyor..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[öge/sn]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Karşılaştırmak için var olan iki klasör ya da dosya seçin." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Klasör seçimi" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Karşılaştırılacak iki (ya da üç) klasör ya da iki (ya da üç) dosya seçin." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Sol (1.) yol geçersiz!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Orta (2.) yol geçersiz!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Sağ (2.) yol geçersiz!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Sağ (3.) yol geçersiz!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Yolların ikisi de geçersiz!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Sol (1.) ve Orta (2.) yollar geçersiz!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Sol (1.) ve Sağ (3.) yollar geçersiz!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Orta (2.) ve Sağ (3.) yollar geçersiz!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Yolların tümü geçersiz!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Yalnızca dosya karşılaştırması için kullanılabilir" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Dosya ile klasör karşılaştırılamaz!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "%1 dosyası bulunamadı" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "%1 dosyası ayıklanamadı" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5585,12 +5591,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Çelişki dosyası işlenemedi." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "" "The file\n" @@ -5602,7 +5608,7 @@ msgstr "" "bir çelişki dosyası değil." #. 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 +5617,28 @@ msgstr "" "Yalnızca karşılaştırma sonuçlarını göster (dosya içeriklerini değil)?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Farklı kaydet" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "%1 içindeki değişiklikler kaydedilsin mi?" #. 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 salt okunur olarak işaretli. Salt okunur dosyanın üzerine yazılmasını ister misiniz ? (Hayır seçerseniz, yeni bir adla kaydedebilirsiniz.)" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Dosya yedekleme sorunu" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5646,7 +5652,7 @@ msgstr "" "Gene de devam edilsin mi?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5662,7 +5668,7 @@ msgstr "" "\t- Farklı bir ad kullanılsın (Tamam üzerine tıklayın)\n" "\t- Bu işlem iptal edilsin (İptal üzerine tıklayın)" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5675,7 +5681,7 @@ msgstr "" "\n" "Ayıklanmış sürümü başka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5688,7 +5694,7 @@ msgstr "" "\n" "Ayıklanmış sürümü başka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5702,7 +5708,7 @@ msgstr "" "Ayıklanmış sürümü başka bir dosyaya kaydetmek ister misiniz?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5718,7 +5724,7 @@ msgstr "" "Değiştirilmiş dosyanın üzerine yazılsın mı?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5728,7 +5734,7 @@ msgstr "" "salt okunur olarak işaretli. Üzerine yazılmasını istediğinize emin misiniz?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5744,22 +5750,22 @@ msgstr "" "Dosyanın yeniden yüklenmesini ister misiniz?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Sol dosyayı farklı kaydet" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Orta dosyayı farklı kaydet" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Sağ dosyayı farklı kaydet" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5771,7 +5777,7 @@ msgstr "" "yok oldu. Devam etmek için dosyanın bir kopyasını kaydedin." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5782,124 +5788,124 @@ msgstr "" "Devam etmeden önce belgeleri yenileyin." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Beyaz boşlukta kesilsin" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Beyaz boşlukta ya da noktalamada kesilsin" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Or&taya kopyala\tAlt+Sağa" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Or&taya kopyala\tAlt+Sola" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Ortadan kopyala\tAlt+Shift+Sağa" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Ortadan kopyala\tAlt+Shift+Sola" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Ortaya kopyala ve ilerle\tCtrl+Alt+Sağa" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Ortaya kopyala ve ilerle\tCtrl+Alt+Sola" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Tümünü ortaya kopyala" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Sağdakini sola (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Sağdakini ortaya (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Ortadakini sola (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Ortadakini sağa (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Soldakini sağa (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Soldakini ortaya (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Soldakini... (%1)" #. IDS_MOVE_MIDDLE_TO -#: Merge.rc:4508 Merge.rc:4540 +#: Merge.rc:4518 Merge.rc:4550 #, c-format msgid "Middle to... (%1)" msgstr "Ortadakini... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Sağdakini... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "İkisini de... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Tümünü... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Farklı olanları... (%1)" #. IDS_COPY_ONLYDIFFITEMS -#: Merge.rc:4519 +#: Merge.rc:4529 msgid "" "Some selected items are identical or skipped.\n" "Copy only items with differences?" @@ -5908,64 +5914,64 @@ msgstr "" "Yalnızca farkları olan ögeleri kopyalamak ister misiniz?" #. IDS_DEL_LEFT_FMT -#: Merge.rc:4525 +#: Merge.rc:4535 #, c-format msgid "Left (%1)" msgstr "Soldakini (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Ortadakini (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Sağdakini (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "İkisini de (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Tümünü (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Sol panonun hedef klasörünü seçin:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Orta panonun hedef klasörünü seçin:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Sağ panonun hedef klasörünü seçin:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 dosya etkilendi)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 / %2 dosya etkilendi)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5977,18 +5983,18 @@ msgstr "" "%1 ?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Kopyalamak istediğinize emin misiniz?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "%d ögeyi kopyalamak istediğinize emin misiniz?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6008,46 +6014,46 @@ msgstr "" "Lütfen karşılaştırmayı yenileyin." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Taşımak istediğinize emin misiniz?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "%d ögeyi taşımak istediğinize emin misiniz?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Taşımayı onayla" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Klasör karşılaştırma penceresini kapatmak üzeresiniz. Bunu yapmak istediğinize emin misiniz?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "Önemli bir zaman harcanan klasör karşılaştırma penceresini kapatmak üzeresiniz. Bunu yapmak istediğinize emin misiniz?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "Dosya ya da klasör adı geçersiz." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "%1 dış düzenleyicisi çalıştırılamadı" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Sıkıştırma biçimi bilinmiyor" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6056,518 +6062,518 @@ msgstr "" "Arşiv dosyalarını metin dosyaları olarak karşılaştırmak ister misiniz?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Dosya adı" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Klasör" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Karşılaştırma sonucu" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Sol dosya tarihi" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Sağ dosya tarihi" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Orta dosya tarihi" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Sol dosya boyutu" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Sağ dosya boyutu" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Orta dosya boyutu" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Sağ dosya boyutu (kısa)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Sol dosya boyutu (kısa)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Orta dosya boyutu (kısa)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Sol dosya oluşturulma zamanı" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Sağ dosya oluşturulma zamanı" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Orta dosya oluşturulma zamanı" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Daha yeni dosya" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Sol dosya sürümü" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Sağ dosya sürümü" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Orta dosya sürümü" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Sonuç özeti" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Sol dosya öznitelikleri" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Sağ dosya önitelikleri" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Orta dosya önitelikleri" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "Sol dosya satır sonu" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "Orta dosya satır sonu" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "Sağ dosya satır sonu" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Sol dosya kodlaması" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Sağ dosya kodlaması" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Orta dosya kodlaması" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Yok sayılan farklılıklar" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Binary" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Ayıklayıcı" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Ön farklılaştırıcı" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Sol" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Orta" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Sağ" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Fark" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Soldaki çift satır sayısı" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Sağdaki çift satır sayısı" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Ortadaki çift satır sayısı" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Taşı" #. IDS_PRPCAT_AUDIO -#: Merge.rc:4658 +#: Merge.rc:4668 msgid "Audio" msgstr "Ses" #. IDS_PRPCAT_CALENDAR -#: Merge.rc:4659 +#: Merge.rc:4669 msgid "Calendar" msgstr "Takvim" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "İletişim" #. IDS_PRPCAT_CONTACT -#: Merge.rc:4661 +#: Merge.rc:4671 msgid "Contact" msgstr "İlgili" #. IDS_PRPCAT_DEVICES -#: Merge.rc:4662 +#: Merge.rc:4672 msgid "Devices" msgstr "Aygıtlar" #. IDS_PRPCAT_DOCUMENT -#: Merge.rc:4663 +#: Merge.rc:4673 msgid "Document" msgstr "Belge" #. IDS_PRPCAT_HOME -#: Merge.rc:4664 +#: Merge.rc:4674 msgid "Home" msgstr "Giriş" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Günlük" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Bağlantı" #. IDS_PRPCAT_MEDIA -#: Merge.rc:4668 +#: Merge.rc:4678 msgid "Media" msgstr "Ortam" #. IDS_PRPCAT_MUSIC -#: Merge.rc:4670 +#: Merge.rc:4680 msgid "Music" msgstr "Müzik" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Not" #. IDS_PRPCAT_PHOTO -#: Merge.rc:4672 +#: Merge.rc:4682 msgid "Photo" msgstr "Fotoğraf" #. IDS_PRPCAT_RECORDEDTV -#: Merge.rc:4673 +#: Merge.rc:4683 msgid "RecordedTV" msgstr "TV kaydı" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Arama" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Güvenlik" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Yazılım" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Görev" #. IDS_PRPCAT_VIDEO -#: Merge.rc:4678 +#: Merge.rc:4688 msgid "Video" msgstr "Görüntü" #. IDS_PRPCAT_HASH -#: Merge.rc:4679 +#: Merge.rc:4689 msgid "Hash" msgstr "Karma" #. IDS_CANT_COMPARE_FILES -#: Merge.rc:4685 +#: Merge.rc:4695 msgid "Unable to compare files" msgstr "Dosyalar karşılaştırılamıyor" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Ögeden vazgeçildi" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Dosya atlandı" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Klasör atlandı" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Yalnızca solda: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Yalnızca ortada: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Yalnızca sağda: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "%1 içinde bulunamadı" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Binary dosyaları aynı" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Binary dosyaları farklı" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Dosyalar farklı" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Klasörler farklı" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Yalnızca soldaki" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Yalnızca sağdaki" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Yalnızca ortadaki" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Solda herhangi bir öge yok" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Sağda herhangi bir öge yok" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Ortada herhangi bir öge yok" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Sorun" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Metin dosyaları aynı" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Orta ve sağ dosya aynı)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Sol ve sağ dosya aynı)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Sol ve orta dosya aynı)" #. IDS_PATH_MISMATCH -#: Merge.rc:4714 +#: Merge.rc:4724 msgid " (paths differ)" msgstr "(yollar farklı)" #. IDS_TEXT_FILES_DIFF -#: Merge.rc:4715 +#: Merge.rc:4725 msgid "Text files are different" msgstr "Metin dosyaları farklı" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Görsel dosyaları aynı" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Görsel dosyaları farklı" #. IDS_EXPR_DIFF -#: Merge.rc:4718 +#: Merge.rc:4728 #, c-format msgid "Files are different (expr: %1)" msgstr "Dosyalar farklı (ifade: %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 "Devre dışı" #. IDS_RENAME_MOVE_DETECTION_RENAME -#: Merge.rc:4721 +#: Merge.rc:4731 msgid "Detect renames" msgstr "Yeniden adlandırmaları algıla" #. IDS_RENAME_MOVE_DETECTION_RENAME_MOVE -#: Merge.rc:4722 +#: Merge.rc:4732 msgid "Detect renames and moves" msgstr "Yeniden adlandırmaları ve taşımaları algıla" #. IDS_RENAME_MOVE_MERGE_MODE_RENAME -#: Merge.rc:4723 +#: Merge.rc:4733 msgid "Merge renames" msgstr "Yeniden adlandırmaları birleştir" #. IDS_RENAME_MOVE_MERGE_MODE_RENAME_MOVE -#: Merge.rc:4724 +#: Merge.rc:4734 msgid "Merge renames and moves" msgstr "Yeniden adlandırma ve taşıma işlemlerini birleştir" #. IDS_RENAMED -#: Merge.rc:4725 +#: Merge.rc:4735 msgid "Renamed" msgstr "Yeniden adlandırıldı" #. IDS_MOVED -#: Merge.rc:4726 +#: Merge.rc:4736 msgid "Moved" msgstr "Taşındı" #. IDS_RENAMED_MOVED -#: Merge.rc:4727 +#: Merge.rc:4737 msgid "Renamed/Moved" msgstr "Yeniden adlandırıldı/Taşındı" #. IDS_RENAMED_MOVED_ITEMS -#: Merge.rc:4728 +#: Merge.rc:4738 #, c-format msgid "(%1 items)" msgstr "(%1 öge)" #. IDS_RENAMED_MOVED_RESULT -#: Merge.rc:4729 +#: Merge.rc:4739 #, c-format msgid "%1 (set %2): " msgstr "%1 (%2 kümesi): " #. 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 +6584,235 @@ msgstr "" "Düz Mod’a geçmek ister misiniz?" #. IDS_ELAPSED_TIME -#: Merge.rc:4736 +#: Merge.rc:4746 #, c-format msgid "Elapsed time: %ld ms" msgstr "Geçen süre: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "1 öge seçilmiş" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "%1 öge seçilmiş" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Dosya ya da klasör adı." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Alt klasörler katıldığında alt klasör adı." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Karşılaştırma sonucu, uzun biçim." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Soldaki dosyanın değiştirilme tarihi." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Sağdaki dosyanın değiştirilme tarihi." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Ortadaki dosyanın değiştirilme tarihi." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Dosya uzantısı." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Soldaki dosyanın bayt olarak boyutu." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Sağdaki dosyanın bayt olarak boyutu." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Ortadaki dosyanın bayt olarak boyutu." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Soldaki dosyanın kısaltılmış boyutu." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Sağdaki dosyanın kısaltılmış boyutu." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Ortadaki dosyanın kısaltılmış boyutu." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Soldaki dosyanın oluşturulma zamanı." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Sağdaki dosyanın oluşturulma zamanı." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Ortadaki dosyanın oluşturulma zamanı." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Hangi panonun en son değişiklik tarihine sahip olduğunu söyler." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Soldaki dosyanın sürümü, yalnızca bazı dosya türleri için." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Sağdaki dosyanın sürümü, yalnızca bazı dosya türleri için." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Ortadaki dosyanın sürümü, yalnızca bazı dosya türleri için." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Kısa karşılaştırma sonucu." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Soldaki dosyanın öznitelikleri." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Sağdaki dosyanın öznitelikleri." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Ortadaki dosyanın öznitelikleri." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Soldaki dosyanın satır sonu türü." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Sağdaki dosyanın satır sonu türü." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Ortadaki dosyanın satır sonu türü." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Soldaki dosyanın kodlaması." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Sağdaki dosyanın kodlaması." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Ortadaki dosyanın kodlaması." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "Dosyada yok sayılan farkların sayısı. Bu farklar WinMerge tarafından yok sayılır ve birleştirilemez." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Dosyadaki fark sayısı. Bu sayıya yok sayılan farklar katılmamıştır." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Dosya binary ise yıldız (*) ile görüntülensin." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Ayıklayıcı eklentisi adı ya da bağlantı yolu." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Ön farklılaştırıcı eklentisi adı ya da bağlantı yolu." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "%1 ile %2 ögesini karşılaştır" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "%1 ile %2 ve %3 ögelerini karşılaştır" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Virgül ile ayrılmış liste" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Sekme ile ayrılmış liste" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "Basit HTML" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "Basit XML" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Rapor dosyası zaten var. Üzerine yazılmasını ister misiniz?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6816,27 +6822,27 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Rapor hazırlandı." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Bu satıra bir eşitleme noktası eklenemedi." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "İki panoda da de aynı dosya açıldı." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Seçilmiş dosyalar aynı." #. IDS_FILESSAME_CURCFG -#: Merge.rc:4829 +#: Merge.rc:4839 msgid "" "Selected files are identical (with current settings).\r\n" "Checking binary identity..." @@ -6845,7 +6851,7 @@ msgstr "" "İkili (binary) özdeşlik kontrol ediliyor…" #. 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 +6860,12 @@ msgstr "" "Ancak ikili (binary) karşılaştırma başarısız oldu." #. IDS_FILESSAME_BINSAME -#: Merge.rc:4831 +#: Merge.rc:4841 msgid "Selected files are identical (binary match)." msgstr "Seçilen dosyalar özdeş (binary eşleşme)." #. 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 +6874,17 @@ msgstr "" "Ancak ikili (binary) düzeyde farklılar." #. IDS_FILEERROR -#: Merge.rc:4833 +#: Merge.rc:4843 msgid "An error occurred while comparing files." msgstr "Dosyalar karşılaştırılırken bir sorun çıktı." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "Geçici klasör oluşturulamadı. Geçici klasör yolu ayarlarınızı denetleyin." #. IDS_SUGGEST_IGNOREEOL -#: Merge.rc:4835 +#: Merge.rc:4845 msgid "" "Files use different EOL.\n" "\n" @@ -6894,17 +6900,17 @@ msgstr "" "Unix/Mac)' seçeneğini işaretleyin." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Seçilmiş klasör geçersiz." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Bir binary dosyası düzenleyicide açılamaz." #. IDS_CREATE_PAIR_FOLDER -#: Merge.rc:4838 +#: Merge.rc:4848 #, c-format msgid "" "Create matching folder:\n" @@ -6918,41 +6924,41 @@ msgstr "" "ve bu klasörleri açmak istiyor musunuz?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "Tüm farkları diğer dosyaya kopyalamak istediğinize emin misiniz?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Sonraki dosyaya geçmek ister misiniz?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Önceki dosyaya geçmek ister misiniz?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Sonraki sayfaya geçmek ister misiniz?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Önceki sayfaya geçmek ister misiniz?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "İlk dosyaya geçmek ister misiniz?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Son dosyaya geçmek ister misiniz?" -#: Merge.rc:4856 +#: Merge.rc:4866 #, c-format msgid "" "Different codepages: left (cp%d), right (cp%d).\n" @@ -6963,51 +6969,51 @@ msgstr "" "Dosyalar kendi kod sayfalarında daha iyi bir görüntülenir ancak birleştirme/kopyalama işlemleri tehlikeli olur.\n" "Dosyaların varsayılan Windows kod sayfasını kullanıyormuş gibi işlenmesini ister misiniz (önerilir)?" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Kodlama sorunları yüzünden iki dosyada da bilgi kaybı oldu" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Kodlama sorunları yüzünden ilk dosyada bilgi kaybı oldu" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Kodlama sorunları yüzünden ikinci dosyada bilgi kaybı oldu" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Kodlama sorunları yüzünden üçüncü dosyada bilgi kaybı oldu" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Fark yok" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Satır farkı" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 dizge değiştirildi." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Aranan \"%s\" ifadesi bulunamadı." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Birleştirme kipine geçiyorsunuz. Birleştirme kipinden çıkmak için F9 tuşuna basın." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -7017,99 +7023,99 @@ msgstr "" "Çözümlenmemiş çelişki sayısı: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Kod sayfası değişikliği birleştirildi." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Kod sayfası değişiklikleri çelişiyor." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Satır sonu değişikliği birleştirildi." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Satır sonu değişiklikleri çelişiyor." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Konum panosu" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Fark panosu" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Yama dosyası kaydedildi." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "1. öge bulunamadı!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "2. öge bulunamadı!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Yama dosyası zaten var. Üzerine yazılmasını ister misiniz?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[%1 dosya seçildi]" #. 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 "Bağlam" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Birleşik" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "%1 dosyasına yazılamadı." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Belirtilen çıktı klasörü mutlak bir yol değil: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Bir çıktı dosyası belirtin." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Binary dosyalarından, yama dosyası hazırlanamaz." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7120,12 +7126,12 @@ msgstr "" "Bir yama hazırlamak için dosyalardaki değişikliklerin kaydedilmiş olması gerekir." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Klasör bulunamadı." #. 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" @@ -7136,37 +7142,37 @@ msgstr "" "Sıkıştırılmış dosya desteği ve nasıl etkinleştirileceği ile ilgili ayrıntılı bilgi almak için kullanım kitabına bakabilirsiniz." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Dışa aktarılacak dosyayı seçin" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "İçe aktarılacak dosyayı seçin" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Ayarlar dosyadan içe aktarıldı." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Ayarlar dosyaya dışa aktarıldı." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Ayarlar dosyadan içe aktarılamadı." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Ayarlar dosyaya dışa aktarılamadı." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7177,44 +7183,44 @@ msgstr "" "Devam etmek istiyor musunuz?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Karma" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Binary" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Yok" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "İşaretleyici rengi %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Yeni model" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Tür" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Düzenleyici betiği" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7223,7 +7229,7 @@ msgstr "" "Geçerli satırdaki fark (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7232,7 +7238,7 @@ msgstr "" "Ayarlar" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7241,7 +7247,7 @@ msgstr "" "Yenile (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7250,7 +7256,7 @@ msgstr "" "Önceki fark (Alt+Yukarı)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7259,7 +7265,7 @@ msgstr "" "Sonraki fark (Alt+Aşağı)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7268,7 +7274,7 @@ msgstr "" "Önceki çelişki (Alt+Shift+Yukarı)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7277,7 +7283,7 @@ msgstr "" "Sonraki çelişki (Alt+Shift+Aşağı)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7286,7 +7292,7 @@ msgstr "" "İlk fark (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7295,7 +7301,7 @@ msgstr "" "İmleçteki fark (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7304,7 +7310,7 @@ msgstr "" "Son fark (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7313,7 +7319,7 @@ msgstr "" "Sağa kopyala (Alt+Sağa)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7322,7 +7328,7 @@ msgstr "" "Sola kopyala (Alt+Sola)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7331,7 +7337,7 @@ msgstr "" "Sağa kopyala ve ilerle (Ctrl+Alt+Sağa)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7340,7 +7346,7 @@ msgstr "" "Sola kopyala ve ilerle (Ctrl+Alt+Sola)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7349,7 +7355,7 @@ msgstr "" "Tü&münü sağa kopyala" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7358,7 +7364,7 @@ msgstr "" "&Tümünü sola kopyala" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7367,7 +7373,7 @@ msgstr "" "Otomatik karşılaştır (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7376,7 +7382,7 @@ msgstr "" "İlk dosya" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7385,7 +7391,7 @@ msgstr "" "Sonraki dosya (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7394,7 +7400,7 @@ msgstr "" "Son dosya" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7403,37 +7409,37 @@ msgstr "" "Önceki dosya (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "Uyarlanan ayıklayıcı iki dosyaya da uygulandı (yalnızca bir dosya bu eklentiye gerek duyuyor)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Ön farklılaştırıcı yok (normal)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Önerilen eklentiler" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Tüm eklentiler" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Özel yapım: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Uygulamanız güncel." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7443,126 +7449,126 @@ msgstr "" "%1 sürümünü indirmek ister misiniz (%2 sürümünü kullanıyorsunuz)?" #. IDS_ALLRIGHTS_RESERVED -#: Merge.rc:5016 +#: Merge.rc:5026 msgid " - All rights reserved." msgstr " - Her hakkı saklıdır." #. IDS_CHECKFORUPDATES_FAILED -#: Merge.rc:5021 +#: Merge.rc:5031 msgid "Failed to download latest version information" msgstr "Son sürüm bilgisi alınamadı" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Eklenti ayarları" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host bulunamadı - .sct betikleri etkisizleştirildi" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "%1. &satıra git" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Taşınmış satıra git\tCtrl+Shift+G" #. IDS_AUTOCOMPLETE_DISABLED -#: Merge.rc:5049 +#: Merge.rc:5059 msgctxt "Options dialog|General|Open dialog Auto completion" msgid "Disabled" msgstr "Engelli" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Dosya sisteminden" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Sık kullanılanlar listesinden" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Vurgulama yok" #. IDS_COLORSCHEME_BATCH -#: Merge.rc:5063 +#: Merge.rc:5073 msgid "Batch" msgstr "Toplu işlem" #. IDS_COLORSCHEME_PO -#: Merge.rc:5090 +#: Merge.rc:5100 msgid "Portable Object" msgstr "Taşınabilir nesne" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Kaynaklar" #. IDS_COLORSCHEME_SH -#: Merge.rc:5098 +#: Merge.rc:5108 msgid "Shell" msgstr "Kabuk" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "So&ldaki sekmeleri kapat" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "&Sağdaki sekmeleri kapat" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "&Diğer sekmeleri kapat" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Otom&atik en fazla genişlik" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "İnternet &sayfası" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "&Metin kaydırılsın" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 #, c-format msgid "%1 is not installed." msgstr "%1 kurulmamış." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "%1 bulunamadı. Oluşturmak ister misiniz?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Klasör oluşturulamadı." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7573,486 +7579,486 @@ msgstr "" "$linenum: Geçerli imleç konumunun satır numarası" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "varsayılan" #. IDS_DIFF_ALGORITHM_MINIMAL -#: Merge.rc:5155 +#: Merge.rc:5165 msgid "minimal" msgstr "en az" #. IDS_DIFF_ALGORITHM_PATIENCE -#: Merge.rc:5156 +#: Merge.rc:5166 msgid "patience" msgstr "tahammül" #. IDS_DIFF_ALGORITHM_HISTOGRAM -#: Merge.rc:5157 +#: Merge.rc:5167 msgid "histogram" msgstr "çubuk grafik" #. IDS_DIFF_ALGORITHM_NONE -#: Merge.rc:5158 +#: Merge.rc:5168 msgid "none" msgstr "yok" #. 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 varsayılan" #. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED -#: Merge.rc:5165 +#: Merge.rc:5175 msgid "DirectWrite Aliased" msgstr "DirectWrite kısaltılmış" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC -#: Merge.rc:5166 +#: Merge.rc:5176 msgid "DirectWrite GDI Classic" msgstr "DirectWrite GFI klasik" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "DirectWrite GDI doğal" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "DirectWrite doğal" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "DirectWrite doğal simetrik" #. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED -#: Merge.rc:5174 +#: Merge.rc:5184 msgctxt "Options dialog|General|Close windows with Esc" msgid "Disabled" msgstr "Engelli" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "MDI alt penceresini ya da ana pencereyi" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Yalnızca MDI alt penceresini" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Yalnızca bir MDI alt penceresi varsa ana pencere kapatılsın" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Fark" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Vurgula" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Işıltı" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Blok boyutu" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Blok alfa" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "CD eşiği" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Ekleme/silme algılaması" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Yok" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Dikey" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Yatay" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Kaplama" #. 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 karıştırma" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Alfa canlandırma" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Yakınlaştırma" #. IDS_PAGE -#: Merge.rc:5199 +#: Merge.rc:5209 msgctxt "ImgMergeFrame|LocationPane" msgid "Page:" msgstr "Sayfa:" #. IDS_IMGCMP_STATUS_PT_RGBA_FMT -#: Merge.rc:5200 +#: Merge.rc:5210 #, c-format msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) " msgstr "Nokta:(%d, %d) RGBA : (%d, %d, %d, %d) " #. IDS_IMGCMP_STATUS_DIST1_FMT -#: Merge.rc:5201 +#: Merge.rc:5211 #, c-format msgid "Dist: %g " msgstr "Uzaklık:%g " #. IDS_IMGCMP_STATUS_DIST2_FMT -#: Merge.rc:5202 +#: Merge.rc:5212 #, c-format msgid "Dist: %g, %g " msgstr "Uzaklık:%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 "Sayfa:%d/%d Yakınlaştırma:%d%% %dx%dpiksel %dbpp " #. IDS_IMGCMP_STATUS_RC_FMT -#: Merge.rc:5204 +#: Merge.rc:5214 #, c-format msgid "Rc: (%d, %d) " msgstr "Al: (%d, %d) " #. IDS_IMGCMP_STATUS_FLIPPED_FMT -#: Merge.rc:5205 +#: Merge.rc:5215 #, c-format msgid "Flipped: %s " msgstr "Çevrildi: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Döndürüldü: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Tüm sayfalar" #. 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 "Seçilebilecek bir fark bulunamadı" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Değişiklik filtresi ekleyecek bir fark bulunamadı" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Bu çift zaten Değişiklik Filtreleri listesinde var" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Bu değişiklik Değişiklik Filtrelerine eklensin mi?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Yalnızca metin" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Satır satır konum ve metin" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Sözcük sözcük konum ve metin" #. IDS_USERDATAFOLDER_APPDATA -#: Merge.rc:5228 +#: Merge.rc:5238 msgid "AppData (Roaming) folder" msgstr "AppData (Roaming) klasörü" #. IDS_USERDATAFOLDER_INSTALL -#: Merge.rc:5229 +#: Merge.rc:5239 msgid "Install folder" msgstr "Kurulum klasörü" #. IDS_USERDATAFOLDER_DOCUMENTS -#: Merge.rc:5230 +#: Merge.rc:5240 msgid "Documents folder" msgstr "Belgeler klasörü" #. IDS_SINGLEINSTANCE_DISABLED -#: Merge.rc:5235 +#: Merge.rc:5245 msgctxt "Options dialog|General|Single instance mode" msgid "Disabled" msgstr "Engelli" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Yalnızca bir kopya çalışsın" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Yalnızca bir kopyanın çalışsın ve kopyanın sonlandırılması beklensin" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Engelli" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Yalnızca pencere etkinleştirildiğinde" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Anında" #. IDS_PLUGIN_ALL -#: Merge.rc:5249 +#: Merge.rc:5259 msgid "Al&l" msgstr "&Tümü" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "&Diğerleri" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Eklenti bağlantı yolunda eklenti adı eksik: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Eklenti bağlantı yolunda tırnak karakteri eksik: %1" #. IDS_PLUGIN_NAME_ALREADY_EXISTS -#: Merge.rc:5255 +#: Merge.rc:5265 #, c-format msgid "Plugin name '%1' already exists." msgstr "'%1' adlı bir eklenti zaten var." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Eklenti değişkenlerini belirtin" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "%1 eklentisi bulunamadı ya da geçersiz" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' bir ayıklayıcı eklentisi değil" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' bir ön farklılaştırıcı eklentisi değil" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "'%1' dosyasında '%2' eklentisi ile ön farklılaştırma yapılırken bir sorun çıktı. Artık ön farklılaştırma uygulanamıyor." #. IDS_PLUGIN_CIRCULAR_REFERENCE -#: Merge.rc:5263 +#: Merge.rc:5273 #, c-format msgid "Circular reference in plugin pipeline: %1" msgstr "Eklenti hattında çevrim başvurusu: %1" #. IDS_PLUGIN_TYPE1 -#: Merge.rc:5264 +#: Merge.rc:5274 msgid "URL Handler" msgstr "Adres işleyici" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Dosya ayıklayıcı" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Dosya ya da klasör ayıklayıcı" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Ayıklayıcı kısaltması" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "Ön farklılaştırıcı kısaltması" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Düzenleyici betiği kısaltması" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "'%1' eklenti hattı kısaltması" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Yeni eklenti açıklaması" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Tümü" #. IDS_PLUGIN_TARGETS_1ST -#: Merge.rc:5274 +#: Merge.rc:5284 msgid "1st" msgstr "Birinci" #. IDS_PLUGIN_TARGETS_2ND -#: Merge.rc:5275 +#: Merge.rc:5285 msgid "2nd" msgstr "İkinci" #. IDS_PLUGIN_TARGETS_3RD -#: Merge.rc:5276 +#: Merge.rc:5286 msgid "3rd" msgstr "Üçüncü" #. IDS_PLUGIN_TARGETS_1ST_2ND -#: Merge.rc:5277 +#: Merge.rc:5287 msgid "1st and 2nd" msgstr "Birinci ve ikinci" #. IDS_PLUGIN_TARGETS_1ST_3RD -#: Merge.rc:5278 +#: Merge.rc:5288 msgid "1st and 3rd" msgstr "Birinci ve üçüncü" #. IDS_PLUGIN_TARGETS_2ND_3RD -#: Merge.rc:5279 +#: Merge.rc:5289 msgid "2nd and 3rd" msgstr "İkinci ve üçüncü" #. IDS_FILTER_APPLIED -#: Merge.rc:5284 +#: Merge.rc:5294 msgid "Filter applied" msgstr "Filtre uygulandı" #. IDS_FILTERMENU_COMPARE -#: Merge.rc:5289 +#: Merge.rc:5299 #, c-format msgid "Compare %1" msgstr "%1’i karşılaştır" #. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN -#: Merge.rc:5290 +#: Merge.rc:5300 msgid "&Filter by This Column" msgstr "Bu sütuna göre &filtrele" #. IDS_FILTERMENU_FILTER_BY_THIS_COLUMN2 -#: Merge.rc:5291 +#: Merge.rc:5301 msgid "&Filter by This Column..." msgstr "Bu sütuna göre &filtrele..." #. IDS_CLIPBOARDHISTORY_TIME -#: Merge.rc:5296 +#: Merge.rc:5306 #, c-format msgid "Clipboard at %s" msgstr "%s zamanındaki pano" #. 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 +8066,115 @@ msgstr "" "Pano geçmişi devre dışı bırakılmış.\r\n" "Pano geçmişini etkinleştirmek için, Windows + V tuşlarına basıp açılan pencerede Aç üzerine tıklayın." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Bu sistemde pano geçmişi özelliği yok." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "32-bit WinMerge sürümünde pano karşılaştırma özelliği yok" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "WebView2 çalıştırıcı bulunamadı. İndirmek ister misiniz?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "Yeni metin karşılaştırması" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "Yeni tablo karşılaştırması" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "Yeni binary karşılaştırması" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "Yeni görsel karşılaştırması" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "Yeni site sayfası karşılaştırması" +#. 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 "Pano karşılaştırması" #. IDS_PREVIEWBAR_PRINT -#: Merge.rc:5321 +#: Merge.rc:5332 msgid "&Print..." msgstr "&Yazdır..." #. IDS_PREVIEWBAR_PREVPAGE -#: Merge.rc:5323 +#: Merge.rc:5334 msgid "Pre&v Page" msgstr "Ö&nceki sayfa" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "İ&ki sayfa" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "&Bir sayfa" #. IDS_PREVIEWBAR_ZOOMIN -#: Merge.rc:5326 +#: Merge.rc:5337 msgid "Zoom &In" msgstr "Y&akınlaştır" #. IDS_PREVIEWBAR_ZOOMOUT -#: Merge.rc:5327 +#: Merge.rc:5338 msgid "Zoom &Out" msgstr "&Uzaklaştır" #. IDS_WEBPAGE_COMPARING -#: Merge.rc:5333 +#: Merge.rc:5344 msgid "Comparing..." msgstr "Karşılaştırılıyor..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Yakınlaştıma:" #. IDS_COPY_GRANULARITY_DIFFHUNK -#: Merge.rc:5339 +#: Merge.rc:5350 msgid "Diff hunk" msgstr "Fark parçası" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Satır arası fark" #. IDS_COPY_GRANULARITY_LINE -#: Merge.rc:5341 +#: Merge.rc:5352 msgid "Line" msgstr "Satır" -#: Merge.rc:5342 +#: Merge.rc:5353 msgid "Character" msgstr "Karakter" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "" "\n" "Previous Difference (Alt+Up)\n" @@ -8176,7 +8187,7 @@ msgstr "" "(Alt+Tekerlek Yukarı)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8189,7 +8200,7 @@ msgstr "" "(Alt+Tekerlek Aşağı)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8204,7 +8215,7 @@ msgstr "" "(Alt+Shift+Tekerlek Aşağı)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8219,7 +8230,7 @@ msgstr "" "(Alt+Shift+Tekerlek Yukarı)" #. ID_MICE_L2RNEXT -#: Merge.rc:5351 +#: Merge.rc:5362 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)\n" @@ -8232,7 +8243,7 @@ msgstr "" "(Ctrl+Alt+Shift+Tekerlek Aşağı)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8245,257 +8256,257 @@ msgstr "" "(Ctrl+Alt+Shift+Tekerlek Yukarı)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "%1 ile %2 karşılaştırılıyor" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "%1 ile %2 ve %3 ile karşılaştırılıyor" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "Karşılaştırma tamamlandı" #. IDS_LOG_COMPARE_ERROR_2 -#: Merge.rc:5365 +#: Merge.rc:5376 #, c-format msgid "Failed to compare %1 with %2: " msgstr "%1 ile %2 karşılaştırılamadı: " #. IDS_LOG_COMPARE_ERROR_3 -#: Merge.rc:5366 +#: Merge.rc:5377 #, c-format msgid "Failed to compare %1 with %2 and %3: " msgstr "%1 ile %2 ve %3 karşılaştırılamadı: " #. IDS_LOG_FILE_SAVED -#: Merge.rc:5367 +#: Merge.rc:5378 msgid "File saved" msgstr "Dosya kaydedildi" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "Dosyalar kopyalanıyor..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "Dosyalar taşınıyor..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "Dosyalar siliniyor..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Geri Dönüşüm Kutusu" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Kalıcı olarak silindi" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Dosya işlemi başarıyla tamamlandı" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Dosya işlemi iptal edildi" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Hata yok" #. IDS_FILTER_ERROR_EMPTY_EXPRESSION -#: Merge.rc:5380 +#: Merge.rc:5391 msgid "Filter expression is empty" msgstr "Filtre ifadesi boş" #. IDS_FILTER_ERROR_UNKNOWN_CHAR -#: Merge.rc:5381 +#: Merge.rc:5392 msgid "Unknown character in filter expression" msgstr "Filtre ifadesinde bilinmeyen karakter" #. IDS_FILTER_ERROR_UNTERMINATED_STRING -#: Merge.rc:5382 +#: Merge.rc:5393 msgid "Unterminated string literal" msgstr "Sonlandırılmamış dize sabiti" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Filtre ifadesinde söz dizimi hatası" #. IDS_FILTER_ERROR_PARSE_FAILURE -#: Merge.rc:5384 +#: Merge.rc:5395 msgid "Failed to parse filter expression" msgstr "Filtre ifadesi ayrıştırılamadı" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Geçersiz sabit değer" #. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION -#: Merge.rc:5386 +#: Merge.rc:5397 msgid "Invalid regular expression" msgstr "Geçersiz düzenli ifade" #. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER -#: Merge.rc:5387 +#: Merge.rc:5398 msgid "Undefined identifier" msgstr "Tanımsız tanımlayıcı" #. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT -#: Merge.rc:5388 +#: Merge.rc:5399 msgid "Invalid number of arguments" msgstr "Geçersiz argüman sayısı" #. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND -#: Merge.rc:5389 +#: Merge.rc:5400 msgid "Filter name not found" msgstr "Filtre adı bulunamadı" #. IDS_FILTER_ERROR_DIVIDE_BY_ZERO -#: Merge.rc:5390 +#: Merge.rc:5401 msgid "Division by zero in filter expression" msgstr "Filtre ifadesinde sıfıra bölme işlemi" #. IDS_FILTER_ERROR_UNKNOWN_ERROR -#: Merge.rc:5391 +#: Merge.rc:5402 msgid "Unknown error" msgstr "Bilinmeyen hata" #. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME -#: Merge.rc:5392 +#: Merge.rc:5403 msgid "Invalid property name" msgstr "Geçersiz özellik adı" #. IDS_FILTER_ERROR_INVALID_DIRECTIVE -#: Merge.rc:5393 +#: Merge.rc:5404 msgid "Invalid directive" msgstr "Geçersiz yönerge" #. IDS_FILTER_OP_EQUALS -#: Merge.rc:5398 +#: Merge.rc:5409 msgid "Equals" msgstr "Eşittir" #. IDS_FILTER_OP_NOT_EQUALS -#: Merge.rc:5399 +#: Merge.rc:5410 msgid "Does not equal" msgstr "Eşit değil" #. IDS_FILTER_OP_LESS_THAN -#: Merge.rc:5400 +#: Merge.rc:5411 msgid "Less than" msgstr "Daha az" #. IDS_FILTER_OP_LESS_EQUAL -#: Merge.rc:5401 +#: Merge.rc:5412 msgid "Less than or equal to" msgstr "Küçük veya eşit" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Büyük veya eşit" #. IDS_FILTER_OP_GREATER_THAN -#: Merge.rc:5403 +#: Merge.rc:5414 msgid "Greater than" msgstr "Daha büyük" #. IDS_FILTER_OP_BETWEEN -#: Merge.rc:5404 +#: Merge.rc:5415 msgid "Between" msgstr "Arasında" #. IDS_FILTER_OP_NOT_BETWEEN -#: Merge.rc:5405 +#: Merge.rc:5416 msgid "Not Between" msgstr "Arasında değil" #. IDS_FILTER_OP_CONTAINS -#: Merge.rc:5406 +#: Merge.rc:5417 msgid "Contains" msgstr "İçerir" #. IDS_FILTER_OP_NOT_CONTAINS -#: Merge.rc:5407 +#: Merge.rc:5418 msgid "Not Contains" msgstr "İçermez" #. IDS_FILTER_OP_RECONTAINS -#: Merge.rc:5408 +#: Merge.rc:5419 msgid "Contains (regex)" msgstr "İçerir (regex)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "İçermez (regex)" #. IDS_FILTER_OP_LIKE -#: Merge.rc:5410 +#: Merge.rc:5421 msgid "Match (wildcard)" msgstr "Eşleştir (joker karakter)" #. IDS_FILTER_OP_NOT_LIKE -#: Merge.rc:5411 +#: Merge.rc:5422 msgid "Not match (wildcard)" msgstr "Eşleşmez (joker karakter)" #. IDS_FILTER_OP_MATCHES -#: Merge.rc:5412 +#: Merge.rc:5423 msgid "Match (regex)" msgstr "Eşleştir (regex)" #. IDS_FILTER_OP_NOT_MATCHES -#: Merge.rc:5413 +#: Merge.rc:5424 msgid "Not match (regex)" msgstr "Eşleşmez (regex)" #. IDS_COLORMODE_LIGHT -#: Merge.rc:5418 +#: Merge.rc:5429 msgid "Light" msgstr "Aydınlık" #. IDS_COLORMODE_DARK -#: Merge.rc:5419 +#: Merge.rc:5430 msgid "Dark" msgstr "Karanlık" #. IDS_COLORMODE_FOLLOWSYSTEM -#: Merge.rc:5420 +#: Merge.rc:5431 msgid "Follow system" msgstr "Sistem ayarını seç" #. IDS_EXAMPLE -#: Merge.rc:5425 +#: Merge.rc:5436 #, c-format msgid "e.g. %1" msgstr "örn. %1" #. IDS_DETECTED_PREVIOUS_CRASH -#: Merge.rc:5430 +#: Merge.rc:5441 msgid "WinMerge detected a previous crash. Please report this if possible." msgstr "WinMerge, önceki bir çökme tespit etti. Mümkünse lütfen bunu bildirin." #. IDS_REGEX_REPLACE_LIST_TEMPLATE -#: Merge.rc:5435 +#: Merge.rc:5446 msgid "" "# Regex replacement list\r\n" "# Format: regexreplacement\r\n" @@ -8510,7 +8521,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/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index b2b043d1f6f..b2b3bb1a16a 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -23,7 +23,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_UKRAINIAN, SUBLANG_DEFAULT" @@ -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 "Позначити від&мінності\tF4" @@ -138,7 +138,7 @@ msgid "Cu&t" msgstr "Ви&різати" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Копіювати" @@ -148,19 +148,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" @@ -180,27 +180,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 "Меню о&болонки" @@ -235,8 +235,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 "&Немає" @@ -251,12 +251,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 "&Наступна сторінка" @@ -266,42 +266,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+*" @@ -326,27 +326,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 "Прямокутний &вибір" @@ -381,37 +381,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 "&Розмір" @@ -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,3607 +476,3613 @@ 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_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Показат&и панель фільтрів\tCtrl+Shift+L" #. 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_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 "Показувати кінці р&ядків (EOL)" #. 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 "Зліва в центр (%1 of %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 of %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 of %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 of %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 of %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 of %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 of %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 "&Заархівувати" #. 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 of %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 of %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 of %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 "Редагувати &шлях\tCtrl+L" #. 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 "Ігнорувати відмінності в кінцях рядків (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 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} - Протокол 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 "Додати плагін &розпакувальник..." #. 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 "Менше ніж 1КБ" #. 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КБ або більше" #. 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 "Менше 10КБ" #. 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КБ або більше" #. 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 "Менше 100КБ" #. 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КБ або більше" #. 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 "Менше 1МБ" #. 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МБ або більше" #. 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 "Менше 10МБ" #. 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МБ або більше" #. 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 "Менше 100МБ" #. 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МБ або більше" #. 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 "Менше 1ГБ" #. 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ГБ або більше" #. 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 "Більше 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 "&Ден" #. 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 "Перші 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 "&Кількість рядків" #. 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 "Менше 1000" #. 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 "Додати умову для &папки" #. 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 "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 "&Елементи" #. 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 "&Загальний розмір" #. 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 "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 "Ли&ше для читання" #. 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 "&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 "&Застосувати" #. 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 "Ігно&рувати відмінності в кінцях рядків (Win/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 "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\n" "Restart required." @@ -4085,7 +4091,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." @@ -4094,769 +4100,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 "Провідник" #. 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 "Перейти до &швидкого порівняння при розмірі більше (МБ):" #. 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 "Шаблон 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 "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)" @@ -4865,7 +4871,7 @@ msgstr "" "Нові документи (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4874,7 +4880,7 @@ msgstr "" "Відкрити (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4883,27 +4889,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)" @@ -4912,7 +4918,7 @@ msgstr "" "Скасувати (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4921,7 +4927,7 @@ msgstr "" "Повторити (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4940,7 +4946,7 @@ msgstr "" "WinMerge Порівняння файлів" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4959,7 +4965,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." @@ -4968,157 +4974,157 @@ msgstr "" "ознайомтеся з GNU General Public License в меню Довідка для докладнішої інформації." #. 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,156 +5133,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" @@ -5289,7 +5295,7 @@ msgstr "" "Скопіюйте файл %1 у папку з фільтрами:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5302,7 +5308,7 @@ msgstr "" "\n" "Переконайтеся, що папка існує і доступна для запису." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5312,7 +5318,7 @@ msgstr "" "\n" "Вкажіть папку з фільтрами на вкладці Система в Налаштуваннях." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5326,11 +5332,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" @@ -5341,17 +5347,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" @@ -5362,217 +5368,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 "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 "Вибір папки" #. 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" @@ -5586,12 +5592,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" @@ -5603,7 +5609,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)?" @@ -5612,28 +5618,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" @@ -5647,7 +5653,7 @@ msgstr "" "Продовжити в будь-якому випадку?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5663,7 +5669,7 @@ msgstr "" "\t- використати інше ім'я файлу (Натисніть OК)\n" "\t- скасувати поточну операцію (Натисніть Скасувати)?" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5674,7 +5680,7 @@ msgstr "" "\n" "Оригінал не змінено. Зберегти розпаковану версію?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5685,7 +5691,7 @@ msgstr "" "\n" "Оригінал не змінено. Зберегти розпаковану версію?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5697,7 +5703,7 @@ msgstr "" "Оригінал не змінено. Зберегти розпаковану версію?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5713,7 +5719,7 @@ msgstr "" "Перезаписати змінений файл?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5721,7 +5727,7 @@ msgid "" msgstr "%1 позначений як лише для читання. Чи згодні ви замінити цей файл?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5737,22 +5743,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" @@ -5764,7 +5770,7 @@ msgstr "" "вилучається. Збережіть копію файлу для продовження." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5775,124 +5781,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 "Копіювати в &центр\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 "Скопіювати на ліву сторону %1 з %2 вибраних елементів" #. 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 з %2 вибраних елементів" #. 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?" @@ -5901,64 +5907,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" @@ -5970,18 +5976,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" @@ -6001,46 +6007,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?" @@ -6049,752 +6055,752 @@ 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" @@ -6804,27 +6810,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..." @@ -6833,7 +6839,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." @@ -6842,12 +6848,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." @@ -6856,17 +6862,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" @@ -6882,17 +6888,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" @@ -6906,41 +6912,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" @@ -6951,51 +6957,51 @@ 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 "Інформація втрачена через помилкове кодування: перший файл" -#: 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" @@ -7005,99 +7011,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 "Пане&ль відмінностей" #. 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" @@ -7108,12 +7114,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" @@ -7125,37 +7131,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" @@ -7166,44 +7172,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)" @@ -7212,7 +7218,7 @@ msgstr "" "Відмінність у поточному рядку (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7221,7 +7227,7 @@ msgstr "" "Налаштування" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7230,7 +7236,7 @@ msgstr "" "Оновити (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7239,7 +7245,7 @@ msgstr "" "Попередня відмінність (Alt+Up)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7248,7 +7254,7 @@ msgstr "" "Наступна відмінність (Alt+Down)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7257,7 +7263,7 @@ msgstr "" "Попередній конфлікт (Alt+Shift+Up)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7266,7 +7272,7 @@ msgstr "" "Наступний конфлікт (Alt+Shift+Down)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7275,7 +7281,7 @@ msgstr "" "Перша відмінність (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7284,7 +7290,7 @@ msgstr "" "Поточна відмінність (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7293,7 +7299,7 @@ msgstr "" "Остання відмінність (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7302,7 +7308,7 @@ msgstr "" "Копіювати праворуч (Alt+Right)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7311,7 +7317,7 @@ msgstr "" "Копіювати ліворуч (Alt+Left)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7320,7 +7326,7 @@ msgstr "" "Копіювати праворуч і перейти далі (Ctrl+Alt+Right)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7329,7 +7335,7 @@ msgstr "" "Копіювати ліворуч і перейти далі (Ctrl+Alt+Left)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7338,7 +7344,7 @@ msgstr "" "Копіювати все праворуч" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7347,7 +7353,7 @@ msgstr "" "Копіювати все ліворуч" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7356,7 +7362,7 @@ msgstr "" "Автоматичне злиття (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7365,7 +7371,7 @@ msgstr "" "Перший файл" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7374,7 +7380,7 @@ msgstr "" "Наступний файл (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7383,7 +7389,7 @@ msgstr "" "Останній файл" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7392,37 +7398,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" @@ -7432,126 +7438,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" #. 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 "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 #, 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" @@ -7562,487 +7568,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 "Поріг розрізнення кольорів" #. 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пікс %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 "Ус&і" # Context of the string - "Plugin type: Others". "Інший" is singular and it feets better. #. 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 "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 "" #. 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." @@ -8050,110 +8056,115 @@ msgstr "" "Історію буфера обміну вимкнено.\r\n" "Увімкнути: Win + 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 "&Друк..." #. 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" @@ -8166,7 +8177,7 @@ msgstr "" "(Alt+Wheel Up)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8178,7 +8189,7 @@ msgstr "" "(Alt+Wheel Down)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8193,7 +8204,7 @@ msgstr "" "(Alt+Shift+Wheel Down)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8208,7 +8219,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" @@ -8221,7 +8232,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" @@ -8234,262 +8245,262 @@ 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 "Ділення на нуль у виразі фільтра" #. 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/Vietnamese.po b/Translations/WinMerge/Vietnamese.po index 84d2d29594b..a5fac8ae988 100644 --- a/Translations/WinMerge/Vietnamese.po +++ b/Translations/WinMerge/Vietnamese.po @@ -23,7 +23,7 @@ msgstr "" "X-Source-Language: en\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_VIETNAMESE, SUBLANG_DEFAULT" @@ -108,7 +108,7 @@ msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3" msgstr "Chép khác biệt được chọn (phải) vào bảng tạm\tCtrl+&3" #. IDR_MERGEDOCTYPE, ID_SELECTLINEDIFF -#: Merge.rc:110 Merge.rc:673 +#: Merge.rc:110 Merge.rc:680 msgid "Select Line &Difference\tF4" msgstr "Chọn dòng &khác biệt\tF4" @@ -138,7 +138,7 @@ msgid "Cu&t" msgstr "Cắ&t" #. IDR_POPUP_DIRVIEW -#: Merge.rc:118 Merge.rc:943 +#: Merge.rc:118 Merge.rc:951 msgid "&Copy" msgstr "&Sao chép" @@ -148,19 +148,19 @@ msgid "&Paste" msgstr "&Dán" #. IDR_MERGEDOCTYPE -#: Merge.rc:121 Merge.rc:875 Merge.rc:882 +#: Merge.rc:121 Merge.rc:882 Merge.rc:889 msgid "&Scripts" msgstr "&Kịch bản" #. 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 "< Trống >" #. 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 "&Đi tới...\tCtrl+G" @@ -180,27 +180,27 @@ msgid "Op&en" msgstr "&Mở" #. 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 "Với ứng dụng đã &đăng ký" #. 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 "Với trình chỉnh sửa &bên ngoài\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 "&Với..." #. 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 "Mở thư mục &cha..." #. IDR_POPUP_IMG_CTXT, ID_FILE_SHELLMENU -#: Merge.rc:137 Merge.rc:1239 +#: Merge.rc:137 Merge.rc:1249 msgid "S&hell Menu" msgstr "Bảng chọn hệ &vỏ" @@ -235,8 +235,8 @@ msgid "Ins&ertion/Deletion Detection" msgstr "Phát hiện &chèn/xoá" #. 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 "&Không" @@ -251,12 +251,12 @@ msgid "&Horizontal" msgstr "&Ngang" #. 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 "Trang &trước" #. 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 "Trang &sau" @@ -266,42 +266,42 @@ msgid "&Active Pane" msgstr "Khung đang &hoạt động" #. 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 "Xoay sang &phải 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 "Xoay sang &trái 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 "Lật theo chiều &dọc" #. 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 "Lật theo chiều &ngang" #. IDR_MERGEDOCTYPE -#: Merge.rc:193 Merge.rc:699 +#: Merge.rc:193 Merge.rc:706 msgid "&Zoom" msgstr "&Thu phóng" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMIN -#: Merge.rc:202 Merge.rc:701 +#: Merge.rc:202 Merge.rc:708 msgid "Zoom &In\tCtrl++" msgstr "Phóng &to\tCtrl++" #. IDR_MERGEDOCTYPE, ID_VIEW_ZOOMOUT -#: Merge.rc:203 Merge.rc:702 +#: Merge.rc:203 Merge.rc:709 msgid "Zoom &Out\tCtrl+-" msgstr "Thu &nhỏ\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 "&Bình thường\tCtrl+*" @@ -326,27 +326,27 @@ msgid "Dragging &Mode" msgstr "&Chế độ kéo" #. 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 "&Di chuyển" #. 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 "&Điều chỉnh độ lệch" #. 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 "Quét theo chiều &dọc" #. 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 "Quét theo chiều &ngang" #. 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 "Chọn hình &chữ nhật" @@ -381,37 +381,37 @@ msgid "Compare Extracted &Text from Images" msgstr "So sánh văn bản được &trích xuất từ hình ảnh" #. IDD_OPEN, IDOK -#: Merge.rc:272 Merge.rc:1980 +#: Merge.rc:272 Merge.rc:1990 msgid "Co&mpare" msgstr "&So sánh" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_SCREENSHOTS -#: Merge.rc:274 Merge.rc:1247 +#: Merge.rc:274 Merge.rc:1257 msgid "&Screenshots" msgstr "Ảnh &màn hình" #. 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 "Ảnh màn hình &kích thước đầy đủ" #. 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 "&Văn bản" #. IDR_POPUP_WEBPAGE_COMPARE, ID_WEB_COMPARE_RESOURCETREES -#: Merge.rc:278 Merge.rc:1251 +#: Merge.rc:278 Merge.rc:1261 msgid "&Resource Trees" msgstr "&Cây tài nguyên" #. 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 "&Kích cỡ" @@ -426,27 +426,27 @@ msgid "&Event Sync" msgstr "Đồng bộ &sự kiện" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_ENABLED -#: Merge.rc:291 Merge.rc:1259 +#: Merge.rc:291 Merge.rc:1269 msgid "&Enabled" msgstr "Đã &bật" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_SCROLL -#: Merge.rc:293 Merge.rc:1261 +#: Merge.rc:293 Merge.rc:1271 msgid "&Scroll" msgstr "&Cuộn" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_CLICK -#: Merge.rc:294 Merge.rc:1262 +#: Merge.rc:294 Merge.rc:1272 msgid "&Click" msgstr "&Nháy chuột" #. IDR_POPUP_WEBPAGE_SYNC_EVENTS, ID_WEB_SYNC_INPUT -#: Merge.rc:295 Merge.rc:1263 +#: Merge.rc:295 Merge.rc:1273 msgid "&Input" msgstr "&Nhập" #. 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 "&Quay lại/Tiến tới" @@ -476,2668 +476,2674 @@ msgid "&All Profiles" msgstr "&Mọi hồ sơ" #. IDR_MERGEDOCTYPE -#: Merge.rc:310 Merge.rc:411 Merge.rc:586 +#: Merge.rc:310 Merge.rc:413 Merge.rc:590 msgid "&File" msgstr "&Tệp" #. IDR_MERGEDOCTYPE -#: Merge.rc:312 Merge.rc:413 Merge.rc:588 +#: Merge.rc:312 Merge.rc:415 Merge.rc:592 msgid "&New" msgstr "&Mới" #. 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 "&Văn bản" #. 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 "Bả&ng" #. 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 "&Nhị phân" #. 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 "&Hình ảnh" #. 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 "Trang &web" +#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#: Merge.rc:319 Merge.rc:328 Merge.rc:422 Merge.rc:431 Merge.rc:599 +#: Merge.rc:608 Merge.rc:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +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 "Mới (&3 khung)" #. 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 "&Mở...\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 "Mở tệp &xung độ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 "Mở &bảng tạm" #. 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 "Mở &dự án...\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 "&Lưu dự án..." #. IDR_MAINFRAME, ID_FILE_PROJECT_MRU_FIRST -#: Merge.rc:335 +#: Merge.rc:337 msgid "Recent Projects" msgstr "Các dự án gần đây" #. 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 "Các &tệp hoặc thư mục gần đây" #. 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 "&Thoát\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 "&Sửa" #. IDR_MERGEDOCTYPE, ID_EDIT_PASTE -#: Merge.rc:345 Merge.rc:671 +#: Merge.rc:347 Merge.rc:678 msgid "&Paste\tCtrl+V" msgstr "&Dán\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 "&Tuỳ chọ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 "&Xem" #. 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 "Thanh &thẻ" #. 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 "&Xem thanh thẻ" #. 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 "&Trên thanh tiêu đề" #. IDR_MERGEDOCTYPE -#: Merge.rc:356 Merge.rc:505 Merge.rc:749 +#: Merge.rc:358 Merge.rc:509 Merge.rc:756 msgid "&Toolbar" msgstr "Thanh &công cụ" #. 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 "&Nhỏ" #. 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 "&Vừa" #. 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 "&Lớn" #. 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 "&Khổng lồ" #. 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 "Thanh &bảng chọn" #. IDR_DIRDOCTYPE, ID_VIEW_OUTPUT_BAR -#: Merge.rc:365 Merge.rc:515 +#: Merge.rc:367 Merge.rc:519 msgid "&Output Pane" msgstr "&Khung đầu ra" #. 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 "Thanh &trạng thái" #. IDR_MERGEDOCTYPE -#: Merge.rc:368 Merge.rc:539 Merge.rc:847 +#: Merge.rc:370 Merge.rc:543 Merge.rc:854 msgid "&Tools" msgstr "&Công cụ" #. 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 "&Bộ lọc..." #. 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 "&Sinh bản vá..." #. IDR_MERGEDOCTYPE -#: Merge.rc:373 Merge.rc:546 Merge.rc:853 +#: Merge.rc:375 Merge.rc:550 Merge.rc:860 msgid "&Plugins" msgstr "Trìn&h cắm" #. 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 "Thiết đặt &trình cắm..." #. 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 "Trình tiền so sánh thủ &công" #. 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 "Trình tiền so sánh &tự động" #. 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 "Bung gói &thủ công" #. 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 "Bung gói &tự động" #. 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 "&Tải lại trình cắm" #. IDR_MERGEDOCTYPE -#: Merge.rc:385 Merge.rc:560 Merge.rc:891 +#: Merge.rc:387 Merge.rc:564 Merge.rc:898 msgid "&Window" msgstr "Cử&a sổ" #. 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 "Đón&g\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 "Đóng &tất cả" #. 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 "Thay đổi &khung\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 "Xếp &ngang" #. 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 "Xếp &dọc" #. 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 "&Xếp tầng" #. 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 "Trợ &giúp" #. 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 "Trợ giúp về &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 "Ghi &chú phát hành" #. 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 "&Bản dịch" #. 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ấu hình" #. 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 "Giấy phép Công cộng &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 "&Về WinMerge..." #. IDR_MERGEDOCTYPE -#: Merge.rc:436 Merge.rc:629 +#: Merge.rc:440 Merge.rc:635 msgid "&Read-Only" msgstr "&Chỉ-đọc" #. IDR_MERGEDOCTYPE, ID_FILE_LEFT_READONLY -#: Merge.rc:438 Merge.rc:631 +#: Merge.rc:442 Merge.rc:637 msgid "L&eft Read-Only" msgstr "Bên &trái Chỉ-đọc" #. IDR_MERGEDOCTYPE, ID_FILE_MIDDLE_READONLY -#: Merge.rc:439 Merge.rc:632 +#: Merge.rc:443 Merge.rc:638 msgid "M&iddle Read-Only" msgstr "Ở &giữa Chỉ-đọc" #. IDR_MERGEDOCTYPE, ID_FILE_RIGHT_READONLY -#: Merge.rc:440 Merge.rc:633 +#: Merge.rc:444 Merge.rc:639 msgid "Ri&ght Read-Only" msgstr "Bên &phải Chỉ-đọc" #. 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 "Biên mã của &tệp..." #. 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 "Chọn &tất cả\tCtrl+A" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWIDENTICAL -#: Merge.rc:460 +#: Merge.rc:464 msgid "Show &Identical Items" msgstr "Hiện các mục &giống hệt nhau" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENT -#: Merge.rc:461 +#: Merge.rc:465 msgid "Show &Different Items" msgstr "Hiện các mục &khác nhau" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUELEFT -#: Merge.rc:462 +#: Merge.rc:466 msgid "Show L&eft Unique Items" msgstr "Hiện các mục duy nhất bên &trái" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUEMIDDLE -#: Merge.rc:463 +#: Merge.rc:467 msgid "Show Midd&le Unique Items" msgstr "Hiện các mục duy nhất ở &giữa" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWUNIQUERIGHT -#: Merge.rc:464 +#: Merge.rc:468 msgid "Show Ri&ght Unique Items" msgstr "Hiện các mục duy nhất bên &phải" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWSKIPPED -#: Merge.rc:465 +#: Merge.rc:469 msgid "Show S&kipped Items" msgstr "Hiện các mục đã &bỏ qua" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWBINARIES -#: Merge.rc:466 +#: Merge.rc:470 msgid "S&how Binary Files" msgstr "&Hiện các tệp nhị phân" #. IDR_DIRDOCTYPE -#: Merge.rc:467 +#: Merge.rc:471 msgid "&3-way Compare" msgstr "So sánh &3 bên" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTLEFTONLY -#: Merge.rc:469 +#: Merge.rc:473 msgid "Show &Left Only Different Items" msgstr "Chỉ hiện các mục khác biệt bên &trái" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTMIDDLEONLY -#: Merge.rc:470 +#: Merge.rc:474 msgid "Show &Middle Only Different Items" msgstr "Chỉ hiện các mục khác biệt ở &giữa" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWDIFFERENTRIGHTONLY -#: Merge.rc:471 +#: Merge.rc:475 msgid "Show &Right Only Different Items" msgstr "Chỉ hiện các mục khác biệt bên &phải" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGLEFTONLY -#: Merge.rc:473 +#: Merge.rc:477 msgid "Show L&eft Only Missing Items" msgstr "Chỉ hiện các mục còn thiếu bên &trái" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGMIDDLEONLY -#: Merge.rc:474 +#: Merge.rc:478 msgid "Show Mi&ddle Only Missing Items" msgstr "Chỉ hiện các mục còn thiếu ở &giữa" #. IDR_DIRDOCTYPE, ID_OPTIONS_SHOWMISSINGRIGHTONLY -#: Merge.rc:475 +#: Merge.rc:479 msgid "Show Rig&ht Only Missing Items" msgstr "Chỉ hiện các mục còn thiếu bên &phải" #. IDR_DIRDOCTYPE, ID_VIEW_SHOWHIDDENITEMS -#: Merge.rc:478 +#: Merge.rc:482 msgid "Show Hidd&en Items" msgstr "Hiện các mục bị &ẩn" #. IDR_DIRDOCTYPE, ID_VIEW_TREEMODE -#: Merge.rc:480 +#: Merge.rc:484 msgid "Tree &Mode" msgstr "&Chế độ cây" #. IDR_DIRDOCTYPE -#: Merge.rc:481 +#: Merge.rc:485 msgid "E&xpand Subfolders" msgstr "&Mở rộng thư mục con" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_ALLSUBDIRS -#: Merge.rc:483 +#: Merge.rc:487 msgid "&All Subfolders" msgstr "Tất cả các thư &mục con" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_DIFFERENT_SUBDIRS -#: Merge.rc:484 +#: Merge.rc:488 msgid "&Different Subfolders" msgstr "Các thư mục con &khác biệt" #. IDR_DIRDOCTYPE, ID_VIEW_EXPAND_IDENTICAL_SUBDIRS -#: Merge.rc:485 +#: Merge.rc:489 msgid "&Identical Subfolders" msgstr "Các thư mục con &giống hệt" #. IDR_DIRDOCTYPE, ID_VIEW_COLLAPSE_ALLSUBDIRS -#: Merge.rc:487 +#: Merge.rc:491 msgid "&Collapse All Subfolders" msgstr "&Gập tất cả thư mục con" #. 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 "Chọn &phông..." #. IDR_MERGEDOCTYPE, ID_VIEW_USEDEFAULTFONT -#: Merge.rc:491 Merge.rc:698 +#: Merge.rc:495 Merge.rc:705 msgid "Use Default Font" msgstr "Sử dụng phông mặc định" #. IDR_MERGEDOCTYPE -#: Merge.rc:493 Merge.rc:736 +#: Merge.rc:497 Merge.rc:743 msgid "Sw&ap Panes" msgstr "Hoán đổi các &khung" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP12 -#: Merge.rc:495 Merge.rc:738 +#: Merge.rc:499 Merge.rc:745 msgid "Swap &1st | 2nd" msgstr "Hoán đổi thứ &nhất | thứ 2" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP23 -#: Merge.rc:496 Merge.rc:739 +#: Merge.rc:500 Merge.rc:746 msgid "Swap &2nd | 3rd" msgstr "Hoán đổi thứ &2 | thứ 3" #. IDR_MERGEDOCTYPE, ID_SWAPPANES_SWAP13 -#: Merge.rc:497 Merge.rc:740 +#: Merge.rc:501 Merge.rc:747 msgid "Swap 1st | &3rd" msgstr "Hoán đổi thứ nhất | thứ &3" #. IDR_DIRDOCTYPE, ID_VIEW_DISPLAY_FILTER_BAR_MENU -#: Merge.rc:514 +#: Merge.rc:518 msgid "Displa&y Filter Bar\tCtrl+Shift+L" msgstr "Hiển thị &thanh bộ lọc\tCtrl+Shift+L" #. IDR_DIRDOCTYPE, ID_VIEW_DIR_STATISTICS -#: Merge.rc:518 +#: Merge.rc:522 msgid "Com&pare Statistics..." msgstr "Thống kê so &sánh..." #. IDR_MERGEDOCTYPE, ID_REFRESH -#: Merge.rc:520 Merge.rc:763 +#: Merge.rc:524 Merge.rc:770 msgid "Refresh\tF5" msgstr "Tải lại\tF5" #. IDR_POPUP_DIRVIEW, ID_RESCAN -#: Merge.rc:521 Merge.rc:1030 +#: Merge.rc:525 Merge.rc:1038 msgid "&Refresh Selected\tCtrl+F5" msgstr "&Tải lại phần được chọn\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:523 Merge.rc:765 +#: Merge.rc:527 Merge.rc:772 msgid "&Merge" msgstr "Trộ&n" #. IDR_DIRDOCTYPE, ID_MERGE_COMPARE -#: Merge.rc:525 +#: Merge.rc:529 msgid "Co&mpare\tEnter" msgstr "So &sánh\tEnter" #. IDR_MERGEDOCTYPE, ID_NEXTDIFF -#: Merge.rc:527 Merge.rc:767 +#: Merge.rc:531 Merge.rc:774 msgid "&Next Difference\tAlt+Down" msgstr "Khác biệt &tiếp theo\tAlt+Down" #. IDR_MERGEDOCTYPE, ID_PREVDIFF -#: Merge.rc:528 Merge.rc:768 +#: Merge.rc:532 Merge.rc:775 msgid "&Previous Difference\tAlt+Up" msgstr "Khác biệt &trước đó\tAlt+Up" #. IDR_MERGEDOCTYPE, ID_FIRSTDIFF -#: Merge.rc:530 Merge.rc:773 +#: Merge.rc:534 Merge.rc:780 msgid "&First Difference\tAlt+Home" msgstr "Khác biệt &đầu tiên\tAlt+Home" #. IDR_MERGEDOCTYPE, ID_CURDIFF -#: Merge.rc:531 Merge.rc:774 +#: Merge.rc:535 Merge.rc:781 msgid "&Current Difference\tAlt+Enter" msgstr "Khác biệt &hiện tại\tAlt+Enter" #. IDR_MERGEDOCTYPE, ID_LASTDIFF -#: Merge.rc:532 Merge.rc:775 +#: Merge.rc:536 Merge.rc:782 msgid "&Last Difference\tAlt+End" msgstr "Khác biệt &cuối cùng\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 "Chép sang bên &phải\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 "Chép sang bên &trái\tAlt+Left" #. IDR_DIRDOCTYPE, ID_MERGE_DELETE -#: Merge.rc:537 +#: Merge.rc:541 msgid "&Delete\tDel" msgstr "&Xoá\tDel" #. IDR_POPUP_DIRVIEW, ID_TOOLS_CUSTOMIZECOLUMNS -#: Merge.rc:541 Merge.rc:1042 +#: Merge.rc:545 Merge.rc:1050 msgid "&Customize Columns..." msgstr "&Tuỳ chỉnh các cột..." #. IDR_MERGEDOCTYPE, ID_TOOLS_GENERATEREPORT -#: Merge.rc:544 Merge.rc:851 +#: Merge.rc:548 Merge.rc:858 msgid "Generate &Report..." msgstr "Sinh &báo cáo..." #. 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 "&Chỉnh sửa bằng trình bung gói..." #. IDR_MERGEDOCTYPE, ID_FILE_SAVE -#: Merge.rc:611 +#: Merge.rc:617 msgid "&Save\tCtrl+S" msgstr "&Lưu\tCtrl+S" #. IDR_MERGEDOCTYPE -#: Merge.rc:612 +#: Merge.rc:618 msgid "Sav&e" msgstr "&Lưu" #. IDR_POPUP_SAVE, ID_FILE_SAVE_LEFT -#: Merge.rc:614 Merge.rc:1201 +#: Merge.rc:620 Merge.rc:1211 msgid "Save &Left" msgstr "Lưu bên &trái" #. IDR_POPUP_SAVE, ID_FILE_SAVE_MIDDLE -#: Merge.rc:615 Merge.rc:1202 +#: Merge.rc:621 Merge.rc:1212 msgid "Save &Middle" msgstr "Lưu ở &giữa" #. IDR_POPUP_SAVE, ID_FILE_SAVE_RIGHT -#: Merge.rc:616 Merge.rc:1203 +#: Merge.rc:622 Merge.rc:1213 msgid "Save &Right" msgstr "Lưu bên &phải" #. IDR_MERGEDOCTYPE -#: Merge.rc:618 +#: Merge.rc:624 msgid "Save &As" msgstr "Lưu &như..." #. 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ưu bên &trái thành..." #. 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ưu ở &giữa thành..." #. IDR_POPUP_SAVE, ID_FILE_SAVEAS_RIGHT -#: Merge.rc:622 Merge.rc:1207 +#: Merge.rc:628 Merge.rc:1217 msgid "Save &Right As..." msgstr "Lưu bên &phải thành..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT -#: Merge.rc:625 +#: Merge.rc:631 msgid "&Print...\tCtrl+P" msgstr "&In...\tCtrl+P" #. IDR_MERGEDOCTYPE, ID_FILE_PAGE_SETUP -#: Merge.rc:626 +#: Merge.rc:632 msgid "Page Set&up..." msgstr "Thiết đặt &trang..." #. IDR_MERGEDOCTYPE, ID_FILE_PRINT_PREVIEW -#: Merge.rc:627 +#: Merge.rc:633 msgid "Print Previe&w..." msgstr "Xem &trước khi in..." #. IDR_MERGEDOCTYPE -#: Merge.rc:636 +#: Merge.rc:642 msgid "&Convert Line Endings to" msgstr "&Chuyển đổi ký tự cuối dòng sang" #. IDR_MERGEDOCTYPE, ID_FILE_MERGINGMODE -#: Merge.rc:643 +#: Merge.rc:649 msgid "Mer&ge Mode\tF9" msgstr "Chế độ &trộn\tF9" #. IDR_MERGEDOCTYPE, ID_RESCAN -#: Merge.rc:645 +#: Merge.rc:651 msgid "Reloa&d\tCtrl+F5" msgstr "Nạp &lại\tCtrl+F5" #. IDR_MERGEDOCTYPE -#: Merge.rc:647 +#: Merge.rc:653 msgid "Reco&mpare As" msgstr "So sánh &lại dưới dạng" #. IDR_MERGEDOCTYPE, ID_EDIT_UNDO -#: Merge.rc:666 +#: Merge.rc:673 msgid "&Undo\tCtrl+Z" msgstr "&Hoàn tác\tCtrl+Z" #. IDR_MERGEDOCTYPE, ID_EDIT_REDO -#: Merge.rc:667 +#: Merge.rc:674 msgid "&Redo\tCtrl+Y" msgstr "&Làm lại\tCtrl+Y" #. IDR_MERGEDOCTYPE, ID_EDIT_CUT -#: Merge.rc:669 +#: Merge.rc:676 msgid "Cu&t\tCtrl+X" msgstr "Cắ&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 "&Sao chép\tCtrl+C" #. IDR_MERGEDOCTYPE, ID_EDIT_FIND -#: Merge.rc:676 +#: Merge.rc:683 msgid "F&ind...\tCtrl+F" msgstr "Tì&m...\tCtrl+F" #. IDR_MERGEDOCTYPE, ID_EDIT_REPLACE -#: Merge.rc:677 +#: Merge.rc:684 msgid "Repla&ce...\tCtrl+H" msgstr "Thay &thế...\tCtrl+H" #. IDR_MERGEDOCTYPE, ID_EDIT_MARK -#: Merge.rc:678 +#: Merge.rc:685 msgid "&Marker...\tCtrl+Shift+M" msgstr "Dấu &mốc...\tCtrl+Shift+M" #. IDR_MERGEDOCTYPE -#: Merge.rc:680 +#: Merge.rc:687 msgid "Advanced" msgstr "Nâng cao" #. IDR_MERGEDOCTYPE, ID_EDIT_COPY_LINENUMBERS -#: Merge.rc:682 +#: Merge.rc:689 msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Chép kèm số dòng\tCtrl+Shift+C" #. IDR_MERGEDOCTYPE -#: Merge.rc:684 +#: Merge.rc:691 msgid "&Bookmarks" msgstr "&Dấu trang" #. IDR_MERGEDOCTYPE, ID_EDIT_TOGGLE_BOOKMARK -#: Merge.rc:686 +#: Merge.rc:693 msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Bật/tắt dấu trang\tCtrl+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_NEXT_BOOKMARK -#: Merge.rc:687 +#: Merge.rc:694 msgid "&Next Bookmark\tF2" msgstr "Dấu trang &kế tiếp\tF2" #. IDR_MERGEDOCTYPE, ID_EDIT_GOTO_PREV_BOOKMARK -#: Merge.rc:688 +#: Merge.rc:695 msgid "&Previous Bookmark\tShift+F2" msgstr "Dấu trang &trước đó\tShift+F2" #. IDR_MERGEDOCTYPE, ID_EDIT_CLEAR_ALL_BOOKMARKS -#: Merge.rc:689 +#: Merge.rc:696 msgid "&Clear All Bookmarks" msgstr "&Xoá tất cả dấu trang" #. IDR_MERGEDOCTYPE -#: Merge.rc:706 +#: Merge.rc:713 msgid "Syntax Highlight" msgstr "Tô sáng cú pháp" #. IDR_MERGEDOCTYPE -#: Merge.rc:711 +#: Merge.rc:718 msgid "&Diff Context" msgstr "Ngữ cảnh &khác biệt" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_ALL -#: Merge.rc:713 +#: Merge.rc:720 msgid "&All Lines" msgstr "&Tất cả các dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_0 -#: Merge.rc:715 +#: Merge.rc:722 msgid "&0 Lines" msgstr "&0 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_1 -#: Merge.rc:716 +#: Merge.rc:723 msgid "&1 Line" msgstr "&1 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_3 -#: Merge.rc:717 +#: Merge.rc:724 msgid "&3 Lines" msgstr "&3 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_5 -#: Merge.rc:718 +#: Merge.rc:725 msgid "&5 Lines" msgstr "&5 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_7 -#: Merge.rc:719 +#: Merge.rc:726 msgid "&7 Lines" msgstr "&7 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_9 -#: Merge.rc:720 +#: Merge.rc:727 msgid "&9 Lines" msgstr "&9 dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_TOGGLE -#: Merge.rc:722 +#: Merge.rc:729 msgid "&Toggle All and 0-9 Lines\tCtrl+D" msgstr "&Bật tắt tất cả và 0-9 dòng\tCtrl+D" #. IDR_MERGEDOCTYPE, ID_VIEW_DIFFCONTEXT_INVERT -#: Merge.rc:724 +#: Merge.rc:731 msgid "&Invert (Hide Different Lines)" msgstr "&Đảo ngược (ẩn các dòng khác biệt)" #. IDR_MERGEDOCTYPE, ID_VIEW_RESIZE_PANES -#: Merge.rc:727 +#: Merge.rc:734 msgid "&Lock Panes" msgstr "&Khoá các khung" #. IDR_MERGEDOCTYPE, ID_VIEW_WHITESPACE -#: Merge.rc:728 +#: Merge.rc:735 msgid "&View Whitespace" msgstr "&Xem khoảng trắng" #. IDR_MERGEDOCTYPE, ID_VIEW_EOL -#: Merge.rc:729 +#: Merge.rc:736 msgid "View E&OL" msgstr "Xem &kí tự cuối dòng (EOL)" #. IDR_MERGEDOCTYPE, ID_VIEW_LINEDIFFS -#: Merge.rc:730 +#: Merge.rc:737 msgid "Vie&w Line Differences" msgstr "Xe&m các khác biệt dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_LINENUMBERS -#: Merge.rc:731 +#: Merge.rc:738 msgid "View Line &Numbers" msgstr "Xem &số dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_SELMARGIN -#: Merge.rc:732 +#: Merge.rc:739 msgid "View &Margins" msgstr "Xem các &mép" #. IDR_MERGEDOCTYPE, ID_VIEW_TOPMARGIN -#: Merge.rc:733 +#: Merge.rc:740 msgid "View To&p Margins" msgstr "Xem mép &trên" #. IDR_MERGEDOCTYPE, ID_VIEW_WORDWRAP -#: Merge.rc:734 +#: Merge.rc:741 msgid "W&rap Lines" msgstr "Bọ&c dòng" #. IDR_MERGEDOCTYPE, ID_VIEW_SPLITVERTICALLY -#: Merge.rc:742 +#: Merge.rc:749 msgid "Split V&ertically" msgstr "Tách theo chiều &dọc" #. IDR_MERGEDOCTYPE, ID_VIEW_DETAIL_BAR -#: Merge.rc:759 +#: Merge.rc:766 msgid "Diff &Pane" msgstr "&Khung xem khác biệt" #. IDR_MERGEDOCTYPE, ID_VIEW_LOCATION_BAR -#: Merge.rc:760 +#: Merge.rc:767 msgid "Lo&cation Pane" msgstr "Khung &vị trí" #. IDS_OUTPUTBAR_CAPTION -#: Merge.rc:761 Merge.rc:4902 +#: Merge.rc:768 Merge.rc:4912 msgid "Output Pane" msgstr "Khung kết quả" #. IDR_MERGEDOCTYPE, ID_NEXTCONFLICT -#: Merge.rc:770 +#: Merge.rc:777 msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "Xung đột &tiếp theo\tAlt+Shift+Down" #. IDR_MERGEDOCTYPE, ID_PREVCONFLICT -#: Merge.rc:771 +#: Merge.rc:778 msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "Xung đột &trước đó\tAlt+Shift+Up" #. IDR_MERGEDOCTYPE -#: Merge.rc:777 +#: Merge.rc:784 msgid "A&dvanced" msgstr "&Nâng cao" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLM -#: Merge.rc:779 +#: Merge.rc:786 msgid "Next Difference (Left/Middle)\tAlt+1" msgstr "Khác biệt tiếp theo (trái/giữa)\tAlt+1" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLM -#: Merge.rc:780 +#: Merge.rc:787 msgid "Previous Difference (Left/Middle)\tAlt+Shift+1" msgstr "Khác biệt trước đó (trái/giữa)\tAlt+Shift+1" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLR -#: Merge.rc:782 +#: Merge.rc:789 msgid "Next Difference (Left/Right)\tAlt+2" msgstr "Khác biệt tiếp theo (trái/phải)\tAlt+2" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLR -#: Merge.rc:783 +#: Merge.rc:790 msgid "Previous Difference (Left/Right)\tAlt+Shift+2" msgstr "Khác biệt trước đó (trái/phải)\tAlt+Shift+2" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMR -#: Merge.rc:785 +#: Merge.rc:792 msgid "Next Difference (Middle/Right)\tAlt+3" msgstr "Khác biệt tiếp theo (giữa/phải)\tAlt+3" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMR -#: Merge.rc:786 +#: Merge.rc:793 msgid "Previous Difference (Middle/Right)\tAlt+Shift+3" msgstr "Khác biệt trước đó (giữa/phải)\tAlt+Shift+3" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFLO -#: Merge.rc:788 +#: Merge.rc:795 msgid "Next Left-Only Difference\tAlt+7" msgstr "Khác biệt tiếp theo chỉ có bên trái\tAlt+7" #. IDR_MERGEDOCTYPE, ID_PREVDIFFLO -#: Merge.rc:789 +#: Merge.rc:796 msgid "Previous Left-Only Difference\tAlt+Shift+7" msgstr "Khác biệt trước đó chỉ có bên trái\tAlt+Shift+7" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFMO -#: Merge.rc:791 +#: Merge.rc:798 msgid "Next Middle-Only Difference\tAlt+8" msgstr "Khác biệt tiếp theo chỉ có ở giữa\tAlt+8" #. IDR_MERGEDOCTYPE, ID_PREVDIFFMO -#: Merge.rc:792 +#: Merge.rc:799 msgid "Previous Middle-Only Difference\tAlt+Shift+8" msgstr "Khác biệt trước đó chỉ có ở giữa\tAlt+Shift+8" #. IDR_MERGEDOCTYPE, ID_NEXTDIFFRO -#: Merge.rc:794 +#: Merge.rc:801 msgid "Next Right-Only Difference\tAlt+9" msgstr "Khác biệt tiếp theo chỉ có bên phải\tAlt+9" #. IDR_MERGEDOCTYPE, ID_PREVDIFFRO -#: Merge.rc:795 +#: Merge.rc:802 msgid "Previous Right-Only Difference\tAlt+Shift+9" msgstr "Khác biệt trước đó chỉ có bên phải\tAlt+Shift+9" #. IDR_MERGEDOCTYPE -#: Merge.rc:797 +#: Merge.rc:804 msgid "Copy from &Left to" msgstr "Chép từ bên &trái sang" #. 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 "&Giữa" #. 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 "&Phải" #. IDR_MERGEDOCTYPE -#: Merge.rc:802 +#: Merge.rc:809 msgid "Copy from &Middle to" msgstr "Chép từ &giữa sang" #. 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 "&Trái" #. IDR_MERGEDOCTYPE -#: Merge.rc:807 +#: Merge.rc:814 msgid "Copy from &Right to" msgstr "Chép từ bên &phải sang" #. IDR_MERGEDOCTYPE -#: Merge.rc:813 +#: Merge.rc:820 msgid "Copy Selected Lines from Le&ft to" msgstr "Chép các dòng được chọn từ bên &trái sang" #. IDR_MERGEDOCTYPE -#: Merge.rc:818 +#: Merge.rc:825 msgid "Copy Selected Lines from Mi&ddle to" msgstr "Chép các dòng được chọn từ &giữa sang" #. IDR_MERGEDOCTYPE -#: Merge.rc:823 +#: Merge.rc:830 msgid "Copy Selected Lines from Ri&ght to" msgstr "Chép các dòng được chọn từ bên &phải sang" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_LEFT -#: Merge.rc:833 +#: Merge.rc:840 msgid "Copy from Left\tAlt+Shift+Right" msgstr "Chép từ bên trái\tAlt+Shift+Right" #. IDR_MERGEDOCTYPE, ID_COPY_FROM_RIGHT -#: Merge.rc:834 +#: Merge.rc:841 msgid "Copy from Right\tAlt+Shift+Left" msgstr "Chép từ bên phải\tAlt+Shift+Left" #. IDR_MERGEDOCTYPE, ID_L2RNEXT -#: Merge.rc:836 +#: Merge.rc:843 msgid "C&opy to Right and Advance\tCtrl+Alt+Right" msgstr "Sao &chép sang bên phải và tiến tiếp\tCtrl+Alt+Right" #. IDR_MERGEDOCTYPE, ID_R2LNEXT -#: Merge.rc:837 +#: Merge.rc:844 msgid "Copy &to Left and Advance\tCtrl+Alt+Left" msgstr "Chép &sang bên trái và tiến tiếp\tCtrl+Alt+Left" #. IDR_MERGEDOCTYPE, ID_ALL_RIGHT -#: Merge.rc:839 +#: Merge.rc:846 msgid "Copy &All to Right" msgstr "Chép &tất cả sang bên phải" #. IDR_MERGEDOCTYPE, ID_ALL_LEFT -#: Merge.rc:840 +#: Merge.rc:847 msgid "Cop&y All to Left" msgstr "Sao ché&p tất cả sang bên trái" #. IDR_MERGEDOCTYPE, ID_AUTO_MERGE -#: Merge.rc:842 +#: Merge.rc:849 msgid "A&uto Merge\tCtrl+Alt+M" msgstr "&Tự động trộn\tCtrl+Alt+M" #. IDR_MERGEDOCTYPE, ID_ADD_SYNCPOINT -#: Merge.rc:844 +#: Merge.rc:851 msgid "Add &Synchronization Point\tAlt+S" msgstr "Thêm điểm &đồng bộ hoá\tAlt+S" #. IDR_MERGEDOCTYPE, ID_CLEAR_SYNCPOINTS -#: Merge.rc:845 +#: Merge.rc:852 msgid "Clear Sync&hronization Points" msgstr "Xoá các điểm đồng &bộ hoá" #. IDR_MERGEDOCTYPE -#: Merge.rc:863 +#: Merge.rc:870 msgid "Unpac&ker" msgstr "Trình &bung gói" #. IDR_MERGEDOCTYPE -#: Merge.rc:869 +#: Merge.rc:876 msgid "&Prediffer" msgstr "Trình tiền &so sánh" #. IDR_MERGEDOCTYPE, ID_APPLY_PREDIFFER -#: Merge.rc:873 +#: Merge.rc:880 msgid "Apply Pre&differ..." msgstr "Áp dụng trình &so sánh trước..." #. IDR_MERGEDOCTYPE, ID_TRANSFORM_WITH_SCRIPT -#: Merge.rc:879 +#: Merge.rc:886 msgid "&Transform with Editor Script..." msgstr "&Chuyển đổi bằng kịch bản chỉnh sửa..." #. IDR_MERGEDOCTYPE -#: Merge.rc:880 +#: Merge.rc:887 msgid "Scripts for &Copying" msgstr "Mã kịch bản để &sao chép" #. IDR_MERGEDOCTYPE, ID_SELECT_EDITOR_SCRIPT_FOR_COPYING -#: Merge.rc:886 +#: Merge.rc:893 msgid "Select &Editor Script..." msgstr "Chọn kịch bản &chỉnh sửa..." #. IDR_MERGEDOCTYPE, ID_WINDOW_SPLIT -#: Merge.rc:898 +#: Merge.rc:905 msgid "Sp&lit" msgstr "&Tách" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE -#: Merge.rc:921 +#: Merge.rc:928 msgid "Comp&are" msgstr "So &sánh" #. 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 "So sánh trong &cửa sổ mới" #. 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 "So sánh không theo chiều &ngang..." #. IDR_POPUP_DIRVIEW -#: Merge.rc:925 +#: Merge.rc:932 msgid "Compare Non-hor&izontally" msgstr "So sánh không theo chiều &ngang" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_LEFT2 -#: Merge.rc:927 +#: Merge.rc:934 msgid "First &Left with Second Left" msgstr "Bên &trái thứ nhất với bên trái thứ 2" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_RIGHT1_RIGHT2 -#: Merge.rc:928 +#: Merge.rc:935 msgid "First &Right with Second Right" msgstr "Bên &phải thứ nhất với bên phải thứ 2" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT1_RIGHT2 -#: Merge.rc:929 +#: Merge.rc:936 msgid "&First Left with Second Right" msgstr "&Bên trái thứ nhất với bên phải thứ 2" #. IDR_POPUP_DIRVIEW, ID_MERGE_COMPARE_LEFT2_RIGHT1 -#: Merge.rc:930 +#: Merge.rc:937 msgid "&Second Left with First Right" msgstr "Bên trái thứ &2 với bên phải thứ nhất" #. IDR_POPUP_DIRVIEW -#: Merge.rc:933 +#: Merge.rc:940 msgid "Co&mpare As" msgstr "So &sánh dưới dạng" #. 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 "Trái sang giữa (%1 trên %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 "Trái sang phải (%1 trên %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 "Trái sang... (%1 trên %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 "Giữa sang trái (%1 trên %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 "Giữa sang phải (%1 trên %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 "Giữa sang... (%1 trên %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 "Phải sang giữa (%1 trên %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 "Phải sang trái (%1 trên %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 "Phải sang... (%1 trên %2)" #. IDD_EDIT_MARKER, IDC_EDIT_MARKER_DELETE -#: Merge.rc:967 Merge.rc:2036 +#: Merge.rc:975 Merge.rc:2046 msgid "&Delete" msgstr "&Xoá" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_BOTH -#: Merge.rc:972 +#: Merge.rc:980 msgid "&Both" msgstr "&Cả hai" #. IDR_POPUP_DIRVIEW, ID_DIR_DEL_ALL -#: Merge.rc:973 +#: Merge.rc:981 msgid "&All" msgstr "&Tất cả" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_SELECTION -#: Merge.rc:974 Merge.rc:2019 +#: Merge.rc:982 Merge.rc:2029 msgid "&Selection" msgstr "Phần được chọn" #. IDR_POPUP_DIRVIEW, ID_DIR_ITEM_RENAME -#: Merge.rc:976 +#: Merge.rc:984 msgid "Re&name" msgstr "Đổi &tên" #. IDR_POPUP_DIRVIEW, ID_DIR_HIDE_FILENAMES -#: Merge.rc:977 +#: Merge.rc:985 msgid "&Hide Items" msgstr "&Ẩn các mục" #. IDR_POPUP_DIRVIEW -#: Merge.rc:979 +#: Merge.rc:987 msgid "&Open Left" msgstr "&Mở bên trái" #. IDR_POPUP_DIRVIEW -#: Merge.rc:986 +#: Merge.rc:994 msgid "Open Midd&le" msgstr "Mở ở &giữa" #. IDR_POPUP_DIRVIEW -#: Merge.rc:993 +#: Merge.rc:1001 msgid "O&pen Right" msgstr "Mở bên &phải" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1001 +#: Merge.rc:1009 msgid "Cop&y Paths" msgstr "Sao &chép các đường dẫn" #. 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 "Bên trái (%1 trên %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 "Ở giữa (%1 trên %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 "Bên phải (%1 trên %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 "Cả hai (%1 trên %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 "Tất cả (%1 trên %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_FILENAMES -#: Merge.rc:1009 +#: Merge.rc:1017 msgid "Copy &Filenames" msgstr "Chép &tên tệp" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1010 +#: Merge.rc:1018 msgid "Copy Items to Clip&board" msgstr "Chép các mục vào bảng &tạm" #. IDR_POPUP_DIRVIEW, ID_DIR_COPY_ALL_DISP_COLUMNS -#: Merge.rc:1018 +#: Merge.rc:1026 msgid "Copy All Di&splayed Columns" msgstr "Chép tất cả các cột đang &hiển thị" #. IDR_POPUP_DIRVIEW -#: Merge.rc:1020 +#: Merge.rc:1028 msgid "&Zip" msgstr "&Nén" #. 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 "Cả hai sang... (%1 trên %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 "Tất cả sang... (%1 trên %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 "Các khác biệt sang... (%1 trên %2)" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_LEFT -#: Merge.rc:1032 +#: Merge.rc:1040 msgid "Left Shell Menu" msgstr "Bảng chọn hệ vỏ bên trái" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_MIDDLE -#: Merge.rc:1033 +#: Merge.rc:1041 msgid "Middle Shell Menu" msgstr "Bảng chọn hệ vỏ ở giữa" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_RIGHT -#: Merge.rc:1034 +#: Merge.rc:1042 msgid "Right Shell Menu" msgstr "Bảng chọn hệ vỏ bên phải" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_BOTH -#: Merge.rc:1035 +#: Merge.rc:1043 msgid "Both Shell Menu" msgstr "Cả hai bảng chọn hệ vỏ" #. IDR_POPUP_DIRVIEW, ID_DIR_SHELL_CONTEXT_MENU_ALL -#: Merge.rc:1036 +#: Merge.rc:1044 msgid "All Shell Menu" msgstr "Tất cả bảng chọn hệ vỏ" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY -#: Merge.rc:1050 +#: Merge.rc:1058 msgid "Copy" msgstr "Sao chép" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_PATH -#: Merge.rc:1051 +#: Merge.rc:1059 msgid "&Copy Full Path" msgstr "Chép đường dẫn đầy đủ" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_COPY_FILENAME -#: Merge.rc:1052 +#: Merge.rc:1060 msgid "Copy &Filename" msgstr "Chép tên tệp" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_CAPTION -#: Merge.rc:1053 +#: Merge.rc:1061 msgid "&Edit Caption\tF2" msgstr "Chỉnh sửa tiêu đề\tF2" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_EDIT_PATH -#: Merge.rc:1055 +#: Merge.rc:1063 msgid "Edit &Path\tCtrl+L" msgstr "Chỉnh sửa đường dẫn\tCtrl+L" #. IDR_POPUP_EDITOR_HEADERBAR, ID_EDITOR_SELECT_FILE -#: Merge.rc:1056 +#: Merge.rc:1064 msgid "&Open..." msgstr "Mở..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1062 +#: Merge.rc:1070 msgid "Unpacker Settings" msgstr "Thiết đặt trình bung gói" #. 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 "Chọn..." #. IDR_POPUP_PLUGINS_SETTINGS -#: Merge.rc:1068 +#: Merge.rc:1076 msgid "Prediffer Settings" msgstr "Thiết đặt trình tiền so sánh" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_GOTODIFF -#: Merge.rc:1080 +#: Merge.rc:1088 msgid "G&o to Diff" msgstr "Đi tới khác biệt" #. IDR_POPUP_LOCATIONBAR, ID_LOCBAR_MOVECURSOR_ONCLICK -#: Merge.rc:1083 +#: Merge.rc:1091 msgid "Move Cursor on &Click" msgstr "Di chuyển con trỏ khi nháy chuột" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_NONE -#: Merge.rc:1085 +#: Merge.rc:1093 msgid "&No Moved Blocks" msgstr "Không có khối nào bị di chuyển" #. IDR_POPUP_LOCATIONBAR, ID_DISPLAY_MOVED_ALL -#: Merge.rc:1086 +#: Merge.rc:1094 msgid "&All Moved Blocks" msgstr "Tất cả khối bị di chuyển" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1094 Merge.rc:1127 +#: Merge.rc:1102 Merge.rc:1135 msgid "W&hitespaces" msgstr "Khoảng trắng" #. 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 "So sánh" #. 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 "Bỏ qua các thay đổi" #. 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 "Bỏ qua tất cả" #. 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 "Bỏ qua dòng trống" #. 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 "Bỏ qua hoa thường" #. 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 "Bỏ qua sự khác biệt 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 "Bỏ qua sự khác biệt trang mã" #. 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ỏ qua số" #. 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 "Bỏ qua sự khác biệt chú thích" #. 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 "Bỏ qua thiếu kí tự EOL ở cuối" #. 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ỏ qua ngắt dòng (Coi như dấu cách)" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_RECURS_CHECK -#: Merge.rc:1109 Merge.rc:2963 +#: Merge.rc:1117 Merge.rc:2973 msgid "&Include Subfolders" msgstr "Bao gồm cả thư mục con" #. IDR_POPUP_PROJECT_DIFF_OPTIONS -#: Merge.rc:1110 Merge.rc:1142 +#: Merge.rc:1118 Merge.rc:1150 msgid "&Compare Method" msgstr "Phương thức so sánh" #. 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 "Nội dung đầy đủ" #. 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 "Nội dung nhanh" #. 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 "Nội dung nhị phân" #. 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 "Ngày sửa đổi" #. 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 "Ngày sửa đổi và kích cỡ" #. 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 "Kích cỡ" #. 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 "Sự tồn tại" #. IDR_POPUP_PROJECT, ID_LOAD_PROJECT -#: Merge.rc:1192 +#: Merge.rc:1202 msgid "&Load Project..." msgstr "Nạp dự án..." #. 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 "${*} - Tất cả đối số" #. 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} - Đối số thứ nhất" #. 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} - Đối số thứ hai" #. 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} - Đối số thứ ba" #. 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} - Đối số thứ tư" #. 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} - Đối số thứ năm" #. 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} - Đối số thứ sáu" #. 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} - Đối số thứ bảy" #. 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} - Đối số thứ tám" #. 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} - Đối số thứ chín" #. 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} - Tệp nguồn" #. 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} - Thư mục nguồn" #. 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 nguồn" #. 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} - Giao thức URL nguồn" #. 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} - Hậu tố URL nguồn" #. 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} - Tệp đích" #. 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} - Thư mục đích" #. 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 đích" #. 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} - Giao thức URL đích" #. 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} - Hậu tố URL đích" #. 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} - Thư mục nhà của 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} - Tệp kịch bản" #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_UNPACKER -#: Merge.rc:1318 +#: Merge.rc:1328 msgid "Add &Unpacker Plugin..." msgstr "Thêm trình cắm bung gói..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_ADD_PREDIFFER -#: Merge.rc:1319 +#: Merge.rc:1329 msgid "Add &Prediffer Plugin..." msgstr "Thêm trình cắm tiền so sánh..." #. IDR_POPUP_PLUGIN_ADD_MENU, ID_PLUGIN_DUPLICATE -#: Merge.rc:1320 +#: Merge.rc:1330 msgid "&Duplicate Plugin..." msgstr "Nhân bản trình cắm..." #. IDR_POPUP_OUTPUTVIEW, ID_EDIT_CLEAR_ALL -#: Merge.rc:1344 +#: Merge.rc:1354 msgid "Clear &All" msgstr "Xoá sạch tất cả" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_CLEAR -#: Merge.rc:1352 +#: Merge.rc:1362 msgid "&Clear All" msgstr "Xoá sạch tất cả" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_REMOVE_LAST -#: Merge.rc:1353 +#: Merge.rc:1363 msgid "Remove Last Filter &Group" msgstr "Loại bỏ nhóm bộ lọc cuối cùng" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_MASK_ALL -#: Merge.rc:1354 +#: Merge.rc:1364 msgid "R&eset to Default (*.*)" msgstr "Đặt lại về mặc định (*.*)" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1355 +#: Merge.rc:1365 msgid "Add E&xclude File" msgstr "Thêm tệp loại trừ" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_SYS -#: Merge.rc:1357 +#: Merge.rc:1367 msgid "&System Files" msgstr "Các tệp hệ thống" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BACKUP -#: Merge.rc:1358 +#: Merge.rc:1368 msgid "&Editor Backup Files" msgstr "Các tệp sao lưu của trình chỉnh sửa" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_BIN -#: Merge.rc:1359 +#: Merge.rc:1369 msgid "&Compiled Binary Files" msgstr "Các tệp nhị phân đã biên dịch" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_LOG -#: Merge.rc:1360 +#: Merge.rc:1370 msgid "&Log Files" msgstr "Các tệp nhật kí" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_TEMP -#: Merge.rc:1361 +#: Merge.rc:1371 msgid "&Temporary or Cache Files" msgstr "Các tệp tạm thời hoặc bộ nhớ đệm" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1363 +#: Merge.rc:1373 msgid "Add Excl&ude Folder" msgstr "Thêm thư mục loại trừ" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_VCS -#: Merge.rc:1365 +#: Merge.rc:1375 msgid "&Version Control" msgstr "Kiểm soát phiên bản" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_BUILD -#: Merge.rc:1366 +#: Merge.rc:1376 msgid "&Build Artifacts" msgstr "Các bản dựng thành phẩm" #. 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 "Thêm điều kiện tệp" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1372 Merge.rc:1551 +#: Merge.rc:1382 Merge.rc:1561 msgid "File &Size" msgstr "Kích cỡ tệp" #. 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 "Nhỏ hơn 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 "Từ 1KB trở lên" #. 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 "Nhỏ hơn 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 "Từ 10KB trở lên" #. 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 "Nhỏ hơn 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 "Từ 100KB trở lên" #. 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 "Nhỏ hơn 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 "Từ 1MB trở lên" #. 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 "Nhỏ hơn 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 "Từ 10MB trở lên" #. 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 "Nhỏ hơn 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 "Từ 100MB trở lên" #. 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 "Nhỏ hơn 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 "Từ 1GB trở lên" #. 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 "Khoảng tuỳ chỉnh..." #. 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 "Sửa đổi lần cuối" #. 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 "Giờ" #. 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 "Cách đây hơn 1 giờ" #. 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 "Trong vòng 1 giờ" #. 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 "Ngày" #. 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 "Trước hôm nay" #. 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 "Hôm nay" #. 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 "Trước hôm qua" #. 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 "Hôm qua" #. 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 "Kể từ hôm qua" #. 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 "Tuần" #. 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 "Trước tuần này" #. 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 "Tuần này" #. 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 "Trước tuần trước" #. 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 "Tuần trước" #. 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 "Kể từ tuần trước" #. 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 "Tháng" #. 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 "Trước tháng này" #. 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 "Tháng này" #. 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 "Trước tháng trước" #. 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 "Tháng trước" #. 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 "Kể từ tháng trước" #. 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 "Năm" #. 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 "Trước năm nay" #. 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 "Năm nay" #. 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 "Trước năm ngoái" #. 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 "Năm ngoái" #. 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 "Kể từ năm ngoái" #. 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 "Khoảng tuỳ chỉnh..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1431 Merge.rc:1589 +#: Merge.rc:1441 Merge.rc:1599 msgid "&Attributes" msgstr "Thuộc tính" #. 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 "Các tệp chỉ-đọc" #. 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 "Các tệp không phải chỉ-đọc" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_HIDDEN -#: Merge.rc:1435 Merge.rc:1609 +#: Merge.rc:1445 Merge.rc:1619 msgid "Hidden files" msgstr "Các tệp ẩn" #. 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 "Các tệp không ẩn" #. IDR_POPUP_FILTERMENU_ATTR, ID_FILTERMENU_ATTR_SYSTEM -#: Merge.rc:1437 Merge.rc:1611 +#: Merge.rc:1447 Merge.rc:1621 msgid "System files" msgstr "Các tệp hệ thống" #. 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 "Các tệp không phải hệ thống" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1440 +#: Merge.rc:1450 msgid "File &Content" msgstr "Nội dung tệp" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_CONTAINS -#: Merge.rc:1442 +#: Merge.rc:1452 msgid "Contains string..." msgstr "Có chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_NOT_CONTAINS -#: Merge.rc:1443 +#: Merge.rc:1453 msgid "Does not contain string..." msgstr "Không chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_CONTAINS -#: Merge.rc:1444 +#: Merge.rc:1454 msgid "First line contains string..." msgstr "Dòng đầu tiên có chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_LINE_NOT_CONTAINS -#: Merge.rc:1445 +#: Merge.rc:1455 msgid "First line does not contain string..." msgstr "Dòng đầu tiên không chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_FIRST_10_CONTAINS -#: Merge.rc:1446 +#: Merge.rc:1456 msgid "First 10 lines contain string..." msgstr "10 dòng đầu có chứa xâu..." #. 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 dòng đầu không chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_10_CONTAINS -#: Merge.rc:1448 +#: Merge.rc:1458 msgid "Last 10 lines contain string..." msgstr "10 dòng cuối có chứa xâu..." #. 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 dòng cuối không chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_CONTAINS -#: Merge.rc:1450 +#: Merge.rc:1460 msgid "Last line contains string..." msgstr "Dòng cuối cùng có chứa xâu..." #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONTENT_LAST_LINE_NOT_CONTAINS -#: Merge.rc:1451 +#: Merge.rc:1461 msgid "Last line does not contain string..." msgstr "Dòng cuối cùng không chứa xâu..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1453 +#: Merge.rc:1463 msgid "&Line Count" msgstr "Số lượng dòng" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10 -#: Merge.rc:1455 +#: Merge.rc:1465 msgid "Less than 10" msgstr "Nhỏ hơn 10" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10 -#: Merge.rc:1456 +#: Merge.rc:1466 msgid "10 or more" msgstr "Từ 10 trở lên" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100 -#: Merge.rc:1457 +#: Merge.rc:1467 msgid "Less than 100" msgstr "Nhỏ hơn 100" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100 -#: Merge.rc:1458 +#: Merge.rc:1468 msgid "100 or more" msgstr "Từ 100 trở lên" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_1000 -#: Merge.rc:1459 +#: Merge.rc:1469 msgid "Less than 1000" msgstr "Nhỏ hơn 1000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_1000 -#: Merge.rc:1460 +#: Merge.rc:1470 msgid "1000 or more" msgstr "Từ 1000 trở lên" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_10000 -#: Merge.rc:1461 +#: Merge.rc:1471 msgid "Less than 10000" msgstr "Nhỏ hơn 10000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_10000 -#: Merge.rc:1462 +#: Merge.rc:1472 msgid "10000 or more" msgstr "Từ 10000 trở lên" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_LT_100000 -#: Merge.rc:1463 +#: Merge.rc:1473 msgid "Less than 100000" msgstr "Nhỏ hơn 100000" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_LINES_GE_100000 -#: Merge.rc:1464 +#: Merge.rc:1474 msgid "100000 or more" msgstr "Từ 100000 trở lên" #. 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 "Các thuộc tính bổ sung..." #. IDR_POPUP_FILTERMENU -#: Merge.rc:1469 +#: Merge.rc:1479 msgid "Add F&older Condition" msgstr "Thêm điều kiện thư mục" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1513 +#: Merge.rc:1523 msgid "&Files" msgstr "Tệp" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_EQ_0 -#: Merge.rc:1515 +#: Merge.rc:1525 msgid "0 files" msgstr "0 tệp" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_FILES_GE_1 -#: Merge.rc:1516 +#: Merge.rc:1526 msgid "1 file or more" msgstr "Từ 1 tệp trở lên" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1519 +#: Merge.rc:1529 msgid "&Items" msgstr "Mục" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_EQ_0 -#: Merge.rc:1521 +#: Merge.rc:1531 msgid "0 items" msgstr "0 mục" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_ITEMS_GE_1 -#: Merge.rc:1522 +#: Merge.rc:1532 msgid "1 item or more" msgstr "Từ 1 mục trở lên" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1525 +#: Merge.rc:1535 msgid "&Total Size" msgstr "Tổng kích cỡ" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FOLDER_STATS_RECURSIVE -#: Merge.rc:1542 +#: Merge.rc:1552 msgid "&Recursive" msgstr "Đệ quy" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_ANY -#: Merge.rc:1544 +#: Merge.rc:1554 msgid "Target: &Any (Left/Middle/Right)" msgstr "Đích: Bất kì (trái/giữa/phải)" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_LEFT -#: Merge.rc:1545 +#: Merge.rc:1555 msgid "Target: &Left" msgstr "Đích: Bên trái" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_MIDDLE -#: Merge.rc:1546 +#: Merge.rc:1556 msgid "Target: &Middle" msgstr "Đích: Ở giữa" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_CONDITION_RIGHT -#: Merge.rc:1547 +#: Merge.rc:1557 msgid "Target: &Right" msgstr "Đích: Bên phải" #. IDR_POPUP_FILTERMENU -#: Merge.rc:1549 +#: Merge.rc:1559 msgid "Add &Difference Condition" msgstr "Thêm điều kiện khác biệt" #. 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 "Bằng" #. 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 "Không bằng" #. 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 "Nhỏ hơn" #. 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 "Nhỏ hơn hoặc bằng" #. 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 "Lớn hơn" #. 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 "Lớn hơn hoặc bằng" #. 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 "Nhỏ hơn 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 "Từ 10B trở lên" #. 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 "Nhỏ hơn 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 "Từ 100B trở lên" #. 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 "Nhỏ hơn 1 giây" #. 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 "Từ 1 giây trở lên" #. 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 "Nhỏ hơn 1 phút" #. 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 "Từ 1 phút trở lên" #. 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 "Nhỏ hơn 1 giờ" #. 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 "Từ 1 giờ trở lên" #. 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 "Nhỏ hơn 1 ngày" #. 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 "Từ 1 ngày trở lên" #. 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 "Nhỏ hơn 1 tuần" #. 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 "Từ 1 tuần trở lên" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_RIGHT -#: Merge.rc:1596 +#: Merge.rc:1606 msgid "Target: &Left and Right" msgstr "Đích: Bên trái và phải" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_LEFT_MIDDLE -#: Merge.rc:1597 +#: Merge.rc:1607 msgid "Target: Left and &Middle" msgstr "Đích: Bên trái và giữa" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_MIDDLE_RIGHT -#: Merge.rc:1598 +#: Merge.rc:1608 msgid "Target: Middle and &Right" msgstr "Đích: Ở giữa và phải" #. IDR_POPUP_FILTERMENU, ID_FILTERMENU_FILE_CONDITION_DIFF_ALL -#: Merge.rc:1599 +#: Merge.rc:1609 msgid "Target: &All" msgstr "Đích: Tất cả" #. 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 "Xoá sạch các điều kiện" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_SIZE -#: Merge.rc:1757 +#: Merge.rc:1767 msgid "Compare &Size" msgstr "So sánh kích cỡ" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_DATE -#: Merge.rc:1758 +#: Merge.rc:1768 msgid "Compare &Date" msgstr "So sánh ngày" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_ATTR -#: Merge.rc:1759 +#: Merge.rc:1769 msgid "Compare &Attributes" msgstr "So sánh thuộc tính" #. IDR_POPUP_ADDCMPMENU, ID_ADDCMPMENU_CMP_CONTENTS -#: Merge.rc:1760 +#: Merge.rc:1770 msgid "Compare C&ontents" msgstr "So sánh nội dung" #. 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 "Phân biệt hoa thường" #. 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 "Về WinMerge" #. IDD_ABOUTBOX, IDC_WWW -#: Merge.rc:1936 +#: Merge.rc:1946 msgid "Visit the WinMerge Homepage!" msgstr "Hãy truy cập trang chủ 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 "Người đóng góp" #. IDD_SELECT_FILES_OR_FOLDERS -#: Merge.rc:1945 Merge.rc:3070 +#: Merge.rc:1955 Merge.rc:3080 msgid "Select Files or Folders" msgstr "Chọn tệp hoặc thư mục" #. IDD_OPEN, IDC_FILES_DIRS_GROUP0 -#: Merge.rc:1949 +#: Merge.rc:1959 msgid "&1st File or Folder" msgstr "Tệp hoặc thư mục thứ nhất" #. IDD_OPEN, IDC_PATH0_READONLY -#: Merge.rc:1951 +#: Merge.rc:1961 msgid "Re&ad-only" msgstr "Chỉ-đọc" #. IDD_OPEN, IDC_SWAP01_STATIC -#: Merge.rc:1953 +#: Merge.rc:1963 msgid "Swap 1st | 2nd" msgstr "Hoán đổi 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 "Duyệt..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP1 -#: Merge.rc:1955 +#: Merge.rc:1965 msgid "&2nd File or Folder" msgstr "Tệp hoặc thư mục thứ 2" #. IDD_OPEN, IDC_PATH1_READONLY -#: Merge.rc:1957 +#: Merge.rc:1967 msgid "Rea&d-only" msgstr "Chỉ-đọc" #. IDD_OPEN, IDC_SWAP12_STATIC -#: Merge.rc:1959 +#: Merge.rc:1969 msgid "Swap 2nd | 3rd" msgstr "Hoán đổi 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 "Duyệt..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP2 -#: Merge.rc:1961 +#: Merge.rc:1971 msgid "&3rd File or Folder (Optional)" msgstr "Tệp hoặc thư mục thứ 3 (tuỳ chọn)" #. IDD_OPEN, IDC_PATH2_READONLY -#: Merge.rc:1963 +#: Merge.rc:1973 msgid "Read-o&nly" msgstr "Chỉ-đọc" #. IDD_OPEN, IDC_SWAP02_STATIC -#: Merge.rc:1965 +#: Merge.rc:1975 msgid "Swap 1st | 3rd" msgstr "Hoán đổi 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 "Duyệt..." #. IDD_OPEN, IDC_FILES_DIRS_GROUP3 -#: Merge.rc:1968 +#: Merge.rc:1978 msgid " Folder: Filter" msgstr " Thư mục: Bộ lọc" #. IDD_OPEN, IDC_RECURS_CHECK -#: Merge.rc:1971 +#: Merge.rc:1981 msgid "&Include subfolders" msgstr "Bao gồm các thư mục con" #. IDD_OPEN, IDC_FILES_DIRS_GROUP5 -#: Merge.rc:1972 +#: Merge.rc:1982 msgid " File: Prediffer Plugin" msgstr " Tệp: Trình cắm tiền so sánh" #. IDD_OPEN, IDC_FILES_DIRS_GROUP4 -#: Merge.rc:1976 +#: Merge.rc:1986 msgid " File: Unpacker Plugin" msgstr " Tệp: Trình cắm bung gói" #. IDD_OPEN, IDC_SELECT_UNPACKER -#: Merge.rc:1978 +#: Merge.rc:1988 msgid "Se&lect..." msgstr "Chọn..." #. 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 "Huỷ" #. IDD_OPEN, IDC_OPEN_STATUS -#: Merge.rc:1982 +#: Merge.rc:1992 msgid "Status:" msgstr "Trạng thái:" #. 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 "Trợ giúp" #. IDD_OPEN, IDC_OPTIONS -#: Merge.rc:1984 +#: Merge.rc:1994 msgid "&Options..." msgstr "Tuỳ chọn..." #. IDD_EDIT_FIND -#: Merge.rc:1989 +#: Merge.rc:1999 msgid "Find" msgstr "Tìm" #. 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 "Tìm gì:" #. 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 "Chỉ khớp cả từ" #. 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 "Biểu thức chính quy" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTWRAP -#: Merge.rc:1997 +#: Merge.rc:2007 msgid "D&on't wrap end of file" msgstr "Đừng tìm vòng lại khi tới cuối tệp" #. IDD_EDIT_FIND, IDC_FINDDLG_DONTCLOSE -#: Merge.rc:1998 +#: Merge.rc:2008 msgid "&Don't close this dialog" msgstr "Đừng đóng hộp thoại này" #. IDD_EDIT_REPLACE, IDC_EDIT_SKIP -#: Merge.rc:1999 Merge.rc:2021 +#: Merge.rc:2009 Merge.rc:2031 msgid "&Find Next" msgstr "Tìm tiếp" #. IDD_EDIT_FIND, IDC_EDIT_FINDPREV -#: Merge.rc:2000 +#: Merge.rc:2010 msgid "Find &Prev" msgstr "Tìm trước đó" #. IDD_EDIT_REPLACE -#: Merge.rc:2006 +#: Merge.rc:2016 msgid "Replace" msgstr "Thay thế" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2011 +#: Merge.rc:2021 msgid "Re&place with:" msgstr "Thay bằng:" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_DONT_WRAP -#: Merge.rc:2016 +#: Merge.rc:2026 msgid "&Don't wrap at end of file" msgstr "Đừng tìm vòng lại khi tới cuối tệp" #. IDD_EDIT_REPLACE, IDC_STATIC -#: Merge.rc:2018 +#: Merge.rc:2028 msgid "Replace in" msgstr "Thay thế trong" #. IDD_EDIT_REPLACE, IDC_EDIT_SCOPE_WHOLE_FILE -#: Merge.rc:2020 +#: Merge.rc:2030 msgid "Wh&ole file" msgstr "Toàn bộ tệp" #. IDD_EDIT_REPLACE, IDC_EDIT_FINDPREV -#: Merge.rc:2022 +#: Merge.rc:2032 msgid "Find Pre&v" msgstr "Tìm trước đó" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE -#: Merge.rc:2023 +#: Merge.rc:2033 msgid "&Replace" msgstr "Thay thế" #. IDD_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL -#: Merge.rc:2024 +#: Merge.rc:2034 msgid "Replace &All" msgstr "Thay thế tất cả" #. IDS_OPTIONSPG_MARKERCOLORS -#: Merge.rc:2030 Merge.rc:4209 +#: Merge.rc:2040 Merge.rc:4219 msgid "Markers" msgstr "Dấu mốc" #. IDD_EDIT_MARKER, IDC_EDIT_MARKERS_ENABLED -#: Merge.rc:2033 +#: Merge.rc:2043 msgid "Enable &markers" msgstr "Bật dấu mốc" #. IDD_FILTERS_LINEFILTERS, IDC_LFILTER_ADDBTN -#: Merge.rc:2035 Merge.rc:2057 +#: Merge.rc:2045 Merge.rc:2067 msgid "New" msgstr "Mới" #. IDD_EDIT_MARKER, IDC_STATIC -#: Merge.rc:2039 +#: Merge.rc:2049 msgid "&Background color:" msgstr "Màu nề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 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 "Áp dụng" #. IDD_FILTERS_LINEFILTERS -#: Merge.rc:2051 +#: Merge.rc:2061 msgid "Line Filters" msgstr "Bộ lọc dòng" #. IDD_FILTERS_LINEFILTERS, IDC_IGNOREREGEXP -#: Merge.rc:2054 +#: Merge.rc:2064 msgid "Enable Line Filters" msgstr "Bật bộ lọc dòng" #. IDD_FILTERS_LINEFILTERS, IDC_STATIC -#: Merge.rc:2055 +#: Merge.rc:2065 msgid "Regular Expressions (one per line):" msgstr "Biểu thức chính quy (mỗi dòng một biểu thức):" #. IDD_PLUGINS_LIST, IDC_PLUGIN_EDIT -#: Merge.rc:2058 Merge.rc:2924 +#: Merge.rc:2068 Merge.rc:2934 msgid "Edit" msgstr "Sửa" #. 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 "Loại bỏ" #. IDD_FILTERS_SUBSTITUTIONFILTERS -#: Merge.rc:2064 +#: Merge.rc:2074 msgid "Substitution Filters" msgstr "Bộ lọc thay thế" #. 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 +3152,546 @@ msgstr "" "là không quan trọng. Các bản vá không bị ảnh hưởng." #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_IGNORED_SUSBSTITUTIONS_ENABLED -#: Merge.rc:2068 +#: Merge.rc:2078 msgid "Enable" msgstr "Bật" #. IDD_PLUGINS_LIST, IDC_PLUGIN_ADD -#: Merge.rc:2070 Merge.rc:2923 +#: Merge.rc:2080 Merge.rc:2933 msgid "Add" msgstr "Thêm" #. IDD_FILTERS_SUBSTITUTIONFILTERS, IDC_LFILTER_CLEARBTN -#: Merge.rc:2072 +#: Merge.rc:2082 msgid "Clear" msgstr "Xoá sạch" #. IDD_PREFERENCES -#: Merge.rc:2077 +#: Merge.rc:2087 msgid "Options" msgstr "Tuỳ chọn" #. IDD_PREFERENCES, IDC_TREEOPT_IMPORT -#: Merge.rc:2086 +#: Merge.rc:2096 msgid "Import..." msgstr "Nhập..." #. IDD_PREFERENCES, IDC_TREEOPT_EXPORT -#: Merge.rc:2087 +#: Merge.rc:2097 msgid "Export..." msgstr "Xuất..." #. 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 "Tổng quát" #. IDD_PROPPAGE_GENERAL, IDC_SCROLL_CHECK -#: Merge.rc:2095 +#: Merge.rc:2105 msgid "Automatically &scroll to first difference" msgstr "Tự động cuộn đến điểm khác biệt đầu tiên" #. 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 "Tự động cuộn đến khác biệt nội dòng đầu tiên" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2099 +#: Merge.rc:2109 msgid "Cl&ose windows with 'Esc':" msgstr "Đóng cửa sổ bằng phím 'Esc':" #. IDD_PROPPAGE_GENERAL, IDC_VERIFY_OPEN_PATHS -#: Merge.rc:2101 +#: Merge.rc:2111 msgid "&Automatically verify paths in Open dialog" msgstr "Tự động xác minh đường dẫn trong hộp thoại Mở" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2103 +#: Merge.rc:2113 msgid "Single instance mode:" msgstr "Chế độ đơn-hiện-thể:" #. IDD_PROPPAGE_GENERAL, IDC_ASK_MULTIWINDOW_CLOSE -#: Merge.rc:2105 +#: Merge.rc:2115 msgid "As&k when closing multiple windows" msgstr "Hỏi khi đóng nhiều cửa sổ" #. IDD_PROPPAGE_GENERAL, IDC_PRESERVE_FILETIME -#: Merge.rc:2107 +#: Merge.rc:2117 msgid "&Preserve file time in file compare" msgstr "Giữ nguyên thời gian tệp khi so sánh tệp" #. IDD_PROPPAGE_GENERAL, IDC_STARTUP_FOLDER_SELECT -#: Merge.rc:2109 +#: Merge.rc:2119 msgid "Show \"Select Files or Folders\" dialog on startup" msgstr "Hiện hộp thoại \"Chọn tệp hoặc thư mục\" khi khởi động" #. 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 "Đóng hộp thoại \"Chọn tệp hoặc thư mục\" khi nhấn nút So sánh" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2113 +#: Merge.rc:2123 msgid "Op&en dialog Auto completion:" msgstr "Tự động hoàn thành hộp thoại mở:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2115 +#: Merge.rc:2125 msgid "Auto-&reload modified files:" msgstr "Tự động tải lại các tệp đã sửa đổi:" #. IDD_PROPPAGE_GENERAL, IDC_STATIC -#: Merge.rc:2117 +#: Merge.rc:2127 msgid "Language:" msgstr "Ngôn ngữ:" #. 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 "Mặc định" #. 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 "Màu sắc" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2127 +#: Merge.rc:2137 msgid "Color &mode:" msgstr "Chế độ màu:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2129 +#: Merge.rc:2139 msgid "&Light mode scheme:" msgstr "Sơ đồ chế độ sáng:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2131 +#: Merge.rc:2141 msgid "&Dark mode scheme:" msgstr "Sơ đồ chế độ tối:" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_STATIC -#: Merge.rc:2133 +#: Merge.rc:2143 msgid "Your custom schemes" msgstr "Sơ đồ tuỳ chỉnh của bạn" #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_SAVE -#: Merge.rc:2134 +#: Merge.rc:2144 msgid "&Save current scheme..." msgstr "Lưu sơ đồ hiện tại..." #. IDD_PROPPAGE_COLOR_SCHEMES, IDC_COLOR_SCHEME_DELETE -#: Merge.rc:2135 +#: Merge.rc:2145 msgid "Delete ¤t scheme..." msgstr "Xoá sơ đồ hiện tại..." #. 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 "Nền" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2144 +#: Merge.rc:2154 msgid "Deleted" msgstr "Đã xoá" #. 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 "Văn bản" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2146 +#: Merge.rc:2156 msgid "Difference:" msgstr "Khác biệt:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2151 +#: Merge.rc:2161 msgid "Selected Difference:" msgstr "Khác biệt được chọn:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2156 +#: Merge.rc:2166 msgid "Ignored Difference:" msgstr "Khác biệt được bỏ qua:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2161 +#: Merge.rc:2171 msgid "Moved:" msgstr "Đã di chuyển:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2166 +#: Merge.rc:2176 msgid "Selected Moved:" msgstr "Phần di chuyển được chọn:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2171 +#: Merge.rc:2181 msgid "Same As Next (3 panes):" msgstr "Giống như phần tiếp theo (3 khung):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2176 +#: Merge.rc:2186 msgid "Same As Next (Selected):" msgstr "Giống như phần tiếp theo (được chọn):" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2181 +#: Merge.rc:2191 msgid "Word Difference:" msgstr "Khác biệt từ:" #. IDD_PROPPAGE_COLORS_WINMERGE, IDC_STATIC -#: Merge.rc:2186 +#: Merge.rc:2196 msgid "Selected Word Diff:" msgstr "Khác biệt từ được chọn:" #. 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 "Hộp thoại" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2198 +#: Merge.rc:2208 msgid "Keywords:" msgstr "Từ khoá:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2199 +#: Merge.rc:2209 msgid "Function names:" msgstr "Tên hàm:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2200 +#: Merge.rc:2210 msgid "Comments:" msgstr "Chú thích:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2201 +#: Merge.rc:2211 msgid "Numbers:" msgstr "Số:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2202 +#: Merge.rc:2212 msgid "Operators:" msgstr "Toán tử:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2203 +#: Merge.rc:2213 msgid "Strings:" msgstr "Xâu ký tự:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2204 +#: Merge.rc:2214 msgid "Preprocessor:" msgstr "Bộ tiền xử lý:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2205 +#: Merge.rc:2215 msgid "User 1:" msgstr "Người dùng 1:" #. IDD_PROPPAGE_COLORS_SYNTAX, IDC_STATIC -#: Merge.rc:2206 +#: Merge.rc:2216 msgid "User 2:" msgstr "Người dùng 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 "Đậm" #. IDD_PROPPAGE_COLORS_TEXT, IDC_DEFAULT_STANDARD_COLORS -#: Merge.rc:2233 +#: Merge.rc:2243 msgid "&Use customized text colors" msgstr "Sử dụng màu văn bản tuỳ chỉnh" #. IDD_PROPPAGE_COLORS_TEXT, IDC_WHITESPACE_COLOR_LABEL -#: Merge.rc:2235 +#: Merge.rc:2245 msgid "Whitespace:" msgstr "Khoảng trắng:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_TEXT_COLOR_LABEL -#: Merge.rc:2236 +#: Merge.rc:2246 msgid "Regular text:" msgstr "Văn bản thường:" #. IDD_PROPPAGE_COLORS_TEXT, IDC_SELECTION_COLOR_LABEL -#: Merge.rc:2237 +#: Merge.rc:2247 msgid "Selection:" msgstr "Phần được chọn:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2245 Merge.rc:2286 +#: Merge.rc:2255 Merge.rc:2296 msgid "Margin:" msgstr "Mép:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER0_COLOR_LABEL -#: Merge.rc:2254 +#: Merge.rc:2264 msgid "Search Marker:" msgstr "Tìm kiếm dấu mốc:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER1_COLOR_LABEL -#: Merge.rc:2255 +#: Merge.rc:2265 msgid "User Defined Marker 1:" msgstr "Dấu mốc người dùng tự định nghĩa 1:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER2_COLOR_LABEL -#: Merge.rc:2256 +#: Merge.rc:2266 msgid "User Defined Marker 2:" msgstr "Dấu mốc người dùng tự định nghĩa 2:" #. IDD_PROPPAGE_COLORS_MARKER, IDC_MARKER3_COLOR_LABEL -#: Merge.rc:2257 +#: Merge.rc:2267 msgid "User Defined Marker 3:" msgstr "Dấu mốc người dùng tự định nghĩa 3:" #. IDD_PROPPAGE_COLORS_DIR, IDC_USE_DIR_COMPARE_COLORS -#: Merge.rc:2270 +#: Merge.rc:2280 msgid "&Use folder compare colors" msgstr "Sử dụng màu so sánh thư mục" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2274 +#: Merge.rc:2284 msgid "Items equal:" msgstr "Mục trùng khớp:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2277 +#: Merge.rc:2287 msgid "Items different:" msgstr "Mục khác biệt:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2280 +#: Merge.rc:2290 msgid "Items missing:" msgstr "Mục bị thiếu:" #. IDD_PROPPAGE_COLORS_DIR, IDC_STATIC -#: Merge.rc:2283 +#: Merge.rc:2293 msgid "Items filtered:" msgstr "Mục được lọc:" #. IDD_PROPPAGE_COLORS_SYSTEM, IDC_SYSCOLOR_HOOK_ENABLED -#: Merge.rc:2295 +#: Merge.rc:2305 msgid "&Use custom system colors" msgstr "Sử dụng màu hệ thống tuỳ chỉnh" #. 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 "Hệ thống" #. IDD_PROPPAGE_SYSTEM, IDC_USE_RECYCLE_BIN -#: Merge.rc:2307 +#: Merge.rc:2317 msgid "&Use Recycle Bin" msgstr "Sử dụng thùng rác" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2308 +#: Merge.rc:2318 msgid "&External editor:" msgstr "Trình chỉnh sửa bên ngoài:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2311 +#: Merge.rc:2321 msgid "&Store user data in:" msgstr "Lưu trữ dữ liệu người dùng tại:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2313 +#: Merge.rc:2323 msgid "&Filter folder:" msgstr "Thư mục bộ lọc:" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2316 +#: Merge.rc:2326 msgid "Temporary files folder" msgstr "Thư mục tệp tạm thời" #. IDD_PROPPAGE_SYSTEM, IDC_TMPFOLDER_SYSTEM -#: Merge.rc:2317 +#: Merge.rc:2327 msgid "S&ystem temp folder" msgstr "Thư mục tạm của hệ thống" #. IDD_PROPPAGE_SYSTEM, IDC_STATIC -#: Merge.rc:2318 +#: Merge.rc:2328 msgid "C&ustom folder:" msgstr "Thư mục tuỳ chỉnh:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_FILE2 -#: Merge.rc:2320 Merge.rc:2416 +#: Merge.rc:2330 Merge.rc:2426 msgid "Br&owse..." msgstr "Duyệt..." #. IDS_OPTIONSPG_COMPARE -#: Merge.rc:2326 Merge.rc:4200 +#: Merge.rc:2336 Merge.rc:4210 msgid "Compare" msgstr "So sánh" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2329 +#: Merge.rc:2339 msgid "Whitespaces" msgstr "Khoảng trắng" #. IDD_PROPPAGE_COMPARE, IDC_WHITESPACE -#: Merge.rc:2330 +#: Merge.rc:2340 msgid "&Compare" msgstr "So sánh" #. IDD_PROPPAGE_COMPARE, IDC_WHITE_CHANGE -#: Merge.rc:2331 +#: Merge.rc:2341 msgid "&Ignore change" msgstr "Bỏ qua thay đổi" #. IDD_PROPPAGE_COMPARE, IDC_ALL_WHITE -#: Merge.rc:2332 +#: Merge.rc:2342 msgid "I&gnore all" msgstr "Bỏ qua tất cả" #. IDD_PROPPAGE_COMPARE, IDC_IGNBLANKS_CHECK -#: Merge.rc:2333 +#: Merge.rc:2343 msgid "Ignore blan&k lines" msgstr "Bỏ qua các dòng trống" #. IDD_PROPPAGE_COMPARE, IDC_IGNCASE_CHECK -#: Merge.rc:2334 +#: Merge.rc:2344 msgid "Ignore &case" msgstr "Bỏ qua &hoa thường" #. IDD_PROPPAGE_COMPARE, IDC_EOL_SENSITIVE -#: Merge.rc:2335 +#: Merge.rc:2345 msgid "Igno&re EOL differences (Windows/Unix/Mac)" msgstr "Bỏ qua &khác biệt EOL (Windows/Unix/Mac)" #. IDD_PROPPAGE_COMPARE, IDC_IGNORE_NUMBERS -#: Merge.rc:2337 +#: Merge.rc:2347 msgid "Ignore num&bers" msgstr "Bỏ qua &số" #. IDD_PROPPAGE_COMPARE, IDC_CP_SENSITIVE -#: Merge.rc:2338 +#: Merge.rc:2348 msgid "Ignore codepage &differences" msgstr "Bỏ qua &khác biệt trang mã" #. IDD_PROPPAGE_COMPARE, IDC_FILTERCOMMENTS_CHECK -#: Merge.rc:2339 +#: Merge.rc:2349 msgid "Ignore c&omment differences" msgstr "Bỏ qua khác biệt &chú thích" #. IDD_PROPPAGE_COMPARE, IDC_IGNEOFEOL_CHECK -#: Merge.rc:2341 +#: Merge.rc:2351 msgid "Ignore &missing trailing EOL" msgstr "Bỏ qua &thiếu hụt EOL đằng sau" #. IDD_PROPPAGE_COMPARE, IDC_IGNLBRKS_CHECK -#: Merge.rc:2343 +#: Merge.rc:2353 msgid "Ignore line &breaks (treat as spaces)" msgstr "Bỏ qua &ngắt dòng (coi như dấu cách)" #. IDD_PROPPAGE_COMPARE, IDC_MOVED_BLOCKS -#: Merge.rc:2345 +#: Merge.rc:2355 msgid "E&nable moved block detection" msgstr "&Bật phát hiện khối đã di chuyển" #. IDD_PROPPAGE_COMPARE, IDC_ALIGN_SIMILAR_LINES -#: Merge.rc:2346 +#: Merge.rc:2356 msgid "Align &similar lines" msgstr "Căn chỉnh các dòng &tương tự" #. IDD_PROPPAGE_COMPARE, IDC_STATIC -#: Merge.rc:2347 +#: Merge.rc:2357 msgid "Diff &algorithm:" msgstr "&Thuật toán so sánh:" #. IDD_PROPPAGE_COMPARE, IDC_INDENT_HEURISTIC -#: Merge.rc:2349 +#: Merge.rc:2359 msgid "Enable indent &heuristic" msgstr "Bật &heuristic thụt lề" #. IDD_PROPPAGE_COMPARE, IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES -#: Merge.rc:2350 +#: Merge.rc:2360 msgid "Completely unhighlight the ignored differences" msgstr "Bỏ tô sáng hoàn toàn các khác biệt được bỏ qua" #. IDS_OPTIONSPG_EDITOR -#: Merge.rc:2357 Merge.rc:4201 +#: Merge.rc:2367 Merge.rc:4211 msgid "Editor" msgstr "Trình chỉnh sửa" #. IDD_PROPPAGE_EDITOR, IDC_HILITE_CHECK -#: Merge.rc:2360 +#: Merge.rc:2370 msgid "&Highlight syntax" msgstr "&Tô sáng cú pháp" #. IDD_PROPPAGE_EDITOR, IDC_MIXED_EOL -#: Merge.rc:2361 +#: Merge.rc:2371 msgid "&Preserve original EOL" msgstr "&Giữ nguyên EOL gốc" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2362 +#: Merge.rc:2372 msgid "Tabs" msgstr "Thẻ" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2363 +#: Merge.rc:2373 msgid "&Tab size:" msgstr "Cỡ &Tab:" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_TABS -#: Merge.rc:2365 +#: Merge.rc:2375 msgid "&Insert tabs" msgstr "&Chèn tab" #. IDD_PROPPAGE_EDITOR, IDC_PROP_INSERT_SPACES -#: Merge.rc:2366 +#: Merge.rc:2376 msgid "Insert &spaces" msgstr "Chèn &khoảng trắng" #. IDD_PROPPAGE_EDITOR, IDC_STATIC -#: Merge.rc:2367 +#: Merge.rc:2377 msgid "&Rendering mode:" msgstr "&Chế độ kết xuất:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_AUTOMRESCAN_CHECK -#: Merge.rc:2376 +#: Merge.rc:2386 msgid "&Automatic rescan" msgstr "Tự động quét &lại" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2377 +#: Merge.rc:2387 msgid "Copy &granularity for selected differences:" msgstr "Độ &chi tiết sao chép cho các khác biệt được chọn:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_LINE_COLORING_GROUP -#: Merge.rc:2379 +#: Merge.rc:2389 msgid "Line Difference Coloring" msgstr "Tô màu khác biệt dòng" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_VIEW_LINE_DIFFERENCES -#: Merge.rc:2380 +#: Merge.rc:2390 msgid "View line differences" msgstr "Xem khác biệt dòng" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_CHARLEVEL -#: Merge.rc:2381 +#: Merge.rc:2391 msgid "&Character-level" msgstr "Cấp độ &ký tự" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_EDITOR_WORDLEVEL -#: Merge.rc:2382 +#: Merge.rc:2392 msgid "&Word-level:" msgstr "Cấp độ &từ:" #. IDD_PROPPAGE_EDITOR_COMPAREMERGE, IDC_STATIC -#: Merge.rc:2384 +#: Merge.rc:2394 msgid "W&ord break characters:" msgstr "Ký tự ngắt &từ:" #. 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,397 +3700,397 @@ msgstr "" "cả thông điệp." #. IDD_SELECT_FILES_OR_FOLDERS, IDC_RESET -#: Merge.rc:2402 Merge.rc:3085 +#: Merge.rc:2412 Merge.rc:3095 msgid "Reset" msgstr "Đặt lại" #. IDD_GENERATE_PATCH -#: Merge.rc:2408 +#: Merge.rc:2418 msgid "Patch Generator" msgstr "Trình sinh bản vá" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2411 +#: Merge.rc:2421 msgid "File&1:" msgstr "Tệp &1:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2414 +#: Merge.rc:2424 msgid "File&2:" msgstr "Tệp &2:" #. IDD_GENERATE_PATCH, IDC_DIFF_SWAPFILES -#: Merge.rc:2417 +#: Merge.rc:2427 msgid "&Swap" msgstr "&Hoán đổi" #. IDD_DIRCMP_REPORT, IDC_REPORT_COPYCLIPBOARD -#: Merge.rc:2418 Merge.rc:2690 +#: Merge.rc:2428 Merge.rc:2700 msgid "&Copy to clipboard" msgstr "&Chép vào bảng tạm" #. IDD_GENERATE_PATCH, IDC_DIFF_APPENDFILE -#: Merge.rc:2419 +#: Merge.rc:2429 msgid "&Append to existing file" msgstr "&Thêm vào cuối tệp đã có" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2420 +#: Merge.rc:2430 msgid "&Result:" msgstr "&Kết quả:" #. IDD_GENERATE_PATCH, IDC_DIFF_BROWSE_RESULT -#: Merge.rc:2422 +#: Merge.rc:2432 msgid "Bro&wse..." msgstr "&Duyệt..." #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2423 +#: Merge.rc:2433 msgid "&Format" msgstr "&Định dạng" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2424 +#: Merge.rc:2434 msgid "St&yle:" msgstr "&Kiểu dáng:" #. IDD_GENERATE_PATCH, IDC_STATIC -#: Merge.rc:2426 +#: Merge.rc:2436 msgid "&Context:" msgstr "&Ngữ cảnh:" #. IDD_GENERATE_PATCH, IDC_DIFF_INCLCMDLINE -#: Merge.rc:2428 +#: Merge.rc:2438 msgid "Inclu&de command line" msgstr "Bao &gồm dòng lệnh" #. IDD_GENERATE_PATCH, IDC_DIFF_OPENTOEDITOR -#: Merge.rc:2429 +#: Merge.rc:2439 msgid "Open in e&xternal editor" msgstr "Mở trong trình chỉnh sửa &bên ngoài" #. IDD_DIRCOLS -#: Merge.rc:2446 +#: Merge.rc:2456 msgid "Display Columns" msgstr "Hiển thị các cột" #. IDD_DIRCOLS, IDC_UP -#: Merge.rc:2450 +#: Merge.rc:2460 msgid "Move &Up" msgstr "Chuyển lên &trên" #. IDD_DIRCOLS, IDC_DOWN -#: Merge.rc:2451 +#: Merge.rc:2461 msgid "Move &Down" msgstr "Chuyển xuống &dưới" #. IDD_DIRCOLS, IDC_COLDLG_ADDITIONAL_PROPERTIES -#: Merge.rc:2453 +#: Merge.rc:2463 msgid "&Additional Properties" msgstr "Thuộc tính &bổ sung" #. IDD_DIRADDITIONALPROPS -#: Merge.rc:2461 +#: Merge.rc:2471 msgid "Additional Properties" msgstr "Thuộc tính bổ sung" #. IDD_PLUGINS_SELECTPLUGIN -#: Merge.rc:2475 +#: Merge.rc:2485 msgid "Select Plugin" msgstr "Chọn trình cắm" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2478 Merge.rc:3115 +#: Merge.rc:2488 Merge.rc:3125 msgid "Plugin &name:" msgstr "&Tên trình cắm:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_STATIC -#: Merge.rc:2480 +#: Merge.rc:2490 msgid "&Target files:" msgstr "Tệp &đích:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2482 Merge.rc:3117 +#: Merge.rc:2492 Merge.rc:3127 msgid "Extensions list:" msgstr "Danh sách phần mở rộng:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2484 Merge.rc:3119 +#: Merge.rc:2494 Merge.rc:3129 msgid "Description:" msgstr "Mô tả:" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2486 Merge.rc:3121 +#: Merge.rc:2496 Merge.rc:3131 msgid "Default arguments:" msgstr "Đối số mặc định:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALLOW_ALL -#: Merge.rc:2488 +#: Merge.rc:2498 msgid "Display all plugins (Ignore extension)" msgstr "Hiển thị tất cả trình cắm (bỏ qua phần mở rộng)" #. 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 "&Mở tệp trong cùng loại cửa sổ sau khi bung gói" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_PIPELINE_STATIC -#: Merge.rc:2492 Merge.rc:3129 +#: Merge.rc:2502 Merge.rc:3139 msgid "&Plugin pipeline:" msgstr "Ống dẫn &trình cắm:" #. IDD_PLUGINS_SELECTPLUGIN, IDC_PLUGIN_ALIAS -#: Merge.rc:2495 +#: Merge.rc:2505 msgid "&Alias..." msgstr "&Bí danh..." #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_STOP -#: Merge.rc:2505 +#: Merge.rc:2515 msgid "Stop" msgstr "Dừng" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_PAUSE -#: Merge.rc:2506 +#: Merge.rc:2516 msgid "Pause" msgstr "Tạm dừng" #. IDD_DIRCOMP_PROGRESS, IDC_COMPARISON_CONTINUE -#: Merge.rc:2507 +#: Merge.rc:2517 msgid "Continue" msgstr "Tiếp tục" #. 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 "Số nhân C&PU sử dụng:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2510 +#: Merge.rc:2520 msgid "Items total:" msgstr "Tổng số mục:" #. IDD_DIRCOMP_PROGRESS, IDC_STATIC -#: Merge.rc:2511 +#: Merge.rc:2521 msgid "Items compared:" msgstr "Mục đã so sánh:" #. IDS_PREVIEWBAR_CLOSE -#: Merge.rc:2526 Merge.rc:2846 Merge.rc:5328 +#: Merge.rc:2536 Merge.rc:2856 Merge.rc:5339 msgid "&Close" msgstr "&Đóng" #. IDD_WMGOTO -#: Merge.rc:2537 +#: Merge.rc:2547 msgid "Go to" msgstr "Đi tới" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2540 +#: Merge.rc:2550 msgid "G&o to:" msgstr "&Đi tới:" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2543 +#: Merge.rc:2553 msgid "File" msgstr "Tệp" #. IDD_WMGOTO, IDC_STATIC -#: Merge.rc:2547 +#: Merge.rc:2557 msgid "Go to what" msgstr "Đi tới mục gì" #. IDD_WMGOTO, IDC_WMGOTO_TOLINE -#: Merge.rc:2548 +#: Merge.rc:2558 msgid "Li&ne" msgstr "&Dòng" #. IDD_WMGOTO, IDC_WMGOTO_TODIFF -#: Merge.rc:2549 +#: Merge.rc:2559 msgid "&Difference" msgstr "&Khác biệt" #. IDD_WMGOTO, IDOK -#: Merge.rc:2550 +#: Merge.rc:2560 msgid "&Go to" msgstr "&Đi tới" #. IDS_PROJECT_ITEM_FILE_FILTER -#: Merge.rc:2556 Merge.rc:4321 +#: Merge.rc:2566 Merge.rc:4331 msgid "File Filters" msgstr "Bộ lọc tệp" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2559 +#: Merge.rc:2569 msgid "&Mask / Filter Expression" msgstr "&Mặt nạ / biểu thức bộ lọc" #. IDD_FILTERS_FILEFILTERS, IDC_STATIC -#: Merge.rc:2562 +#: Merge.rc:2572 msgid "Preset &Filters" msgstr "Bộ &lọc cài sẵn" #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_TEST_BTN -#: Merge.rc:2564 +#: Merge.rc:2574 msgid "Test..." msgstr "Kiểm tra..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_INSTALL -#: Merge.rc:2565 +#: Merge.rc:2575 msgid "Install..." msgstr "Cài đặt..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_NEWBTN -#: Merge.rc:2566 +#: Merge.rc:2576 msgid "New..." msgstr "Mới..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_EDITBTN -#: Merge.rc:2567 +#: Merge.rc:2577 msgid "Edit..." msgstr "Sửa..." #. IDD_FILTERS_FILEFILTERS, IDC_FILTERFILE_DELETEBTN -#: Merge.rc:2568 +#: Merge.rc:2578 msgid "Delete..." msgstr "Xoá..." #. IDD_FILTERS_CONDITION -#: Merge.rc:2573 +#: Merge.rc:2583 msgid "Filter Condition" msgstr "Điều kiện bộ lọc" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2576 +#: Merge.rc:2586 msgid "&Left-hand side:" msgstr "Bên &trái:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2578 +#: Merge.rc:2588 msgid "&Operator:" msgstr "&Toán tử:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2580 +#: Merge.rc:2590 msgid "&Right-hand side:" msgstr "Bên &phải:" #. IDD_FILTERS_CONDITION, IDC_STATIC -#: Merge.rc:2586 +#: Merge.rc:2596 msgid "Expression:" msgstr "Biểu thức:" #. 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 "Giống hệt" #. 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 "Khác biệt" #. 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 "Trang mã" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2622 +#: Merge.rc:2632 msgid "Default Codepage" msgstr "Trang mã mặc định" #. IDD_PROPPAGE_CODEPAGE, IDC_STATIC -#: Merge.rc:2623 +#: Merge.rc:2633 msgid "Select the default codepage for non-Unicode files:" msgstr "Chọn trang mã mặc định cho các tệp không phải Unicode:" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_SYSTEM -#: Merge.rc:2624 +#: Merge.rc:2634 msgid "System codepage" msgstr "Trang mã hệ thống" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_UI -#: Merge.rc:2625 +#: Merge.rc:2635 msgid "According to WinMerge User Interface" msgstr "Theo giao diện người dùng WinMerge" #. IDD_PROPPAGE_CODEPAGE, IDC_CP_CUSTOM -#: Merge.rc:2626 +#: Merge.rc:2636 msgid "Custom codepage:" msgstr "Trang mã tuỳ chỉnh:" #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE -#: Merge.rc:2628 +#: Merge.rc:2638 msgid "" "Detect codepage for: .html, .rc, .xml\n" "Restart required." @@ -4093,7 +4099,7 @@ msgstr "" "Yêu cầu khởi động lại." #. IDD_PROPPAGE_CODEPAGE, IDC_DETECT_CODEPAGE2 -#: Merge.rc:2630 +#: Merge.rc:2640 msgid "" "Detect codepage for files with mlang.dll\n" "Restart required." @@ -4102,769 +4108,769 @@ msgstr "" "Yêu cầu khởi động lại." #. IDS_OPTIONSPG_ARCHIVE -#: Merge.rc:2638 Merge.rc:4214 +#: Merge.rc:2648 Merge.rc:4224 msgid "Archive Support" msgstr "Hỗ trợ về lưu trữ" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_ENABLE -#: Merge.rc:2641 +#: Merge.rc:2651 msgid "&Enable archive file support" msgstr "&Bật hỗ trợ tệp lưu trữ" #. IDD_PROPPAGE_ARCHIVE, IDC_ARCHIVE_DETECTTYPE -#: Merge.rc:2642 +#: Merge.rc:2652 msgid "&Detect archive type from file signature" msgstr "&Phát hiện loại lưu trữ từ chữ ký tệp" #. IDD_PROPPAGE_PROJECT, IDC_STATIC -#: Merge.rc:2651 +#: Merge.rc:2661 msgid "Items saved to or restored from the project file:" msgstr "Các mục được lưu vào hoặc khôi phục từ tệp dự án:" #. IDD_SAVECLOSING -#: Merge.rc:2658 +#: Merge.rc:2668 msgid "Save Modified Files?" msgstr "Có lưu các tệp đã sửa đổi không?" #. IDD_SAVECLOSING, IDC_SAVECLOSING_LEFTFRAME -#: Merge.rc:2661 +#: Merge.rc:2671 msgid "Left side file" msgstr "Tệp bên trái" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVELEFT -#: Merge.rc:2663 +#: Merge.rc:2673 msgid "&Save changes" msgstr "&Lưu thay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDLEFT -#: Merge.rc:2664 +#: Merge.rc:2674 msgid "&Discard changes" msgstr "&Huỷ bỏ thay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_MIDDLEFRAME -#: Merge.rc:2665 +#: Merge.rc:2675 msgid "Middle side file" msgstr "Tệp ở giữa" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVEMIDDLE -#: Merge.rc:2667 +#: Merge.rc:2677 msgid "Sa&ve changes" msgstr "Lưu &thay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDMIDDLE -#: Merge.rc:2668 +#: Merge.rc:2678 msgid "Discard c&hanges" msgstr "Huỷ bỏ t&hay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_RIGHTFRAME -#: Merge.rc:2669 +#: Merge.rc:2679 msgid "Right side file" msgstr "Tệp bên phải" #. IDD_SAVECLOSING, IDC_SAVECLOSING_SAVERIGHT -#: Merge.rc:2671 +#: Merge.rc:2681 msgid "S&ave changes" msgstr "Lư&u thay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDRIGHT -#: Merge.rc:2672 +#: Merge.rc:2682 msgid "Dis&card changes" msgstr "Huỷ &bỏ thay đổi" #. IDD_SAVECLOSING, IDC_SAVECLOSING_DISCARDALL -#: Merge.rc:2673 +#: Merge.rc:2683 msgid "Disca&rd All" msgstr "Huỷ bỏ &Tất cả" #. IDD_DIRCMP_REPORT -#: Merge.rc:2680 +#: Merge.rc:2690 msgid "Folder Compare Report" msgstr "Báo cáo so sánh thư mục" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2683 +#: Merge.rc:2693 msgid "Report &file:" msgstr "&Tệp báo cáo:" #. IDD_DIRCMP_REPORT, IDC_STATIC -#: Merge.rc:2686 +#: Merge.rc:2696 msgid "&Style:" msgstr "&Kiểu dáng:" #. IDD_DIRCMP_REPORT, IDC_REPORT_INCLUDEFILECMPREPORT -#: Merge.rc:2688 +#: Merge.rc:2698 msgid "&Include file compare report" msgstr "Bao &gồm báo cáo so sánh tệp" #. IDD_FILTERS_FILEFILTERS_SHARED -#: Merge.rc:2697 +#: Merge.rc:2707 msgid "Shared or Private Filter" msgstr "Bộ lọc chung hoặc riêng" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_STATIC -#: Merge.rc:2700 +#: Merge.rc:2710 msgid "What type of filter do you want?" msgstr "Bạn muốn loại bộ lọc nào?" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_SHARED -#: Merge.rc:2701 +#: Merge.rc:2711 msgid "Shared Filter (for all users)" msgstr "Bộ lọc chung (cho tất cả người dùng)" #. IDD_FILTERS_FILEFILTERS_SHARED, IDC_PRIVATE -#: Merge.rc:2702 +#: Merge.rc:2712 msgid "Private Filter (current user only)" msgstr "Bộ lọc riêng (chỉ người dùng hiện tại)" #. IDD_COMPARE_STATISTICS3 -#: Merge.rc:2709 Merge.rc:2750 +#: Merge.rc:2719 Merge.rc:2760 msgid "Compare Statistics" msgstr "Thống kê so sánh" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2712 Merge.rc:2753 +#: Merge.rc:2722 Merge.rc:2763 msgid "Folders:" msgstr "Thư mục:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2713 Merge.rc:2754 +#: Merge.rc:2723 Merge.rc:2764 msgid "Files:" msgstr "Tệp:" #. 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 "Nhị phân:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2722 Merge.rc:2763 +#: Merge.rc:2732 Merge.rc:2773 msgid "Unique" msgstr "Duy nhất" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2723 Merge.rc:2764 +#: Merge.rc:2733 Merge.rc:2774 msgid "Left:" msgstr "Trái:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2728 Merge.rc:2774 +#: Merge.rc:2738 Merge.rc:2784 msgid "Right:" msgstr "Bên phải:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2742 Merge.rc:2803 +#: Merge.rc:2752 Merge.rc:2813 msgid "Total:" msgstr "Tổng cộng:" #. IDD_COMPARE_STATISTICS3, IDOK -#: Merge.rc:2745 Merge.rc:2806 +#: Merge.rc:2755 Merge.rc:2816 msgid "Close" msgstr "Đóng" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2769 +#: Merge.rc:2779 msgid "Middle:" msgstr "Giữa:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2779 +#: Merge.rc:2789 msgid "Missing Left:" msgstr "Thiếu bên trái:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2784 +#: Merge.rc:2794 msgid "Missing Middle:" msgstr "Thiếu ở giữa:" #. IDD_COMPARE_STATISTICS3, IDC_STATIC -#: Merge.rc:2789 +#: Merge.rc:2799 msgid "Missing Right:" msgstr "Thiếu bên phải:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_AFFECTS_GROUP -#: Merge.rc:2814 +#: Merge.rc:2824 msgid "Affects" msgstr "Ảnh hưởng" #. 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 "(Ảnh hưởng)" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOADING_GROUP -#: Merge.rc:2821 +#: Merge.rc:2831 msgid "Select Codepage for" msgstr "Chọn trang mã cho" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_FILES_LABEL -#: Merge.rc:2822 +#: Merge.rc:2832 msgid "&File Loading:" msgstr "Tải &tệp:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_SAVE_FILES_LABEL -#: Merge.rc:2824 +#: Merge.rc:2834 msgid "File &Saving:" msgstr "Lưu &tệp:" #. IDD_LOAD_SAVE_CODEPAGE, IDC_LOAD_SAVE_SAME_CODEPAGE -#: Merge.rc:2827 +#: Merge.rc:2837 msgid "&Use same codepage for both" msgstr "&Sử dụng cùng trang mã cho cả hai" #. IDS_MESSAGEBOX_CANCEL -#: Merge.rc:2830 Merge.rc:4172 +#: Merge.rc:2840 Merge.rc:4182 msgid "&Cancel" msgstr "&Huỷ" #. IDD_FILTERS_FILEFILTERS_TEST -#: Merge.rc:2835 +#: Merge.rc:2845 msgid "Test Filter" msgstr "Kiểm tra bộ lọc" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_HEADER -#: Merge.rc:2838 +#: Merge.rc:2848 msgid "Testing filter:" msgstr "Đang kiểm tra bộ lọc:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_PROMPT_LABEL -#: Merge.rc:2840 +#: Merge.rc:2850 msgid "&Enter text to test:" msgstr "&Nhập văn bản để kiểm tra:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_IS_DIRECTORY -#: Merge.rc:2842 +#: Merge.rc:2852 msgid "&Folder Name" msgstr "Tên &thư mục" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_STATIC -#: Merge.rc:2843 +#: Merge.rc:2853 msgid "Result:" msgstr "Kết quả:" #. IDD_FILTERS_FILEFILTERS_TEST, IDC_TEST_BTN -#: Merge.rc:2845 +#: Merge.rc:2855 msgid "&Test" msgstr "&Kiểm tra" #. IDS_OPTIONSPG_TABLECOMPARE -#: Merge.rc:2851 Merge.rc:2990 Merge.rc:4228 +#: Merge.rc:2861 Merge.rc:3000 Merge.rc:4238 msgid "Table" msgstr "Bảng" #. IDD_OPEN_TABLE, IDC_STATIC -#: Merge.rc:2854 +#: Merge.rc:2864 msgid "File type" msgstr "Loại tệp" #. 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 "Giá trị ngăn cách bằng dấu &phân cách tuỳ chỉnh" #. 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 "Ký tự phân &cách:" #. 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 "Cho &phép dòng mới trong ngoặc kép" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:2865 Merge.rc:3008 +#: Merge.rc:2875 Merge.rc:3018 msgid "&Quote character:" msgstr "Ký tự &ngoặc kép:" #. IDS_OPTIONSPG_BACKUPS -#: Merge.rc:2873 Merge.rc:4216 +#: Merge.rc:2883 Merge.rc:4226 msgid "Backup Files" msgstr "Sao lưu tệp" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2876 +#: Merge.rc:2886 msgid "Create backup files for:" msgstr "Tạo tệp sao lưu cho:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FOLDERCMP -#: Merge.rc:2877 +#: Merge.rc:2887 msgid "&Folder compare" msgstr "So sánh &thư mục" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_FILECMP -#: Merge.rc:2878 +#: Merge.rc:2888 msgid "Fil&e compare" msgstr "So sánh &tệp" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2879 +#: Merge.rc:2889 msgid "Create backup files in:" msgstr "Tạo tệp sao lưu tại:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_ORIGFOLD -#: Merge.rc:2880 +#: Merge.rc:2890 msgid "&Original file's folder" msgstr "Thư mục của tệp &gốc" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_GLOBALFOLD -#: Merge.rc:2881 +#: Merge.rc:2891 msgid "&Global backup folder:" msgstr "Thư mục sao lưu &toàn cục:" #. IDD_PROPPAGE_BACKUPS, IDC_STATIC -#: Merge.rc:2884 +#: Merge.rc:2894 msgid "Backup filename:" msgstr "Tên tệp sao lưu:" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_BAK -#: Merge.rc:2885 +#: Merge.rc:2895 msgid "&Append .bak extension" msgstr "Thêm &phần mở rộng .bak vào cuối" #. IDD_PROPPAGE_BACKUPS, IDC_BACKUP_APPEND_TIME -#: Merge.rc:2886 +#: Merge.rc:2896 msgid "A&ppend timestamp" msgstr "Thêm tem &thời gian" #. IDS_CONFIRM_COPY_CAPTION -#: Merge.rc:2892 Merge.rc:4565 +#: Merge.rc:2902 Merge.rc:4575 msgid "Confirm Copy" msgstr "Xác nhận sao chép" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_QUERY -#: Merge.rc:2896 +#: Merge.rc:2906 msgid "Are you sure you want to copy XXX items?" msgstr "Bạn có chắc chắn muốn sao chép XXX mục không?" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_FROM_TEXT -#: Merge.rc:2897 +#: Merge.rc:2907 msgid "From left" msgstr "Từ bên trái" #. IDD_CONFIRM_COPY, IDC_FLDCONFIRM_TO_TEXT -#: Merge.rc:2899 +#: Merge.rc:2909 msgid "To right" msgstr "Sang bên phải" #. 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 "Đừng hỏi lại câu &hỏi này nữa." #. IDD_CONFIRM_COPY, IDYES -#: Merge.rc:2903 +#: Merge.rc:2913 msgid "Yes" msgstr "Có" #. IDD_CONFIRM_COPY, IDNO -#: Merge.rc:2904 +#: Merge.rc:2914 msgid "No" msgstr "Không" #. IDS_PROJECT_ITEM_PLUGIN -#: Merge.rc:2909 Merge.rc:4323 +#: Merge.rc:2919 Merge.rc:4333 msgid "Plugins" msgstr "Trình cắm" #. IDD_PLUGINS_LIST, IDC_PLUGINS_ENABLE -#: Merge.rc:2912 +#: Merge.rc:2922 msgid "&Enable plugins" msgstr "&Bật trình cắm" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:2913 Merge.rc:3113 +#: Merge.rc:2923 Merge.rc:3123 msgid "Plugin &type:" msgstr "&Loại trình cắm:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2916 +#: Merge.rc:2926 msgid "File filters:" msgstr "Bộ lọc tệp:" #. IDD_PLUGINS_LIST, IDC_STATIC -#: Merge.rc:2918 +#: Merge.rc:2928 msgid "&Plugin arguments:" msgstr "Đối số &trình cắm:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_AUTOMATIC -#: Merge.rc:2920 Merge.rc:3134 +#: Merge.rc:2930 Merge.rc:3144 msgid "Enable &automatic unpacking/prediffing" msgstr "Bật tự động bung gói / tiền so sánh" #. IDS_OPTIONSPG_SHELL -#: Merge.rc:2934 Merge.rc:4217 +#: Merge.rc:2944 Merge.rc:4227 msgid "Shell Integration" msgstr "Tích hợp hệ vỏ (shell)" #. 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 "&Thêm vào bảng chọn ngữ cảnh" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_ADVANCED -#: Merge.rc:2939 +#: Merge.rc:2949 msgid "E&nable advanced menu" msgstr "&Bật bảng chọn nâng cao" #. IDD_PROPPAGE_SHELL, IDC_EXPLORER_COMPARE_AS -#: Merge.rc:2940 +#: Merge.rc:2950 msgid "Enable &Compare As menu" msgstr "Bật bảng chọn \"&So sánh như là\"" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION -#: Merge.rc:2941 +#: Merge.rc:2951 msgid "&Register Shell Extension" msgstr "Đăng ký &phần mở rộng hệ vỏ" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION -#: Merge.rc:2942 +#: Merge.rc:2952 msgid "&Unregister Shell Extension" msgstr "&Huỷ đăng ký phần mở rộng hệ vỏ" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2943 +#: Merge.rc:2953 msgid "Register Shell Extension for Current User &Only" msgstr "Chỉ đăng ký phần mở rộng hệ vỏ cho người dùng &hiện tại" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_SHELLEXTENSION_PERUSER -#: Merge.rc:2944 +#: Merge.rc:2954 msgid "Unregister Shell Extension for Current User On&ly" msgstr "Chỉ &huỷ đăng ký phần mở rộng hệ vỏ cho người dùng hiện tại" #. IDD_PROPPAGE_SHELL, IDC_REGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2945 +#: Merge.rc:2955 msgid "Register Shell Extension for &Windows 11" msgstr "Đăng ký phần mở rộng hệ vỏ cho &Windows 11" #. IDD_PROPPAGE_SHELL, IDC_UNREGISTER_WINMERGECONTEXTMENU -#: Merge.rc:2946 +#: Merge.rc:2956 msgid "Unregister Shell Extension for W&indows 11" msgstr "Huỷ đăng ký phần mở rộng hệ vỏ cho W&indows 11" #. IDD_PROPPAGE_SHELL, IDC_STATIC -#: Merge.rc:2947 +#: Merge.rc:2957 msgid "Jump List" msgstr "Danh sách nhảy" #. IDD_PROPPAGE_SHELL, IDC_CLEAR_ALL_RECENT_ITEMS -#: Merge.rc:2949 +#: Merge.rc:2959 msgid "Clear all recent items" msgstr "Xoá sạch tất cả các mục gần đây" #. IDS_OPTIONSPG_FOLDERCOMPARE -#: Merge.rc:2954 Merge.rc:4225 +#: Merge.rc:2964 Merge.rc:4235 msgctxt "Options dialog|Categories" msgid "Folder" msgstr "Thư mục" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2957 +#: Merge.rc:2967 msgid "&Compare method:" msgstr "Phương pháp &so sánh:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_STOPFIRST -#: Merge.rc:2959 +#: Merge.rc:2969 msgid "S&top after first difference" msgstr "Dừng lại &sau khác biệt đầu tiên" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_SMALLTIMEDIFF -#: Merge.rc:2961 +#: Merge.rc:2971 msgid "Ign&ore time differences less than 3 seconds" msgstr "Bỏ &qua khác biệt thời gian dưới 3 giây" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2964 +#: Merge.rc:2974 msgid "Expand subfolders &after comparison:" msgstr "Duỗi các thư mục con &sau khi so sánh:" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_COMPARE_WALKSUBDIRS -#: Merge.rc:2966 +#: Merge.rc:2976 msgid "Include &unique subfolders contents" msgstr "Bao gồm nội dung thư mục con &độc nhất" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_IGNORE_REPARSEPOINTS -#: Merge.rc:2968 +#: Merge.rc:2978 msgid "Ignore &reparse points" msgstr "Bỏ qua các điểm phân tích &lại" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2969 +#: Merge.rc:2979 msgid "Switch to &quick compare when size exceeds (MB):" msgstr "Chuyển sang so sánh &nhanh khi kích cỡ vượt quá (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2971 +#: Merge.rc:2981 msgid "Switch to &binary compare when size exceeds (MB):" msgstr "Chuyển sang so sánh &nhị phân khi kích cỡ vượt quá (MB):" #. IDD_PROPPAGE_COMPARE_FOLDER, IDC_STATIC -#: Merge.rc:2975 +#: Merge.rc:2985 msgid "Additional comparison condi&tions:" msgstr "Các điều &kiện so sánh bổ sung:" #. 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 "Mẫu tệp:" #. IDD_PROPPAGE_COMPARE_TABLE, IDC_STATIC -#: Merge.rc:3001 +#: Merge.rc:3011 msgid "Custom Delimiter-Separated Values" msgstr "Các giá trị ngăn cách bằng dấu phân tách tuỳ chỉnh" #. IDS_OPTIONSPG_BINARYCOMPARE -#: Merge.rc:3015 Merge.rc:4227 +#: Merge.rc:3025 Merge.rc:4237 msgctxt "Options dialog|Categories" msgid "Binary" msgstr "Nhị phân" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3018 +#: Merge.rc:3028 msgid "Binary file &patterns:" msgstr "&Mẫu tệp nhị phân:" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_STATIC -#: Merge.rc:3020 +#: Merge.rc:3030 msgid "Frhed settings" msgstr "Thiết đặt Frhed" #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_VIEWSETTINGS -#: Merge.rc:3021 +#: Merge.rc:3031 msgid "View &Settings..." msgstr "Xem &thiết đặt..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_BINARYMODE -#: Merge.rc:3022 +#: Merge.rc:3032 msgid "&Binary Mode..." msgstr "Chế độ &nhị phân..." #. IDD_PROPPAGE_COMPARE_BINARY, IDC_COMPAREBINARY_CHARACTERSET -#: Merge.rc:3023 +#: Merge.rc:3033 msgid "&Character Set..." msgstr "Tập &ký tự..." #. IDS_PRPCAT_IMAGE -#: Merge.rc:3029 Merge.rc:4226 Merge.rc:4665 +#: Merge.rc:3039 Merge.rc:4236 Merge.rc:4675 msgid "Image" msgstr "Hình ảnh" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3032 +#: Merge.rc:3042 msgid "Image file &patterns:" msgstr "&Mẫu tệp hình ảnh:" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_ENABLE_IMGCMP_IN_DIRCMP -#: Merge.rc:3034 +#: Merge.rc:3044 msgid "&Enable image compare in folder compare" msgstr "&Bật so sánh hình ảnh trong so sánh thư mục" #. IDD_PROPPAGE_COMPARE_IMAGE, IDC_STATIC -#: Merge.rc:3036 +#: Merge.rc:3046 msgid "OCR result:" msgstr "Kết quả OCR:" #. IDS_OPTIONSPG_WEBPAGECOMPARE -#: Merge.rc:3043 Merge.rc:4229 +#: Merge.rc:3053 Merge.rc:4239 msgid "Webpage" msgstr "Trang web" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3046 +#: Merge.rc:3056 msgid "URL pattern to &include (Regular expression):" msgstr "Mẫu URL cần &bao gồm (biểu thức chính quy):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3048 +#: Merge.rc:3058 msgid "URL pattern to &exclude (Regular expression):" msgstr "Mẫu URL cần &loại trừ (biểu thức chính quy):" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_STATIC -#: Merge.rc:3050 +#: Merge.rc:3060 msgid "&User data folder location:" msgstr "Vị trí thư mục &dữ liệu người dùng:" #. IDD_PROPPAGE_COMPARE_WEBPAGE, IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE -#: Merge.rc:3052 +#: Merge.rc:3062 msgid "&Separate user data folders for each pane" msgstr "Thư mục dữ liệu người dùng &riêng biệt cho mỗi khung" #. IDD_ENCODINGERROR, IDC_HEXVIEW -#: Merge.rc:3065 +#: Merge.rc:3075 msgid "&Hex View" msgstr "Xem mã &Hex" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3110 +#: Merge.rc:3120 msgid "Edit Plugin" msgstr "Sửa trình cắm" #. IDD_PLUGINS_EDITPLUGIN, IDC_STATIC -#: Merge.rc:3123 +#: Merge.rc:3133 msgid "&Category:" msgstr "&Hạng mục:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_MENUCAPTION_STATIC -#: Merge.rc:3125 +#: Merge.rc:3135 msgid "&Menu caption:" msgstr "Phụ đề &bảng chọn:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_WINDOWTYPE_STATIC -#: Merge.rc:3127 +#: Merge.rc:3137 msgid "&Window type:" msgstr "Loại &cửa sổ:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_UNPACKEDFILEEXTENSION_STATIC -#: Merge.rc:3132 +#: Merge.rc:3142 msgid "&Unpacked file extension:" msgstr "Đuôi tệp đã &bung gói:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_ARGUMENTSREQUIRED -#: Merge.rc:3136 +#: Merge.rc:3146 msgid "&Require arguments" msgstr "&Yêu cầu đối số" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_GENERATESCRIPT -#: Merge.rc:3137 +#: Merge.rc:3147 msgid "&Generate editor script" msgstr "&Sinh kịch bản chỉnh sửa" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_COMMAND_LINE_STATIC -#: Merge.rc:3140 +#: Merge.rc:3150 msgid "Command &line:" msgstr "&Dòng lệnh:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_FILEEXTENSION_STATIC -#: Merge.rc:3143 +#: Merge.rc:3153 msgid "&Script file extension:" msgstr "Đuôi tệp kịch &bản:" #. IDD_PLUGINS_EDITPLUGIN, IDC_PLUGIN_SCRIPT_BODY_STATIC -#: Merge.rc:3145 +#: Merge.rc:3155 msgid "Script &body:" msgstr "&Thân kịch bản:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3154 +#: Merge.rc:3164 msgid "Font" msgstr "Phông" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3157 +#: Merge.rc:3167 msgid "&Font:" msgstr "&Phông:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3163 +#: Merge.rc:3173 msgid "Font st&yle:" msgstr "Kiểu &dáng phông:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3169 +#: Merge.rc:3179 msgid "&Size:" msgstr "&Cỡ:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3175 +#: Merge.rc:3185 msgid "Effects" msgstr "Hiệu ứng" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3176 +#: Merge.rc:3186 msgid "Stri&keout" msgstr "Gạch &ngang" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3177 +#: Merge.rc:3187 msgid "&Underline" msgstr "&Gạch chân" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3179 +#: Merge.rc:3189 msgid "&Color:" msgstr "&Màu sắc:" #. IDD_PLUGINS_EDITPLUGIN -#: Merge.rc:3184 +#: Merge.rc:3194 msgid "Sample" msgstr "Mẫu" #. 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 "Kịch &bản:" #. IDD_PLUGINS_EDITPLUGIN, IDC_MANAGE_LINK -#: Merge.rc:3194 +#: Merge.rc:3204 msgid "Show more fonts" msgstr "Hiện thêm phông chữ" #. ID_INDICATOR_EXT -#: Merge.rc:4118 +#: Merge.rc:4128 msgid "EXT" msgstr "ĐUÔI" #. ID_INDICATOR_CAPS -#: Merge.rc:4119 +#: Merge.rc:4129 msgid "CAP" msgstr "HOA" #. ID_INDICATOR_NUM -#: Merge.rc:4120 +#: Merge.rc:4130 msgid "NUM" msgstr "SỐ" #. ID_INDICATOR_SCRL -#: Merge.rc:4121 +#: Merge.rc:4131 msgid "SCRL" msgstr "CUỘN" #. ID_INDICATOR_OVR -#: Merge.rc:4122 +#: Merge.rc:4132 msgid "OVR" msgstr "ĐÈ" #. ID_INDICATOR_REC -#: Merge.rc:4123 +#: Merge.rc:4133 msgid "REC" msgstr "GHI" #. ID_FILE_NEW -#: Merge.rc:4129 +#: Merge.rc:4139 msgid "" "\n" "New Documents (Ctrl+N)" @@ -4873,7 +4879,7 @@ msgstr "" "Tài liệu mới (Ctrl+N)" #. ID_FILE_OPEN -#: Merge.rc:4130 +#: Merge.rc:4140 msgid "" "\n" "Open (Ctrl+O)" @@ -4882,7 +4888,7 @@ msgstr "" "Mở (Ctrl+O)" #. ID_FILE_SAVE -#: Merge.rc:4131 +#: Merge.rc:4141 msgid "" "\n" "Save (Ctrl+S)" @@ -4891,27 +4897,27 @@ msgstr "" "Lưu (Ctrl+S)" #. IDS_UNK_ERROR_READING_PROJECT -#: Merge.rc:4137 +#: Merge.rc:4147 msgid "Unknown error opening project file." msgstr "Lỗi không xác định khi mở tệp dự án." #. IDS_UNK_ERROR_SAVING_PROJECT -#: Merge.rc:4138 +#: Merge.rc:4148 msgid "Unknown error saving project file." msgstr "Lỗi không xác định khi lưu tệp dự án." #. IDS_PROJFILE_LOAD_SUCCESS -#: Merge.rc:4143 +#: Merge.rc:4153 msgid "Project file loaded." msgstr "Tệp dự án đã được nạp." #. IDS_PROJFILE_SAVE_SUCCESS -#: Merge.rc:4144 +#: Merge.rc:4154 msgid "Project file saved." msgstr "Tệp dự án đã được lưu." #. ID_EDIT_UNDO -#: Merge.rc:4150 +#: Merge.rc:4160 msgid "" "\n" "Undo (Ctrl+Z)" @@ -4920,7 +4926,7 @@ msgstr "" "Hoàn tác (Ctrl+Z)" #. ID_EDIT_REDO -#: Merge.rc:4151 +#: Merge.rc:4161 msgid "" "\n" "Redo (Ctrl+Y)" @@ -4929,7 +4935,7 @@ msgstr "" "Làm lại (Ctrl+Y)" #. IDR_MERGEDOCTYPE -#: Merge.rc:4158 +#: Merge.rc:4168 msgid "" "\n" "FileCompare\n" @@ -4948,7 +4954,7 @@ msgstr "" "So sánh tệp WinMerge" #. IDR_DIRDOCTYPE -#: Merge.rc:4159 +#: Merge.rc:4169 msgid "" "\n" "FolderCompare\n" @@ -4967,7 +4973,7 @@ msgstr "" "So sánh thư mục 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 " @@ -4978,66 +4984,66 @@ msgstr "" "Trợ giúp để biết chi tiết." #. IDS_MESSAGEBOX_ABORT -#: Merge.rc:4173 +#: Merge.rc:4183 msgid "&Abort" msgstr "&Huỷ bỏ" #. IDS_MESSAGEBOX_RETRY -#: Merge.rc:4174 +#: Merge.rc:4184 msgid "&Retry" msgstr "&Thử lại" #. IDS_MESSAGEBOX_IGNORE -#: Merge.rc:4175 +#: Merge.rc:4185 msgid "&Ignore" msgstr "&Bỏ qua" #. IDS_MESSAGEBOX_IGNOREALL -#: Merge.rc:4176 +#: Merge.rc:4186 msgid "Ignore &all" msgstr "Bỏ qua &tất cả" #. IDS_MESSAGEBOX_YES -#: Merge.rc:4177 +#: Merge.rc:4187 msgid "&Yes" msgstr "&Có" #. IDS_MESSAGEBOX_YES_TO_ALL -#: Merge.rc:4183 +#: Merge.rc:4193 msgid "Yes to &all" msgstr "Có với &tất cả" #. IDS_MESSAGEBOX_NO -#: Merge.rc:4184 +#: Merge.rc:4194 msgid "&No" msgstr "&Không" #. IDS_MESSAGEBOX_NO_TO_ALL -#: Merge.rc:4185 +#: Merge.rc:4195 msgid "No to a&ll" msgstr "Không với tất &cả" #. IDS_MESSAGEBOX_CONTINUE -#: Merge.rc:4186 +#: Merge.rc:4196 msgid "&Continue" msgstr "&Tiếp tục" #. IDS_MESSAGEBOX_SKIP -#: Merge.rc:4187 +#: Merge.rc:4197 msgid "&Skip" msgstr "&Bỏ qua" #. IDS_MESSAGEBOX_SKIPALL -#: Merge.rc:4188 +#: Merge.rc:4198 msgid "Skip &all" msgstr "Bỏ qua &tất cả" #. IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN -#: Merge.rc:4190 +#: Merge.rc:4200 msgid "Don't display this &message again." msgstr "Đừng hiển thị &thông điệp này nữa." -#: Merge.rc:4193 +#: Merge.rc:4203 msgid "" "To make this message box visible, press Reset on the Message Boxes page in " "Options." @@ -5046,129 +5052,129 @@ msgstr "" "điệp trong mục Tuỳ chọn." #. IDS_OPTIONSPG_EDITOR_COMPAREMERGE -#: Merge.rc:4203 +#: Merge.rc:4213 msgid "Compare/Merge" msgstr "So sánh/Trộn" #. IDS_OPTIONSPG_SYNTAXCOLORS -#: Merge.rc:4204 Merge.rc:4208 +#: Merge.rc:4214 Merge.rc:4218 msgid "Syntax" msgstr "Cú pháp" #. IDS_OPTIONSPG_COLOR_SCHEMES -#: Merge.rc:4206 +#: Merge.rc:4216 msgid "Color Schemes" msgstr "Lược đồ màu" #. IDS_OPTIONSPG_DIRCOLORS -#: Merge.rc:4210 +#: Merge.rc:4220 msgid "Folder Compare" msgstr "So sánh thư mục" #. IDS_OPTIONSPG_PROJECT -#: Merge.rc:4215 +#: Merge.rc:4225 msgid "Project" msgstr "Dự án" #. IDS_COLHDR_NSDIFFS -#: Merge.rc:4218 Merge.rc:4640 +#: Merge.rc:4228 Merge.rc:4650 msgid "Differences" msgstr "Khác biệt" #. IDS_OPTIONSPG_MESSAGEBOXES -#: Merge.rc:4220 +#: Merge.rc:4230 msgid "Message Boxes" msgstr "Hộp thông điệp" #. IDS_TO -#: Merge.rc:4235 +#: Merge.rc:4245 msgid "To:" msgstr "Đến:" #. IDS_FROM_LEFT -#: Merge.rc:4236 +#: Merge.rc:4246 msgid "From left:" msgstr "Từ bên trái:" #. IDS_TO_LEFT -#: Merge.rc:4237 +#: Merge.rc:4247 msgid "To left:" msgstr "Đến bên trái:" #. IDS_FROM_RIGHT -#: Merge.rc:4238 +#: Merge.rc:4248 msgid "From right:" msgstr "Từ bên phải:" #. IDS_TO_RIGHT -#: Merge.rc:4239 +#: Merge.rc:4249 msgid "To right:" msgstr "Đến bên phải:" #. IDS_FROM_MIDDLE -#: Merge.rc:4240 +#: Merge.rc:4250 msgid "From middle:" msgstr "Từ giữa:" #. IDS_TO_MIDDLE -#: Merge.rc:4241 +#: Merge.rc:4251 msgid "To middle:" msgstr "Đến giữa:" #. IDS_VERSION_FMT -#: Merge.rc:4247 +#: Merge.rc:4257 #, c-format msgid "Version %1" msgstr "Phiên bản %1" #. IDS_OPTIONS_TITLE -#: Merge.rc:4253 +#: Merge.rc:4263 #, c-format msgid "Options (%1)" msgstr "Tuỳ chọn (%1)" #. IDS_MESSAGE_BOX_ARE_RESET -#: Merge.rc:4254 +#: Merge.rc:4264 msgid "All message boxes are now displayed again." msgstr "Tất cả các hộp thông điệp hiện đã được hiển thị lại." -#: Merge.rc:4256 +#: Merge.rc:4266 #, c-format msgid "Tab size value is out of range. Please use 1 - %1." msgstr "Giá trị cỡ Tab nằm ngoài phạm vi. Xin hãy sử dụng từ 1 - %1." #. IDS_PROJECT_OPEN -#: Merge.rc:4262 Merge.rc:4318 +#: Merge.rc:4272 Merge.rc:4328 msgid "Open" msgstr "Mở" #. IDS_PROGRAMFILES -#: Merge.rc:4263 +#: Merge.rc:4273 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Chương trình|*.exe;*.bat;*.cmd|Tất cả các tệp (*.*)|*.*||" #. IDS_ALLFILES -#: Merge.rc:4264 +#: Merge.rc:4274 msgid "All Files (*.*)|*.*||" msgstr "Tất cả các tệp (*.*)|*.*||" #. IDS_PROJECTFILES -#: Merge.rc:4265 +#: Merge.rc:4275 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Tệp dự án WinMerge (*.WinMerge)|*.WinMerge||" #. IDS_INIFILES -#: Merge.rc:4267 +#: Merge.rc:4277 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Tệp tuỳ chọn (*.ini)|*.ini|Tất cả các tệp (*.*)|*.*||" #. 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 +5183,121 @@ msgstr "" "(*.*)|*.*||" #. IDS_HTML_REPORT_FILES -#: Merge.rc:4275 +#: Merge.rc:4285 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Tệp HTML (*.htm,*.html)|*.htm;*.html|Tất cả các tệp (*.*)|*.*||" #. IDS_XML_REPORT_FILES -#: Merge.rc:4276 +#: Merge.rc:4286 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Tệp XML (*.xml)|*.xml|Tất cả các tệp (*.*)|*.*||" #. IDS_EXPANDSUBDIRS_DONOTEXPAND -#: Merge.rc:4294 +#: Merge.rc:4304 msgid "Do not expand" msgstr "Đừng duỗi" #. IDS_EXPANDSUBDIRS_ALL -#: Merge.rc:4295 +#: Merge.rc:4305 msgid "Expand all subfolders" msgstr "Duỗi tất cả thư mục con" #. IDS_EXPANDSUBDIRS_DIFFERENT -#: Merge.rc:4296 +#: Merge.rc:4306 msgid "Expand different subfolders" msgstr "Duỗi các thư mục con khác biệt" #. IDS_EXPANDSUBDIRS_IDENTICAL -#: Merge.rc:4297 +#: Merge.rc:4307 msgid "Expand identical subfolders" msgstr "Duỗi các thư mục con giống hệt" #. IDS_SYNTAXTABLE_FILETYPE -#: Merge.rc:4303 +#: Merge.rc:4313 msgid "File Type" msgstr "Loại tệp" #. IDS_COLHDR_EXTENSION -#: Merge.rc:4304 Merge.rc:4597 +#: Merge.rc:4314 Merge.rc:4607 msgid "Extension" msgstr "Phần mở rộng" #. IDS_PRPCAT_MESSAGE -#: Merge.rc:4310 Merge.rc:4669 +#: Merge.rc:4320 Merge.rc:4679 msgid "Message" msgstr "Thông điệp" #. IDS_MESSAGEBOX_ANSWER -#: Merge.rc:4311 +#: Merge.rc:4321 msgid "Answer" msgstr "Trả lời" #. IDS_PROJECT_ITEM -#: Merge.rc:4317 +#: Merge.rc:4327 msgid "Item" msgstr "Mục" #. IDS_PROJECT_LOAD -#: Merge.rc:4319 +#: Merge.rc:4329 msgid "Load" msgstr "Nạp" #. IDS_PROJECT_SAVE -#: Merge.rc:4320 +#: Merge.rc:4330 msgid "Save" msgstr "Lưu" #. IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS -#: Merge.rc:4322 +#: Merge.rc:4332 msgid "Include Subfolders" msgstr "Bao gồm thư mục con" #. IDS_PROJECT_ITEM_COMPARE_OPTIONS -#: Merge.rc:4324 +#: Merge.rc:4334 msgid "Compare Options" msgstr "Tuỳ chọn so sánh" #. IDS_PROJECT_ITEM_HIDDEN_ITEMS -#: Merge.rc:4325 +#: Merge.rc:4335 msgid "Hidden Items" msgstr "Các mục ẩn" #. IDS_PLUGINSLIST_NAME -#: Merge.rc:4331 Merge.rc:4956 +#: Merge.rc:4341 Merge.rc:4966 msgid "Name" msgstr "Tên" #. IDS_FILTERFILE_PATHTITLE -#: Merge.rc:4332 +#: Merge.rc:4342 msgid "Location" msgstr "Vị trí" #. IDS_FILTER_TITLE -#: Merge.rc:4333 +#: Merge.rc:4343 msgid "Filters" msgstr "Bộ lọc" #. 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 "Mô tả" #. IDS_FILEFILTER_SAVENEW -#: Merge.rc:4336 +#: Merge.rc:4346 msgid "Select Filename for New Filter" msgstr "Chọn tên tệp cho bộ lọc mới" #. IDS_FILEFILTER_FILEMASK -#: Merge.rc:4337 +#: Merge.rc:4347 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Bộ lọc tệp (*.flt)|*.flt|Tất cả các tệp (*.*)|*.*||" -#: Merge.rc:4339 +#: Merge.rc:4349 #, c-format msgid "" "Cannot find filter template!\n" @@ -5304,7 +5310,7 @@ msgstr "" "Hãy chép %1 vào thư mục WinMerge/Filters:\n" "%2." -#: Merge.rc:4341 +#: Merge.rc:4351 #, c-format msgid "" "Cannot copy filter template:\n" @@ -5317,7 +5323,7 @@ msgstr "" "\n" "Hãy đảm bảo thư mục tồn tại và có thể ghi được." -#: Merge.rc:4343 +#: Merge.rc:4353 msgid "" "User's filter folder is not defined!\n" "\n" @@ -5327,7 +5333,7 @@ msgstr "" "\n" "Hãy chọn thư mục bộ lọc trong Tuỳ chọn/Hệ thống." -#: Merge.rc:4345 +#: Merge.rc:4355 #, c-format msgid "" "Failed to delete filter:\n" @@ -5341,11 +5347,11 @@ msgstr "" "Có lẽ tệp đang ở chế độ chỉ-đọc." #. IDS_FILEFILTER_INSTALL -#: Merge.rc:4346 +#: Merge.rc:4356 msgid "Locate Filter File to Install" msgstr "Định vị tệp bộ lọc để cài đặt" -#: Merge.rc:4348 +#: Merge.rc:4358 msgid "" "Installing filter file failed.\n" "\n" @@ -5356,17 +5362,17 @@ msgstr "" "Không thể chép bộ lọc mới vào thư mục." #. IDS_FILEFILTER_OVERWRITE -#: Merge.rc:4349 +#: Merge.rc:4359 msgid "Filter file exists. Overwrite?" msgstr "Tệp bộ lọc đã tồn tại. Có ghi đè không?" #. IDS_FILTERLINE_REGEXP -#: Merge.rc:4355 +#: Merge.rc:4365 msgid "Regular expression" msgstr "Biểu thức chính quy" #. IDS_FILTERCHANGED -#: Merge.rc:4361 +#: Merge.rc:4371 msgid "" "Filters updated. Refresh all open folder compares?\n" "\n" @@ -5378,217 +5384,217 @@ msgstr "" "Chọn 'Không' để làm mới sau." #. IDS_DIRECTORY_WINDOW_TITLE -#: Merge.rc:4367 +#: Merge.rc:4377 msgid "Folder Comparison Results" msgstr "Kết quả so sánh thư mục" #. IDS_FILE_COMPARISON_TITLE -#: Merge.rc:4368 +#: Merge.rc:4378 msgid "File Comparison" msgstr "So sánh tệp" #. IDS_EMPTY_LEFT_FILE -#: Merge.rc:4369 +#: Merge.rc:4379 msgid "Untitled Left" msgstr "Bên trái không tiêu đề" #. IDS_EMPTY_MIDDLE_FILE -#: Merge.rc:4370 +#: Merge.rc:4380 msgid "Untitled Middle" msgstr "Ở giữa không tiêu đề" #. IDS_EMPTY_RIGHT_FILE -#: Merge.rc:4371 +#: Merge.rc:4381 msgid "Untitled Right" msgstr "Bên phải không tiêu đề" #. IDS_CONFLICT_BASE_FILE -#: Merge.rc:4372 +#: Merge.rc:4382 msgid "Base File" msgstr "Tệp cơ sở" #. IDS_CONFLICT_THEIRS_FILE -#: Merge.rc:4373 +#: Merge.rc:4383 msgid "Theirs File" msgstr "Tệp của họ" #. IDS_CONFLICT_MINE_FILE -#: Merge.rc:4374 +#: Merge.rc:4384 msgid "Mine File" msgstr "Tệp của tôi" #. IDS_SELFCOMPARE_ORIGINAL_FILE -#: Merge.rc:4375 +#: Merge.rc:4385 msgid "Original File" msgstr "Tệp gốc" #. 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 "Dòng: %s Cột: %d/%d K.tự: %d/%d EOL: %s" #. IDS_EMPTY_LINE_STATUS_INFO -#: Merge.rc:4382 +#: Merge.rc:4392 #, c-format msgid "Line: %s" msgstr "Dòng: %s" #. IDS_LINE_STATUS_INFO -#: Merge.rc:4383 +#: Merge.rc:4393 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Dòng: %s Cột: %d/%d Kí tự: %d/%d" #. IDS_LINE_STATUS_INFO_SEL -#: Merge.rc:4384 +#: Merge.rc:4394 #, c-format msgid " Sel: %d | %d" msgstr " Phần chọn: %d | %d" #. IDS_MERGEMODE_MERGING -#: Merge.rc:4385 +#: Merge.rc:4395 msgid "Merge" msgstr "Trộn" #. IDS_DIFF_NUMBER_STATUS_FMT -#: Merge.rc:4386 +#: Merge.rc:4396 #, c-format msgid "Difference %1 of %2" msgstr "Khác biệt %1 trên %2" #. IDS_NO_DIFF_SEL_FMT -#: Merge.rc:4387 +#: Merge.rc:4397 #, c-format msgid "%1 Differences Found" msgstr "Tìm thấy %1 khác biệt" #. IDS_1_DIFF_FOUND -#: Merge.rc:4388 +#: Merge.rc:4398 msgid "1 Difference Found" msgstr "Tìm thấy 1 khác biệt" #. IDS_NO_ERR_SEL_FMT -#: Merge.rc:4389 +#: Merge.rc:4399 #, c-format msgid "%1 Errors Found" msgstr "Tìm thấy %1 lỗi" #. IDS_1_ERR_FOUND -#: Merge.rc:4390 +#: Merge.rc:4400 msgid "1 Error Found" msgstr "Tìm thấy 1 lỗi" #. IDS_STATUSBAR_READONLY, Abbreviation from "Read Only" -#: Merge.rc:4391 +#: Merge.rc:4401 msgid "RO" msgstr "CĐ" #. IDS_DIRVIEW_STATUS_FMT_FOCUS -#: Merge.rc:4397 +#: Merge.rc:4407 #, c-format msgid "Item %1 of %2" msgstr "Mục %1 trên %2" #. IDS_DIRVIEW_STATUS_FMT_NOFOCUS -#: Merge.rc:4398 +#: Merge.rc:4408 #, c-format msgid "Items: %1" msgstr "Số mục: %1" #. IDS_DIRVIEW_STATUS_COMPARING -#: Merge.rc:4399 +#: Merge.rc:4409 msgid "Comparing items..." msgstr "Đang so sánh các mục..." #. IDS_ITEMS_PER_SEC -#: Merge.rc:4400 +#: Merge.rc:4410 #, c-format msgid "%.1f[items/sec]" msgstr "%.1f[mục/giây]" #. IDS_ERROR_INCOMPARABLE -#: Merge.rc:4406 +#: Merge.rc:4416 msgid "Select two existing folders/files to compare." msgstr "Chọn hai thư mục/tệp hiện có để so sánh." #. IDS_DIRSEL_TAG -#: Merge.rc:4407 +#: Merge.rc:4417 msgid "Folder Selection" msgstr "Chọn thư mục" #. IDS_OPEN_FILESDIRS -#: Merge.rc:4408 +#: Merge.rc:4418 msgid "Select two (or three) folders/files to compare." msgstr "Chọn hai (hoặc ba) thư mục / tệp để so sánh." #. IDS_OPEN_LEFTINVALID -#: Merge.rc:4409 +#: Merge.rc:4419 msgid "Left (1st) path is invalid!" msgstr "Đường dẫn bên trái (thứ nhất) không hợp lệ!" #. IDS_OPEN_MIDDLEINVALID -#: Merge.rc:4410 +#: Merge.rc:4420 msgid "Middle (2nd) path is invalid!" msgstr "Đường dẫn ở giữa (thứ 2) không hợp lệ!" #. IDS_OPEN_RIGHTINVALID2 -#: Merge.rc:4411 +#: Merge.rc:4421 msgid "Right (2nd) path is invalid!" msgstr "Đường dẫn bên phải (thứ 2) không hợp lệ!" #. IDS_OPEN_RIGHTINVALID3 -#: Merge.rc:4412 +#: Merge.rc:4422 msgid "Right (3rd) path is invalid!" msgstr "Đường dẫn bên phải (thứ 3) không hợp lệ!" #. IDS_OPEN_BOTHINVALID -#: Merge.rc:4413 +#: Merge.rc:4423 msgid "Both paths are invalid!" msgstr "Cả hai đường dẫn đều không hợp lệ!" -#: Merge.rc:4415 +#: Merge.rc:4425 msgid "Left (1st) and Middle (2nd) paths are invalid!" msgstr "Đường dẫn bên trái (1) và ở giữa (2) không hợp lệ!" #. IDS_OPEN_LEFTRIGHTINVALID -#: Merge.rc:4416 +#: Merge.rc:4426 msgid "Left (1st) and Right (3rd) paths are invalid!" msgstr "Đường dẫn bên trái (1) và bên phải (3) không hợp lệ!" -#: Merge.rc:4418 +#: Merge.rc:4428 msgid "Middle (2nd) and Right (3rd) paths are invalid!" msgstr "Đường dẫn ở giữa (2) và bên phải (3) không hợp lệ!" #. IDS_OPEN_ALLINVALID -#: Merge.rc:4419 +#: Merge.rc:4429 msgid "All paths are invalid!" msgstr "Tất cả đường dẫn đều không hợp lệ!" #. IDS_OPEN_UNPACKERDISABLED -#: Merge.rc:4420 +#: Merge.rc:4430 msgid "Only enabled for file comparisons" msgstr "Chỉ bật cho so sánh tệp" #. IDS_OPEN_MISMATCH -#: Merge.rc:4421 +#: Merge.rc:4431 msgid "Cannot compare file and folder!" msgstr "Không thể so sánh tệp và thư mục!" #. IDS_ERROR_FILE_NOT_FOUND -#: Merge.rc:4427 +#: Merge.rc:4437 #, c-format msgid "File not found: %1" msgstr "Không tìm thấy tệp: %1" #. IDS_ERROR_FILE_NOT_UNPACKED -#: Merge.rc:4428 +#: Merge.rc:4438 #, c-format msgid "File not unpacked: %1" msgstr "Tệp chưa được bung gói: %1" #. IDS_ERROR_FILEOPEN -#: Merge.rc:4429 +#: Merge.rc:4439 #, c-format msgid "" "Cannot open file\n" @@ -5602,12 +5608,12 @@ msgstr "" "%2" #. IDS_ERROR_CONF_RESOLVE -#: Merge.rc:4430 +#: Merge.rc:4440 msgid "Failed to parse conflict file." msgstr "Không thể phân tích cú pháp tệp xung đột." #. IDS_NOT_CONFLICT_FILE -#: Merge.rc:4431 +#: Merge.rc:4441 #, c-format msgid "" "The file\n" @@ -5619,7 +5625,7 @@ msgstr "" "không phải là một tệp xung đột." #. 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)?" @@ -5628,18 +5634,18 @@ msgstr "" "Chỉ hiển thị kết quả so sánh (không hiện nội dung tệp) nhé?" #. IDS_SAVE_AS_TITLE -#: Merge.rc:4438 +#: Merge.rc:4448 msgid "Save As" msgstr "Lưu thành" #. IDS_SAVE_FMT -#: Merge.rc:4439 +#: Merge.rc:4449 #, c-format msgid "Save changes to %1?" msgstr "Có lưu các thay đổi vào %1 nhé?" #. 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 "" @@ -5647,11 +5653,11 @@ msgstr "" "mới?" #. IDS_ERROR_BACKUP -#: Merge.rc:4441 +#: Merge.rc:4451 msgid "Error backing up file" msgstr "Lỗi khi sao lưu tệp" -#: Merge.rc:4443 +#: Merge.rc:4453 #, c-format msgid "" "Unable to backup original file:\n" @@ -5665,7 +5671,7 @@ msgstr "" "Vẫn tiếp tục nhé?" #. IDS_FILESAVE_FAILED -#: Merge.rc:4444 +#: Merge.rc:4454 #, c-format msgid "" "Saving file failed.\n" @@ -5680,7 +5686,7 @@ msgstr "" "\t- Sử dụng tên tệp khác (OK)\n" "\t- Huỷ bỏ (Huỷ)?" -#: Merge.rc:4446 +#: Merge.rc:4456 #, c-format msgid "" "Plugin '%2' cannot pack changes to left file into '%1'.\n" @@ -5691,7 +5697,7 @@ msgstr "" "\n" "Tệp gốc chưa thay đổi. Có lưu phiên bản đã bung gói không?" -#: Merge.rc:4448 +#: Merge.rc:4458 #, c-format msgid "" "Plugin '%2' cannot pack changes to middle file into '%1'.\n" @@ -5702,7 +5708,7 @@ msgstr "" "\n" "Tệp gốc chưa thay đổi. Có lưu phiên bản đã bung gói không?" -#: Merge.rc:4450 +#: Merge.rc:4460 #, c-format msgid "" "Plugin '%2' cannot pack changes to right file into '%1'.\n" @@ -5714,7 +5720,7 @@ msgstr "" "Tệp gốc chưa thay đổi. Có lưu phiên bản đã bung gói không?" #. IDS_FILECHANGED_ONDISK -#: Merge.rc:4451 +#: Merge.rc:4461 #, c-format msgid "" "Another application updated\n" @@ -5730,7 +5736,7 @@ msgstr "" "Có ghi đè không?" #. IDS_SAVEREADONLY_MULTI -#: Merge.rc:4452 +#: Merge.rc:4462 #, c-format msgid "" "%1\n" @@ -5740,7 +5746,7 @@ msgstr "" "là tệp chỉ-đọc. Có ghi đè không?" #. IDS_FILECHANGED_RESCAN -#: Merge.rc:4453 +#: Merge.rc:4463 #, c-format msgid "" "Another application updated\n" @@ -5756,22 +5762,22 @@ msgstr "" "Có tải lại không?" #. IDS_SAVE_LEFT_AS -#: Merge.rc:4454 +#: Merge.rc:4464 msgid "Save Left File As" msgstr "Lưu tệp bên trái thành" #. IDS_SAVE_MIDDLE_AS -#: Merge.rc:4455 +#: Merge.rc:4465 msgid "Save Middle File As" msgstr "Lưu tệp ở giữa thành" #. IDS_SAVE_RIGHT_AS -#: Merge.rc:4456 +#: Merge.rc:4466 msgid "Save Right File As" msgstr "Lưu tệp bên phải thành" #. IDS_FILE_DISAPPEARED -#: Merge.rc:4461 +#: Merge.rc:4471 #, c-format msgid "" "File\n" @@ -5783,7 +5789,7 @@ msgstr "" "không tìm thấy. Lưu một bản sao để tiếp tục." #. IDS_VIEWS_OUTOFSYNC -#: Merge.rc:4467 +#: Merge.rc:4477 msgid "" "Cannot merge unsynched documents.\n" "\n" @@ -5794,124 +5800,124 @@ msgstr "" "Hãy làm mới trước khi tiếp tục." #. IDS_BREAK_ON_WHITESPACE -#: Merge.rc:4472 +#: Merge.rc:4482 msgid "Break at whitespace" msgstr "Ngắt tại khoảng trắng" #. IDS_BREAK_ON_PUNCTUATION -#: Merge.rc:4473 +#: Merge.rc:4483 msgid "Break at whitespace or punctuation" msgstr "Ngắt tại khoảng trắng hoặc dấu câu" #. IDS_L2M -#: Merge.rc:4479 +#: Merge.rc:4489 msgid "Copy to &Middle\tAlt+Right" msgstr "Chép sang &giữa\tAlt+Right" #. IDS_R2M -#: Merge.rc:4480 +#: Merge.rc:4490 msgid "Copy to &Middle\tAlt+Left" msgstr "Chép sang &giữa\tAlt+Left" #. IDS_COPY_FROM_MIDDLE_R -#: Merge.rc:4481 +#: Merge.rc:4491 msgid "Copy from Middle\tAlt+Shift+Right" msgstr "Chép từ giữa\tAlt+Shift+Right" #. IDS_COPY_FROM_MIDDLE_L -#: Merge.rc:4482 +#: Merge.rc:4492 msgid "Copy from Middle\tAlt+Shift+Left" msgstr "Chép từ giữa\tAlt+Shift+Left" #. IDS_L2MNEXT -#: Merge.rc:4483 +#: Merge.rc:4493 msgid "Copy to Middle and Advance\tCtrl+Alt+Right" msgstr "Chép sang giữa và tiến tiếp\tCtrl+Alt+Right" #. IDS_R2MNEXT -#: Merge.rc:4484 +#: Merge.rc:4494 msgid "Copy to Middle and Advance\tCtrl+Alt+Left" msgstr "Chép sang giữa và tiến tiếp\tCtrl+Alt+Left" #. IDS_ALL_MIDDLE -#: Merge.rc:4485 +#: Merge.rc:4495 msgid "Copy All to Middle" msgstr "Chép tất cả sang giữa" #. IDS_COPY_RIGHT_TO_LEFT -#: Merge.rc:4491 +#: Merge.rc:4501 #, c-format msgid "Right to Left (%1)" msgstr "Phải sang trái (%1)" #. IDS_COPY_RIGHT_TO_MIDDLE -#: Merge.rc:4492 +#: Merge.rc:4502 #, c-format msgid "Right to Middle (%1)" msgstr "Phải sang giữa (%1)" #. IDS_COPY_MIDDLE_TO_LEFT -#: Merge.rc:4493 +#: Merge.rc:4503 #, c-format msgid "Middle to Left (%1)" msgstr "Giữa sang trái (%1)" #. IDS_COPY_MIDDLE_TO_RIGHT -#: Merge.rc:4494 +#: Merge.rc:4504 #, c-format msgid "Middle to Right (%1)" msgstr "Giữa sang phải (%1)" #. IDS_COPY_LEFT_TO_RIGHT -#: Merge.rc:4495 +#: Merge.rc:4505 #, c-format msgid "Left to Right (%1)" msgstr "Trái sang phải (%1)" #. IDS_COPY_LEFT_TO_MIDDLE -#: Merge.rc:4496 +#: Merge.rc:4506 #, c-format msgid "Left to Middle (%1)" msgstr "Trái sang giữa (%1)" #. IDS_MOVE_LEFT_TO -#: Merge.rc:4507 Merge.rc:4539 +#: Merge.rc:4517 Merge.rc:4549 #, c-format msgid "Left to... (%1)" msgstr "Trái sang... (%1)" #. IDS_MOVE_MIDDLE_TO -#: Merge.rc:4508 Merge.rc:4540 +#: Merge.rc:4518 Merge.rc:4550 #, c-format msgid "Middle to... (%1)" msgstr "Giữa sang... (%1)" #. IDS_MOVE_RIGHT_TO -#: Merge.rc:4509 Merge.rc:4541 +#: Merge.rc:4519 Merge.rc:4551 #, c-format msgid "Right to... (%1)" msgstr "Phải sang... (%1)" #. IDS_COPY_BOTH_TO -#: Merge.rc:4510 +#: Merge.rc:4520 #, c-format msgid "Both to... (%1)" msgstr "Cả hai sang... (%1)" #. IDS_COPY_ALL_TO -#: Merge.rc:4511 +#: Merge.rc:4521 #, c-format msgid "All to... (%1)" msgstr "Tất cả sang... (%1)" #. IDS_COPY_DIFFERENCES_TO -#: Merge.rc:4512 +#: Merge.rc:4522 #, c-format msgid "Differences to... (%1)" msgstr "Khác biệt sang... (%1)" #. IDS_COPY_ONLYDIFFITEMS -#: Merge.rc:4519 +#: Merge.rc:4529 msgid "" "Some selected items are identical or skipped.\n" "Copy only items with differences?" @@ -5920,64 +5926,64 @@ msgstr "" "Chỉ sao chép những mục có sự khác biệt nhé?" #. IDS_DEL_LEFT_FMT -#: Merge.rc:4525 +#: Merge.rc:4535 #, c-format msgid "Left (%1)" msgstr "Bên trái (%1)" #. IDS_DEL_MIDDLE_FMT -#: Merge.rc:4526 +#: Merge.rc:4536 #, c-format msgid "Middle (%1)" msgstr "Giữa (%1)" #. IDS_DEL_RIGHT_FMT -#: Merge.rc:4527 +#: Merge.rc:4537 #, c-format msgid "Right (%1)" msgstr "Phải (%1)" #. IDS_DEL_BOTH_FMT -#: Merge.rc:4528 +#: Merge.rc:4538 #, c-format msgid "Both (%1)" msgstr "Cả hai (%1)" #. IDS_DEL_ALL_FMT -#: Merge.rc:4529 +#: Merge.rc:4539 #, c-format msgid "All (%1)" msgstr "Tất cả (%1)" #. IDS_SELECT_DEST_LEFT -#: Merge.rc:4545 +#: Merge.rc:4555 msgid "Left Side - Select Destination Folder:" msgstr "Bên trái - chọn thư mục đích:" #. IDS_SELECT_DEST_MIDDLE -#: Merge.rc:4546 +#: Merge.rc:4556 msgid "Middle Side - Select Destination Folder:" msgstr "Ở giữa - chọn thư mục đích:" #. IDS_SELECT_DEST_RIGHT -#: Merge.rc:4547 +#: Merge.rc:4557 msgid "Right Side - Select Destination Folder:" msgstr "Bên phải - chọn thư mục đích:" #. IDS_FILES_AFFECTED_FMT -#: Merge.rc:4548 +#: Merge.rc:4558 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 tệp bị ảnh hưởng)" #. IDS_FILES_AFFECTED_FMT2 -#: Merge.rc:4549 +#: Merge.rc:4559 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 trên %2 tệp bị ảnh hưởng)" #. IDS_CONFIRM_DELETE_SINGLE -#: Merge.rc:4555 +#: Merge.rc:4565 #, c-format msgid "" "Are you sure you want to delete\n" @@ -5989,18 +5995,18 @@ msgstr "" "%1 không?" #. IDS_CONFIRM_SINGLE_COPY -#: Merge.rc:4556 +#: Merge.rc:4566 msgid "Are you sure you want to copy?" msgstr "Bạn có chắc chắn muốn sao chép không?" #. IDS_CONFIRM_MULTIPLE_COPY -#: Merge.rc:4557 +#: Merge.rc:4567 #, c-format msgid "Are you sure you want to copy %d items?" msgstr "Bạn có chắc chắn muốn sao chép %d mục không?" #. IDS_DIRCMP_NOTSYNC -#: Merge.rc:4558 +#: Merge.rc:4568 #, c-format msgid "" "Operation aborted!\n" @@ -6020,47 +6026,47 @@ msgstr "" "Hãy làm mới lại việc so sánh." #. IDS_CONFIRM_SINGLE_MOVE -#: Merge.rc:4563 +#: Merge.rc:4573 msgid "Are you sure you want to move?" msgstr "Bạn có chắc chắn muốn di chuyển không?" #. IDS_CONFIRM_MULTIPLE_MOVE -#: Merge.rc:4564 +#: Merge.rc:4574 #, c-format msgid "Are you sure you want to move %d items?" msgstr "Bạn có chắc chắn muốn di chuyển %d mục không?" #. IDS_CONFIRM_MOVE_CAPTION -#: Merge.rc:4566 +#: Merge.rc:4576 msgid "Confirm Move" msgstr "Xác nhận di chuyển" -#: Merge.rc:4568 +#: Merge.rc:4578 msgid "Close the folder comparison window?" msgstr "Có đóng cửa sổ so sánh thư mục không?" -#: Merge.rc:4570 +#: Merge.rc:4580 msgid "Close the folder comparison window, which took a long time?" msgstr "" "Có đóng cửa sổ so sánh thư mục không (việc này tốn khá nhiều thời gian)?" #. IDS_ERROR_INVALID_DIR_FILE_NAME -#: Merge.rc:4571 +#: Merge.rc:4581 msgid "The file or folder name is invalid." msgstr "Tên tệp hoặc tên thư mục không hợp lệ." #. IDS_ERROR_EXECUTE_FILE -#: Merge.rc:4577 +#: Merge.rc:4587 #, c-format msgid "Failed to execute external editor: %1" msgstr "Không thể thực thi trình chỉnh sửa bên ngoài: %1" #. IDS_UNKNOWN_ARCHIVE_FORMAT -#: Merge.rc:4583 +#: Merge.rc:4593 msgid "Unknown archive format" msgstr "Định dạng tệp nén không xác định" -#: Merge.rc:4585 +#: Merge.rc:4595 msgid "" "Failed to extract archive.\n" "Compare as text file?" @@ -6069,752 +6075,752 @@ msgstr "" "Có so sánh dưới dạng tệp văn bản không?" #. IDS_COLHDR_FILENAME -#: Merge.rc:4591 +#: Merge.rc:4601 msgid "Filename" msgstr "Tên tệp" #. IDS_COLHDR_DIR -#: Merge.rc:4592 +#: Merge.rc:4602 msgctxt "DirView|ColumnHeader" msgid "Folder" msgstr "Thư mục" #. IDS_COLHDR_RESULT -#: Merge.rc:4593 +#: Merge.rc:4603 msgid "Comparison Result" msgstr "Kết quả so sánh" #. IDS_COLHDR_LTIMEM -#: Merge.rc:4594 +#: Merge.rc:4604 msgid "Left Date" msgstr "Ngày (trái)" #. IDS_COLHDR_RTIMEM -#: Merge.rc:4595 +#: Merge.rc:4605 msgid "Right Date" msgstr "Ngày (phải)" #. IDS_COLHDR_MTIMEM -#: Merge.rc:4596 +#: Merge.rc:4606 msgid "Middle Date" msgstr "Ngày (giữa)" #. IDS_COLHDR_LSIZE -#: Merge.rc:4598 +#: Merge.rc:4608 msgid "Left Size" msgstr "Kích cỡ (trái)" #. IDS_COLHDR_RSIZE -#: Merge.rc:4599 +#: Merge.rc:4609 msgid "Right Size" msgstr "Kích cỡ (phải)" #. IDS_COLHDR_MSIZE -#: Merge.rc:4604 +#: Merge.rc:4614 msgid "Middle Size" msgstr "Kích cỡ (giữa)" #. IDS_COLHDR_RSIZE_SHORT -#: Merge.rc:4605 +#: Merge.rc:4615 msgid "Right Size (Short)" msgstr "Kích cỡ (phải, ngắn)" #. IDS_COLHDR_LSIZE_SHORT -#: Merge.rc:4606 +#: Merge.rc:4616 msgid "Left Size (Short)" msgstr "Kích cỡ (trái, ngắn)" #. IDS_COLHDR_MSIZE_SHORT -#: Merge.rc:4607 +#: Merge.rc:4617 msgid "Middle Size (Short)" msgstr "Kích cỡ (giữa, ngắn)" #. IDS_COLHDR_LTIMEC -#: Merge.rc:4613 +#: Merge.rc:4623 msgid "Left Creation Time" msgstr "Thời gian tạo (trái)" #. IDS_COLHDR_RTIMEC -#: Merge.rc:4614 +#: Merge.rc:4624 msgid "Right Creation Time" msgstr "Thời gian tạo (phải)" #. IDS_COLHDR_MTIMEC -#: Merge.rc:4615 +#: Merge.rc:4625 msgid "Middle Creation Time" msgstr "Thời gian tạo (giữa)" #. IDS_COLHDR_NEWER -#: Merge.rc:4616 +#: Merge.rc:4626 msgid "Newer File" msgstr "Tệp mới hơn" #. IDS_COLHDR_LVERSION -#: Merge.rc:4617 +#: Merge.rc:4627 msgid "Left File Version" msgstr "Phiên bản tệp (trái)" #. IDS_COLHDR_RVERSION -#: Merge.rc:4618 +#: Merge.rc:4628 msgid "Right File Version" msgstr "Phiên bản tệp (phải)" #. IDS_COLHDR_MVERSION -#: Merge.rc:4619 +#: Merge.rc:4629 msgid "Middle File Version" msgstr "Phiên bản tệp (giữa)" #. IDS_COLHDR_RESULT_ABBR -#: Merge.rc:4620 +#: Merge.rc:4630 msgid "Short Result" msgstr "Kết quả ngắn" #. IDS_COLHDR_LATTRIBUTES -#: Merge.rc:4621 +#: Merge.rc:4631 msgid "Left Attributes" msgstr "Thuộc tính (trái)" #. IDS_COLHDR_RATTRIBUTES -#: Merge.rc:4622 +#: Merge.rc:4632 msgid "Right Attributes" msgstr "Thuộc tính (phải)" #. IDS_COLHDR_MATTRIBUTES -#: Merge.rc:4623 +#: Merge.rc:4633 msgid "Middle Attributes" msgstr "Thuộc tính (giữa)" #. IDS_COLHDR_LEOL_TYPE -#: Merge.rc:4628 +#: Merge.rc:4638 msgid "Left EOL" msgstr "EOL (trái)" #. IDS_COLHDR_MEOL_TYPE -#: Merge.rc:4629 +#: Merge.rc:4639 msgid "Middle EOL" msgstr "EOL (giữa)" #. IDS_COLHDR_REOL_TYPE -#: Merge.rc:4630 +#: Merge.rc:4640 msgid "Right EOL" msgstr "EOL (phải)" #. IDS_COLHDR_LENCODING -#: Merge.rc:4636 +#: Merge.rc:4646 msgid "Left Encoding" msgstr "Biên mã (trái)" #. IDS_COLHDR_RENCODING -#: Merge.rc:4637 +#: Merge.rc:4647 msgid "Right Encoding" msgstr "Biên mã (phải)" #. IDS_COLHDR_MENCODING -#: Merge.rc:4638 +#: Merge.rc:4648 msgid "Middle Encoding" msgstr "Biên mã (giữa)" #. IDS_COLHDR_NIDIFFS -#: Merge.rc:4639 +#: Merge.rc:4649 msgid "Ignored Diff" msgstr "Khác biệt đã bỏ qua" #. IDS_COLHDR_BINARY -#: Merge.rc:4641 +#: Merge.rc:4651 msgctxt "DirView|ColumnHeader" msgid "Binary" msgstr "Nhị phân" #. IDS_PLUGINS_TYPE_UNPACKER -#: Merge.rc:4642 Merge.rc:4959 +#: Merge.rc:4652 Merge.rc:4969 msgid "Unpacker" msgstr "Trình bung gói" #. IDS_PLUGIN_TYPE4 -#: Merge.rc:4643 Merge.rc:4960 Merge.rc:5267 +#: Merge.rc:4653 Merge.rc:4970 Merge.rc:5277 msgid "Prediffer" msgstr "Trình tiền so sánh" #. IDS_COLHDR_LEFT -#: Merge.rc:4644 +#: Merge.rc:4654 msgid "Left" msgstr "Trái" #. IDS_COLHDR_MIDDLE -#: Merge.rc:4645 +#: Merge.rc:4655 msgid "Middle" msgstr "Giữa" #. IDS_COLHDR_RIGHT -#: Merge.rc:4646 +#: Merge.rc:4656 msgid "Right" msgstr "Phải" #. IDS_COLHDR_DIFF -#: Merge.rc:4647 +#: Merge.rc:4657 msgid "Diff" msgstr "Khác biệt" #. IDS_COLHDR_LEFT_DUPLICATE -#: Merge.rc:4648 +#: Merge.rc:4658 msgid "Left Duplicate Count" msgstr "Số lượng trùng lặp (trái)" #. IDS_COLHDR_RIGHT_DUPLICATE -#: Merge.rc:4649 +#: Merge.rc:4659 msgid "Right Duplicate Count" msgstr "Số lượng trùng lặp (phải)" #. IDS_COLHDR_MIDDLE_DUPLICATE -#: Merge.rc:4650 +#: Merge.rc:4660 msgid "Middle Duplicate Count" msgstr "Số lượng trùng lặp (giữa)" #. IDS_COLHDR_MOVE -#: Merge.rc:4651 +#: Merge.rc:4661 msgid "Move" msgstr "Di chuyển" #. IDS_PRPCAT_AUDIO -#: Merge.rc:4658 +#: Merge.rc:4668 msgid "Audio" msgstr "Âm thanh" #. IDS_PRPCAT_CALENDAR -#: Merge.rc:4659 +#: Merge.rc:4669 msgid "Calendar" msgstr "Lịch" #. IDS_PRPCAT_COMMUNICATION -#: Merge.rc:4660 +#: Merge.rc:4670 msgid "Communication" msgstr "Truyền thông" #. IDS_PRPCAT_CONTACT -#: Merge.rc:4661 +#: Merge.rc:4671 msgid "Contact" msgstr "Liên hệ" #. IDS_PRPCAT_DEVICES -#: Merge.rc:4662 +#: Merge.rc:4672 msgid "Devices" msgstr "Thiết bị" #. IDS_PRPCAT_DOCUMENT -#: Merge.rc:4663 +#: Merge.rc:4673 msgid "Document" msgstr "Tài liệu" #. IDS_PRPCAT_HOME -#: Merge.rc:4664 +#: Merge.rc:4674 msgid "Home" msgstr "Trang chủ" #. IDS_PRPCAT_JOURNAL -#: Merge.rc:4666 +#: Merge.rc:4676 msgid "Journal" msgstr "Nhật ký" #. IDS_PRPCAT_LINK -#: Merge.rc:4667 +#: Merge.rc:4677 msgid "Link" msgstr "Liên kết" #. IDS_PRPCAT_MEDIA -#: Merge.rc:4668 +#: Merge.rc:4678 msgid "Media" msgstr "Phương tiện" #. IDS_PRPCAT_MUSIC -#: Merge.rc:4670 +#: Merge.rc:4680 msgid "Music" msgstr "Nhạc" #. IDS_PRPCAT_NOTE -#: Merge.rc:4671 +#: Merge.rc:4681 msgid "Note" msgstr "Ghi chú" #. IDS_PRPCAT_PHOTO -#: Merge.rc:4672 +#: Merge.rc:4682 msgid "Photo" msgstr "Ảnh" #. IDS_PRPCAT_RECORDEDTV -#: Merge.rc:4673 +#: Merge.rc:4683 msgid "RecordedTV" msgstr "TV đã ghi" #. IDS_PRPCAT_SEARCH -#: Merge.rc:4674 +#: Merge.rc:4684 msgid "Search" msgstr "Tìm kiếm" #. IDS_PRPCAT_SECURITY -#: Merge.rc:4675 +#: Merge.rc:4685 msgid "Security" msgstr "Bảo mật" #. IDS_PRPCAT_SOFTWARE -#: Merge.rc:4676 +#: Merge.rc:4686 msgid "Software" msgstr "Phần mềm" #. IDS_PRPCAT_TASK -#: Merge.rc:4677 +#: Merge.rc:4687 msgid "Task" msgstr "Công việc" #. 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 "Mã băm" #. IDS_CANT_COMPARE_FILES -#: Merge.rc:4685 +#: Merge.rc:4695 msgid "Unable to compare files" msgstr "Không thể so sánh các tệp" #. IDS_ABORTED_ITEM -#: Merge.rc:4686 +#: Merge.rc:4696 msgid "Item aborted" msgstr "Mục bị huỷ bỏ" #. IDS_FILE_SKIPPED -#: Merge.rc:4687 +#: Merge.rc:4697 msgid "File skipped" msgstr "Tệp bị bỏ qua" #. IDS_DIR_SKIPPED -#: Merge.rc:4688 +#: Merge.rc:4698 msgid "Folder skipped" msgstr "Thư mục bị bỏ qua" #. IDS_LEFT_ONLY_IN_FMT -#: Merge.rc:4689 +#: Merge.rc:4699 #, c-format msgid "Left only: %1" msgstr "Chỉ bên trái: %1" #. IDS_MIDDLE_ONLY_IN_FMT -#: Merge.rc:4690 +#: Merge.rc:4700 #, c-format msgid "Middle only: %1" msgstr "Chỉ ở giữa: %1" #. IDS_RIGHT_ONLY_IN_FMT -#: Merge.rc:4691 +#: Merge.rc:4701 #, c-format msgid "Right only: %1" msgstr "Chỉ bên phải: %1" #. IDS_DOES_NOT_EXIST_IN_FMT -#: Merge.rc:4692 +#: Merge.rc:4702 #, c-format msgid "Does not exist in %1" msgstr "Không tồn tại trong %1" #. IDS_BIN_FILES_SAME -#: Merge.rc:4693 +#: Merge.rc:4703 msgid "Binary files are identical" msgstr "Các tệp nhị phân giống hệt nhau" #. IDS_BIN_FILES_DIFF -#: Merge.rc:4699 +#: Merge.rc:4709 msgid "Binary files are different" msgstr "Các tệp nhị phân này khác nhau" #. IDS_FILES_ARE_DIFFERENT -#: Merge.rc:4700 +#: Merge.rc:4710 msgid "Files are different" msgstr "Các tệp này khác nhau" #. IDS_FOLDERS_ARE_DIFFERENT -#: Merge.rc:4701 +#: Merge.rc:4711 msgid "Folders are different" msgstr "Các thư mục này khác nhau" #. IDS_LEFTONLY -#: Merge.rc:4702 +#: Merge.rc:4712 msgid "Left Only" msgstr "Chỉ bên trái" #. IDS_RIGHTONLY -#: Merge.rc:4703 +#: Merge.rc:4713 msgid "Right Only" msgstr "Chỉ bên phải" #. IDS_MIDDLEONLY -#: Merge.rc:4704 +#: Merge.rc:4714 msgid "Middle Only" msgstr "Chỉ ở giữa" #. IDS_NOITEMLEFT -#: Merge.rc:4705 +#: Merge.rc:4715 msgid "No item in left" msgstr "Không có mục nào ở bên trái" #. IDS_NOITEMRIGHT -#: Merge.rc:4706 +#: Merge.rc:4716 msgid "No item in right" msgstr "Không có mục nào ở bên phải" #. IDS_NOITEMMIDDLE -#: Merge.rc:4707 +#: Merge.rc:4717 msgid "No item in middle" msgstr "Không có mục nào ở giữa" #. IDS_CMPRES_ERROR -#: Merge.rc:4709 +#: Merge.rc:4719 msgid "Error" msgstr "Lỗi" #. IDS_TEXT_FILES_SAME -#: Merge.rc:4710 +#: Merge.rc:4720 msgid "Text files are identical" msgstr "Các tệp văn bản giống hệt nhau" #. IDS_LEFTONLY_DIFF -#: Merge.rc:4711 +#: Merge.rc:4721 msgid " (Middle and right are identical)" msgstr " (Ở giữa và bên phải giống hệt nhau)" #. IDS_MIDDLEONLY_DIFF -#: Merge.rc:4712 +#: Merge.rc:4722 msgid " (Left and right are identical)" msgstr " (Bên trái và bên phải giống hệt nhau)" #. IDS_RIGHTONLY_DIFF -#: Merge.rc:4713 +#: Merge.rc:4723 msgid " (Left and middle are identical)" msgstr " (Bên trái và ở giữa giống hệt nhau)" #. 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 "Các tệp văn bản này khác nhau" #. IDS_IMAGE_FILES_SAME -#: Merge.rc:4716 +#: Merge.rc:4726 msgid "Image files are identical" msgstr "Các tệp hình ảnh giống hệt nhau" #. IDS_IMAGE_FILES_DIFF -#: Merge.rc:4717 +#: Merge.rc:4727 msgid "Image files are different" msgstr "Các tệp hình ảnh này khác nhau" #. IDS_EXPR_DIFF -#: Merge.rc:4718 +#: Merge.rc:4728 #, c-format msgid "Files are different (expr: %1)" msgstr "Các tệp này khác nhau (biểu thức: %1)" #. IDS_HASH_GROUP -#: Merge.rc:4719 +#: Merge.rc:4729 #, c-format msgid "Group%d" msgstr "Nhóm %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 "Thời gian trôi qua: %ld ms" #. IDS_STATUS_SELITEM1 -#: Merge.rc:4737 +#: Merge.rc:4747 msgid "1 item selected" msgstr "Đã chọn 1 mục" #. IDS_STATUS_SELITEMS -#: Merge.rc:4738 +#: Merge.rc:4748 #, c-format msgid "%1 items selected" msgstr "Đã chọn %1 mục" #. IDS_COLDESC_FILENAME -#: Merge.rc:4744 +#: Merge.rc:4754 msgid "Filename or folder name." msgstr "Tên tệp hoặc tên thư mục." #. IDS_COLDESC_DIR -#: Merge.rc:4745 +#: Merge.rc:4755 msgid "Subfolder name when subfolders are included." msgstr "Tên thư mục con khi bao gồm các thư mục con." #. IDS_COLDESC_RESULT -#: Merge.rc:4746 +#: Merge.rc:4756 msgid "Comparison result, long form." msgstr "Kết quả so sánh, dạng dài." #. IDS_COLDESC_LTIMEM -#: Merge.rc:4751 +#: Merge.rc:4761 msgid "Left side modification date." msgstr "Ngày sửa đổi bên trái." #. IDS_COLDESC_RTIMEM -#: Merge.rc:4752 +#: Merge.rc:4762 msgid "Right side modification date." msgstr "Ngày sửa đổi bên phải." #. IDS_COLDESC_MTIMEM -#: Merge.rc:4753 +#: Merge.rc:4763 msgid "Middle side modification date." msgstr "Ngày sửa đổi ở giữa." #. IDS_COLDESC_EXTENSION -#: Merge.rc:4754 +#: Merge.rc:4764 msgid "File's extension." msgstr "Phần mở rộng của tệp." #. IDS_COLDESC_LSIZE -#: Merge.rc:4755 +#: Merge.rc:4765 msgid "Left file size in bytes." msgstr "Kích cỡ tệp bên trái tính bằng byte." #. IDS_COLDESC_RSIZE -#: Merge.rc:4756 +#: Merge.rc:4766 msgid "Right file size in bytes." msgstr "Kích cỡ tệp bên phải tính bằng byte." #. IDS_COLDESC_MSIZE -#: Merge.rc:4757 +#: Merge.rc:4767 msgid "Middle file size in bytes." msgstr "Kích cỡ tệp ở giữa tính bằng byte." #. IDS_COLDESC_LSIZE_SHORT -#: Merge.rc:4758 +#: Merge.rc:4768 msgid "Left file size abbreviated." msgstr "Kích cỡ tệp bên trái viết tắt." #. IDS_COLDESC_RSIZE_SHORT -#: Merge.rc:4759 +#: Merge.rc:4769 msgid "Right file size abbreviated." msgstr "Kích cỡ tệp bên phải viết tắt." #. IDS_COLDESC_MSIZE_SHORT -#: Merge.rc:4760 +#: Merge.rc:4770 msgid "Middle file size abbreviated." msgstr "Kích cỡ tệp ở giữa viết tắt." #. IDS_COLDESC_LTIMEC -#: Merge.rc:4766 +#: Merge.rc:4776 msgid "Left side creation time." msgstr "Thời gian tạo bên trái." #. IDS_COLDESC_RTIMEC -#: Merge.rc:4767 +#: Merge.rc:4777 msgid "Right side creation time." msgstr "Thời gian tạo bên phải." #. IDS_COLDESC_MTIMEC -#: Merge.rc:4768 +#: Merge.rc:4778 msgid "Middle side creation time." msgstr "Thời gian tạo ở giữa." #. IDS_COLDESC_NEWER -#: Merge.rc:4769 +#: Merge.rc:4779 msgid "Tells which side has newer modification date." msgstr "Cho biết bên nào có ngày sửa đổi mới hơn." #. IDS_COLDESC_LVERSION -#: Merge.rc:4770 +#: Merge.rc:4780 msgid "Left side file version, only for some file types." msgstr "Phiên bản tệp bên trái, chỉ dành cho một số loại tệp." #. IDS_COLDESC_RVERSION -#: Merge.rc:4771 +#: Merge.rc:4781 msgid "Right side file version, only for some file types." msgstr "Phiên bản tệp bên phải, chỉ dành cho một số loại tệp." #. IDS_COLDESC_MVERSION -#: Merge.rc:4776 +#: Merge.rc:4786 msgid "Middle side file version, only for some file types." msgstr "Phiên bản tệp ở giữa, chỉ dành cho một số loại tệp." #. IDS_COLDESC_RESULT_ABBR -#: Merge.rc:4777 +#: Merge.rc:4787 msgid "Short comparison result." msgstr "Kết quả so sánh ngắn." #. IDS_COLDESC_LATTRIBUTES -#: Merge.rc:4778 +#: Merge.rc:4788 msgid "Left side attributes." msgstr "Thuộc tính bên trái." #. IDS_COLDESC_RATTRIBUTES -#: Merge.rc:4779 +#: Merge.rc:4789 msgid "Right side attributes." msgstr "Thuộc tính bên phải." #. IDS_COLDESC_MATTRIBUTES -#: Merge.rc:4780 +#: Merge.rc:4790 msgid "Middle side attributes." msgstr "Thuộc tính ở giữa." #. IDS_COLDESC_LEOL_TYPE -#: Merge.rc:4781 +#: Merge.rc:4791 msgid "Left side file EOL type." msgstr "Loại EOL tệp bên trái." #. IDS_COLDESC_REOL_TYPE -#: Merge.rc:4782 +#: Merge.rc:4792 msgid "Right side file EOL type." msgstr "Loại EOL tệp bên phải." #. IDS_COLDESC_MEOL_TYPE -#: Merge.rc:4783 +#: Merge.rc:4793 msgid "Middle side file EOL type." msgstr "Loại EOL tệp ở giữa." #. IDS_COLDESC_LENCODING -#: Merge.rc:4789 +#: Merge.rc:4799 msgid "Left side encoding." msgstr "Biên mã bên trái." #. IDS_COLDESC_RENCODING -#: Merge.rc:4790 +#: Merge.rc:4800 msgid "Right side encoding." msgstr "Biên mã bên phải." #. IDS_COLDESC_MENCODING -#: Merge.rc:4791 +#: Merge.rc:4801 msgid "Middle side encoding." msgstr "Biên mã ở giữa." #. IDS_COLDESC_NIDIFFS -#: Merge.rc:4792 +#: Merge.rc:4802 msgid "Number of ignored differences in file. Ignored and cannot be merged." msgstr "" "Số lượng khác biệt bị bỏ qua trong tệp. Đã bị bỏ qua và không thể trộn." #. IDS_COLDESC_NSDIFFS -#: Merge.rc:4793 +#: Merge.rc:4803 msgid "Number of differences in file (excluding ignored)." msgstr "Số lượng khác biệt trong tệp (không bao gồm các mục bị bỏ qua)." #. IDS_COLDESC_BINARY -#: Merge.rc:4794 +#: Merge.rc:4804 msgid "Shows an asterisk (*) if the file is binary." msgstr "Hiển thị dấu sao (*) nếu tệp là nhị phân." #. IDS_COLDESC_UNPACKER -#: Merge.rc:4795 +#: Merge.rc:4805 msgid "Unpacker plugin name or pipeline." msgstr "Tên hoặc ống dẫn của trình cắm bung gói." #. IDS_COLDESC_PREDIFFER -#: Merge.rc:4796 +#: Merge.rc:4806 msgid "Prediffer plugin name or pipeline." msgstr "Tên hoặc ống dẫn của trình cắm tiền so sánh." #. IDS_DIRECTORY_REPORT_TITLE -#: Merge.rc:4802 +#: Merge.rc:4812 #, c-format msgid "Compare %1 with %2" msgstr "So sánh %1 với %2" #. IDS_DIRECTORY_REPORT_TITLE3 -#: Merge.rc:4803 +#: Merge.rc:4813 #, c-format msgid "Compare %1 with %2 and %3" msgstr "So sánh %1 với %2 và %3" #. IDS_REPORT_COMMALIST -#: Merge.rc:4804 +#: Merge.rc:4814 msgid "Comma-separated list" msgstr "Danh sách ngăn cách bằng dấu phẩy" #. IDS_REPORT_TABLIST -#: Merge.rc:4805 +#: Merge.rc:4815 msgid "Tab-separated list" msgstr "Danh sách ngăn cách bằng phím Tab" #. IDS_REPORT_SIMPLEHTML -#: Merge.rc:4806 +#: Merge.rc:4816 msgid "Simple HTML" msgstr "HTML đơn giản" #. IDS_REPORT_SIMPLEXML -#: Merge.rc:4807 +#: Merge.rc:4817 msgid "Simple XML" msgstr "XML đơn giản" -#: Merge.rc:4809 +#: Merge.rc:4819 msgid "Report file already exists. Overwrite?" msgstr "Đã tồn tại tệp báo cáo. Có ghi đè không?" #. IDS_REPORT_ERROR -#: Merge.rc:4814 +#: Merge.rc:4824 #, c-format msgid "" "Error creating the report:\n" @@ -6824,27 +6830,27 @@ msgstr "" "%1" #. IDS_REPORT_SUCCESS -#: Merge.rc:4815 +#: Merge.rc:4825 msgid "Report created successfully." msgstr "Báo cáo đã được tạo thành công." #. IDS_SYNCPOINT_LASTBLOCK -#: Merge.rc:4821 +#: Merge.rc:4831 msgid "Cannot add a synchronization point at this line." msgstr "Không thể thêm điểm đồng bộ hoá tại dòng này." #. IDS_FILE_TO_ITSELF -#: Merge.rc:4827 +#: Merge.rc:4837 msgid "Same file is opened in both panes." msgstr "Cùng một tệp đang được mở ở cả hai khung." #. IDS_FILESSAME -#: Merge.rc:4828 +#: Merge.rc:4838 msgid "Selected files are identical." msgstr "Các tệp được chọn giống hệt nhau." #. IDS_FILESSAME_CURCFG -#: Merge.rc:4829 +#: Merge.rc:4839 msgid "" "Selected files are identical (with current settings).\r\n" "Checking binary identity..." @@ -6853,7 +6859,7 @@ msgstr "" "Đang kiểm tra tính đồng nhất nhị phân..." #. IDS_FILESSAME_BINERROR -#: Merge.rc:4830 +#: Merge.rc:4840 msgid "" "Selected files are identical (with current settings).\r\n" "But binary comparison failed." @@ -6862,12 +6868,12 @@ msgstr "" "Nhưng không so sánh nhị phân được." #. IDS_FILESSAME_BINSAME -#: Merge.rc:4831 +#: Merge.rc:4841 msgid "Selected files are identical (binary match)." msgstr "Các tệp được chọn giống hệt nhau (khớp về mặt nhị phân)." #. 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." @@ -6876,19 +6882,19 @@ msgstr "" "Nhưng khác nhau ở cấp độ nhị phân." #. IDS_FILEERROR -#: Merge.rc:4833 +#: Merge.rc:4843 msgid "An error occurred while comparing files." msgstr "Đã xảy ra lỗi khi so sánh các tệp." #. IDS_TEMP_FILEERROR -#: Merge.rc:4834 +#: Merge.rc:4844 msgid "Could not create temporary files. Check your temporary path settings." msgstr "" "Không thể tạo các tệp tạm thời. Hãy kiểm tra các thiết đặt đường dẫn tạm " "thời của bạn." #. IDS_SUGGEST_IGNOREEOL -#: Merge.rc:4835 +#: Merge.rc:4845 msgid "" "Files use different EOL.\n" "\n" @@ -6905,17 +6911,17 @@ msgstr "" "Tuỳ chọn." #. IDS_INVALID_DIRECTORY -#: Merge.rc:4836 +#: Merge.rc:4846 msgid "Selected folder is invalid." msgstr "Thư mục được chọn không hợp lệ." #. IDS_CANNOT_OPEN_BINARYFILE -#: Merge.rc:4837 +#: Merge.rc:4847 msgid "Cannot open a binary file in Editor." msgstr "Không thể mở tệp nhị phân trong trình chỉnh sửa." #. IDS_CREATE_PAIR_FOLDER -#: Merge.rc:4838 +#: Merge.rc:4848 #, c-format msgid "" "Create matching folder:\n" @@ -6927,41 +6933,41 @@ msgstr "" "ở phía bên kia và mở ra không?" #. IDS_CONFIRM_COPY_ALL_DIFFS -#: Merge.rc:4839 +#: Merge.rc:4849 msgid "Copy all differences to other file?" msgstr "Có chép tất cả khác biệt sang tệp kia không?" #. IDS_MOVE_TO_NEXTFILE -#: Merge.rc:4844 +#: Merge.rc:4854 msgid "Move to next file?" msgstr "Có di chuyển đến tệp tiếp theo không?" #. IDS_MOVE_TO_PREVFILE -#: Merge.rc:4845 +#: Merge.rc:4855 msgid "Move to previous file?" msgstr "Có di chuyển đến tệp trước đó không?" #. IDS_MOVE_TO_NEXTPAGE -#: Merge.rc:4846 +#: Merge.rc:4856 msgid "Move to next page?" msgstr "Có di chuyển đến trang tiếp theo không?" #. IDS_MOVE_TO_PREVPAGE -#: Merge.rc:4847 +#: Merge.rc:4857 msgid "Move to previous page?" msgstr "Có di chuyển đến trang trước đó không?" #. IDS_MOVE_TO_FIRSTFILE -#: Merge.rc:4848 +#: Merge.rc:4858 msgid "Move to first file?" msgstr "Có di chuyển đến tệp đầu tiên không?" #. IDS_MOVE_TO_LASTFILE -#: Merge.rc:4849 +#: Merge.rc:4859 msgid "Move to last file?" msgstr "Có di chuyển đến tệp cuối cùng không?" -#: Merge.rc:4856 +#: Merge.rc:4866 #, c-format msgid "" "Different codepages: left (cp%d), right (cp%d).\n" @@ -6974,51 +6980,51 @@ msgstr "" "(trộn an toàn hơn) không?\n" "(Khuyên dùng: trang mã Windows mặc định)" -#: Merge.rc:4858 +#: Merge.rc:4868 msgid "Information lost due to encoding errors: both files" msgstr "Thông tin bị mất do lỗi biên mã: cả hai tệp" -#: Merge.rc:4860 +#: Merge.rc:4870 msgid "Information lost due to encoding errors: first file" msgstr "Thông tin bị mất do lỗi biên mã: tệp thứ nhất" -#: Merge.rc:4862 +#: Merge.rc:4872 msgid "Information lost due to encoding errors: second file" msgstr "Thông tin bị mất do lỗi biên mã: tệp thứ hai" -#: Merge.rc:4864 +#: Merge.rc:4874 msgid "Information lost due to encoding errors: third file" msgstr "Thông tin bị mất do lỗi biên mã: tệp thứ ba" #. IDS_LINEDIFF_NODIFF -#: Merge.rc:4870 +#: Merge.rc:4880 msgid "No difference" msgstr "Không có khác biệt" #. IDS_LINEDIFF_NODIFF_CAPTION -#: Merge.rc:4871 +#: Merge.rc:4881 msgid "Line difference" msgstr "Khác biệt dòng" #. IDS_NUM_REPLACED -#: Merge.rc:4877 +#: Merge.rc:4887 #, c-format msgid "Replaced %1 string(s)." msgstr "Đã thay thế %1 xâu." #. IDS_EDIT_TEXT_NOT_FOUND -#: Merge.rc:4878 +#: Merge.rc:4888 #, c-format msgid "Cannot find string \"%s\"." msgstr "Không thể tìm thấy xâu \"%s\"." #. IDS_MERGE_MODE -#: Merge.rc:4884 +#: Merge.rc:4894 msgid "Entering Merge Mode. Press F9 to turn off." msgstr "Đang vào chế độ trộn. Nhấn F9 để tắt." #. IDS_AUTO_MERGE -#: Merge.rc:4890 +#: Merge.rc:4900 #, c-format msgid "" "Automatic merges: %1\n" @@ -7028,99 +7034,99 @@ msgstr "" "Xung đột chưa được giải quyết: %2" #. IDS_CODEPAGE_MERGED -#: Merge.rc:4891 +#: Merge.rc:4901 msgid "Codepage change merged." msgstr "Đã trộn thay đổi về trang mã." #. IDS_CODEPAGE_CONFLICT -#: Merge.rc:4892 +#: Merge.rc:4902 msgid "Codepage changes are conflicting." msgstr "Các thay đổi trang mã đang bị xung đột." #. IDS_EOL_MERGED -#: Merge.rc:4893 +#: Merge.rc:4903 msgid "EOL change merged." msgstr "Đã trộn thay đổi EOL." #. IDS_EOL_CONFLICT -#: Merge.rc:4894 +#: Merge.rc:4904 msgid "EOL changes are conflicting." msgstr "Các thay đổi EOL đang bị xung đột." #. IDS_LOCBAR_CAPTION -#: Merge.rc:4900 +#: Merge.rc:4910 msgid "Location Pane" msgstr "Khung vị trí" #. IDS_DIFFBAR_CAPTION -#: Merge.rc:4901 +#: Merge.rc:4911 msgid "Diff Pane" msgstr "Khung khác biệt" #. IDS_DIFF_SUCCEEDED -#: Merge.rc:4908 +#: Merge.rc:4918 msgid "Patch file written." msgstr "Tệp bản vá đã được ghi." #. IDS_DIFF_ITEM1NOTFOUND -#: Merge.rc:4909 +#: Merge.rc:4919 msgid "First item not found!" msgstr "Không tìm thấy mục thứ nhất!" #. IDS_DIFF_ITEM2NOTFOUND -#: Merge.rc:4910 +#: Merge.rc:4920 msgid "Second item not found!" msgstr "Không tìm thấy mục thứ hai!" #. IDS_DIFF_FILEOVERWRITE -#: Merge.rc:4911 +#: Merge.rc:4921 msgid "Patch file already exists. Overwrite?" msgstr "Đã tồn tại tệp bản vá. Có ghi đè không?" #. IDS_DIFF_SELECTEDFILES -#: Merge.rc:4912 +#: Merge.rc:4922 #, c-format msgid "[%1 files selected]" msgstr "[đã chọn %1 tệp]" #. IDS_DIFF_NORMAL -#: Merge.rc:4913 +#: Merge.rc:4923 msgid "Normal" msgstr "Bình thường" #. IDS_DIFF_CONTEXT -#: Merge.rc:4914 +#: Merge.rc:4924 msgid "Context" msgstr "Ngữ cảnh" #. IDS_DIFF_UNIFIED -#: Merge.rc:4915 +#: Merge.rc:4925 msgid "Unified" msgstr "Thống nhất" #. IDS_FILEWRITE_ERROR -#: Merge.rc:4917 +#: Merge.rc:4927 #, c-format msgid "Could not write to file %1." msgstr "Không thể ghi vào tệp %1." #. IDS_PATH_NOT_ABSOLUTE -#: Merge.rc:4918 +#: Merge.rc:4928 #, c-format msgid "Output path is not absolute: %1" msgstr "Đường dẫn đầu ra không phải là tuyệt đối: %1" #. IDS_MUST_SPECIFY_OUTPUT -#: Merge.rc:4919 +#: Merge.rc:4929 msgid "Specify an output file." msgstr "Chỉ định một tệp đầu ra." -#: Merge.rc:4921 +#: Merge.rc:4931 msgid "Cannot create patch from binary files." msgstr "Không thể tạo bản vá từ các tệp nhị phân." #. IDS_SAVEFILES_FORPATCH -#: Merge.rc:4922 +#: Merge.rc:4932 msgid "" "Save all files first.\n" "\n" @@ -7131,12 +7137,12 @@ msgstr "" "Việc tạo bản vá yêu cầu không có thay đổi nào chưa được lưu." #. IDS_FOLDER_NOTEXIST -#: Merge.rc:4923 +#: Merge.rc:4933 msgid "Folder does not exist." msgstr "Thư mục không tồn tại." #. 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" @@ -7147,37 +7153,37 @@ msgstr "" "Xem tài liệu hướng dẫn để biết về hỗ trợ lưu trữ." #. IDS_OPT_EXPORT_CAPTION -#: Merge.rc:4929 +#: Merge.rc:4939 msgid "Select file for export" msgstr "Chọn tệp để xuất" #. IDS_OPT_IMPORT_CAPTION -#: Merge.rc:4930 +#: Merge.rc:4940 msgid "Select file for import" msgstr "Chọn tệp để nhập" #. IDS_OPT_IMPORT_DONE -#: Merge.rc:4931 +#: Merge.rc:4941 msgid "Options imported from file." msgstr "Các tuỳ chọn đã được nhập từ tệp." #. IDS_OPT_EXPORT_DONE -#: Merge.rc:4932 +#: Merge.rc:4942 msgid "Options exported to file." msgstr "Các tuỳ chọn đã được xuất ra tệp." #. IDS_OPT_IMPORT_ERR -#: Merge.rc:4933 +#: Merge.rc:4943 msgid "Failed to import options from file." msgstr "Không thể nhập tuỳ chọn từ tệp." #. IDS_OPT_EXPORT_ERR -#: Merge.rc:4934 +#: Merge.rc:4944 msgid "Failed to write options to file." msgstr "Không thể ghi tuỳ chọn vào tệp." #. IDS_CLOSEALL_WINDOWS -#: Merge.rc:4935 +#: Merge.rc:4945 msgid "" "Close multiple compare windows?\n" "\n" @@ -7188,44 +7194,44 @@ msgstr "" "Tiếp tục nhé?" #. IDS_EOL_MIXED -#: Merge.rc:4944 +#: Merge.rc:4954 msgid "Mixed" msgstr "Hỗn hợp" #. IDS_EOL_BIN -#: Merge.rc:4945 +#: Merge.rc:4955 msgctxt "EOL Type" msgid "Binary" msgstr "Nhị phân" #. IDS_EOL_NONE -#: Merge.rc:4949 +#: Merge.rc:4959 msgid "None" msgstr "Không có" #. IDS_MARKER_COLOR_FMT -#: Merge.rc:4950 +#: Merge.rc:4960 #, c-format msgid "Marker Color %d" msgstr "Màu dấu mốc %d" #. IDS_MARKER_NEW_PATTERN -#: Merge.rc:4951 +#: Merge.rc:4961 msgid "New Pattern" msgstr "Mẫu mới" #. IDS_PLUGINSLIST_TYPE -#: Merge.rc:4957 +#: Merge.rc:4967 msgid "Type" msgstr "Loại" #. IDS_PLUGINS_TYPE_EDITSCRIPT -#: Merge.rc:4961 +#: Merge.rc:4971 msgid "Editor script" msgstr "Kịch bản chỉnh sửa" #. ID_SELECTLINEDIFF -#: Merge.rc:4967 +#: Merge.rc:4977 msgid "" "\n" "Difference in Current Line (F4)" @@ -7234,7 +7240,7 @@ msgstr "" "Khác biệt trong dòng hiện tại (F4)" #. ID_OPTIONS -#: Merge.rc:4968 +#: Merge.rc:4978 msgid "" "\n" "Options" @@ -7243,7 +7249,7 @@ msgstr "" "Tuỳ chọn" #. ID_REFRESH -#: Merge.rc:4969 +#: Merge.rc:4979 msgid "" "\n" "Refresh (F5)" @@ -7252,7 +7258,7 @@ msgstr "" "Làm mới (F5)" #. ID_PREVDIFF -#: Merge.rc:4975 +#: Merge.rc:4985 msgid "" "\n" "Previous Difference (Alt+Up)" @@ -7261,7 +7267,7 @@ msgstr "" "Khác biệt trước đó (Alt+Lên)" #. ID_NEXTDIFF -#: Merge.rc:4976 +#: Merge.rc:4986 msgid "" "\n" "Next Difference (Alt+Down)" @@ -7270,7 +7276,7 @@ msgstr "" "Khác biệt tiếp theo (Alt+Xuống)" #. ID_PREVCONFLICT -#: Merge.rc:4977 +#: Merge.rc:4987 msgid "" "\n" "Previous Conflict (Alt+Shift+Up)" @@ -7279,7 +7285,7 @@ msgstr "" "Xung đột trước đó (Alt+Shift+Lên)" #. ID_NEXTCONFLICT -#: Merge.rc:4978 +#: Merge.rc:4988 msgid "" "\n" "Next Conflict (Alt+Shift+Down)" @@ -7288,7 +7294,7 @@ msgstr "" "Xung đột tiếp theo (Alt+Shift+Xuống)" #. ID_FIRSTDIFF -#: Merge.rc:4983 +#: Merge.rc:4993 msgid "" "\n" "First Difference (Alt+Home)" @@ -7297,7 +7303,7 @@ msgstr "" "Khác biệt đầu tiên (Alt+Home)" #. ID_CURDIFF -#: Merge.rc:4984 +#: Merge.rc:4994 msgid "" "\n" "Current Difference (Alt+Enter)" @@ -7306,7 +7312,7 @@ msgstr "" "Khác biệt hiện tại (Alt+Enter)" #. ID_LASTDIFF -#: Merge.rc:4985 +#: Merge.rc:4995 msgid "" "\n" "Last Difference (Alt+End)" @@ -7315,7 +7321,7 @@ msgstr "" "Khác biệt cuối cùng (Alt+End)" #. ID_L2R -#: Merge.rc:4986 +#: Merge.rc:4996 msgid "" "\n" "Copy to Right (Alt+Right)" @@ -7324,7 +7330,7 @@ msgstr "" "Chép sang bên phải (Alt+Phải)" #. ID_R2L -#: Merge.rc:4987 +#: Merge.rc:4997 msgid "" "\n" "Copy to Left (Alt+Left)" @@ -7333,7 +7339,7 @@ msgstr "" "Chép sang bên trái (Alt+Trái)" #. ID_L2RNEXT -#: Merge.rc:4988 +#: Merge.rc:4998 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)" @@ -7342,7 +7348,7 @@ msgstr "" "Chép sang bên phải và tiến tiếp (Ctrl+Alt+Phải)" #. ID_R2LNEXT -#: Merge.rc:4989 +#: Merge.rc:4999 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)" @@ -7351,7 +7357,7 @@ msgstr "" "Chép sang bên trái và tiến tiếp (Ctrl+Alt+Trái)" #. ID_ALL_RIGHT -#: Merge.rc:4990 +#: Merge.rc:5000 msgid "" "\n" "Copy All to Right" @@ -7360,7 +7366,7 @@ msgstr "" "Chép tất cả sang bên phải" #. ID_ALL_LEFT -#: Merge.rc:4991 +#: Merge.rc:5001 msgid "" "\n" "Copy All to Left" @@ -7369,7 +7375,7 @@ msgstr "" "Chép tất cả sang bên trái" #. ID_AUTO_MERGE -#: Merge.rc:4992 +#: Merge.rc:5002 msgid "" "\n" "Auto Merge (Ctrl+Alt+M)" @@ -7378,7 +7384,7 @@ msgstr "" "Tự động trộn (Ctrl+Alt+M)" #. ID_FIRSTFILE -#: Merge.rc:4993 +#: Merge.rc:5003 msgid "" "\n" "First File" @@ -7387,7 +7393,7 @@ msgstr "" "Tệp đầu tiên" #. ID_NEXTFILE -#: Merge.rc:4994 +#: Merge.rc:5004 msgid "" "\n" "Next File (Ctrl+F8)" @@ -7396,7 +7402,7 @@ msgstr "" "Tệp tiếp theo (Ctrl+F8)" #. ID_LASTFILE -#: Merge.rc:4995 +#: Merge.rc:5005 msgid "" "\n" "Last File" @@ -7405,7 +7411,7 @@ msgstr "" "Tệp cuối cùng" #. ID_PREVFILE -#: Merge.rc:4996 +#: Merge.rc:5006 msgid "" "\n" "Previous File (Ctrl+F7)" @@ -7414,39 +7420,39 @@ msgstr "" "Tệp trước đó (Ctrl+F7)" #. IDS_UNPACK_AUTO -#: Merge.rc:5003 +#: Merge.rc:5013 msgid "Adapted unpacker applied to both files (one needs extension)." msgstr "" "Trình bung gói thích ứng đã áp dụng cho cả hai tệp (một tệp cần phần mở " "rộng)." #. IDS_NO_PREDIFFER -#: Merge.rc:5004 +#: Merge.rc:5014 msgid "No Prediffer (Normal)" msgstr "Không dùng trình tiền so sánh (bình thường)" #. IDS_SUGGESTED_PLUGINS -#: Merge.rc:5005 +#: Merge.rc:5015 msgid "Suggested Plugins" msgstr "Trình cắm được đề xuất" #. IDS_NOT_SUGGESTED_PLUGINS -#: Merge.rc:5006 +#: Merge.rc:5016 msgid "All Plugins" msgstr "Tất cả trình cắm" #. IDS_PRIVATEBUILD_FMT -#: Merge.rc:5012 +#: Merge.rc:5022 #, c-format msgid "Private Build: %1" msgstr "Bản dựng riêng: %1" #. IDS_CHECKFORUPDATES_UPTODATE -#: Merge.rc:5013 +#: Merge.rc:5023 msgid "Your software is up to date." msgstr "Phần mềm của bạn đã được cập nhật." -#: Merge.rc:5015 +#: Merge.rc:5025 #, c-format msgid "" "WinMerge update available.\n" @@ -7456,126 +7462,126 @@ msgstr "" "Phiên bản %1 đã sẵn sàng (bạn đang dùng %2). Có tải xuống luôn không?" #. IDS_ALLRIGHTS_RESERVED -#: Merge.rc:5016 +#: Merge.rc:5026 msgid " - All rights reserved." msgstr " - Bảo lưu mọi quyền." #. IDS_CHECKFORUPDATES_FAILED -#: Merge.rc:5021 +#: Merge.rc:5031 msgid "Failed to download latest version information" msgstr "Không thể tải thông tin phiên bản mới nhất" #. IDS_TITLE_PLUGINS_SETTINGS -#: Merge.rc:5027 +#: Merge.rc:5037 msgid "Plugin Settings" msgstr "Thiết đặt trình cắm" #. IDS_NO_SCT_SCRIPTS -#: Merge.rc:5029 +#: Merge.rc:5039 msgid "WSH not found - .sct scripts disabled" msgstr "Không tìm thấy WSH - các kịch bản .sct đã bị vô hiệu hoá" #. IDS_LOCBAR_GOTOLINE_FMT -#: Merge.rc:5037 +#: Merge.rc:5047 #, c-format msgid "G&o to Line %1" msgstr "Đi tới dòng %1" #. IDS_GOTO_MOVED_LINE -#: Merge.rc:5043 +#: Merge.rc:5053 msgid "Go to Moved Line\tCtrl+Shift+G" msgstr "Đi tới dòng đã di chuyển\tCtrl+Shift+G" #. IDS_AUTOCOMPLETE_DISABLED -#: Merge.rc:5049 +#: Merge.rc:5059 msgctxt "Options dialog|General|Open dialog Auto completion" msgid "Disabled" msgstr "Đã tắt" #. IDS_AUTOCOMPLETE_FILE_SYS -#: Merge.rc:5050 +#: Merge.rc:5060 msgid "From file system" msgstr "Từ hệ thống tệp" #. IDS_AUTOCOMPLETE_MRU -#: Merge.rc:5051 +#: Merge.rc:5061 msgid "From Most Recently Used list" msgstr "Từ danh sách dùng gần đây nhất" #. IDS_COLORSCHEME_PLAIN -#: Merge.rc:5057 +#: Merge.rc:5067 msgid "No Highlighting" msgstr "Không tô sáng" #. IDS_COLORSCHEME_BATCH -#: Merge.rc:5063 +#: Merge.rc:5073 msgid "Batch" msgstr "Lệnh theo lô (Batch)" #. IDS_COLORSCHEME_PO -#: Merge.rc:5090 +#: Merge.rc:5100 msgid "Portable Object" msgstr "Đối tượng di động (PO)" #. IDS_COLORSCHEME_RSRC -#: Merge.rc:5094 +#: Merge.rc:5104 msgid "Resources" msgstr "Tài nguyên" #. IDS_COLORSCHEME_SH -#: Merge.rc:5098 +#: Merge.rc:5108 msgid "Shell" msgstr "Hệ vỏ (shell)" #. IDS_CLOSE_LEFT_TABS -#: Merge.rc:5115 +#: Merge.rc:5125 msgid "Close &Left Tabs" msgstr "Đóng các thẻ bên trái" #. IDS_CLOSE_RIGHT_TABS -#: Merge.rc:5116 +#: Merge.rc:5126 msgid "Close R&ight Tabs" msgstr "Đóng các thẻ bên phải" #. IDS_CLOSE_OTHER_TABS -#: Merge.rc:5117 +#: Merge.rc:5127 msgid "Close &Other Tabs" msgstr "Đóng các thẻ khác" #. IDS_TABBAR_AUTO_MAXWIDTH -#: Merge.rc:5118 +#: Merge.rc:5128 msgid "Enable &Auto Max Width" msgstr "Bật tự động mở tối đa chiều rộng" #. IDS_WEBPAGE_MENU -#: Merge.rc:5128 +#: Merge.rc:5138 msgid "We&bpage" msgstr "Trang web" #. IDS_VIEW_WRAP_TEXT -#: Merge.rc:5133 +#: Merge.rc:5143 msgid "W&rap Text" msgstr "Tự &ngắt dòng văn bản" #. IDS_NOTINSTALLED -#: Merge.rc:5138 +#: Merge.rc:5148 #, c-format msgid "%1 is not installed." msgstr "%1 chưa được cài đặt." #. IDS_CREATE_FOLDER -#: Merge.rc:5143 +#: Merge.rc:5153 #, c-format msgid "%1 does not exist. Create it?" msgstr "Không tồn tại %1. Có tạo nó không?" #. IDS_CREATE_FOLDER_ERROR -#: Merge.rc:5144 +#: Merge.rc:5154 msgid "Failed to create folder." msgstr "Không thể tạo thư mục." #. IDC_EXT_EDITOR_PATH -#: Merge.rc:5149 +#: Merge.rc:5159 msgid "" "Parameters:\n" "$file: Current file path\n" @@ -7586,487 +7592,487 @@ msgstr "" "$linenum: Số dòng tại con trỏ hiện tại" #. IDS_DIFF_ALGORITHM_DEFAULT -#: Merge.rc:5154 +#: Merge.rc:5164 msgid "default" msgstr "mặc định" #. IDS_DIFF_ALGORITHM_MINIMAL -#: Merge.rc:5155 +#: Merge.rc:5165 msgid "minimal" msgstr "tối thiểu" #. IDS_DIFF_ALGORITHM_PATIENCE -#: Merge.rc:5156 +#: Merge.rc:5166 msgid "patience" msgstr "kiên nhẫn" #. IDS_DIFF_ALGORITHM_HISTOGRAM -#: Merge.rc:5157 +#: Merge.rc:5167 msgid "histogram" msgstr "biểu đồ tần suất" #. IDS_DIFF_ALGORITHM_NONE -#: Merge.rc:5158 +#: Merge.rc:5168 msgid "none" msgstr "không" #. 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 Mặc định" #. IDS_RENDERING_MODE_DIRECTWRITE_ALIASED -#: Merge.rc:5165 +#: Merge.rc:5175 msgid "DirectWrite Aliased" msgstr "DirectWrite Răng cưa" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC -#: Merge.rc:5166 +#: Merge.rc:5176 msgid "DirectWrite GDI Classic" msgstr "DirectWrite GDI Cổ điển" #. IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL -#: Merge.rc:5167 +#: Merge.rc:5177 msgid "DirectWrite GDI Natural" msgstr "DirectWrite GDI Tự nhiên" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL -#: Merge.rc:5168 +#: Merge.rc:5178 msgid "DirectWrite Natural" msgstr "DirectWrite Tự nhiên" #. IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC -#: Merge.rc:5169 +#: Merge.rc:5179 msgid "DirectWrite Natural Symmetric" msgstr "DirectWrite Tự nhiên Đối xứng" #. IDS_CLOSE_WINDOWS_WITH_ESC_DISABLED -#: Merge.rc:5174 +#: Merge.rc:5184 msgctxt "Options dialog|General|Close windows with Esc" msgid "Disabled" msgstr "Vô hiệu hoá" #. IDS_CLOSE_WINDOWS_WITH_ESC_1 -#: Merge.rc:5175 +#: Merge.rc:5185 msgid "MDI child window or main window" msgstr "Cửa sổ con MDI hoặc cửa sổ chính" #. IDS_CLOSE_WINDOWS_WITH_ESC_2 -#: Merge.rc:5176 +#: Merge.rc:5186 msgid "MDI child window only" msgstr "Chỉ cửa sổ con MDI" #. IDS_CLOSE_WINDOWS_WITH_ESC_3 -#: Merge.rc:5177 +#: Merge.rc:5187 msgid "Close main window if only one MDI child window" msgstr "Đóng cửa sổ chính nếu chỉ còn một cửa sổ con MDI" #. IDS_DIFF_GROUP -#: Merge.rc:5182 +#: Merge.rc:5192 msgctxt "ImgMergeFrame|LocationPane" msgid "Diff" msgstr "Khác biệt" #. IDS_DIFF_HIGHLIGHT -#: Merge.rc:5183 +#: Merge.rc:5193 msgctxt "ImgMergeFrame|LocationPane" msgid "Highlight" msgstr "Tô sáng" #. IDS_DIFF_BLINK -#: Merge.rc:5184 +#: Merge.rc:5194 msgctxt "ImgMergeFrame|LocationPane" msgid "Blink" msgstr "Nhấp nháy" #. IDS_DIFF_BLOCKSIZE -#: Merge.rc:5185 +#: Merge.rc:5195 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Size" msgstr "Kích cỡ khối" #. IDS_DIFF_BLOCKALPHA -#: Merge.rc:5186 +#: Merge.rc:5196 msgctxt "ImgMergeFrame|LocationPane" msgid "Block Alpha" msgstr "Am-pha khối" #. IDS_DIFF_CDTHRESHOLD -#: Merge.rc:5187 +#: Merge.rc:5197 msgctxt "ImgMergeFrame|LocationPane" msgid "CD Threshold" msgstr "Ngưỡng CD" #. IDS_DIFF_INSERTION_DELETION_DETECTION -#: Merge.rc:5188 +#: Merge.rc:5198 msgctxt "ImgMergeFrame|LocationPane" msgid "Ins/Del Detection" msgstr "Phát hiện thêm/xoá" #. IDS_OVERLAY_MODE_NONE -#: Merge.rc:5189 Merge.rc:5194 +#: Merge.rc:5199 Merge.rc:5204 msgctxt "ImgMergeFrame|LocationPane" msgid "None" msgstr "Không có" #. IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL -#: Merge.rc:5190 +#: Merge.rc:5200 msgctxt "ImgMergeFrame|LocationPane" msgid "Vertical" msgstr "Chiều dọc" #. IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL -#: Merge.rc:5191 +#: Merge.rc:5201 msgctxt "ImgMergeFrame|LocationPane" msgid "Horizontal" msgstr "Chiều ngang" #. IDS_OVERLAY_GROUP -#: Merge.rc:5192 +#: Merge.rc:5202 msgctxt "ImgMergeFrame|LocationPane" msgid "Overlay" msgstr "Lớp phủ" #. IDS_OVERLAY_ALPHA -#: Merge.rc:5193 +#: Merge.rc:5203 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha" msgstr "Am-pha" #. 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 "Pha trộn am-pha" #. IDS_OVERLAY_MODE_ALPHA_ANIMATION -#: Merge.rc:5197 +#: Merge.rc:5207 msgctxt "ImgMergeFrame|LocationPane" msgid "Alpha Animation" msgstr "Hoạt ảnh am-pha" #. IDS_ZOOM -#: Merge.rc:5198 +#: Merge.rc:5208 msgctxt "ImgMergeFrame|LocationPane" msgid "Zoom" msgstr "Thu phóng" #. IDS_PAGE -#: Merge.rc:5199 +#: Merge.rc:5209 msgctxt "ImgMergeFrame|LocationPane" msgid "Page:" msgstr "Trang:" #. IDS_IMGCMP_STATUS_PT_RGBA_FMT -#: Merge.rc:5200 +#: Merge.rc:5210 #, c-format msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) " msgstr "Điểm: (%d, %d) RGBA: (%d, %d, %d, %d) " #. IDS_IMGCMP_STATUS_DIST1_FMT -#: Merge.rc:5201 +#: Merge.rc:5211 #, c-format msgid "Dist: %g " msgstr "Kh.cách: %g " #. IDS_IMGCMP_STATUS_DIST2_FMT -#: Merge.rc:5202 +#: Merge.rc:5212 #, c-format msgid "Dist: %g, %g " msgstr "Kh.cách: %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 "Trang: %d/%d T.phóng: %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 "Đã lật: %s " #. IDS_IMGCMP_STATUS_ROTATED_FMT -#: Merge.rc:5206 +#: Merge.rc:5216 #, c-format msgid "Rotated: %d " msgstr "Đã xoay: %d " #. IDS_IMGCMP_REPORT_ALLPAGES -#: Merge.rc:5207 +#: Merge.rc:5217 msgid "All pages" msgstr "Tất cả các trang" #. 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 "Không tìm thấy khác biệt nào để chọn" #. IDS_IGNSUB_STR3 -#: Merge.rc:5214 +#: Merge.rc:5224 msgid "No differences found to add as substitution filter" msgstr "Không tìm thấy khác biệt nào để thêm vào bộ lọc thay thế" #. IDS_IGNSUB_STR4 -#: Merge.rc:5215 +#: Merge.rc:5225 msgid "The pair is already in the Substitution Filters list" msgstr "Cặp này đã có trong danh sách bộ lọc thay thế" #. IDS_IGNSUB_STR5 -#: Merge.rc:5216 +#: Merge.rc:5226 msgid "Add this change to Substitution Filters?" msgstr "Có thêm thay đổi này vào bộ lọc thay thế không?" #. IDS_OCRRESULT_TEXTONLY -#: Merge.rc:5221 +#: Merge.rc:5231 msgid "Text only" msgstr "Chỉ văn bản" #. IDS_OCRRESULT_POS_LINE -#: Merge.rc:5222 +#: Merge.rc:5232 msgid "Line-by-line position and text" msgstr "Vị trí và văn bản theo từng dòng" #. IDS_OCRRESULT_POS_WORD -#: Merge.rc:5223 +#: Merge.rc:5233 msgid "Word-by-word position and text" msgstr "Vị trí và văn bản theo từng từ" #. IDS_USERDATAFOLDER_APPDATA -#: Merge.rc:5228 +#: Merge.rc:5238 msgid "AppData (Roaming) folder" msgstr "Thư mục AppData (Roaming)" #. IDS_USERDATAFOLDER_INSTALL -#: Merge.rc:5229 +#: Merge.rc:5239 msgid "Install folder" msgstr "Thư mục cài đặt" #. IDS_USERDATAFOLDER_DOCUMENTS -#: Merge.rc:5230 +#: Merge.rc:5240 msgid "Documents folder" msgstr "Thư mục tài liệu" #. IDS_SINGLEINSTANCE_DISABLED -#: Merge.rc:5235 +#: Merge.rc:5245 msgctxt "Options dialog|General|Single instance mode" msgid "Disabled" msgstr "Đã tắt" #. IDS_SINGLEINSTANCE_STR1 -#: Merge.rc:5236 +#: Merge.rc:5246 msgid "Allow only one instance to run" msgstr "Chỉ cho phép một hiện thể chạy" #. IDS_SINGLEINSTANCE_STR2 -#: Merge.rc:5237 +#: Merge.rc:5247 msgid "Allow only one instance; wait for termination" msgstr "Chỉ cho phép một hiện thể; chờ cho đến khi kết thúc" #. IDS_AUTO_RELOAD_MODIFIED_FILES_DISABLED -#: Merge.rc:5242 +#: Merge.rc:5252 msgctxt "Options dialog|General|Auto-reload modified files" msgid "Disabled" msgstr "Đã tắt" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 -#: Merge.rc:5243 +#: Merge.rc:5253 msgid "Only on window activated" msgstr "Chỉ khi cửa sổ được kích hoạt" #. IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 -#: Merge.rc:5244 +#: Merge.rc:5254 msgid "Immediately" msgstr "Ngay lập tức" #. IDS_PLUGIN_ALL -#: Merge.rc:5249 +#: Merge.rc:5259 msgid "Al&l" msgstr "Tất cả" #. IDS_PLUGIN_OTHERS -#: Merge.rc:5250 +#: Merge.rc:5260 msgid "&Others" msgstr "&Khác" -#: Merge.rc:5252 +#: Merge.rc:5262 #, c-format msgid "Missing plugin name in pipeline: %1" msgstr "Thiếu tên trình cắm trong ống dẫn: %1" -#: Merge.rc:5254 +#: Merge.rc:5264 #, c-format msgid "Missing quote in plugin pipeline: %1" msgstr "Thiếu dấu ngoặc kép trong ống dẫn trình cắm: %1" #. IDS_PLUGIN_NAME_ALREADY_EXISTS -#: Merge.rc:5255 +#: Merge.rc:5265 #, c-format msgid "Plugin name '%1' already exists." msgstr "Tên trình cắm '%1' đã tồn tại." #. IDS_PLUGIN_TITLE1 -#: Merge.rc:5256 +#: Merge.rc:5266 msgid "Specify plugin arguments" msgstr "Chỉ định đối số trình cắm" -#: Merge.rc:5258 +#: Merge.rc:5268 #, c-format msgid "Plugin not found or invalid: %1" msgstr "Không thấy trình cắm hoặc không hợp lệ: %1" #. IDS_PLUGIN_NOT_UNPACK -#: Merge.rc:5259 +#: Merge.rc:5269 #, c-format msgid "'%1' is not an unpacker plugin" msgstr "'%1' không phải là trình cắm bung gói" #. IDS_PLUGIN_NOT_PREDIFF -#: Merge.rc:5260 +#: Merge.rc:5270 #, c-format msgid "'%1' is not a prediffer plugin" msgstr "'%1' không phải là trình cắm tiền so sánh" -#: Merge.rc:5262 +#: Merge.rc:5272 #, c-format msgid "Error prediffing '%1' with '%2'. Prediffing disabled." msgstr "" "Lỗi khi xử lí tiền so sánh '%1' với '%2'. Đã tắt tính năng tiền so sánh." #. IDS_PLUGIN_CIRCULAR_REFERENCE -#: Merge.rc:5263 +#: Merge.rc:5273 #, c-format msgid "Circular reference in plugin pipeline: %1" msgstr "Tham chiếu vòng tròn trong ống dẫn trình cắm: %1" #. IDS_PLUGIN_TYPE1 -#: Merge.rc:5264 +#: Merge.rc:5274 msgid "URL Handler" msgstr "Trình xử lý URL" #. IDS_PLUGIN_TYPE2 -#: Merge.rc:5265 +#: Merge.rc:5275 msgid "File Unpacker" msgstr "Trình bung gói tệp" #. IDS_PLUGIN_TYPE3 -#: Merge.rc:5266 +#: Merge.rc:5276 msgid "File or Folder Unpacker" msgstr "Trình bung gói tệp hoặc thư mục" #. IDS_PLUGIN_TYPE5 -#: Merge.rc:5268 +#: Merge.rc:5278 msgid "Alias for Unpacker" msgstr "Bí danh cho trình bung gói" #. IDS_PLUGIN_TYPE6 -#: Merge.rc:5269 +#: Merge.rc:5279 msgid "Alias for Prediffer" msgstr "Bí danh cho trình tiền so sánh" #. IDS_PLUGIN_TYPE7 -#: Merge.rc:5270 +#: Merge.rc:5280 msgid "Alias for Editor script" msgstr "Bí danh cho kịch bản chỉnh sửa" #. IDS_PLUGIN_ALIAS_DESC -#: Merge.rc:5271 +#: Merge.rc:5281 #, c-format msgid "Alias for plugin pipeline '%1'" msgstr "Bí danh cho ống dẫn trình cắm '%1'" #. IDS_PLUGIN_NEW_DESC -#: Merge.rc:5272 +#: Merge.rc:5282 msgid "New plugin description" msgstr "Mô tả trình cắm mới" #. IDS_PLUGIN_TARGETS_ALL -#: Merge.rc:5273 +#: Merge.rc:5283 msgid "All" msgstr "Tất cả" #. IDS_PLUGIN_TARGETS_1ST -#: Merge.rc:5274 +#: Merge.rc:5284 msgid "1st" msgstr "Thứ nhất" #. IDS_PLUGIN_TARGETS_2ND -#: Merge.rc:5275 +#: Merge.rc:5285 msgid "2nd" msgstr "Thứ 2" #. IDS_PLUGIN_TARGETS_3RD -#: Merge.rc:5276 +#: Merge.rc:5286 msgid "3rd" msgstr "Thứ 3" #. IDS_PLUGIN_TARGETS_1ST_2ND -#: Merge.rc:5277 +#: Merge.rc:5287 msgid "1st and 2nd" msgstr "Thứ nhất và thứ 2" #. IDS_PLUGIN_TARGETS_1ST_3RD -#: Merge.rc:5278 +#: Merge.rc:5288 msgid "1st and 3rd" msgstr "Thứ nhất và thứ 3" #. IDS_PLUGIN_TARGETS_2ND_3RD -#: Merge.rc:5279 +#: Merge.rc:5289 msgid "2nd and 3rd" msgstr "Thứ 2 và thứ 3" #. IDS_FILTER_APPLIED -#: Merge.rc:5284 +#: Merge.rc:5294 msgid "Filter applied" msgstr "Đã áp dụng bộ lọc" #. IDS_FILTERMENU_COMPARE -#: Merge.rc:5289 +#: Merge.rc:5299 #, c-format msgid "Compare %1" msgstr "So sánh %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 "Bảng tạm lúc %s" #. IDS_CLIPBOARDHISTORY_DISABLED -#: Merge.rc:5297 +#: Merge.rc:5307 msgid "" "Clipboard history disabled.\r\n" "Enable: Windows logo key + V, then Turn on." @@ -8074,110 +8080,115 @@ msgstr "" "Lịch sử bảng tạm đã bị tắt.\r\n" "Bật: Phím Windows + V, sau đó chọn Bật (Turn on)." -#: Merge.rc:5299 +#: Merge.rc:5309 msgid "This system does not support clipboard history." msgstr "Hệ thống này không hỗ trợ lịch sử bảng tạm." -#: Merge.rc:5301 +#: Merge.rc:5311 msgid "32-bit WinMerge does not support Clipboard Compare" msgstr "WinMerge phiên bản 32-bit không hỗ trợ So sánh bảng tạm" #. IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED -#: Merge.rc:5306 +#: Merge.rc:5316 msgid "WebView2 runtime not installed. Download it?" msgstr "Chưa cài đặt thời gian chạy (runtime) WebView2. Có tải xuống không?" #. IDS_JUMPLIST_NEW_TEXT_COMPARE -#: Merge.rc:5311 +#: Merge.rc:5321 msgid "New Text Compare" msgstr "So sánh văn bản mới" #. IDS_JUMPLIST_NEW_TABLE_COMPARE -#: Merge.rc:5312 +#: Merge.rc:5322 msgid "New Table Compare" msgstr "So sánh bảng mới" #. IDS_JUMPLIST_NEW_BINARY_COMPARE -#: Merge.rc:5313 +#: Merge.rc:5323 msgid "New Binary Compare" msgstr "So sánh nhị phân mới" #. IDS_JUMPLIST_NEW_IMAGE_COMPARE -#: Merge.rc:5314 +#: Merge.rc:5324 msgid "New Image Compare" msgstr "So sánh hình ảnh mới" #. IDS_JUMPLIST_NEW_WEBPAGE_COMPARE -#: Merge.rc:5315 +#: Merge.rc:5325 msgid "New Webpage Compare" msgstr "So sánh trang web mới" +#. 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 "So sánh bảng tạm" #. IDS_PREVIEWBAR_PRINT -#: Merge.rc:5321 +#: Merge.rc:5332 msgid "&Print..." msgstr "In..." #. IDS_PREVIEWBAR_PREVPAGE -#: Merge.rc:5323 +#: Merge.rc:5334 msgid "Pre&v Page" msgstr "Trang trước" #. IDS_PREVIEWBAR_TWOPAGE -#: Merge.rc:5324 +#: Merge.rc:5335 msgid "&Two Page" msgstr "Hai trang" #. IDS_PREVIEWBAR_ONEPAGE -#: Merge.rc:5325 +#: Merge.rc:5336 msgid "&One Page" msgstr "Một trang" #. IDS_PREVIEWBAR_ZOOMIN -#: Merge.rc:5326 +#: Merge.rc:5337 msgid "Zoom &In" msgstr "Phóng to" #. IDS_PREVIEWBAR_ZOOMOUT -#: Merge.rc:5327 +#: Merge.rc:5338 msgid "Zoom &Out" msgstr "Thu nhỏ" #. IDS_WEBPAGE_COMPARING -#: Merge.rc:5333 +#: Merge.rc:5344 msgid "Comparing..." msgstr "Đang so sánh..." #. IDS_WEBPAGE_ZOOM -#: Merge.rc:5334 +#: Merge.rc:5345 msgid "Zoom:" msgstr "Thu phóng:" #. IDS_COPY_GRANULARITY_DIFFHUNK -#: Merge.rc:5339 +#: Merge.rc:5350 msgid "Diff hunk" msgstr "Khối khác biệt" #. IDS_COPY_GRANULARITY_INLINE -#: Merge.rc:5340 +#: Merge.rc:5351 msgid "Inline diff" msgstr "Khác biệt trên dòng" #. IDS_COPY_GRANULARITY_LINE -#: Merge.rc:5341 +#: Merge.rc:5352 msgid "Line" msgstr "Dòng" -#: Merge.rc:5342 +#: Merge.rc:5353 msgid "Character" msgstr "Kí tự" #. ID_MICE_PREVDIFF -#: Merge.rc:5347 +#: Merge.rc:5358 msgid "" "\n" "Previous Difference (Alt+Up)\n" @@ -8190,7 +8201,7 @@ msgstr "" "(Alt+Cuộn lên)" #. ID_MICE_NEXTDIFF -#: Merge.rc:5348 +#: Merge.rc:5359 msgid "" "\n" "Next Difference (Alt+Down)\n" @@ -8203,7 +8214,7 @@ msgstr "" "(Alt+Cuộn xuống)" #. ID_MICE_L2R -#: Merge.rc:5349 +#: Merge.rc:5360 msgid "" "\n" "Copy to Right (Alt+Right)\n" @@ -8218,7 +8229,7 @@ msgstr "" "(Alt+Shift+Cuộn xuống)" #. ID_MICE_R2L -#: Merge.rc:5350 +#: Merge.rc:5361 msgid "" "\n" "Copy to Left (Alt+Left)\n" @@ -8233,7 +8244,7 @@ msgstr "" "(Alt+Shift+Cuộn lên)" #. ID_MICE_L2RNEXT -#: Merge.rc:5351 +#: Merge.rc:5362 msgid "" "\n" "Copy to Right and Advance (Ctrl+Alt+Right)\n" @@ -8246,7 +8257,7 @@ msgstr "" "(Ctrl+Alt+Shift+Cuộn xuống)" #. ID_MICE_R2LNEXT -#: Merge.rc:5352 +#: Merge.rc:5363 msgid "" "\n" "Copy to Left and Advance (Ctrl+Alt+Left)\n" @@ -8259,262 +8270,262 @@ msgstr "" "(Ctrl+Alt+Shift+Cuộn lên)" #. IDS_LOG_COMPARING_2 -#: Merge.rc:5362 +#: Merge.rc:5373 #, c-format msgid "Comparing %1 with %2" msgstr "Đang so sánh %1 với %2" #. IDS_LOG_COMPARING_3 -#: Merge.rc:5363 +#: Merge.rc:5374 #, c-format msgid "Comparing %1 with %2 and %3" msgstr "Đang so sánh %1 với %2 và %3" #. IDS_LOG_COMPARE_COMPLETED -#: Merge.rc:5364 +#: Merge.rc:5375 msgid "Comparison completed" msgstr "So sánh hoàn tất" #. IDS_LOG_COMPARE_ERROR_2 -#: Merge.rc:5365 +#: Merge.rc:5376 #, c-format msgid "Failed to compare %1 with %2: " msgstr "Không thể so sánh %1 với %2: " #. IDS_LOG_COMPARE_ERROR_3 -#: Merge.rc:5366 +#: Merge.rc:5377 #, c-format msgid "Failed to compare %1 with %2 and %3: " msgstr "Không thể so sánh %1 với %2 và %3: " #. IDS_LOG_FILE_SAVED -#: Merge.rc:5367 +#: Merge.rc:5378 msgid "File saved" msgstr "Tệp đã được lưu" #. IDS_LOG_COPYING_FILES -#: Merge.rc:5368 +#: Merge.rc:5379 msgid "Copying files..." msgstr "Đang sao chép các tệp..." #. IDS_LOG_MOVING_FILES -#: Merge.rc:5369 +#: Merge.rc:5380 msgid "Moving files..." msgstr "Đang di chuyển các tệp..." #. IDS_LOG_DELETING_FILES -#: Merge.rc:5370 +#: Merge.rc:5381 msgid "Deleting files..." msgstr "Đang xoá các tệp..." #. IDS_LOG_RECYCLEBIN -#: Merge.rc:5371 +#: Merge.rc:5382 msgid "Recycle Bin" msgstr "Thùng rác" #. IDS_LOG_PERMANENTLY_DELETED -#: Merge.rc:5372 +#: Merge.rc:5383 msgid "Permanently deleted" msgstr "Đã xoá vĩnh viễn" #. IDS_LOG_FILEOPERATION_COMPLETED -#: Merge.rc:5373 +#: Merge.rc:5384 msgid "File operation completed successfully" msgstr "Thao tác tệp đã hoàn thành thành công" #. IDS_LOG_FILEOPERATION_CANCELED -#: Merge.rc:5374 +#: Merge.rc:5385 msgid "File operation canceled" msgstr "Thao tác tệp đã bị huỷ" #. IDS_FILTER_ERROR_NO_ERROR -#: Merge.rc:5379 +#: Merge.rc:5390 msgid "No error" msgstr "Không có lỗi" #. IDS_FILTER_ERROR_EMPTY_EXPRESSION -#: Merge.rc:5380 +#: Merge.rc:5391 msgid "Filter expression is empty" msgstr "Biểu thức bộ lọc trống" #. IDS_FILTER_ERROR_UNKNOWN_CHAR -#: Merge.rc:5381 +#: Merge.rc:5392 msgid "Unknown character in filter expression" msgstr "Kí tự không xác định trong biểu thức bộ lọc" #. IDS_FILTER_ERROR_UNTERMINATED_STRING -#: Merge.rc:5382 +#: Merge.rc:5393 msgid "Unterminated string literal" msgstr "Chuỗi văn bản chưa được kết thúc" #. IDS_FILTER_ERROR_SYNTAX_ERROR -#: Merge.rc:5383 +#: Merge.rc:5394 msgid "Syntax error in filter expression" msgstr "Lỗi cú pháp trong biểu thức bộ lọc" #. IDS_FILTER_ERROR_PARSE_FAILURE -#: Merge.rc:5384 +#: Merge.rc:5395 msgid "Failed to parse filter expression" msgstr "Không thể phân tích cú pháp biểu thức bộ lọc" #. IDS_FILTER_ERROR_INVALID_LITERAL -#: Merge.rc:5385 +#: Merge.rc:5396 msgid "Invalid literal value" msgstr "Giá trị hằng nguyên văn không hợp lệ" #. IDS_FILTER_ERROR_INVALID_REGULAR_EXPRESSION -#: Merge.rc:5386 +#: Merge.rc:5397 msgid "Invalid regular expression" msgstr "Biểu thức chính quy không hợp lệ" #. IDS_FILTER_ERROR_UNDEFINED_IDENTIFIER -#: Merge.rc:5387 +#: Merge.rc:5398 msgid "Undefined identifier" msgstr "Định danh chưa được định nghĩa" #. IDS_FILTER_ERROR_INVALID_ARGUMENT_COUNT -#: Merge.rc:5388 +#: Merge.rc:5399 msgid "Invalid number of arguments" msgstr "Số lượng đối số không hợp lệ" #. IDS_FILTER_ERROR_FILTER_NAME_NOT_FOUND -#: Merge.rc:5389 +#: Merge.rc:5400 msgid "Filter name not found" msgstr "Không tìm thấy tên bộ lọc" #. IDS_FILTER_ERROR_DIVIDE_BY_ZERO -#: Merge.rc:5390 +#: Merge.rc:5401 msgid "Division by zero in filter expression" msgstr "Lỗi chia cho số không trong biểu thức bộ lọc" #. IDS_FILTER_ERROR_UNKNOWN_ERROR -#: Merge.rc:5391 +#: Merge.rc:5402 msgid "Unknown error" msgstr "Lỗi không xác định" #. IDS_FILTER_ERROR_INVALID_PROPERTY_NAME -#: Merge.rc:5392 +#: Merge.rc:5403 msgid "Invalid property name" msgstr "Tên thuộc tính không hợp lệ" #. 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 "Bằng" #. IDS_FILTER_OP_NOT_EQUALS -#: Merge.rc:5399 +#: Merge.rc:5410 msgid "Does not equal" msgstr "Không bằng" #. IDS_FILTER_OP_LESS_THAN -#: Merge.rc:5400 +#: Merge.rc:5411 msgid "Less than" msgstr "Nhỏ hơn" #. IDS_FILTER_OP_LESS_EQUAL -#: Merge.rc:5401 +#: Merge.rc:5412 msgid "Less than or equal to" msgstr "Nhỏ hơn hoặc bằng" #. IDS_FILTER_OP_GREATER_EQUAL -#: Merge.rc:5402 +#: Merge.rc:5413 msgid "Greater than or equal to" msgstr "Lớn hơn hoặc bằng" #. IDS_FILTER_OP_GREATER_THAN -#: Merge.rc:5403 +#: Merge.rc:5414 msgid "Greater than" msgstr "Lớn hơn" #. IDS_FILTER_OP_BETWEEN -#: Merge.rc:5404 +#: Merge.rc:5415 msgid "Between" msgstr "Ở giữa" #. IDS_FILTER_OP_NOT_BETWEEN -#: Merge.rc:5405 +#: Merge.rc:5416 msgid "Not Between" msgstr "Không ở giữa" #. IDS_FILTER_OP_CONTAINS -#: Merge.rc:5406 +#: Merge.rc:5417 msgid "Contains" msgstr "Chứa" #. IDS_FILTER_OP_NOT_CONTAINS -#: Merge.rc:5407 +#: Merge.rc:5418 msgid "Not Contains" msgstr "Không chứa" #. IDS_FILTER_OP_RECONTAINS -#: Merge.rc:5408 +#: Merge.rc:5419 msgid "Contains (regex)" msgstr "Chứa (biểu thức chính quy)" #. IDS_FILTER_OP_NOT_RECONTAINS -#: Merge.rc:5409 +#: Merge.rc:5420 msgid "Not Contains (regex)" msgstr "Không chứa (biểu thức chính quy)" #. 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 "Sáng" #. IDS_COLORMODE_DARK -#: Merge.rc:5419 +#: Merge.rc:5430 msgid "Dark" msgstr "Tối" #. IDS_COLORMODE_FOLLOWSYSTEM -#: Merge.rc:5420 +#: Merge.rc:5431 msgid "Follow system" msgstr "Theo hệ thống" #. 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 "" From bdd053d5765c48b82515c08f1904712cffed0465 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 13 Apr 2026 19:11:23 +0900 Subject: [PATCH 02/10] Update Command_line.xml --- Docs/Manual/English/Command_line.xml | 2 +- Docs/Manual/French/Command_line.xml | 4 ++-- Docs/Manual/Hebrew/Command_line.xml | 4 ++-- Docs/Manual/Italian/Command_line.xml | 7 ++++--- Docs/Manual/Japanese/Command_line.xml | 3 ++- Translations/Docs/Manual/English.pot | 4 ++-- Translations/Docs/Manual/French.po | 10 +++++----- Translations/Docs/Manual/Hebrew.po | 10 +++++----- Translations/Docs/Manual/Italian.po | 12 ++++++------ Translations/Docs/Manual/Japanese.po | 8 ++++---- 10 files changed, 33 insertions(+), 31 deletions(-) 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 7c1f00da8f5..57c19b3c05d 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..0f6844562aa 100644 --- a/Docs/Manual/Italian/Command_line.xml +++ b/Docs/Manual/Italian/Command_line.xml @@ -187,9 +187,10 @@ 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. +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/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 2048452fcff..2f9cfacfb7c 100644 --- a/Translations/Docs/Manual/French.po +++ b/Translations/Docs/Manual/French.po @@ -8,7 +8,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-15 08:05+0900\n" "Last-Translator: t3chnob0y \n" "Language-Team: French \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..fef5376a0f6 100644 --- a/Translations/Docs/Manual/Italian.po +++ b/Translations/Docs/Manual/Italian.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" @@ -934,13 +934,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, Binario, Immagine " -"o Pagina Web." +"delle parole chiave Text, Table, 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 From f02fdc69598af36c696be39f5aa7f405cb0d4948 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Tue, 14 Apr 2026 06:32:48 +0900 Subject: [PATCH 03/10] WIP --- Src/MainFrm.cpp | 103 ++++++++++++++++++++++++++++++++++++++++-------- Src/MainFrm.h | 4 +- 2 files changed, 90 insertions(+), 17 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 18581437646..1c7dc850a6e 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -857,7 +857,7 @@ bool CMainFrame::ShowAutoMergeDoc(UINT nID, IDirDoc * pDirDoc, return ShowWebDiffDoc(pDirDoc, nFiles, ifileloc, dwFlags, strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams)); case ID_MERGE_COMPARE_FOLDER: - return ShowDirDoc(pDirDoc, nFiles, ifileloc, dwFlags, + 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)); @@ -901,7 +901,7 @@ bool CMainFrame::ShowMergeDoc(UINT nID, IDirDoc* pDirDoc, strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams)); case ID_MERGE_COMPARE_FOLDER: - return ShowDirDoc(pDirDoc, nFiles, ifileloc, dwFlags, + return ShowDirDoc(nullptr, nFiles, ifileloc, dwFlags, strDesc, sReportFile, infoUnpacker, infoPrediffer, dynamic_cast(pOpenParams)); default: @@ -1184,8 +1184,86 @@ bool CMainFrame::ShowTextMergeDoc(IDirDoc* pDirDoc, int nBuffers, const String t 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*/) + const OpenFolderParams* pOpenParams /*= nullptr*/, CTempPathContext *pTempPathContext /*= nullptr*/, + std::optional bRecurse /*= false*/) { + // 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 && bRecurse.has_value() + ? *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; } @@ -1287,6 +1365,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 @@ -1560,20 +1639,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); - - const auto* pOpenFolderParams = dynamic_cast(pOpenParams); - 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 diff --git a/Src/MainFrm.h b/Src/MainFrm.h index 17ea28e32d0..d7bc52c1395 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -47,6 +47,7 @@ class CImgMergeFrame; class CWebPageDiffFrame; class DirWatcher; class COutputDoc; +class CTempPathContext; typedef std::shared_ptr TempFilePtr; @@ -213,7 +214,8 @@ class CMainFrame : public CMDIFrameWnd 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); + const OpenFolderParams* pOpenParams = nullptr, CTempPathContext* pTempPathContext = nullptr, + std::optional bRecurse = false); void UpdateTitleBarAndTabBar(); void UpdateResources(); From f58da41760fb19f493390715441684b166a4588a Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 19 Apr 2026 10:10:31 +0900 Subject: [PATCH 04/10] WIP --- Src/7zCommon.cpp | 9 ++++ Src/7zCommon.h | 2 + Src/Common/ScopeExit.h | 111 ++++++++++++++++++++++++++++++++++++++ Src/MainFrm.cpp | 15 ++++++ Src/Merge.vcxproj | 3 +- Src/Merge.vcxproj.filters | 9 ++-- 6 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 Src/Common/ScopeExit.h diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp index d82c59d27f4..3ea201491f1 100644 --- a/Src/7zCommon.cpp +++ b/Src/7zCommon.cpp @@ -732,4 +732,13 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files) return res; } +void Merge7zInit() +{ + m_Merge7z = { + { 0, 0, DllBuild_Merge7z, }, + "Merge7z\\Merge7z.dll", + "Merge7z", + nullptr + }; +} diff --git a/Src/7zCommon.h b/Src/7zCommon.h index 22691aa6d96..9b3698c4f21 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 Merge7zInit(); + 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/MainFrm.cpp b/Src/MainFrm.cpp index 1c7dc850a6e..6819063954a 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" @@ -1187,6 +1188,20 @@ bool CMainFrame::ShowDirDoc(IDirDoc * pDirDoc, int nFiles, const FileLocation fi const OpenFolderParams* pOpenParams /*= nullptr*/, CTempPathContext *pTempPathContext /*= nullptr*/, std::optional bRecurse /*= false*/) { + 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); + Merge7zInit(); + + 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) 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 From e684bdd04aaf81b743ab486a9be85b40c09f76b6 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 19 Apr 2026 13:15:51 +0900 Subject: [PATCH 05/10] Update Manual/Italian.po --- Translations/Docs/Manual/Italian.po | 16726 ++++++++------------------ 1 file changed, 5243 insertions(+), 11483 deletions(-) diff --git a/Translations/Docs/Manual/Italian.po b/Translations/Docs/Manual/Italian.po index fef5376a0f6..8b169cc8e1b 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-13 19:02+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \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 @@ -34,12 +35,9 @@ msgstr "Pubblico e ambito" #. type: Content of: <article><section><para> #: English/About_Doc.xml:10 -msgid "" -"WinMerge Help is intended for both new and experienced users. It explains " -"how to use WinMerge, and documents its capabilities and limitations." +msgid "WinMerge Help is intended for both new and experienced users. It explains how to use WinMerge, and documents its capabilities and limitations." msgstr "" -"La Guida di WinMerge è destinata sia agli utenti nuovi che a quelli esperti." -"Spiega come utilizzare WinMerge e ne documenta le capacità e i limiti." +"La Guida di WinMerge è destinata sia agli utenti nuovi che a quelli esperti.Spiega come utilizzare WinMerge e ne documenta le capacità e i limiti." #. type: Content of: <article><section><title> #: English/About_Doc.xml:16 @@ -53,12 +51,8 @@ msgstr "Gli argomenti della Guida di WinMerge vengono forniti in due forme:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/About_Doc.xml:22 -msgid "" -"Microsoft HTML Help (<filename>WinMerge.chm</filename>), located in your " -"WinMerge\\Docs installation directory." -msgstr "" -"Guida Microsoft HTML (<filename>WinMerge.chm</filename>), situata nella " -"cartella di installazione di WinMerge\\Docs." +msgid "Microsoft HTML Help (<filename>WinMerge.chm</filename>), located in your WinMerge\\Docs installation directory." +msgstr "Guida Microsoft HTML (<filename>WinMerge.chm</filename>), situata nella cartella di installazione di WinMerge\\Docs." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/About_Doc.xml:27 @@ -78,12 +72,10 @@ msgstr "Menu Guida di WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:38 msgid "" -"While using WinMerge, click <menuchoice> <guimenu>Help</guimenu> " -"<guimenuitem>WinMerge Help</guimenuitem> </menuchoice>. HTML Help opens at " -"the beginning (this topic)." +"While using WinMerge, click <menuchoice> <guimenu>Help</guimenu> <guimenuitem>WinMerge Help</guimenuitem> </menuchoice>. HTML Help opens at the " +"beginning (this topic)." msgstr "" -"Mentre usi WinMerge, fai clic su <menuchoice> <guimenu >Aiuto</guimenu > " -"<guimenuitem >Aiuto WinMerge</guimenuitem > </menuchoice >.La Guida HTML si " +"Mentre usi WinMerge, fai clic su <menuchoice> <guimenu >Aiuto</guimenu > <guimenuitem >Aiuto WinMerge</guimenuitem > </menuchoice >.La Guida HTML si " "apre all'inizio (questo argomento)." #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -94,14 +86,11 @@ msgstr "Aiuto sensibile al contesto" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:50 msgid "" -"While using any WinMerge window, press <keycap>F1</keycap>. If a specific " -"topic is available for your current window, Help opens at that topic. If " +"While using any WinMerge window, press <keycap>F1</keycap>. If a specific topic is available for your current window, Help opens at that topic. If " "not, Help opens at the beginning." msgstr "" -"Mentre usi una qualsiasi finestra WinMerge, premi <keycap>F1</keycap>.Se un " -"argomento specifico è disponibile per la finestra corrente, la Guida si apre " -"in corrispondenza di quell'argomento.In caso contrario, la Guida si aprirà " -"all'inizio." +"Mentre usi una qualsiasi finestra WinMerge, premi <keycap>F1</keycap>.Se un argomento specifico è disponibile per la finestra corrente, la Guida si " +"apre in corrispondenza di quell'argomento.In caso contrario, la Guida si aprirà all'inizio." #. type: Content of: <article><title><indexterm><primary> #: English/About_Doc.xml:57 English/Command_line.xml:6 @@ -110,12 +99,8 @@ msgstr "Riga di comando di WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:60 -msgid "" -"Use the /? or -? switch when running WinMerge from the command line. HTML " -"Help opens at the beginning." -msgstr "" -"Usa il /?O -?passare quando si esegue WinMerge dalla riga di comando.La " -"Guida HTML si apre all'inizio." +msgid "Use the /? or -? switch when running WinMerge from the command line. HTML Help opens at the beginning." +msgstr "Usa il /?O -?passare quando si esegue WinMerge dalla riga di comando.La Guida HTML si apre all'inizio." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:66 @@ -125,15 +110,11 @@ msgstr "Sito Web WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:69 msgid "" -"Open your Web browser to <ulink url=\"https://winmerge.org/\">winmerge.org</" -"ulink>. Under <ulink url=\"https://winmerge.org/docs/\">Documentation</" -"ulink>, follow the <ulink url=\"https://manual.winmerge.org/\">Manual</" -"ulink> link to the latest Help version." +"Open your Web browser to <ulink url=\"https://winmerge.org/\">winmerge.org</ulink>. Under <ulink url=\"https://winmerge.org/docs/\">Documentation</" +"ulink>, follow the <ulink url=\"https://manual.winmerge.org/\">Manual</ulink> link to the latest Help version." msgstr "" -"Apri il tuo browser Web su <ulink url=\"https://winmerge.org/\">winmerge." -"org</ulink>.In <ulink url=\"https://winmerge.org/docs/\">Documentazione</" -"ulink>, segui il collegamento <ulink url=\"https://manual.winmerge.org/" -"\">Manuale</ulink> alla versione più recente della Guida." +"Apri il tuo browser Web su <ulink url=\"https://winmerge.org/\">winmerge.org</ulink>.In <ulink url=\"https://winmerge.org/docs/\">Documentazione</" +"ulink>, segui il collegamento <ulink url=\"https://manual.winmerge.org/\">Manuale</ulink> alla versione più recente della Guida." #. type: Content of: <article><section><title> #: English/About_Doc.xml:80 @@ -143,9 +124,7 @@ msgstr "Come utilizzare la Guida" #. type: Content of: <article><section><para> #: English/About_Doc.xml:82 msgid "Please read the following topics to learn essential WinMerge basics," -msgstr "" -"Si prega di leggere i seguenti argomenti per apprendere le basi essenziali " -"di WinMerge," +msgstr "Si prega di leggere i seguenti argomenti per apprendere le basi essenziali di WinMerge," #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:87 @@ -155,9 +134,7 @@ msgstr "<xref linkend=\"Quick_start\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:90 msgid "Gets you quickly started with WinMerge and shows its basic usage." -msgstr "" -"Ti consente di iniziare rapidamente con WinMerge e ne mostra l'utilizzo di " -"base." +msgstr "Ti consente di iniziare rapidamente con WinMerge e ne mostra l'utilizzo di base." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:96 @@ -166,12 +143,8 @@ msgstr "<xref linkend=\"Compare_dirs\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:99 -msgid "" -"Explains the folder comparison window, available operations, and customizing " -"the results display." -msgstr "" -"Spiega la finestra di confronto delle cartelle, le operazioni disponibili e " -"la personalizzazione della visualizzazione dei risultati." +msgid "Explains the folder comparison window, available operations, and customizing the results display." +msgstr "Spiega la finestra di confronto delle cartelle, le operazioni disponibili e la personalizzazione della visualizzazione dei risultati." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:105 @@ -180,12 +153,8 @@ msgstr "<xref linkend=\"Compare_files\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:108 -msgid "" -"Explains the file comparison/merge window, available operations, methods of " -"navigation, and modes." -msgstr "" -"Spiega la finestra di confronto/unione dei file, le operazioni disponibili, " -"i metodi di navigazione e le modalità." +msgid "Explains the file comparison/merge window, available operations, methods of navigation, and modes." +msgstr "Spiega la finestra di confronto/unione dei file, le operazioni disponibili, i metodi di navigazione e le modalità." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:114 @@ -234,18 +203,13 @@ msgstr "<xref linkend=\"Configuration\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:149 -msgid "" -"Explains how to customize WinMerge, including handling whitespace, colours, " -"and text encoding." -msgstr "" -"Spiega come personalizzare WinMerge, inclusa la gestione degli spazi " -"bianchi, dei colori e della codifica del testo." +msgid "Explains how to customize WinMerge, including handling whitespace, colours, and text encoding." +msgstr "Spiega come personalizzare WinMerge, inclusa la gestione degli spazi bianchi, dei colori e della codifica del testo." #. type: Content of: <article><section><para> #: English/About_Doc.xml:155 msgid "To learn about WinMerge in more detail, read these topics:" -msgstr "" -"Per conoscere WinMerge in modo più dettagliato, leggi questi argomenti:" +msgstr "Per conoscere WinMerge in modo più dettagliato, leggi questi argomenti:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:159 @@ -255,12 +219,10 @@ msgstr "<xref linkend=\"Open_paths\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:162 msgid "" -"Introduces several ways to open files and folders in WinMerge - there are " -"many! For example, do you know how to use the Shell Extension context menu " +"Introduces several ways to open files and folders in WinMerge - there are many! For example, do you know how to use the Shell Extension context menu " "in advanced mode?" msgstr "" -"Presenta diversi modi per aprire file e cartelle in WinMerge: ce ne sono " -"molti!Ad esempio, sai come utilizzare il menu contestuale dell'estensione " +"Presenta diversi modi per aprire file e cartelle in WinMerge: ce ne sono molti!Ad esempio, sai come utilizzare il menu contestuale dell'estensione " "della shell in modalità avanzata?" #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -270,12 +232,8 @@ msgstr "<xref linkend=\"Plugins\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:172 -msgid "" -"Describes the optional, extra features that you can add to WinMerge using " -"its plugin mechanism." -msgstr "" -"Descrive le funzionalità extra opzionali che puoi aggiungere a WinMerge " -"utilizzando il suo meccanismo di plug-in." +msgid "Describes the optional, extra features that you can add to WinMerge using its plugin mechanism." +msgstr "Descrive le funzionalità extra opzionali che puoi aggiungere a WinMerge utilizzando il suo meccanismo di plug-in." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:178 @@ -284,12 +242,8 @@ msgstr "<xref linkend=\"Filters\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:181 -msgid "" -"Explains how to control what is compared in the folder or file comparison " -"window." -msgstr "" -"Spiega come controllare cosa viene confrontato nella finestra di confronto " -"di cartelle o file." +msgid "Explains how to control what is compared in the folder or file comparison window." +msgstr "Spiega come controllare cosa viene confrontato nella finestra di confronto di cartelle o file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:187 @@ -298,12 +252,8 @@ msgstr "<xref linkend=\"Command_line\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:190 -msgid "" -"Lists command-line parameters for using WinMerge with other tools or from a " -"script." -msgstr "" -"Elenca i parametri della riga di comando per l'utilizzo di WinMerge con " -"altri strumenti o da uno script." +msgid "Lists command-line parameters for using WinMerge with other tools or from a script." +msgstr "Elenca i parametri della riga di comando per l'utilizzo di WinMerge con altri strumenti o da uno script." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:196 @@ -318,13 +268,11 @@ msgstr "Contiene le risposte a molte domande comuni poste agli sviluppatori." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:202 msgid "" -"Before submitting questions to <ulink url=\"https://github.com/WinMerge/" -"winmerge/\">GitHub</ulink>, please check the <xref linkend=\"Faq\" /> topic " +"Before submitting questions to <ulink url=\"https://github.com/WinMerge/winmerge/\">GitHub</ulink>, please check the <xref linkend=\"Faq\" /> topic " "first to see if your question is answered there." msgstr "" -"Prima di inviare domande a <ulink url=\"https://github.com/WinMerge/winmerge/" -"\">GitHub</ulink>, controlla prima l'argomento <xref linkend=\"Faq\" /> per " -"vedere se la tua domanda trova la risposta lì." +"Prima di inviare domande a <ulink url=\"https://github.com/WinMerge/winmerge/\">GitHub</ulink>, controlla prima l'argomento <xref linkend=\"Faq\" /> " +"per vedere se la tua domanda trova la risposta lì." #. type: Content of: <article><section><title><indexterm><primary> #: English/About_Doc.xml:213 @@ -334,8 +282,7 @@ msgstr "convenzioni, documentazione" #. type: Content of: <article><section><title> #: English/About_Doc.xml:212 msgid "Documentation conventions<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Convenzioni sulla documentazione<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Convenzioni sulla documentazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><section><section><example><title> #: English/About_Doc.xml:220 English/Filters.xml:737 @@ -355,9 +302,7 @@ msgstr "Inserisci <userinput>UTF-8</userinput> nel campo." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:228 msgid "Click the <guibutton>Browse</guibutton> button to navigate to the path." -msgstr "" -"Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il " -"percorso." +msgstr "Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il percorso." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:230 @@ -387,12 +332,10 @@ msgstr "Premi <keycombo> <keycap>Ctrl</keycap> <keycap>O</keycap> </keycombo>" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:252 msgid "" -"<wordasword>Press</wordasword> indicates a keyboard action. In this " -"example, press the <keycap>Ctrl</keycap> and <keycap>O</keycap> keys in " +"<wordasword>Press</wordasword> indicates a keyboard action. In this example, press the <keycap>Ctrl</keycap> and <keycap>O</keycap> keys in " "combination." msgstr "" -"<wordasword>Premere</wordasword> indica un'azione da tastiera.In questo " -"esempio, premi i tasti <keycap>Ctrl</keycap> e <keycap>O</keycap> in " +"<wordasword>Premere</wordasword> indica un'azione da tastiera.In questo esempio, premi i tasti <keycap>Ctrl</keycap> e <keycap>O</keycap> in " "combinazione." #. type: Content of: <article><section><section><orderedlist><listitem><para> @@ -402,51 +345,35 @@ msgstr "Fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:260 -msgid "" -"Click indicates a left mouse click on an object, such as a menu item or " -"button." -msgstr "" -"Fare clic indica un clic con il tasto sinistro del mouse su un oggetto, ad " -"esempio una voce di menu o un pulsante." +msgid "Click indicates a left mouse click on an object, such as a menu item or button." +msgstr "Fare clic indica un clic con il tasto sinistro del mouse su un oggetto, ad esempio una voce di menu o un pulsante." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:265 -msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" -"menuchoice>." -msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" -"guimenuitem > </menuchoice >." +msgid "Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>." +msgstr "Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:271 msgid "" -"The arrow indicates menu navigation. In the example, you choose the " -"<guimenuitem>Open</guimenuitem> item in the WinMerge <guimenu>File</guimenu> " +"The arrow indicates menu navigation. In the example, you choose the <guimenuitem>Open</guimenuitem> item in the WinMerge <guimenu>File</guimenu> " "menu ." msgstr "" -"La freccia indica la navigazione nel menu.Nell'esempio, scegli la voce " -"<guimenuitem >Apri</guimenuitem > nel menu <guimenu >File</guimenu > di " +"La freccia indica la navigazione nel menu.Nell'esempio, scegli la voce <guimenuitem >Apri</guimenuitem > nel menu <guimenu >File</guimenu > di " "WinMerge." #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/About_Doc.xml:277 English/Quick_start.xml:293 -msgid "" -"Right-click the row and choose the <guimenuitem>Compare</guimenuitem> " -"shortcut." -msgstr "" -"Fai clic con il tasto destro sulla riga e scegli la scorciatoia <guimenuitem " -">Confronta</guimenuitem >." +msgid "Right-click the row and choose the <guimenuitem>Compare</guimenuitem> shortcut." +msgstr "Fai clic con il tasto destro sulla riga e scegli la scorciatoia <guimenuitem >Confronta</guimenuitem >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:280 msgid "" -"Click the right mouse button on an object to open its context menu, and then " -"either left-click or right-click the indicated item in the context menu." +"Click the right mouse button on an object to open its context menu, and then either left-click or right-click the indicated item in the context menu." msgstr "" -"Fare clic con il pulsante destro del mouse su un oggetto per aprire il " -"relativo menu contestuale, quindi fare clic con il pulsante sinistro o " -"destro del mouse sull'elemento indicato nel menu contestuale." +"Fare clic con il pulsante destro del mouse su un oggetto per aprire il relativo menu contestuale, quindi fare clic con il pulsante sinistro o destro " +"del mouse sull'elemento indicato nel menu contestuale." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:286 @@ -455,21 +382,13 @@ msgstr "Inserisci <replaceable>file di opzioni</replaceable>.ini" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:286 -msgid "" -"Use the <guilabel>Filter</guilabel> field to eliminate files from the " -"operation." -msgstr "" -"Usa il campo <guilabel >Filtro</guilabel > per eliminare i file " -"dall'operazione." +msgid "Use the <guilabel>Filter</guilabel> field to eliminate files from the operation." +msgstr "Usa il campo <guilabel >Filtro</guilabel > per eliminare i file dall'operazione." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:288 -msgid "" -"One or more consecutive different lines form one difference (or " -"<glossterm>diff</glossterm>)." -msgstr "" -"Una o più linee diverse consecutive formano una differenza (o " -"<glossterm>diff</glossterm>)." +msgid "One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>)." +msgstr "Una o più linee diverse consecutive formano una differenza (o <glossterm>diff</glossterm>)." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:291 @@ -479,12 +398,10 @@ msgstr "Il testo in corsivo può rappresentare:" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><itemizedlist><listitem><para> #: English/About_Doc.xml:293 msgid "" -"A replaceable value or string. In the first example, you would substitute a " -"real file name for the italicized term, but enter the <filename>ini</" +"A replaceable value or string. In the first example, you would substitute a real file name for the italicized term, but enter the <filename>ini</" "filename> file extension, which is not italicized, as written." msgstr "" -"Un valore o una stringa sostituibile.Nel primo esempio, sostituiresti il ​​" -"termine in corsivo con un nome file reale, ma inseriresti l'estensione file " +"Un valore o una stringa sostituibile.Nel primo esempio, sostituiresti il ​​termine in corsivo con un nome file reale, ma inseriresti l'estensione file " "<filename>ini</filename>, che non è in corsivo, come scritto." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><itemizedlist><listitem><para> @@ -499,12 +416,8 @@ msgstr "Una parola o frase significativa che viene introdotta." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:311 -msgid "" -"The path <envar>%WORKDIR%\\project1</envar> is expanded to <filename " -"class=\"directory\">C:\\workfiles\\project1</filename>." -msgstr "" -"Il percorso <envar>%WORKDIR%\\project1</envar> viene espanso in <filename " -"class=\"directory\">C:\\workfiles\\project1</filename>." +msgid "The path <envar>%WORKDIR%\\project1</envar> is expanded to <filename class=\"directory\">C:\\workfiles\\project1</filename>." +msgstr "Il percorso <envar>%WORKDIR%\\project1</envar> viene espanso in <filename class=\"directory\">C:\\workfiles\\project1</filename>." #. type: Content of: <article><section><section><example><para><screen> #: English/About_Doc.xml:314 English/Configuration.xml:619 @@ -513,12 +426,10 @@ msgid "TwoWords" msgstr "Due parole" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para> -#: English/About_Doc.xml:313 English/Filters.xml:1606 English/Filters.xml:1617 -#: English/Filters.xml:1766 English/Filters.xml:1772 English/Filters.xml:1788 -#: English/Filters.xml:1795 English/Filters.xml:1814 English/Filters.xml:1818 -#: English/Filters.xml:1822 English/Filters.xml:1828 English/Filters.xml:1839 -#: English/Filters.xml:1843 English/Filters.xml:1851 English/Filters.xml:1855 -#: English/Intro_diffs.xml:62 English/Intro_diffs.xml:71 +#: English/About_Doc.xml:313 English/Filters.xml:1606 English/Filters.xml:1617 English/Filters.xml:1766 English/Filters.xml:1772 +#: English/Filters.xml:1788 English/Filters.xml:1795 English/Filters.xml:1814 English/Filters.xml:1818 English/Filters.xml:1822 English/Filters.xml:1828 +#: English/Filters.xml:1839 English/Filters.xml:1843 English/Filters.xml:1851 English/Filters.xml:1855 English/Intro_diffs.xml:62 +#: English/Intro_diffs.xml:71 msgid "<placeholder type=\"screen\" id=\"0\"/>" msgstr "<placeholder type=\"screen\" id=\"0\"/>" @@ -550,60 +461,45 @@ msgstr "Informazioni immesse in un modulo o nella riga di comando" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><cmdsynopsis> #: English/About_Doc.xml:338 msgid "" -"<command moreinfo=\"none\">command</command> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>inputpath</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><replaceable>outputpath</replaceable></arg>" +"<command moreinfo=\"none\">command</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>inputpath</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>outputpath</replaceable></arg>" msgstr "" -"<command moreinfo=\"none\">comando</command> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>percorso di input</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><replaceable>percorso di output</" -"replaceable></arg>" +"<command moreinfo=\"none\">comando</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>percorso di input</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><replaceable>percorso di output</replaceable></arg>" #. type: Content of: <article><para> -#: English/About_Doc.xml:337 English/Command_line.xml:18 -#: English/Command_line.xml:24 +#: English/About_Doc.xml:337 English/Command_line.xml:18 English/Command_line.xml:24 msgid "<placeholder type=\"cmdsynopsis\" id=\"0\"/>" msgstr "<placeholder type=\"cmdsynopsis\" id=\"0\"/>" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:347 msgid "" -"In syntax lines, brackets indicate optional elements. In this example, you " -"must enter an input path with the command; you can enter an output path, but " -"the command is valid without it." +"In syntax lines, brackets indicate optional elements. In this example, you must enter an input path with the command; you can enter an output path, " +"but the command is valid without it." msgstr "" -"Nelle righe di sintassi, le parentesi indicano elementi opzionali.In questo " -"esempio è necessario inserire un percorso di input con il comando;puoi " +"Nelle righe di sintassi, le parentesi indicano elementi opzionali.In questo esempio è necessario inserire un percorso di input con il comando;puoi " "inserire un percorso di output, ma il comando è valido senza di esso." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:4 English/Command_line.xml:8 -#: English/Filters.xml:102 English/Filters.xml:1443 English/Open_paths.xml:369 +#: English/Command_line.xml:4 English/Command_line.xml:8 English/Filters.xml:102 English/Filters.xml:1443 English/Open_paths.xml:369 #: English/Quick_start.xml:205 msgid "command line" msgstr "riga di comando" #. type: Content of: <article><title> #: English/Command_line.xml:3 -msgid "" -"Command line<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Riga di comando<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>" +msgid "Command line<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Riga di comando<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><para> #: English/Command_line.xml:11 msgid "" -"The WinMerge command line accepts several parameters in addition to the " -"paths to compare. Most of these parameters are intended for using WinMerge " -"as an external compare application or starting a compare operation from a " -"batch file." +"The WinMerge command line accepts several parameters in addition to the paths to compare. Most of these parameters are intended for using WinMerge as " +"an external compare application or starting a compare operation from a batch file." msgstr "" -"La riga di comando WinMerge accetta diversi parametri oltre ai percorsi da " -"confrontare.La maggior parte di questi parametri sono destinati all'utilizzo " -"di WinMerge come applicazione di confronto esterna o all'avvio di " -"un'operazione di confronto da un file batch." +"La riga di comando WinMerge accetta diversi parametri oltre ai percorsi da confrontare.La maggior parte di questi parametri sono destinati " +"all'utilizzo di WinMerge come applicazione di confronto esterna o all'avvio di un'operazione di confronto da un file batch." #. type: Content of: <article><para> #: English/Command_line.xml:16 @@ -612,161 +508,87 @@ msgstr "Utilizza uno di questi formati per il comando WinMerge:" #. type: Content of: <article><para><cmdsynopsis> #: English/Command_line.xml:19 -msgid "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?" -"</option></arg>" -msgstr "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?" -"</option></arg>" +msgid "<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?</option></arg>" +msgstr "<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?</option></arg>" #. type: Content of: <article><para><cmdsynopsis> #: English/Command_line.xml:25 msgid "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/" -"r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</option></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/f</option> <replaceable>filter</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> " -"<replaceable>compare-method</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/t</option> <replaceable>window-type</replaceable></" -"arg> <arg><option>/x</option></arg> <arg><option>/xq</option></arg> " -"<arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/" -"s-</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ul</option></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ur</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/wl</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/wr</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/self-compare</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> " -"<arg><option>/minimize</option></arg> <arg><option>/maximize</option></arg> " -"<arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/fm</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/l</option> <replaceable>linenumber</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " -"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimiter</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> " -"<replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</option> " -"<replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option> " -"<replaceable>unpacker-name</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/prediffer</option> <replaceable>prediffer-name</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cp</option> " -"<replaceable>codepage</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/fileext</option> <replaceable>file-extension</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</" -"option> <replaceable>name=value</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/inifile</option> <replaceable>inifile</" -"replaceable></arg> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg " -"cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> " -"<arg choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " -"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/or</option> <replaceable>reportpath</replaceable></" -"arg>" -msgstr "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/" -"r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</option></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/f</option> <replaceable>filtro</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> " -"<replaceable>metodo di confronto</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/t</option><replaceable>tipo finestra</" -"replaceable></arg> <arg><option>/x</option></arg> <arg><option>/xq</option></" -"arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> " -"<arg><option>/s-</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" -"minimize</option></arg> <arg><option>/maximize</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/fm</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/l</option><replaceable>numero di " -"linea</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</" -"option> <replaceable>charpos</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/table-delimiter</option> " -"<replaceable>delimitatore</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dm</option> " -"<replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/dr</option><replaceable>rightdesc</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/am</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/noninteractive</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignoreblanklines</option></arg> " -"<arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option><replaceable>nome-" -"unpacker</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/" -"prediffer</option> <replaceable>nome-prediffer</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" -"option> <replaceable>estensione file</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/cfg</option> <replaceable>nome=valore</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</" -"option><replaceable>fileini</replaceable></arg> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg " -"cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> " -"<arg choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " -"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/o</option> <replaceable>reportpath</replaceable></" -"arg>" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</" +"option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/f</option> " +"<replaceable>filter</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> <replaceable>compare-method</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/t</option> <replaceable>window-type</replaceable></arg> <arg><option>/x</option></arg> <arg><option>/xq</" +"option></arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/s-</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" +"minimize</option></arg> <arg><option>/maximize</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/fm</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/l</option> <replaceable>linenumber</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " +"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimiter</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</option> " +"<replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option> <replaceable>unpacker-name</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/prediffer</option> <replaceable>prediffer-name</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" +"option> <replaceable>file-extension</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</option> <replaceable>name=value</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</option> <replaceable>inifile</replaceable></arg> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> <arg " +"choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " +"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/or</option> <replaceable>reportpath</replaceable></arg>" +msgstr "" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</" +"option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/f</option> " +"<replaceable>filtro</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> <replaceable>metodo di confronto</replaceable></arg> " +"<arg choice=\"opt\" rep=\"norepeat\"><option>/t</option><replaceable>tipo finestra</replaceable></arg> <arg><option>/x</option></arg> <arg><option>/" +"xq</option></arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/s-</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" +"minimize</option></arg> <arg><option>/maximize</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/fm</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/l</option><replaceable>numero di linea</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " +"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimitatore</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</" +"option><replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option><replaceable>nome-unpacker</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/prediffer</option> <replaceable>nome-prediffer</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" +"option> <replaceable>estensione file</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</option> <replaceable>nome=valore</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</option><replaceable>fileini</replaceable></arg> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> <arg " +"choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " +"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> <replaceable>reportpath</replaceable></arg>" #. type: Content of: <article><cmdsynopsis> #: English/Command_line.xml:162 -msgid "" -"<command>WinMergeU</command> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>conflictfile</replaceable></arg>" -msgstr "" -"<command>WinMergeU</command> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>conflittofile</replaceable></arg>" +msgid "<command>WinMergeU</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>conflictfile</replaceable></arg>" +msgstr "<command>WinMergeU</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>conflittofile</replaceable></arg>" #. type: Content of: <article><para> #: English/Command_line.xml:168 msgid "" -"Entering the command with no parameters or pathnames simply opens the " -"WinMerge window. Parameters are prefixed with either a forward slash " -"( <literal>/</literal> ) or dash ( <literal>-</literal> ) character. " -"Pathnames have no prefix character." +"Entering the command with no parameters or pathnames simply opens the WinMerge window. Parameters are prefixed with either a forward slash " +"( <literal>/</literal> ) or dash ( <literal>-</literal> ) character. Pathnames have no prefix character." msgstr "" -"L'immissione del comando senza parametri o nomi di percorso apre " -"semplicemente la finestra WinMerge.I parametri sono preceduti da una barra " -"( <literal>/</literal> ) o da un trattino ( <literal>-</literal> ).I nomi " -"dei percorsi non hanno caratteri di prefisso." +"L'immissione del comando senza parametri o nomi di percorso apre semplicemente la finestra WinMerge.I parametri sono preceduti da una barra " +"( <literal>/</literal> ) o da un trattino ( <literal>-</literal> ).I nomi dei percorsi non hanno caratteri di prefisso." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:175 @@ -779,9 +601,7 @@ msgid "Opens WinMerge Help at this topic." msgstr "Apre la Guida di WinMerge in questo argomento." #. type: Content of: <article><section><section><title><indexterm><seealso> -#: English/Command_line.xml:183 English/Compare_dirs.xml:54 -#: English/Compare_dirs.xml:254 English/Open_paths.xml:288 -#: English/Open_paths.xml:294 +#: English/Command_line.xml:183 English/Compare_dirs.xml:54 English/Compare_dirs.xml:254 English/Open_paths.xml:288 English/Open_paths.xml:294 msgid "recursive folder compare" msgstr "confronto ricorsivo di cartelle" @@ -793,19 +613,14 @@ msgstr "<option>/r</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:187 msgid "" -"Compares all files in all subfolders (recursive compare). Unique folders " -"(occurring only on one side) are listed in the compare result as separate " -"items. Note that including subfolders can increase compare time " -"significantly. Without this parameter, WinMerge lists only files and " -"subfolders at the top level of the two target folders. It does not compare " -"the subfolders." +"Compares all files in all subfolders (recursive compare). Unique folders (occurring only on one side) are listed in the compare result as separate " +"items. Note that including subfolders can increase compare time significantly. Without this parameter, WinMerge lists only files and subfolders at " +"the top level of the two target folders. It does not compare the subfolders." msgstr "" -"Confronta tutti i file in tutte le sottocartelle (confronto ricorsivo).Le " -"cartelle univoche (presenti solo su un lato) sono elencate nel risultato del " -"confronto come elementi separati.Tieni presente che l'inclusione di " -"sottocartelle può aumentare significativamente il tempo di confronto.Senza " -"questo parametro, WinMerge elenca solo i file e le sottocartelle al livello " -"superiore delle due cartelle di destinazione.Non confronta le sottocartelle." +"Confronta tutti i file in tutte le sottocartelle (confronto ricorsivo).Le cartelle univoche (presenti solo su un lato) sono elencate nel risultato " +"del confronto come elementi separati.Tieni presente che l'inclusione di sottocartelle può aumentare significativamente il tempo di confronto.Senza " +"questo parametro, WinMerge elenca solo i file e le sottocartelle al livello superiore delle due cartelle di destinazione.Non confronta le " +"sottocartelle." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> #: English/Command_line.xml:198 @@ -820,17 +635,14 @@ msgstr "<option>/r-</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:202 msgid "" -"Compares all files within the specified folders but excludes the files and " -"subfolders within its subfolders. This allows for a shorter comparison time." +"Compares all files within the specified folders but excludes the files and subfolders within its subfolders. This allows for a shorter comparison " +"time." msgstr "" -"Confronta tutti i file all'interno delle cartelle specificate ma esclude i " -"file e le sottocartelle all'interno delle relative sottocartelle.Ciò " +"Confronta tutti i file all'interno delle cartelle specificate ma esclude i file e le sottocartelle all'interno delle relative sottocartelle.Ciò " "consente un tempo di confronto più breve." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:210 English/Command_line.xml:294 -#: English/Command_line.xml:417 English/Configuration.xml:277 -#: English/Quick_start.xml:22 +#: English/Command_line.xml:210 English/Command_line.xml:294 English/Command_line.xml:417 English/Configuration.xml:277 English/Quick_start.xml:22 msgid "WinMerge window" msgstr "Finestra WinMerge" @@ -847,31 +659,24 @@ msgstr "<option>/e</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:216 msgid "" -"Enables you to close WinMerge with a single <keycap>Esc</keycap> key press. " -"This is useful when you use WinMerge as an external compare application: you " -"can close WinMerge quickly, like a dialog. Without this parameter, you might " -"have to press <keycap>Esc</keycap> multiple times to close all its windows." +"Enables you to close WinMerge with a single <keycap>Esc</keycap> key press. This is useful when you use WinMerge as an external compare application: " +"you can close WinMerge quickly, like a dialog. Without this parameter, you might have to press <keycap>Esc</keycap> multiple times to close all its " +"windows." msgstr "" -"Ti consente di chiudere WinMerge con la semplice pressione del tasto " -"<keycap>Esc</keycap>.Ciò è utile quando usi WinMerge come applicazione di " -"confronto esterna: puoi chiudere WinMerge rapidamente, come una finestra di " -"dialogo.Senza questo parametro, potresti dover premere <keycap>Esc</keycap> " -"più volte per chiudere tutte le finestre." +"Ti consente di chiudere WinMerge con la semplice pressione del tasto <keycap>Esc</keycap>.Ciò è utile quando usi WinMerge come applicazione di " +"confronto esterna: puoi chiudere WinMerge rapidamente, come una finestra di dialogo.Senza questo parametro, potresti dover premere <keycap>Esc</" +"keycap> più volte per chiudere tutte le finestre." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:226 English/Configuration.xml:820 -#: English/Configuration.xml:848 English/Configuration.xml:871 -#: English/Filters.xml:4 English/Filters.xml:87 English/Filters.xml:91 -#: English/Filters.xml:133 English/Filters.xml:1297 English/Filters.xml:1301 -#: English/Filters.xml:1628 English/Filters.xml:1632 English/Filters.xml:1735 -#: English/Filters.xml:1862 English/Filters.xml:1866 English/Filters.xml:1878 +#: English/Command_line.xml:226 English/Configuration.xml:820 English/Configuration.xml:848 English/Configuration.xml:871 English/Filters.xml:4 +#: English/Filters.xml:87 English/Filters.xml:91 English/Filters.xml:133 English/Filters.xml:1297 English/Filters.xml:1301 English/Filters.xml:1628 +#: English/Filters.xml:1632 English/Filters.xml:1735 English/Filters.xml:1862 English/Filters.xml:1866 English/Filters.xml:1878 #: English/Open_paths.xml:91 msgid "filters" msgstr "filtri" #. type: Content of: <article><variablelist><varlistentry><indexterm><secondary> -#: English/Command_line.xml:227 English/Command_line.xml:243 -#: English/Command_line.xml:259 +#: English/Command_line.xml:227 English/Command_line.xml:243 English/Command_line.xml:259 msgid "applying in command line" msgstr "applicandolo nella riga di comando" @@ -883,15 +688,11 @@ msgstr "<option>/f</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:232 msgid "" -"Applies a specified filter to restrict the comparison. The filter can be a " -"filemask like <filename><userinput>*.h *.cpp</userinput></filename>, or the " -"name of a file filter like <userinput>XML/HTML Devel</userinput>. Add " -"quotation marks around a filter mask or name that contains spaces." +"Applies a specified filter to restrict the comparison. The filter can be a filemask like <filename><userinput>*.h *.cpp</userinput></filename>, or " +"the name of a file filter like <userinput>XML/HTML Devel</userinput>. Add quotation marks around a filter mask or name that contains spaces." msgstr "" -"Applica un filtro specificato per limitare il confronto.Il filtro può essere " -"una maschera di file come <filename><userinput>*.h *.cpp</userinput></" -"filename>, o il nome di un filtro di file come <userinput>XML/HTML Devel</" -"userinput>.Aggiungi virgolette attorno a una maschera di filtro o a un nome " +"Applica un filtro specificato per limitare il confronto.Il filtro può essere una maschera di file come <filename><userinput>*.h *.cpp</userinput></" +"filename>, o il nome di un filtro di file come <userinput>XML/HTML Devel</userinput>.Aggiungi virgolette attorno a una maschera di filtro o a un nome " "che contiene spazi." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> @@ -907,16 +708,12 @@ msgstr "<option>/m <replaceable>metodo di confronto</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:248 msgid "" -"Sets the compare method to use for the comparison. This can be one of the " -"keywords <userinput>Full</userinput>, <userinput>Quick</userinput>, " -"<userinput>Binary</userinput>, <userinput>Date</userinput>, " -"<userinput>SizeDate</userinput>, <userinput>Size</userinput> or " -"<userinput>Existence</userinput>." +"Sets the compare method to use for the comparison. This can be one of the keywords <userinput>Full</userinput>, <userinput>Quick</userinput>, " +"<userinput>Binary</userinput>, <userinput>Date</userinput>, <userinput>SizeDate</userinput>, <userinput>Size</userinput> or <userinput>Existence</" +"userinput>." msgstr "" -"Imposta il metodo di confronto da utilizzare per il confronto.Può essere una " -"delle parole chiave <userinput>Full</userinput>, <userinput>Quick</" -"userinput>, <userinput>Binary</userinput>, <userinput>Date</userinput>, " -"<userinput>SizeDate</userinput>, <userinput>Size</userinput> o " +"Imposta il metodo di confronto da utilizzare per il confronto.Può essere una delle parole chiave <userinput>Full</userinput>, <userinput>Quick</" +"userinput>, <userinput>Binary</userinput>, <userinput>Date</userinput>, <userinput>SizeDate</userinput>, <userinput>Size</userinput> o " "<userinput>Existence</userinput>." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> @@ -932,15 +729,11 @@ msgstr "<option>/t <replaceable>tipo di finestra</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:264 msgid "" -"Specifies the type of window in which to display files. This can be one of " -"the keywords <userinput>Text</userinput>, <userinput>Table</userinput>, " -"<userinput>Binary</userinput>, <userinput>Image</userinput>, " -"<userinput>Webpage</userinput> or <userinput>Folder</userinput>." +"Specifies the type of window in which to display files. This can be one of the keywords <userinput>Text</userinput>, <userinput>Table</userinput>, " +"<userinput>Binary</userinput>, <userinput>Image</userinput>, <userinput>Webpage</userinput> or <userinput>Folder</userinput>." msgstr "" -"Specifica il tipo di finestra in cui visualizzare i file.Può essere una " -"delle parole chiave <userinput>Text</userinput>, <userinput>Table</" -"userinput>, <userinput>Binary</userinput>, <userinput>Image</userinput> , " -"<userinput>Webpage</userinput> o <userinput>Folder</userinput>." +"Specifica il tipo di finestra in cui visualizzare i file. Può essere una delle parole chiave <userinput>Text</userinput>, <userinput>Table</" +"userinput>, <userinput>Binary</userinput>, <userinput>Image</userinput>, <userinput>Webpage</userinput> o <userinput>Folder</userinput>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:272 @@ -950,19 +743,13 @@ msgstr "<option>/x</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:274 msgid "" -"Closes WinMerge (after displaying an information dialog) when you start a " -"comparison of identical files. The parameter has no effect after the " -"comparison, for example if the files become identical as a result of merging " -"or editing. This parameter is useful when you use WinMerge as an external " -"compare application, or when you want to eliminate unnecessary steps by " -"ignoring files that don't have any differences." -msgstr "" -"Chiude WinMerge (dopo aver visualizzato una finestra di dialogo informativa) " -"quando si avvia un confronto di file identici.Dopo il confronto il parametro " -"non ha alcun effetto, ad esempio se i file diventano identici in seguito " -"alla fusione o alla modifica.Questo parametro è utile quando si utilizza " -"WinMerge come applicazione di confronto esterna o quando si desidera " -"eliminare passaggi non necessari ignorando i file che non presentano " +"Closes WinMerge (after displaying an information dialog) when you start a comparison of identical files. The parameter has no effect after the " +"comparison, for example if the files become identical as a result of merging or editing. This parameter is useful when you use WinMerge as an " +"external compare application, or when you want to eliminate unnecessary steps by ignoring files that don't have any differences." +msgstr "" +"Chiude WinMerge (dopo aver visualizzato una finestra di dialogo informativa) quando si avvia un confronto di file identici.Dopo il confronto il " +"parametro non ha alcun effetto, ad esempio se i file diventano identici in seguito alla fusione o alla modifica.Questo parametro è utile quando si " +"utilizza WinMerge come applicazione di confronto esterna o quando si desidera eliminare passaggi non necessari ignorando i file che non presentano " "differenze." #. type: Content of: <article><variablelist><varlistentry><term> @@ -972,11 +759,8 @@ msgstr "<option>/xq</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:287 -msgid "" -"Is similar to <option>/x</option> but does not show the message about " -"identical files." -msgstr "" -"È simile a <option>/x</option> ma non mostra il messaggio sui file identici." +msgid "Is similar to <option>/x</option> but does not show the message about identical files." +msgstr "È simile a <option>/x</option> ma non mostra il messaggio sui file identici." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Command_line.xml:295 English/Configuration.xml:279 @@ -991,16 +775,12 @@ msgstr "<option>/s</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:300 msgid "" -"Limits WinMerge windows to a single instance. For example, if WinMerge is " -"already running, a new compare opens in the same instance. Without this " -"parameter, multiple windows are allowed: depending on other settings, a new " -"compare might open in the existing window or in a new window." +"Limits WinMerge windows to a single instance. For example, if WinMerge is already running, a new compare opens in the same instance. Without this " +"parameter, multiple windows are allowed: depending on other settings, a new compare might open in the existing window or in a new window." msgstr "" -"Limita le finestre WinMerge a una singola istanza.Ad esempio, se WinMerge è " -"già in esecuzione, nella stessa istanza si apre un nuovo confronto.Senza " -"questo parametro sono consentite più finestre: a seconda delle altre " -"impostazioni, un nuovo confronto potrebbe aprirsi nella finestra esistente o " -"in una nuova finestra." +"Limita le finestre WinMerge a una singola istanza.Ad esempio, se WinMerge è già in esecuzione, nella stessa istanza si apre un nuovo confronto.Senza " +"questo parametro sono consentite più finestre: a seconda delle altre impostazioni, un nuovo confronto potrebbe aprirsi nella finestra esistente o in " +"una nuova finestra." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:309 @@ -1009,12 +789,8 @@ msgstr "<option>/sw</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:311 -msgid "" -"Limit the WinMerge window to one instance as well as the option /s. " -"However, it waits for the instance displaying the window to terminate." -msgstr "" -"Limita la finestra WinMerge a un'istanza e all'opzione /s.Tuttavia, attende " -"che l'istanza che visualizza la finestra termini." +msgid "Limit the WinMerge window to one instance as well as the option /s. However, it waits for the instance displaying the window to terminate." +msgstr "Limita la finestra WinMerge a un'istanza e all'opzione /s.Tuttavia, attende che l'istanza che visualizza la finestra termini." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:318 @@ -1023,16 +799,11 @@ msgstr "<option>/s-</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:320 -msgid "" -"Ensure that another instance is always executed, ignoring the value of the " -"\"Allow only one instance to run\" option." -msgstr "" -"Assicurati che venga sempre eseguita un'altra istanza, ignorando il valore " -"dell'opzione \"Consenti l'esecuzione di una sola istanza\"." +msgid "Ensure that another instance is always executed, ignoring the value of the \"Allow only one instance to run\" option." +msgstr "Assicurati che venga sempre eseguita un'altra istanza, ignorando il valore dell'opzione \"Consenti l'esecuzione di una sola istanza\"." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> -#: English/Command_line.xml:327 English/Configuration.xml:430 -#: English/Faq.xml:114 +#: English/Command_line.xml:327 English/Configuration.xml:430 English/Faq.xml:114 msgid "MRU list" msgstr "Elenco MRU" @@ -1044,14 +815,11 @@ msgstr "<option>/ul</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:332 msgid "" -"Prevents WinMerge from adding the left path to the Most Recently Used (MRU) " -"list. External applications should not add paths to the MRU list in the " +"Prevents WinMerge from adding the left path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " "Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso sinistro all'elenco dei " -"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " -"o cartelle." +"Impedisce a WinMerge di aggiungere il percorso sinistro all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:339 @@ -1061,14 +829,11 @@ msgstr "<option>/um</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:341 msgid "" -"Prevents WinMerge from adding the middle path to the Most Recently Used " -"(MRU) list. External applications should not add paths to the MRU list in " -"the Select Files or Folders dialog." +"Prevents WinMerge from adding the middle path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " +"Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso intermedio all'elenco dei " -"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " -"o cartelle." +"Impedisce a WinMerge di aggiungere il percorso intermedio all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:348 @@ -1078,14 +843,11 @@ msgstr "<option>/ur</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:350 msgid "" -"Prevents WinMerge from adding the right path to the Most Recently Used (MRU) " -"list. External applications should not add paths to the MRU list in the " +"Prevents WinMerge from adding the right path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " "Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso corretto all'elenco dei " -"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " -"o cartelle." +"Impedisce a WinMerge di aggiungere il percorso corretto all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:357 @@ -1095,18 +857,14 @@ msgstr "<option>/u</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:359 msgid "" -"Prevents WinMerge from adding either path (left or right) to the Most " -"Recently Used (MRU) list. External applications should not add paths to the " -"MRU list in the Select Files or Folders dialog." +"Prevents WinMerge from adding either path (left or right) to the Most Recently Used (MRU) list. External applications should not add paths to the MRU " +"list in the Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso (sinistro o destro) " -"all'elenco Utilizzati più di recente (MRU).Le applicazioni esterne non " -"devono aggiungere percorsi all'elenco MRU nella finestra di dialogo " -"Seleziona file o cartelle." +"Impedisce a WinMerge di aggiungere il percorso (sinistro o destro) all'elenco Utilizzati più di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><section><section><title><indexterm><see> -#: English/Command_line.xml:368 English/Compare_dirs.xml:741 -#: English/Compare_dirs.xml:745 +#: English/Command_line.xml:368 English/Compare_dirs.xml:741 English/Compare_dirs.xml:745 msgid "protecting files" msgstr "proteggere i file" @@ -1117,12 +875,8 @@ msgstr "<option>/wl</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:373 -msgid "" -"Opens the left side as read-only. Use this when you don't want to change " -"left side items in the compare." -msgstr "" -"Apre il lato sinistro in sola lettura.Utilizzalo quando non desideri " -"modificare gli elementi sul lato sinistro nel confronto." +msgid "Opens the left side as read-only. Use this when you don't want to change left side items in the compare." +msgstr "Apre il lato sinistro in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato sinistro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:379 @@ -1131,12 +885,8 @@ msgstr "<option>/wm</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:381 -msgid "" -"Opens the middle side as read-only. Use this when you don't want to change " -"right side items in the compare." -msgstr "" -"Apre il lato centrale in sola lettura.Utilizzalo quando non desideri " -"modificare gli elementi sul lato destro nel confronto." +msgid "Opens the middle side as read-only. Use this when you don't want to change right side items in the compare." +msgstr "Apre il lato centrale in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato destro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:387 @@ -1145,12 +895,8 @@ msgstr "<option>/wr</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:389 -msgid "" -"Opens the right side as read-only. Use this when you don't want to change " -"right side items in the compare." -msgstr "" -"Apre il lato destro in sola lettura.Utilizzalo quando non desideri " -"modificare gli elementi sul lato destro nel confronto." +msgid "Opens the right side as read-only. Use this when you don't want to change right side items in the compare." +msgstr "Apre il lato destro in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato destro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:395 @@ -1194,12 +940,8 @@ msgstr "<option>/minimizza</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:423 -msgid "" -"Starts WinMerge as a minimized window. This option can be useful during " -"lengthy compares." -msgstr "" -"Avvia WinMerge come finestra ridotta a icona.Questa opzione può essere utile " -"durante lunghi confronti." +msgid "Starts WinMerge as a minimized window. This option can be useful during lengthy compares." +msgstr "Avvia WinMerge come finestra ridotta a icona.Questa opzione può essere utile durante lunghi confronti." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:429 @@ -1259,23 +1001,18 @@ msgstr "<option>/c <replaceable>charpos</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:467 msgid "Specifies a character position to jump to after loading the files." -msgstr "" -"Specifica la posizione del carattere a cui passare dopo aver caricato i file." +msgstr "Specifica la posizione del carattere a cui passare dopo aver caricato i file." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:472 msgid "<option>/table-delimiter <replaceable>delimiter</replaceable></option>" -msgstr "" -"<option>/table-delimiter <replaceable>delimitatore</replaceable></option>" +msgstr "<option>/table-delimiter <replaceable>delimitatore</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:474 -msgid "" -"Specifies a delimiter character for table editing. To specify a tab " -"character, specify \"tab\", \"\\t\", or \"\\x09\"." +msgid "Specifies a delimiter character for table editing. To specify a tab character, specify \"tab\", \"\\t\", or \"\\x09\"." msgstr "" -"Specifica un carattere delimitatore per la modifica della tabella.Per " -"specificare un carattere di tabulazione, specificare \"tab\", \"\\t\" o " +"Specifica un carattere delimitatore per la modifica della tabella.Per specificare un carattere di tabulazione, specificare \"tab\", \"\\t\" o " "\"\\x09\"." #. type: Content of: <article><variablelist><varlistentry><term> @@ -1286,16 +1023,12 @@ msgstr "<option>/dl</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:481 msgid "" -"Specifies a description in the left side title bar, overriding the default " -"folder or filename text. For example: <userinput>/dl \"Version 1.0</" -"userinput>\" or <userinput>/dl WorkingCopy</userinput>. Use quotation marks " -"around descriptions that contain spaces." +"Specifies a description in the left side title bar, overriding the default folder or filename text. For example: <userinput>/dl \"Version 1.0</" +"userinput>\" or <userinput>/dl WorkingCopy</userinput>. Use quotation marks around descriptions that contain spaces." msgstr "" -"Specifica una descrizione nella barra del titolo sul lato sinistro, " -"sovrascrivendo il testo della cartella o del nome file predefinito.Ad " -"esempio: <userinput>/dl \"Versione 1.0</userinput>\" o <userinput>/dl " -"WorkingCopy</userinput>.Utilizzare le virgolette attorno alle descrizioni " -"che contengono spazi." +"Specifica una descrizione nella barra del titolo sul lato sinistro, sovrascrivendo il testo della cartella o del nome file predefinito.Ad esempio: " +"<userinput>/dl \"Versione 1.0</userinput>\" o <userinput>/dl WorkingCopy</userinput>.Utilizzare le virgolette attorno alle descrizioni che contengono " +"spazi." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:490 @@ -1304,12 +1037,8 @@ msgstr "<option>/dm</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:492 -msgid "" -"Specifies a description in the middle side title bar, just like <option>/dl</" -"option>." -msgstr "" -"Specifica una descrizione nella barra del titolo centrale, proprio come " -"<option>/dl</option>." +msgid "Specifies a description in the middle side title bar, just like <option>/dl</option>." +msgstr "Specifica una descrizione nella barra del titolo centrale, proprio come <option>/dl</option>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:498 @@ -1318,12 +1047,8 @@ msgstr "<option>/dr</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:500 -msgid "" -"Specifies a description in the right side title bar, just like <option>/dl</" -"option>." -msgstr "" -"Specifica una descrizione nella barra del titolo sul lato destro, proprio " -"come <option>/dl</option>." +msgid "Specifies a description in the right side title bar, just like <option>/dl</option>." +msgstr "Specifica una descrizione nella barra del titolo sul lato destro, proprio come <option>/dl</option>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:506 @@ -1363,14 +1088,11 @@ msgstr "<option>/non interattivo</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:530 msgid "" -"Runs WinMerge without displaying message boxes during comparison or report " -"generation. The process terminates automatically when the operation is " +"Runs WinMerge without displaying message boxes during comparison or report generation. The process terminates automatically when the operation is " "complete, making it suitable for batch or scripted execution." msgstr "" -"Esegue WinMerge senza visualizzare finestre di messaggio durante il " -"confronto o la generazione di report.Il processo termina automaticamente al " -"termine dell'operazione, rendendolo adatto all'esecuzione batch o tramite " -"script." +"Esegue WinMerge senza visualizzare finestre di messaggio durante il confronto o la generazione di report.Il processo termina automaticamente al " +"termine dell'operazione, rendendolo adatto all'esecuzione batch o tramite script." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:538 @@ -1379,12 +1101,8 @@ msgstr "<option>/noprefs</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:541 -msgid "" -"Runs WinMerge without loading or saving settings from the registry. All " -"comparisons use default preferences only." -msgstr "" -"Esegue WinMerge senza caricare o salvare le impostazioni dal registro.Tutti " -"i confronti utilizzano solo le preferenze predefinite." +msgid "Runs WinMerge without loading or saving settings from the registry. All comparisons use default preferences only." +msgstr "Esegue WinMerge senza caricare o salvare le impostazioni dal registro.Tutti i confronti utilizzano solo le preferenze predefinite." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:548 @@ -1393,12 +1111,8 @@ msgstr "<option>/enableexitcode</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:550 -msgid "" -"Sets the comparison result to the process exit code. 0: identical, 1: " -"different, 2: error" -msgstr "" -"Imposta il risultato del confronto sul codice di uscita del processo.0: " -"identico, 1: diverso, 2: errore" +msgid "Sets the comparison result to the process exit code. 0: identical, 1: different, 2: error" +msgstr "Imposta il risultato del confronto sul codice di uscita del processo.0: identico, 1: diverso, 2: errore" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:555 @@ -1407,33 +1121,23 @@ msgstr "<option>/ignora</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:557 -msgid "" -"Controls the \"Whitespaces\" option (whitespace comparison settings) " -"persistently:" -msgstr "" -"Controlla l'opzione \"Spazi bianchi\" (impostazioni di confronto degli spazi " -"bianchi) in modo persistente:" +msgid "Controls the \"Whitespaces\" option (whitespace comparison settings) persistently:" +msgstr "Controlla l'opzione \"Spazi bianchi\" (impostazioni di confronto degli spazi bianchi) in modo persistente:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:559 msgid "<option>/ignorews:0</option> - do not ignore whitespace differences." -msgstr "" -"<option>/ignorews:0</option> - non ignora le differenze di spazi bianchi." +msgstr "<option>/ignorews:0</option> - non ignora le differenze di spazi bianchi." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:560 -msgid "" -"<option>/ignorews</option> or <option>/ignorews:1</option> - ignore " -"differences in the amount of whitespace." -msgstr "" -"<option>/ignorews</option> o <option>/ignorews:1</option>: ignora le " -"differenze nella quantità di spazi bianchi." +msgid "<option>/ignorews</option> or <option>/ignorews:1</option> - ignore differences in the amount of whitespace." +msgstr "<option>/ignorews</option> o <option>/ignorews:1</option>: ignora le differenze nella quantità di spazi bianchi." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:561 msgid "<option>/ignorews:2</option> - ignore all whitespace characters." -msgstr "" -"<option>/ignorews:2</option> - ignora tutti i caratteri di spazio bianco." +msgstr "<option>/ignorews:2</option> - ignora tutti i caratteri di spazio bianco." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:567 @@ -1448,18 +1152,12 @@ msgstr "Controlla in modo persistente l'opzione \"Ignora righe vuote\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:571 msgid "<option>/ignoreblanklines:0</option> - disables ignoring blank lines." -msgstr "" -"<option>/ignoreblanklines:0</option> - disabilita l'ignoranza delle righe " -"vuote." +msgstr "<option>/ignoreblanklines:0</option> - disabilita l'ignoranza delle righe vuote." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:572 -msgid "" -"<option>/ignoreblanklines</option> or <option>/ignoreblanklines:1</option> - " -"enables ignoring blank lines." -msgstr "" -"<option>/ignoreblanklines</option> o <option>/ignoreblanklines:1</option> - " -"consente di ignorare le righe vuote." +msgid "<option>/ignoreblanklines</option> or <option>/ignoreblanklines:1</option> - enables ignoring blank lines." +msgstr "<option>/ignoreblanklines</option> o <option>/ignoreblanklines:1</option> - consente di ignorare le righe vuote." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:578 @@ -1469,24 +1167,17 @@ msgstr "<option>/ignorecase</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:580 msgid "Controls the \"Ignore case\" option persistently:" -msgstr "" -"Controlla l'opzione \"Ignora maiuscole e minuscole\" in modo persistente:" +msgstr "Controlla l'opzione \"Ignora maiuscole e minuscole\" in modo persistente:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:582 msgid "<option>/ignorecase:0</option> - disables ignoring case differences." -msgstr "" -"<option>/ignorecase:0</option> - disabilita l'ignoranza delle differenze tra " -"maiuscole e minuscole." +msgstr "<option>/ignorecase:0</option> - disabilita l'ignoranza delle differenze tra maiuscole e minuscole." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:583 -msgid "" -"<option>/ignorecase</option> or <option>/ignorecase:1</option> - enables " -"ignoring case differences." -msgstr "" -"<option>/ignorecase</option> o <option>/ignorecase:1</option> - consente di " -"ignorare le differenze tra maiuscole e minuscole." +msgid "<option>/ignorecase</option> or <option>/ignorecase:1</option> - enables ignoring case differences." +msgstr "<option>/ignorecase</option> o <option>/ignorecase:1</option> - consente di ignorare le differenze tra maiuscole e minuscole." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:589 @@ -1501,17 +1192,12 @@ msgstr "Controlla in modo persistente l'opzione \"Ignora differenze EOL\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:593 msgid "<option>/ignoreeol:0</option> - disables ignoring EOL differences." -msgstr "" -"<option>/ignoreeol:0</option> - disabilita l'ignoranza delle differenze EOL." +msgstr "<option>/ignoreeol:0</option> - disabilita l'ignoranza delle differenze EOL." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:594 -msgid "" -"<option>/ignoreeol</option> or <option>/ignoreeol:1</option> - enables " -"ignoring EOL differences." -msgstr "" -"<option>/ignoreeol</option> o <option>/ignoreeol:1</option> - consente di " -"ignorare le differenze EOL." +msgid "<option>/ignoreeol</option> or <option>/ignoreeol:1</option> - enables ignoring EOL differences." +msgstr "<option>/ignoreeol</option> o <option>/ignoreeol:1</option> - consente di ignorare le differenze EOL." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:600 @@ -1521,25 +1207,17 @@ msgstr "<option>/ignorecodepage</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:602 msgid "Controls the \"Ignore codepage differences\" option persistently:" -msgstr "" -"Controlla in modo persistente l'opzione \"Ignora differenze tabella codici\":" +msgstr "Controlla in modo persistente l'opzione \"Ignora differenze tabella codici\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:604 -msgid "" -"<option>/ignorecodepage:0</option> - disables ignoring codepage differences." -msgstr "" -"<option>/ignorecodepage:0</option> - disabilita l'ignoranza delle differenze " -"nella tabella codici." +msgid "<option>/ignorecodepage:0</option> - disables ignoring codepage differences." +msgstr "<option>/ignorecodepage:0</option> - disabilita l'ignoranza delle differenze nella tabella codici." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:605 -msgid "" -"<option>/ignorecodepage</option> or <option>/ignorecodepage:1</option> - " -"enables ignoring codepage differences." -msgstr "" -"<option>/ignorecodepage</option> o <option>/ignorecodepage:1</option>: " -"consente di ignorare le differenze nella tabella codici." +msgid "<option>/ignorecodepage</option> or <option>/ignorecodepage:1</option> - enables ignoring codepage differences." +msgstr "<option>/ignorecodepage</option> o <option>/ignorecodepage:1</option>: consente di ignorare le differenze nella tabella codici." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:611 @@ -1549,53 +1227,37 @@ msgstr "<option>/ignorecomments</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:613 msgid "Controls the \"Ignore comment differences\" option persistently:" -msgstr "" -"Controlla in modo persistente l'opzione \"Ignora differenze commenti\":" +msgstr "Controlla in modo persistente l'opzione \"Ignora differenze commenti\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:615 msgid "<option>/ignorecomments:0</option> - disables ignoring comments." -msgstr "" -"<option>/ignorecomments:0</option> - disabilita l'ignoranza dei commenti." +msgstr "<option>/ignorecomments:0</option> - disabilita l'ignoranza dei commenti." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:616 -msgid "" -"<option>/ignorecomments</option> or <option>/ignorecomments:1</option> - " -"enables ignoring comments." -msgstr "" -"<option>/ignorecomments</option> o <option>/ignorecomments:1</option> - " -"consente di ignorare i commenti." +msgid "<option>/ignorecomments</option> or <option>/ignorecomments:1</option> - enables ignoring comments." +msgstr "<option>/ignorecomments</option> o <option>/ignorecomments:1</option> - consente di ignorare i commenti." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:622 msgid "<option>/unpacker <replaceable>plugin pipeline</replaceable></option>" -msgstr "" -"<option>/unpacker <replaceable>pipeline di plugin</replaceable></option>" +msgstr "<option>/unpacker <replaceable>pipeline di plugin</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:625 -msgid "" -"Specifies the plugin pipeline for the Unpacker plugin. Example: <option>/" -"unpacker \"SortAscending|SelectLines 1-10\"</option>" -msgstr "" -"Specifica la pipeline del plugin per il plugin Unpacker.Esempio: <option>/" -"unpacker \"SortAscending|SelectLines 1-10\"</option>" +msgid "Specifies the plugin pipeline for the Unpacker plugin. Example: <option>/unpacker \"SortAscending|SelectLines 1-10\"</option>" +msgstr "Specifica la pipeline del plugin per il plugin Unpacker.Esempio: <option>/unpacker \"SortAscending|SelectLines 1-10\"</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:632 msgid "<option>/prediffer <replaceable>plugin pipeline</replaceable></option>" -msgstr "" -"<option>/prediffer <replaceable>pipeline di plug-in</replaceable></option>" +msgstr "<option>/prediffer <replaceable>pipeline di plug-in</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:635 -msgid "" -"Specifies the plugin pipeline for the Prediffer plugin. Example: <option>/" -"prediffer \"IgnoreColumns 1-10\"</option>" -msgstr "" -"Specifica la pipeline del plug-in per il plug-in Prediffer.Esempio: <option>/" -"prediffer \"IgnoraColonne 1-10\"</option>" +msgid "Specifies the plugin pipeline for the Prediffer plugin. Example: <option>/prediffer \"IgnoreColumns 1-10\"</option>" +msgstr "Specifica la pipeline del plug-in per il plug-in Prediffer.Esempio: <option>/prediffer \"IgnoraColonne 1-10\"</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:642 @@ -1604,12 +1266,8 @@ msgstr "<option>/cp <replaceable>codepage</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:645 -msgid "" -"Specifies the codepage to use for file comparison. Example: <option>/cp " -"65001</option>" -msgstr "" -"Specifica la tabella codici da utilizzare per il confronto dei file.Esempio: " -"<option>/cp 65001</option>" +msgid "Specifies the codepage to use for file comparison. Example: <option>/cp 65001</option>" +msgstr "Specifica la tabella codici da utilizzare per il confronto dei file.Esempio: <option>/cp 65001</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:652 @@ -1619,9 +1277,7 @@ msgstr "<option>/fileext <replaceable>estensione file</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:654 msgid "Specifies a file extension for determining syntax hightliting." -msgstr "" -"Specifica un'estensione di file per determinare l'evidenziazione della " -"sintassi." +msgstr "Specifica un'estensione di file per determinare l'evidenziazione della sintassi." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:659 @@ -1631,8 +1287,7 @@ msgstr "<option>/cfg <replaceable>nome=valore</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:662 msgid "Sets a configuration value in the WinMerge registry or INI file." -msgstr "" -"Imposta un valore di configurazione nel registro WinMerge o nel file INI." +msgstr "Imposta un valore di configurazione nel registro WinMerge o nel file INI." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:665 @@ -1641,12 +1296,8 @@ msgstr "Esempio: <option>/cfg Impostazioni/DiffAlgorithm=3</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:668 -msgid "" -"If the section name is unambiguous and does not conflict with other setting " -"names, it can be omitted:" -msgstr "" -"Se il nome della sezione non è ambiguo e non è in conflitto con altri nomi " -"di impostazioni, può essere omesso:" +msgid "If the section name is unambiguous and does not conflict with other setting names, it can be omitted:" +msgstr "Se il nome della sezione non è ambiguo e non è in conflitto con altri nomi di impostazioni, può essere omesso:" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:671 @@ -1656,15 +1307,11 @@ msgstr "<option>/cfg DiffAlgo=3</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:674 msgid "" -"Note: This entry does not explain which configuration names are available. " -"For a list of settings, refer to " -"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> " -"in regedit." +"Note: This entry does not explain which configuration names are available. For a list of settings, refer to " +"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> in regedit." msgstr "" -"Nota: questa voce non spiega quali nomi di configurazione sono disponibili." -"Per un elenco delle impostazioni, fare riferimento a " -"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> " -"in regedit." +"Nota: questa voce non spiega quali nomi di configurazione sono disponibili.Per un elenco delle impostazioni, fare riferimento a " +"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> in regedit." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:681 @@ -1674,9 +1321,7 @@ msgstr "<option><replaceable>percorso a sinistra</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:683 msgid "Specifies the folder, file or project file to open on the left side." -msgstr "" -"Specifica la cartella, il file o il file di progetto da aprire sul lato " -"sinistro." +msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato sinistro." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:688 @@ -1686,9 +1331,7 @@ msgstr "<option><replaceable>percorso intermedio</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:690 msgid "Specifies the folder, file or project file to open on the middle side." -msgstr "" -"Specifica la cartella, il file o il file di progetto da aprire sul lato " -"centrale." +msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato centrale." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:695 @@ -1698,38 +1341,28 @@ msgstr "<option><replaceable>rightpath</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:697 msgid "Specifies the folder, file or project file to open on the right side." -msgstr "" -"Specifica la cartella, il file o il file di progetto da aprire sul lato " -"destro." +msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato destro." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:699 msgid "" -"WinMerge cannot compare files to folders, so the path parameters " -"(<option><replaceable>leftpath</replaceable></option>, " -"<option><replaceable>middlepath</replaceable></option> and " -"<option><replaceable>rightpath</replaceable></option>) must point to the " -"same target type (either folders or files). If WinMerge cannot find either " -"of the specified paths, it opens the Select Files or Folders dialog, where " -"you can browse for the correct paths." -msgstr "" -"WinMerge non può confrontare file con cartelle, quindi i parametri del " -"percorso (<option ><replaceable>leftpath</replaceable></option>, " -"<option><replaceable>middlepath</replaceable></option> e " -"<option><replaceable>rightpath</replaceable></option>) devono puntare allo " -"stesso tipo di destinazione (cartelle o file).Se WinMerge non riesce a " -"trovare nessuno dei percorsi specificati, apre la finestra di dialogo " -"Seleziona file o cartelle, dove è possibile cercare i percorsi corretti." +"WinMerge cannot compare files to folders, so the path parameters (<option><replaceable>leftpath</replaceable></option>, " +"<option><replaceable>middlepath</replaceable></option> and <option><replaceable>rightpath</replaceable></option>) must point to the same target type " +"(either folders or files). If WinMerge cannot find either of the specified paths, it opens the Select Files or Folders dialog, where you can browse " +"for the correct paths." +msgstr "" +"WinMerge non può confrontare file con cartelle, quindi i parametri del percorso (<option ><replaceable>leftpath</replaceable></option>, " +"<option><replaceable>middlepath</replaceable></option> e <option><replaceable>rightpath</replaceable></option>) devono puntare allo stesso tipo di " +"destinazione (cartelle o file).Se WinMerge non riesce a trovare nessuno dei percorsi specificati, apre la finestra di dialogo Seleziona file o " +"cartelle, dove è possibile cercare i percorsi corretti." #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:708 msgid "" -"In file comparisons, you can specify a folder name in one of the path " -"parameters, as long as the folder contains a file with the same name as the " -"one specified in the other, file path." +"In file comparisons, you can specify a folder name in one of the path parameters, as long as the folder contains a file with the same name as the one " +"specified in the other, file path." msgstr "" -"Nei confronti di file, è possibile specificare il nome di una cartella in " -"uno dei parametri del percorso, purché la cartella contenga un file con lo " +"Nei confronti di file, è possibile specificare il nome di una cartella in uno dei parametri del percorso, purché la cartella contenga un file con lo " "stesso nome di quello specificato nell'altro percorso file." #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> @@ -1739,33 +1372,22 @@ msgstr "Ad esempio, considera questo comando:" #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:714 -msgid "" -"<userinput>WinMergeU <filename>C:\\Folder\\File.txt</filename> <filename " -"class=\"directory\">C:\\Folder2</filename> </userinput>" -msgstr "" -"<userinput>WinMergeU <filename>C:\\Cartella\\File.txt</filename> <filename " -"class=\"directory\">C:\\Cartella2</filename> </userinput>" +msgid "<userinput>WinMergeU <filename>C:\\Folder\\File.txt</filename> <filename class=\"directory\">C:\\Folder2</filename> </userinput>" +msgstr "<userinput>WinMergeU <filename>C:\\Cartella\\File.txt</filename> <filename class=\"directory\">C:\\Cartella2</filename> </userinput>" #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:717 msgid "" -"If <filename class=\"directory\">C:\\Folder2</filename> contains a file " -"named <filename>File.txt</filename>: WinMerge implicitly resolves the second " -"path as a file specification, and compares the two files. Of course, the " -"command is invalid if <filename class=\"directory\">C:\\Folder2</filename> " -"does <emphasis>not</emphasis> contain a file named <filename>File.txt</" -"filename>." +"If <filename class=\"directory\">C:\\Folder2</filename> contains a file named <filename>File.txt</filename>: WinMerge implicitly resolves the second " +"path as a file specification, and compares the two files. Of course, the command is invalid if <filename class=\"directory\">C:\\Folder2</filename> " +"does <emphasis>not</emphasis> contain a file named <filename>File.txt</filename>." msgstr "" -"Se <filename class=\"directory\">C:\\Folder2</filename> contiene un file " -"denominato <filename>File.txt</filename>: WinMerge risolve implicitamente il " -"secondo percorso come specifica di file e confronta i due file. " -"Naturalmente, il comando non è valido se <filename class=\"directory\">C:" -"\\Folder2</filename> <emphasis>non</emphasis> contiene un file chiamato " -"<filename>File.txt</filename>." +"Se <filename class=\"directory\">C:\\Folder2</filename> contiene un file denominato <filename>File.txt</filename>: WinMerge risolve implicitamente il " +"secondo percorso come specifica di file e confronta i due file. Naturalmente, il comando non è valido se <filename class=\"directory\">C:\\Folder2</" +"filename> <emphasis>non</emphasis> contiene un file chiamato <filename>File.txt</filename>." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:730 English/Compare_files.xml:1481 -#: English/Intro_diffs.xml:253 English/Intro_diffs.xml:407 +#: English/Command_line.xml:730 English/Compare_files.xml:1481 English/Intro_diffs.xml:253 English/Intro_diffs.xml:407 msgid "merging differences" msgstr "fondere le differenze" @@ -1781,47 +1403,32 @@ msgstr "<option>/o <replaceable>percorso di output</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:736 -msgid "" -"Specifies an optional output file path where you want merged result files to " -"be saved." -msgstr "" -"Specifica un percorso file di output facoltativo in cui si desidera salvare " -"i file dei risultati uniti." +msgid "Specifies an optional output file path where you want merged result files to be saved." +msgstr "Specifica un percorso file di output facoltativo in cui si desidera salvare i file dei risultati uniti." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:739 msgid "" -"The output path is rarely needed when you start WinMerge from the command " -"line. It is meant to be used with version control tools, where you might " -"need to specify a output path for the <wordasword>result</wordasword> file. " -"If you specify a output path, WinMerge still shows only two or three files " -"in the File Compare window. However, if you save either of these files, it " -"is written to the output path, leaving the two or three source files intact." -msgstr "" -"Il percorso di output è raramente necessario quando si avvia WinMerge dalla " -"riga di comando.È pensato per essere utilizzato con strumenti di controllo " -"della versione, dove potrebbe essere necessario specificare un percorso di " -"output per il file <wordasword>risultato</wordasword>.Se specifichi un " -"percorso di output, WinMerge mostra comunque solo due o tre file nella " -"finestra Confronta file.Tuttavia, se si salva uno di questi file, verrà " -"scritto nel percorso di output, lasciando intatti i due o tre file di " -"origine." +"The output path is rarely needed when you start WinMerge from the command line. It is meant to be used with version control tools, where you might " +"need to specify a output path for the <wordasword>result</wordasword> file. If you specify a output path, WinMerge still shows only two or three " +"files in the File Compare window. However, if you save either of these files, it is written to the output path, leaving the two or three source files " +"intact." +msgstr "" +"Il percorso di output è raramente necessario quando si avvia WinMerge dalla riga di comando.È pensato per essere utilizzato con strumenti di " +"controllo della versione, dove potrebbe essere necessario specificare un percorso di output per il file <wordasword>risultato</wordasword>.Se " +"specifichi un percorso di output, WinMerge mostra comunque solo due o tre file nella finestra Confronta file.Tuttavia, se si salva uno di questi " +"file, verrà scritto nel percorso di output, lasciando intatti i due o tre file di origine." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:747 msgid "" -"Version control systems typically refer to the source and result files using " -"terms like <glossterm>theirs</glossterm>, <glossterm>mine</glossterm>, and " -"either <glossterm>merged</glossterm> or <glossterm>resolved</glossterm>. If " -"you specify a output path on the WinMerge command line, and are working with " -"a version control system, you should list the files in that order." +"Version control systems typically refer to the source and result files using terms like <glossterm>theirs</glossterm>, <glossterm>mine</glossterm>, " +"and either <glossterm>merged</glossterm> or <glossterm>resolved</glossterm>. If you specify a output path on the WinMerge command line, and are " +"working with a version control system, you should list the files in that order." msgstr "" -"I sistemi di controllo della versione in genere si riferiscono ai file " -"sorgente e di risultato utilizzando termini come <glossterm>loro</" -"glossterm>, <glossterm>mio</glossterm> e <glossterm>unito</glossterm> o " -"<glossterm>risolto</glossterm>.Se specifichi un percorso di output sulla " -"riga di comando di WinMerge e stai lavorando con un sistema di controllo " -"della versione, dovresti elencare i file in quest'ordine." +"I sistemi di controllo della versione in genere si riferiscono ai file sorgente e di risultato utilizzando termini come <glossterm>loro</glossterm>, " +"<glossterm>mio</glossterm> e <glossterm>unito</glossterm> o <glossterm>risolto</glossterm>.Se specifichi un percorso di output sulla riga di comando " +"di WinMerge e stai lavorando con un sistema di controllo della versione, dovresti elencare i file in quest'ordine." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:757 @@ -1830,12 +1437,8 @@ msgstr "<option>/o <replaceable>percorso di output</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:760 -msgid "" -"Outputs a comparison report for files or folders. Example: " -"<option>WinMergeU path1 path2 /or c:\\tmp\\report.html</option>" -msgstr "" -"Genera un rapporto di confronto per file o cartelle.Esempio: " -"<option>WinMergeU percorso1 percorso2 /o c:\\tmp\\report.html</option>" +msgid "Outputs a comparison report for files or folders. Example: <option>WinMergeU path1 path2 /or c:\\tmp\\report.html</option>" +msgstr "Genera un rapporto di confronto per file o cartelle.Esempio: <option>WinMergeU percorso1 percorso2 /o c:\\tmp\\report.html</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:763 @@ -1844,11 +1447,8 @@ msgstr "Spesso è utile combinare questa opzione con:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:765 -msgid "" -"<option>/noninteractive</option> - exits WinMerge after producing the report." -msgstr "" -"<option>/noninteractive</option> - esce da WinMerge dopo aver prodotto il " -"report." +msgid "<option>/noninteractive</option> - exits WinMerge after producing the report." +msgstr "<option>/noninteractive</option> - esce da WinMerge dopo aver prodotto il report." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:766 @@ -1858,22 +1458,16 @@ msgstr "<option>/minimize</option> - avvia WinMerge in stato ridotto a icona." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:767 msgid "" -"<option>/noprefs</option> - ignores the current preferences and uses default " -"settings. Any changes made with <option>/cfg</option> will then be " +"<option>/noprefs</option> - ignores the current preferences and uses default settings. Any changes made with <option>/cfg</option> will then be " "temporary and not saved." msgstr "" -"<option>/noprefs</option> - ignora le preferenze correnti e utilizza le " -"impostazioni predefinite.Qualsiasi modifica apportata con <option>/cfg</" +"<option>/noprefs</option> - ignora le preferenze correnti e utilizza le impostazioni predefinite.Qualsiasi modifica apportata con <option>/cfg</" "option> sarà quindi temporanea e non verrà salvata." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:771 -msgid "" -"The following <option>/cfg</option> settings can also be useful (parameter " -"names may change in the future):" -msgstr "" -"Possono essere utili anche le seguenti impostazioni <option>/cfg</option> (i " -"nomi dei parametri potrebbero cambiare in futuro):" +msgid "The following <option>/cfg</option> settings can also be useful (parameter names may change in the future):" +msgstr "Possono essere utili anche le seguenti impostazioni <option>/cfg</option> (i nomi dei parametri potrebbero cambiare in futuro):" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:773 @@ -1882,22 +1476,14 @@ msgstr "Per i confronti dei file:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:775 -msgid "" -"<option>/cfg Settings/DiffContextV2=0</option> - hides matching lines in the " -"report (equivalent to View -> Diff Context -> 0 Lines)." +msgid "<option>/cfg Settings/DiffContextV2=0</option> - hides matching lines in the report (equivalent to View -> Diff Context -> 0 Lines)." msgstr "" -"<option>/cfg Settings/DiffContextV2=0</option> - nasconde le righe " -"corrispondenti nel report (equivalente a Visualizza -> Contesto diff -> 0 " -"righe)." +"<option>/cfg Settings/DiffContextV2=0</option> - nasconde le righe corrispondenti nel report (equivalente a Visualizza -> Contesto diff -> 0 righe)." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:776 -msgid "" -"<option>/cfg Settings/ViewLineNumbers=1</option> - outputs line numbers (set " -"to 0 to disable)." -msgstr "" -"<option>/cfg Settings/ViewLineNumbers=1</option> - restituisce i numeri di " -"riga (impostato su 0 per disabilitare)." +msgid "<option>/cfg Settings/ViewLineNumbers=1</option> - outputs line numbers (set to 0 to disable)." +msgstr "<option>/cfg Settings/ViewLineNumbers=1</option> - restituisce i numeri di riga (impostato su 0 per disabilitare)." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:778 @@ -1906,29 +1492,18 @@ msgstr "Per i confronti delle cartelle:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:780 -msgid "" -"<option>/cfg Settings/DirViewExpandSubdirs=1</option> - automatically expand " -"all subfolders." -msgstr "" -"<option>/cfg Settings/DirViewExpandSubdirs=1</option> - espande " -"automaticamente tutte le sottocartelle." +msgid "<option>/cfg Settings/DirViewExpandSubdirs=1</option> - automatically expand all subfolders." +msgstr "<option>/cfg Settings/DirViewExpandSubdirs=1</option> - espande automaticamente tutte le sottocartelle." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:781 -msgid "" -"<option>/cfg ReportFiles/ReportType=2</option> - report style: Simple HTML." -msgstr "" -"<option>/cfg ReportFiles/ReportType=2</option> - stile del report: HTML " -"semplice." +msgid "<option>/cfg ReportFiles/ReportType=2</option> - report style: Simple HTML." +msgstr "<option>/cfg ReportFiles/ReportType=2</option> - stile del report: HTML semplice." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:782 -msgid "" -"<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include file " -"comparison reports." -msgstr "" -"<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include report di " -"confronto file." +msgid "<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include file comparison reports." +msgstr "<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include report di confronto file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Command_line.xml:789 English/Compare_files.xml:1805 @@ -1948,16 +1523,12 @@ msgstr "<option><replaceable>file di conflitto</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:795 msgid "" -"Specifies a conflict file, typically generated by a Version control system. " -"The conflict file opens in the File Compare window, where you can merge and " -"resolve conflicts, as described in <xref linkend=\"ResolveConflictFiles\" /" -">. Note that no other paths can be used with a conflict file." +"Specifies a conflict file, typically generated by a Version control system. The conflict file opens in the File Compare window, where you can merge " +"and resolve conflicts, as described in <xref linkend=\"ResolveConflictFiles\" />. Note that no other paths can be used with a conflict file." msgstr "" -"Specifica un file di conflitto, generalmente generato da un sistema di " -"controllo della versione.Il file di conflitto si apre nella finestra " -"Confronto file, dove è possibile unire e risolvere i conflitti, come " -"descritto in <xref linkend=\"ResolveConflictFiles\" />.Tieni presente che " -"non è possibile utilizzare altri percorsi con un file in conflitto." +"Specifica un file di conflitto, generalmente generato da un sistema di controllo della versione.Il file di conflitto si apre nella finestra Confronto " +"file, dove è possibile unire e risolvere i conflitti, come descritto in <xref linkend=\"ResolveConflictFiles\" />.Tieni presente che non è possibile " +"utilizzare altri percorsi con un file in conflitto." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> #: English/Command_line.xml:805 @@ -1971,11 +1542,8 @@ msgstr "<option>/file ini <replaceable>file ini</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:811 -msgid "" -"specifies an INI file used to load and save settings instead of the registry." -msgstr "" -"specifica un file INI utilizzato per caricare e salvare le impostazioni al " -"posto del registro." +msgid "specifies an INI file used to load and save settings instead of the registry." +msgstr "specifica un file INI utilizzato per caricare e salvare le impostazioni al posto del registro." #. type: Content of: <article><title> #: English/Compare_bin.xml:5 @@ -1983,11 +1551,8 @@ msgid "Comparing in hexadecimal format" msgstr "Confronto in formato esadecimale" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_bin.xml:8 English/Compare_files.xml:6 -#: English/Compare_images.xml:8 English/Compare_table.xml:8 -#: English/Compare_webpages.xml:8 English/Configuration.xml:1072 -#: English/Configuration.xml:1198 English/Filters.xml:66 -#: English/Intro_diffs.xml:12 English/Quick_start.xml:325 +#: English/Compare_bin.xml:8 English/Compare_files.xml:6 English/Compare_images.xml:8 English/Compare_table.xml:8 English/Compare_webpages.xml:8 +#: English/Configuration.xml:1072 English/Configuration.xml:1198 English/Filters.xml:66 English/Intro_diffs.xml:12 English/Quick_start.xml:325 msgid "comparing files" msgstr "confronto dei file" @@ -1999,17 +1564,12 @@ msgstr "binario" #. type: Content of: <article><para> #: English/Compare_bin.xml:13 msgid "WinMerge can view and edit your files in hexadecimal format." -msgstr "" -"WinMerge può visualizzare e modificare i tuoi file in formato esadecimale." +msgstr "WinMerge può visualizzare e modificare i tuoi file in formato esadecimale." #. type: Content of: <article><mediaobject> #: English/Compare_bin.xml:17 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /" -"> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /" -"> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><mediaobject><textobject><phrase> #: English/Compare_bin.xml:22 @@ -2019,37 +1579,27 @@ msgstr "Finestra di confronto HEX" #. type: Content of: <article><para> #: English/Compare_bin.xml:27 msgid "" -"Whether files are opened in hexadecimal format depends on whether the file " -"name matches defined patterns. By default, if the file extension is .bin or ." -"frx, it will be opened in hexadecimal format. If you want to change the " -"patterns, specify it on the Compare/Binary page in the Options dialog." +"Whether files are opened in hexadecimal format depends on whether the file name matches defined patterns. By default, if the file extension is .bin " +"or .frx, it will be opened in hexadecimal format. If you want to change the patterns, specify it on the Compare/Binary page in the Options dialog." msgstr "" -"L'apertura dei file in formato esadecimale dipende dal fatto che il nome del " -"file corrisponda ai modelli definiti.Per impostazione predefinita, se " -"l'estensione del file è .bin o .frx, verrà aperto in formato esadecimale.Se " -"desideri modificare i modelli, specificalo nella pagina Confronta/Binario " +"L'apertura dei file in formato esadecimale dipende dal fatto che il nome del file corrisponda ai modelli definiti.Per impostazione predefinita, se " +"l'estensione del file è .bin o .frx, verrà aperto in formato esadecimale.Se desideri modificare i modelli, specificalo nella pagina Confronta/Binario " "nella finestra di dialogo Opzioni." #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:4 English/Configuration.xml:1202 -#: English/Filters.xml:43 English/Quick_start.xml:239 +#: English/Compare_dirs.xml:4 English/Configuration.xml:1202 English/Filters.xml:43 English/Quick_start.xml:239 msgid "comparing folders" msgstr "confronto delle cartelle" #. type: Content of: <article><title> #: English/Compare_dirs.xml:3 msgid "Comparing and merging folders<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronto e unione di cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronto e unione di cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Compare_dirs.xml:7 -msgid "" -"This topic describes how to compare and merge folders using the Folder " -"Compare window." -msgstr "" -"In questo argomento viene descritto come confrontare e unire le cartelle " -"utilizzando la finestra Confronto cartelle." +msgid "This topic describes how to compare and merge folders using the Folder Compare window." +msgstr "In questo argomento viene descritto come confrontare e unire le cartelle utilizzando la finestra Confronto cartelle." #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:11 @@ -2058,58 +1608,41 @@ msgstr "Avvio di un'operazione di confronto delle cartelle" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:13 -msgid "" -"You can begin a folder compare operation from either the WinMerge window or " -"a Command Prompt window." -msgstr "" -"È possibile avviare un'operazione di confronto delle cartelle dalla finestra " -"WinMerge o dalla finestra del prompt dei comandi." +msgid "You can begin a folder compare operation from either the WinMerge window or a Command Prompt window." +msgstr "È possibile avviare un'operazione di confronto delle cartelle dalla finestra WinMerge o dalla finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Compare_dirs.xml:18 English/Compare_files.xml:23 -#: English/Compare_images.xml:23 English/Compare_webpages.xml:30 +#: English/Compare_dirs.xml:18 English/Compare_files.xml:23 English/Compare_images.xml:23 English/Compare_webpages.xml:30 msgid "From the WinMerge window" msgstr "Dalla finestra WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:21 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" -"menuchoice>. Use the Select Files or Folders dialog to specify the left and " -"right folders to compare. By default, the compare includes all files in the " -"folders, and is recursive (does include subfolders). To change any of these " -"options and for more details about the Select Files or Folder dialog, see " -"<xref linkend=\"Open_paths\" />." -msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" -"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " -"file o cartelle per specificare le cartelle sinistra e destra da confrontare." -"Per impostazione predefinita, il confronto include tutti i file nelle " -"cartelle ed è ricorsivo (include le sottocartelle).Per modificare una " -"qualsiasi di queste opzioni e per ulteriori dettagli sulla finestra di " -"dialogo Seleziona file o cartella, vedi <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " +"and right folders to compare. By default, the compare includes all files in the folders, and is recursive (does include subfolders). To change any of " +"these options and for more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." +msgstr "" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " +"o cartelle per specificare le cartelle sinistra e destra da confrontare.Per impostazione predefinita, il confronto include tutti i file nelle " +"cartelle ed è ricorsivo (include le sottocartelle).Per modificare una qualsiasi di queste opzioni e per ulteriori dettagli sulla finestra di dialogo " +"Seleziona file o cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Compare_dirs.xml:35 English/Compare_files.xml:38 -#: English/Compare_images.xml:38 English/Compare_webpages.xml:57 +#: English/Compare_dirs.xml:35 English/Compare_files.xml:38 English/Compare_images.xml:38 English/Compare_webpages.xml:57 msgid "From a Command Prompt window" msgstr "Da una finestra del prompt dei comandi" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:38 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " -"directory. In your command arguments, include the left and right folders to " -"compare. By default, the compare includes all files in the folders, and is " -"nonrecursive. To change any of these options and for information about other " -"command options, see <xref linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right folders to " +"compare. By default, the compare includes all files in the folders, and is nonrecursive. To change any of these options and for information about " +"other command options, see <xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " -"installazione di WinMerge. Negli argomenti del comando, includi le cartelle " -"sinistra e destra da confrontare. Per impostazione predefinita, il confronto " -"include tutti i file nelle cartelle e non è ricorsivo. Per modificare una " -"qualsiasi di queste opzioni e per informazioni su altre opzioni di comando, " -"vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi le cartelle " +"sinistra e destra da confrontare. Per impostazione predefinita, il confronto include tutti i file nelle cartelle e non è ricorsivo. Per modificare " +"una qualsiasi di queste opzioni e per informazioni su altre opzioni di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><tip><title> #: English/Compare_dirs.xml:49 @@ -2124,30 +1657,22 @@ msgstr "Modalità ricorsiva<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:58 msgid "" -"Recursive mode is useful for detecting and manipulating different files in " -"an entire folder structure. However, it can be slow if there are many " -"subfolders and files. For deeply nested directory structures, consider " -"enabling the <xref linkend=\"Compare_dirs_treeview\" /> for easier " -"navigation of the Compare window." +"Recursive mode is useful for detecting and manipulating different files in an entire folder structure. However, it can be slow if there are many " +"subfolders and files. For deeply nested directory structures, consider enabling the <xref linkend=\"Compare_dirs_treeview\" /> for easier navigation " +"of the Compare window." msgstr "" -"La modalità ricorsiva è utile per rilevare e manipolare file diversi in " -"un'intera struttura di cartelle. Tuttavia, può essere lento se sono presenti " -"molte sottocartelle e file. Per strutture di cartelle profondamente " -"annidate, valuta la possibilità di abilitare <xref " -"linkend=\"Compare_dirs_treeview\" /> per una navigazione più semplice nella " -"finestra Confronta." +"La modalità ricorsiva è utile per rilevare e manipolare file diversi in un'intera struttura di cartelle. Tuttavia, può essere lento se sono presenti " +"molte sottocartelle e file. Per strutture di cartelle profondamente annidate, valuta la possibilità di abilitare <xref " +"linkend=\"Compare_dirs_treeview\" /> per una navigazione più semplice nella finestra Confronta." #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:65 msgid "" -"Nonrecursive mode has the advantage of speed when there are many subfolders " -"that need not be examined. Also, the display can be easier to manage because " -"it shows items in only selected folders." +"Nonrecursive mode has the advantage of speed when there are many subfolders that need not be examined. Also, the display can be easier to manage " +"because it shows items in only selected folders." msgstr "" -"La modalità non ricorsiva presenta il vantaggio della velocità quando sono " -"presenti molte sottocartelle che non necessitano di essere esaminate." -"Inoltre, la visualizzazione può essere più semplice da gestire perché mostra " -"gli elementi solo nelle cartelle selezionate." +"La modalità non ricorsiva presenta il vantaggio della velocità quando sono presenti molte sottocartelle che non necessitano di essere " +"esaminate.Inoltre, la visualizzazione può essere più semplice da gestire perché mostra gli elementi solo nelle cartelle selezionate." #. type: Content of: <article><section><tip><variablelist><varlistentry><term> #: English/Compare_dirs.xml:73 @@ -2157,35 +1682,23 @@ msgstr "Confronti rapidi dei contenuti" #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:76 msgid "" -"The <guilabel>Quick Contents</guilabel> method for file comparison, " -"described in <xref linkend=\"Configuration\" />, can be useful when you " -"compare big binary files; and it is automatically used to compare files " -"bigger than 4 MB. Possible disadvantages are that line filters do not work, " -"and there is no difference counts information in the Folder Compare window. " -"This should not matter In most cases, because such large files are usually " -"binary." -msgstr "" -"Il metodo <guilabel >Contenuti rapidi</guilabel > per il confronto dei file, " -"descritto in <xref linkend=\"Configuration\" />, può essere utile quando " -"confronti file binari di grandi dimensioni;e viene utilizzato " -"automaticamente per confrontare file più grandi di 4 MB.I possibili " -"svantaggi sono che i filtri di riga non funzionano e non vi sono " -"informazioni sui conteggi delle differenze nella finestra Confronto cartelle." -"Nella maggior parte dei casi questo non dovrebbe avere importanza, perché " -"file di grandi dimensioni sono solitamente binari." +"The <guilabel>Quick Contents</guilabel> method for file comparison, described in <xref linkend=\"Configuration\" />, can be useful when you compare " +"big binary files; and it is automatically used to compare files bigger than 4 MB. Possible disadvantages are that line filters do not work, and there " +"is no difference counts information in the Folder Compare window. This should not matter In most cases, because such large files are usually binary." +msgstr "" +"Il metodo <guilabel >Contenuti rapidi</guilabel > per il confronto dei file, descritto in <xref linkend=\"Configuration\" />, può essere utile quando " +"confronti file binari di grandi dimensioni;e viene utilizzato automaticamente per confrontare file più grandi di 4 MB.I possibili svantaggi sono che " +"i filtri di riga non funzionano e non vi sono informazioni sui conteggi delle differenze nella finestra Confronto cartelle.Nella maggior parte dei " +"casi questo non dovrebbe avere importanza, perché file di grandi dimensioni sono solitamente binari." #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:84 msgid "" -"To use this method, configure it before your compare operation: in the " -"Compare page of the WinMerge options, click the <guilabel>File Compare " -"method</guilabel> drop-down menu and choose <guimenuitem>Quick Contents</" -"guimenuitem>." +"To use this method, configure it before your compare operation: in the Compare page of the WinMerge options, click the <guilabel>File Compare method</" +"guilabel> drop-down menu and choose <guimenuitem>Quick Contents</guimenuitem>." msgstr "" -"Per utilizzare questo metodo, configuralo prima dell'operazione di " -"confronto: nella pagina Confronta delle opzioni di WinMerge, fai clic sul " -"menu a discesa <guilabel >Metodo di confronto file</guilabel > e scegli " -"<guimenuitem >Contenuti rapidi</guimenuitem >." +"Per utilizzare questo metodo, configuralo prima dell'operazione di confronto: nella pagina Confronta delle opzioni di WinMerge, fai clic sul menu a " +"discesa <guilabel >Metodo di confronto file</guilabel > e scegli <guimenuitem >Contenuti rapidi</guimenuitem >." #. type: Content of: <article><section><tip><variablelist><varlistentry><term> #: English/Compare_dirs.xml:92 @@ -2201,18 +1714,13 @@ msgstr "HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge\\Settings\\QuickM #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:95 msgid "" -"You can change the 4 MB file size limit of the <guilabel>Compare by Quick " -"Contents</guilabel>, for example if you have a lot of very big text files. " -"To do so, run the Windows <command>regedit</command> command, navigate to " -"this keyword, and modify its value: <placeholder type=\"screen\" id=\"0\"/" +"You can change the 4 MB file size limit of the <guilabel>Compare by Quick Contents</guilabel>, for example if you have a lot of very big text files. " +"To do so, run the Windows <command>regedit</command> command, navigate to this keyword, and modify its value: <placeholder type=\"screen\" id=\"0\"/" ">As usual, be careful when editing the registry!" msgstr "" -"Puoi modificare il limite di dimensione del file di 4 MB del <guilabel " -">Confronta per contenuto rapido</guilabel >, ad esempio se hai molti file di " -"testo molto grandi.Per fare ciò, esegui il comando <command>regedit</" -"command> di Windows, vai a questa parola chiave e modifica il suo valore: " -"<placeholder type=\"screen\" id=\"0\"/>Come al solito, fai attenzione quando " -"modifichi il registro!" +"Puoi modificare il limite di dimensione del file di 4 MB del <guilabel >Confronta per contenuto rapido</guilabel >, ad esempio se hai molti file di " +"testo molto grandi.Per fare ciò, esegui il comando <command>regedit</command> di Windows, vai a questa parola chiave e modifica il suo valore: " +"<placeholder type=\"screen\" id=\"0\"/>Come al solito, fai attenzione quando modifichi il registro!" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:108 English/Compare_dirs.xml:120 @@ -2221,83 +1729,58 @@ msgstr "Finestra di avanzamento del confronto delle cartelle" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:107 -msgid "" -"Folder Compare Progress window<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Finestra di avanzamento del confronto delle cartelle<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Folder Compare Progress window<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Finestra di avanzamento del confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:111 -msgid "" -"When you start a folder compare operation, WinMerge displays this status " -"window:" -msgstr "" -"Quando si avvia un'operazione di confronto delle cartelle, WinMerge " -"visualizza questa finestra di stato:" +msgid "When you start a folder compare operation, WinMerge displays this status window:" +msgstr "Quando si avvia un'operazione di confronto delle cartelle, WinMerge visualizza questa finestra di stato:" #. type: Content of: <article><section><section><mediaobject> #: English/Compare_dirs.xml:115 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:124 msgid "" -"If the compare operation is quick, you might not notice the Progress window, " -"which closes as soon as WinMerge displays the Folder Compare result. The " -"Progress window shows the number of files and folders to be included in the " -"operation, and the number compared so far. The progress bar graphically " +"If the compare operation is quick, you might not notice the Progress window, which closes as soon as WinMerge displays the Folder Compare result. The " +"Progress window shows the number of files and folders to be included in the operation, and the number compared so far. The progress bar graphically " "represents the Items compared." msgstr "" -"Se l'operazione di confronto è rapida, potresti non notare la finestra di " -"avanzamento, che si chiude non appena WinMerge visualizza il risultato del " -"confronto delle cartelle.La finestra di avanzamento mostra il numero di file " -"e cartelle da includere nell'operazione e il numero confrontato finora.La " -"barra di avanzamento rappresenta graficamente gli Articoli confrontati." +"Se l'operazione di confronto è rapida, potresti non notare la finestra di avanzamento, che si chiude non appena WinMerge visualizza il risultato del " +"confronto delle cartelle.La finestra di avanzamento mostra il numero di file e cartelle da includere nell'operazione e il numero confrontato " +"finora.La barra di avanzamento rappresenta graficamente gli Articoli confrontati." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:131 msgid "" -"Because the files compares are usually of different sizes, the status data " -"does not indicate the time used or remaining. For example, a 50/100 ratio " +"Because the files compares are usually of different sizes, the status data does not indicate the time used or remaining. For example, a 50/100 ratio " "does not necessarily mean that half of the compare operation time is expired." msgstr "" -"Poiché i file confrontati sono generalmente di dimensioni diverse, i dati " -"sullo stato non indicano il tempo utilizzato o rimanente.Ad esempio, un " -"rapporto 50/100 non significa necessariamente che la metà del tempo " -"dell'operazione di confronto è scaduta." +"Poiché i file confrontati sono generalmente di dimensioni diverse, i dati sullo stato non indicano il tempo utilizzato o rimanente.Ad esempio, un " +"rapporto 50/100 non significa necessariamente che la metà del tempo dell'operazione di confronto è scaduta." -#. I'm not able to reproduce the behavior documented in the earlier version of this topic: +#. I'm not able to reproduce the behavior documented in the earlier version of this topic: #. I get the partial list, but no Abort indicator. #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:137 msgid "" -"You can click <guibutton>Stop</guibutton> to terminate the operation at any " -"time before the compare operation finishes. The Folder Compare window is " -"displayed with the results calculated at that time, omitting any uncompleted " -"results." +"You can click <guibutton>Stop</guibutton> to terminate the operation at any time before the compare operation finishes. The Folder Compare window is " +"displayed with the results calculated at that time, omitting any uncompleted results." msgstr "" -"Puoi fare clic su <guibutton >Interrompi</guibutton > per terminare " -"l'operazione in qualsiasi momento prima che termini l'operazione di " -"confronto.Viene visualizzata la finestra Confronto cartelle con i risultati " -"calcolati in quel momento, omettendo eventuali risultati incompleti." +"Puoi fare clic su <guibutton >Interrompi</guibutton > per terminare l'operazione in qualsiasi momento prima che termini l'operazione di " +"confronto.Viene visualizzata la finestra Confronto cartelle con i risultati calcolati in quel momento, omettendo eventuali risultati incompleti." #. type: Content of: <article><section><mediaobject><textobject><phrase> -#: English/Compare_dirs.xml:147 English/Compare_dirs.xml:301 -#: English/Compare_dirs.xml:485 English/Compare_dirs.xml:737 -#: English/Compare_dirs.xml:1118 English/Compare_dirs.xml:1131 -#: English/Quick_start.xml:243 English/Quick_start.xml:261 +#: English/Compare_dirs.xml:147 English/Compare_dirs.xml:301 English/Compare_dirs.xml:485 English/Compare_dirs.xml:737 English/Compare_dirs.xml:1118 +#: English/Compare_dirs.xml:1131 English/Quick_start.xml:243 English/Quick_start.xml:261 msgid "Folder Compare window" msgstr "Finestra Confronta cartelle" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:149 English/Compare_dirs.xml:151 -#: English/Compare_files.xml:54 English/Compare_files.xml:56 +#: English/Compare_dirs.xml:149 English/Compare_dirs.xml:151 English/Compare_files.xml:54 English/Compare_files.xml:56 msgid "Compare window" msgstr "Finestra Confronta" @@ -2312,31 +1795,23 @@ msgid "subfolders" msgstr "sottocartelle" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Compare_dirs.xml:157 English/Compare_dirs.xml:483 -#: English/Compare_dirs.xml:504 English/Compare_dirs.xml:616 -#: English/Compare_dirs.xml:642 English/Compare_dirs.xml:657 -#: English/Compare_dirs.xml:800 +#: English/Compare_dirs.xml:157 English/Compare_dirs.xml:483 English/Compare_dirs.xml:504 English/Compare_dirs.xml:616 English/Compare_dirs.xml:642 +#: English/Compare_dirs.xml:657 English/Compare_dirs.xml:800 msgid "in Folder Compare window" msgstr "nella finestra Confronto cartelle" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:146 msgid "" -"Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +"Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " -"id=\"2\"/>" +"Finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder " +"type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:160 -msgid "" -"The Folder Compare window shows the result of a folder compare. Two " -"different views are available:" -msgstr "" -"La finestra Confronto cartelle mostra il risultato di un confronto cartelle." -"Sono disponibili due diverse visualizzazioni:" +msgid "The Folder Compare window shows the result of a folder compare. Two different views are available:" +msgstr "La finestra Confronto cartelle mostra il risultato di un confronto cartelle.Sono disponibili due diverse visualizzazioni:" #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_dirs.xml:166 @@ -2350,21 +1825,13 @@ msgstr "Visualizzazione tabellare<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:170 -msgid "" -"In tabular view, each file or folder in the result is listed in a row. This " -"is the default view. Here's an example:" -msgstr "" -"In tabular view, each file or folder in the result is listed in a row.Questa " -"è la visualizzazione predefinita.Ecco un esempio:" +msgid "In tabular view, each file or folder in the result is listed in a row. This is the default view. Here's an example:" +msgstr "In tabular view, each file or folder in the result is listed in a row.Questa è la visualizzazione predefinita.Ecco un esempio:" #. type: Content of: <article><section><mediaobject> #: English/Compare_dirs.xml:174 English/Quick_start.xml:255 -msgid "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"foldercomp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"foldercomp1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/foldercomp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/foldercomp1.png\" format=\"PNG\" /> </imageobject>" #. type: Attribute 'xreflabel' of: <article><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:184 @@ -2384,80 +1851,56 @@ msgstr "Visualizzazione ad albero<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:189 msgid "" -"In the tree view, folders are expandable and collapsible, containing files " -"and subfolders. The tree view is available only in recursive compares. For " +"In the tree view, folders are expandable and collapsible, containing files and subfolders. The tree view is available only in recursive compares. For " "example:" msgstr "" -"Nella visualizzazione ad albero, le cartelle sono espandibili e comprimibili " -"e contengono file e sottocartelle.La visualizzazione ad albero è disponibile " -"solo nei confronti ricorsivi.Per esempio:" +"Nella visualizzazione ad albero, le cartelle sono espandibili e comprimibili e contengono file e sottocartelle.La visualizzazione ad albero è " +"disponibile solo nei confronti ricorsivi.Per esempio:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_dirs.xml:194 -msgid "" -"<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/" -"treeview-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/" -"treeview-01.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/treeview-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/treeview-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:203 -msgid "" -"To expand or collapse a single folder, click the plus or minus control " -"beside the folder icon, or double-click anywhere in the row." +msgid "To expand or collapse a single folder, click the plus or minus control beside the folder icon, or double-click anywhere in the row." msgstr "" -"Per espandere o comprimere una singola cartella, fai clic sul controllo più " -"o meno accanto all'icona della cartella oppure fai doppio clic in un punto " -"qualsiasi della riga." +"Per espandere o comprimere una singola cartella, fai clic sul controllo più o meno accanto all'icona della cartella oppure fai doppio clic in un " +"punto qualsiasi della riga." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:209 msgid "" -"To expand or collapse all folders in the view, click <menuchoice> " -"<guimenu>View</guimenu> <guimenuitem>Expand Subfolders</guimenuitem> " -"<guimenuitem>All Subfolders</guimenuitem> </menuchoice> or <menuchoice> " -"<guimenu>View</guimenu> <guimenuitem>Collapse All Subfolders</guimenuitem> </" +"To expand or collapse all folders in the view, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Expand Subfolders</guimenuitem> " +"<guimenuitem>All Subfolders</guimenuitem> </menuchoice> or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Collapse All Subfolders</guimenuitem> </" "menuchoice> in the menu." msgstr "" -"Per espandere o comprimere tutte le cartelle nella vista, fai clic su " -"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Espandi " -"sottocartelle</guimenuitem > <guimenuitem >Tutte le sottocartelle</" -"guimenuitem > </menuchoice > o <menuchoice> <guimenu >Visualizza</guimenu > " -"<guimenuitem >Comprimi tutte le sottocartelle</guimenuitem > </menuchoice > " -"nel menu." +"Per espandere o comprimere tutte le cartelle nella vista, fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Espandi " +"sottocartelle</guimenuitem > <guimenuitem >Tutte le sottocartelle</guimenuitem > </menuchoice > o <menuchoice> <guimenu >Visualizza</guimenu > " +"<guimenuitem >Comprimi tutte le sottocartelle</guimenuitem > </menuchoice > nel menu." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:226 msgid "" -"During a recursive compare (that is, if you enabled the <option>Include " -"subfolders</option> option in the Select Files or Folders dialog when you " -"launched the compare), you can click <menuchoice> <guimenu>View</guimenu> " -"<guimenuitem>Tree Mode</guimenuitem> </menuchoice> command to switch between " -"the two views. The <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree " -"Mode</guimenuitem> </menuchoice> command is disabled for non-recursive " -"compares." -msgstr "" -"Durante un confronto ricorsivo (ovvero, se hai abilitato l'opzione <option " -">Includi sottocartelle</option > nella finestra di dialogo Seleziona file o " -"cartelle quando hai avviato il confronto), puoi fare clic sul comando " -"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Modalità albero</" -"guimenuitem > </menuchoice > per passare da una visualizzazione all'altra.Il " -"comando <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Modalità " -"albero</guimenuitem > </menuchoice > è disabilitato per i confronti non " -"ricorsivi." +"During a recursive compare (that is, if you enabled the <option>Include subfolders</option> option in the Select Files or Folders dialog when you " +"launched the compare), you can click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree Mode</guimenuitem> </menuchoice> command to switch " +"between the two views. The <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree Mode</guimenuitem> </menuchoice> command is disabled for non-" +"recursive compares." +msgstr "" +"Durante un confronto ricorsivo (ovvero, se hai abilitato l'opzione <option >Includi sottocartelle</option > nella finestra di dialogo Seleziona file " +"o cartelle quando hai avviato il confronto), puoi fare clic sul comando <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Modalità albero</" +"guimenuitem > </menuchoice > per passare da una visualizzazione all'altra.Il comando <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " +">Modalità albero</guimenuitem > </menuchoice > è disabilitato per i confronti non ricorsivi." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:238 msgid "" -"In both views, the columns show different types of data for each result " -"item. You can control the sorting of items in the view by clicking a column " +"In both views, the columns show different types of data for each result item. You can control the sorting of items in the view by clicking a column " "heading. This changes the sorting in two ways:" msgstr "" -"In entrambe le visualizzazioni, le colonne mostrano diversi tipi di dati per " -"ciascun elemento risultato.Puoi controllare l'ordinamento degli elementi " -"nella vista facendo clic sull'intestazione di una colonna.Ciò modifica " -"l'ordinamento in due modi:" +"In entrambe le visualizzazioni, le colonne mostrano diversi tipi di dati per ciascun elemento risultato.Puoi controllare l'ordinamento degli elementi " +"nella vista facendo clic sull'intestazione di una colonna.Ciò modifica l'ordinamento in due modi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:244 @@ -2481,21 +1924,13 @@ msgstr "confronto cartelle non ricorsivo" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:253 -msgid "" -"Recursive and nonrecursive compare results<placeholder type=\"indexterm\" " -"id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Risultati di confronto ricorsivo e non ricorsivo<placeholder " -"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Recursive and nonrecursive compare results<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Risultati di confronto ricorsivo e non ricorsivo<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:263 -msgid "" -"The Folder Compare window looks and behaves slightly differently for " -"recursive and nonrecursive compares:" -msgstr "" -"La finestra Confronto cartelle appare e si comporta in modo leggermente " -"diverso per i confronti ricorsivi e non ricorsivi:" +msgid "The Folder Compare window looks and behaves slightly differently for recursive and nonrecursive compares:" +msgstr "La finestra Confronto cartelle appare e si comporta in modo leggermente diverso per i confronti ricorsivi e non ricorsivi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:268 @@ -2505,27 +1940,17 @@ msgstr "Confronto ricorsivo di cartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:271 msgid "" -"The compare result includes all subfolders. You can control the types of " -"items displayed within the folders by choosing the options in the " -"<guimenu>View</guimenu> menu (for example, <guimenuitem>Show Identical " -"Items</guimenuitem>). The Folder column is always empty: only the files " -"within the folders are displayed. To see an item's subfolder, look at its " -"path in the Compare result column. Folders that exist on only one side are " -"displayed if one of the <guimenu>View</guimenu> menu options, " -"<guimenuitem>Show Left Unique Files</guimenuitem>, <guimenuitem>Show Middle " -"Unique Files </guimenuitem> or <guimenuitem>Show Right Unique Files</" -"guimenuitem>, is enabled." -msgstr "" -"Il risultato del confronto include tutte le sottocartelle. Puoi controllare " -"i tipi di elementi visualizzati all'interno delle cartelle scegliendo le " -"opzioni nel menu <guimenu >Visualizza</guimenu > (ad esempio, <guimenuitem " -">Visualizza elementi identici</guimenuitem >).La colonna Cartella è sempre " -"vuota: vengono visualizzati solo i file all'interno delle cartelle. Per " -"visualizzare la sottocartella di un elemento, osserva il suo percorso nella " -"colonna dei risultati Confronta.Le cartelle che esistono su un solo lato " -"vengono visualizzate se una delle opzioni del menu <guimenu >Visualizza</" -"guimenu >, <guimenuitem >Visualizza file univoci a sinistra</guimenuitem >, " -"<guimenuitem >Visualizza file univoci centrali </guimenuitem > o " +"The compare result includes all subfolders. You can control the types of items displayed within the folders by choosing the options in the " +"<guimenu>View</guimenu> menu (for example, <guimenuitem>Show Identical Items</guimenuitem>). The Folder column is always empty: only the files within " +"the folders are displayed. To see an item's subfolder, look at its path in the Compare result column. Folders that exist on only one side are " +"displayed if one of the <guimenu>View</guimenu> menu options, <guimenuitem>Show Left Unique Files</guimenuitem>, <guimenuitem>Show Middle Unique " +"Files </guimenuitem> or <guimenuitem>Show Right Unique Files</guimenuitem>, is enabled." +msgstr "" +"Il risultato del confronto include tutte le sottocartelle. Puoi controllare i tipi di elementi visualizzati all'interno delle cartelle scegliendo le " +"opzioni nel menu <guimenu >Visualizza</guimenu > (ad esempio, <guimenuitem >Visualizza elementi identici</guimenuitem >).La colonna Cartella è sempre " +"vuota: vengono visualizzati solo i file all'interno delle cartelle. Per visualizzare la sottocartella di un elemento, osserva il suo percorso nella " +"colonna dei risultati Confronta.Le cartelle che esistono su un solo lato vengono visualizzate se una delle opzioni del menu <guimenu >Visualizza</" +"guimenu >, <guimenuitem >Visualizza file univoci a sinistra</guimenuitem >, <guimenuitem >Visualizza file univoci centrali </guimenuitem > o " "<guimenuitem >Visualizza file univoci a destra</guimenuitem >, è abilitata." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2536,12 +1961,10 @@ msgstr "Confronto cartelle non ricorsivo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:289 msgid "" -"The result includes only the files and subfolders at the top level of the " -"selected folders. However, you can browse to any subfolder that you want to " +"The result includes only the files and subfolders at the top level of the selected folders. However, you can browse to any subfolder that you want to " "compare." msgstr "" -"Il risultato include solo i file e le sottocartelle al livello superiore " -"delle cartelle selezionate.Tuttavia, puoi accedere a qualsiasi sottocartella " +"Il risultato include solo i file e le sottocartelle al livello superiore delle cartelle selezionate.Tuttavia, puoi accedere a qualsiasi sottocartella " "che desideri confrontare." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -2557,215 +1980,136 @@ msgstr "Icone di file e cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:304 msgid "" -"In the Folder Compare window, files and folders are compared and divided " -"into several categories. In each row, the category is clearly identified in " +"In the Folder Compare window, files and folders are compared and divided into several categories. In each row, the category is clearly identified in " "the left column with one of these icons:" msgstr "" -"Nella finestra Confronto cartelle, file e cartelle vengono confrontati e " -"divisi in diverse categorie.In ogni riga la categoria è chiaramente " +"Nella finestra Confronto cartelle, file e cartelle vengono confrontati e divisi in diverse categorie.In ogni riga la categoria è chiaramente " "identificata nella colonna di sinistra con una di queste icone:" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:310 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"equaltextfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"equaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equaltextfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:309 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical text files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo identici" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo identici" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:317 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:316 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical binary files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari identici" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical binary files" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari identici" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:324 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:323 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical files (type " -"undetermined)" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File identici (tipo " -"indeterminato)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical files (type undetermined)" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File identici (tipo indeterminato)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:331 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"notequaltextfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"notequaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequaltextfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:330 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different text files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo diversi" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo diversi" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:338 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"binarydiff.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"binarydiff.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binarydiff.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binarydiff.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:337 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different binary files" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different binary files" msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari diversi" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:345 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:344 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different files (type " -"undetermined)" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File diversi (tipo " -"indeterminato)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different files (type undetermined)" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File diversi (tipo indeterminato)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:352 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"foldersame.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"foldersame.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/foldersame.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/foldersame.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:351 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical folders (in " -"tree view only)" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle identiche (solo " -"nella visualizzazione ad albero)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical folders (in tree view only)" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle identiche (solo nella visualizzazione ad albero)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:359 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"folderdiff.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"folderdiff.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderdiff.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderdiff.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:358 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different folders (in " -"tree view only)" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle diverse (solo " -"nella visualizzazione ad albero)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different folders (in tree view only)" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle diverse (solo nella visualizzazione ad albero)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:366 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:365 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Left-only folders" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle di sola sinistra" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle di sola sinistra" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:373 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:372 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Middle-only folders" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle solo centrali" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle solo centrali" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:380 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:379 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Right-only folders" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle con soli diritti" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle con soli diritti" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:387 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:386 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Left-only files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di sola sinistra" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di sola sinistra" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:394 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:393 @@ -2774,90 +2118,59 @@ msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File solo centrali" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:401 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:400 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Right-only files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File con soli diritti" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File con soli diritti" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:408 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"folderskip.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"folderskip.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderskip.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderskip.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:407 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) " -"directories" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle saltate " -"(filtrate)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) directories" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle saltate (filtrate)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:415 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:414 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) files" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File saltati (filtrati)" +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) files" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File saltati (filtrati)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:422 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:421 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Items that can't be " -"compared; for example when another program has locked the file." +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Items that can't be compared; for example when another program has locked the file." msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elementi che non possono " -"essere confrontati;ad esempio quando un altro programma ha bloccato il file." +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elementi che non possono essere confrontati;ad esempio quando un altro programma ha bloccato il " +"file." #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:430 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:429 msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Aborted item. WinMerge " -"did not finish comparing this item when the compare was stopped. The result " +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Aborted item. WinMerge did not finish comparing this item when the compare was stopped. The result " "is unknown." msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elemento interrotto." -"WinMerge non ha terminato il confronto di questo elemento quando il " -"confronto è stato interrotto.Il risultato è sconosciuto." +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elemento interrotto.WinMerge non ha terminato il confronto di questo elemento quando il confronto " +"è stato interrotto.Il risultato è sconosciuto." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:440 @@ -2875,67 +2188,47 @@ msgid "folder compare" msgstr "confronto cartelle" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:452 English/Compare_files.xml:1207 -#: English/Intro_diffs.xml:225 English/Intro_diffs.xml:344 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"nextdiff_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"nextdiff_btn.png\" /> </imageobject>" +#: English/Compare_dirs.xml:452 English/Compare_files.xml:1207 English/Intro_diffs.xml:225 English/Intro_diffs.xml:344 +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/nextdiff_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/nextdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:457 English/Compare_files.xml:1213 -#: English/Intro_diffs.xml:231 English/Intro_diffs.xml:350 +#: English/Compare_dirs.xml:457 English/Compare_files.xml:1213 English/Intro_diffs.xml:231 English/Intro_diffs.xml:350 msgid "Next Difference button" msgstr "Pulsante Differenza successiva" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:448 msgid "" -"You can use the mouse as well as <link linkend=\"Shortcut_keys\">keyboard</" -"link> and context menu shortcuts to navigate the Folder Compare window. You " -"can also use the toolbar buttons. For example, the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guimenuitem>Next Difference</" -"guimenuitem> button finds the next different file or folder and selects it." +"You can use the mouse as well as <link linkend=\"Shortcut_keys\">keyboard</link> and context menu shortcuts to navigate the Folder Compare window. " +"You can also use the toolbar buttons. For example, the <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guimenuitem>Next Difference</guimenuitem> " +"button finds the next different file or folder and selects it." msgstr "" -"Puoi utilizzare il mouse, la <link linkend=\"Shortcut_keys\">tastiera</link> " -"e le scorciatoie del menu contestuale per navigare nella finestra Confronto " -"cartelle.Puoi anche utilizzare i pulsanti della barra degli strumenti.Ad " -"esempio, il pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " -"<guimenuitem >Differenza successiva</guimenuitem > trova il successivo file " -"o cartella diversa e la seleziona." +"Puoi utilizzare il mouse, la <link linkend=\"Shortcut_keys\">tastiera</link> e le scorciatoie del menu contestuale per navigare nella finestra " +"Confronto cartelle.Puoi anche utilizzare i pulsanti della barra degli strumenti.Ad esempio, il pulsante <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> <guimenuitem >Differenza successiva</guimenuitem > trova il successivo file o cartella diversa e la seleziona." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:463 -msgid "" -"Unique files and folders are navigated in the same way as different ones." -msgstr "" -"I file e le cartelle univoci vengono esplorati allo stesso modo di quelli " -"diversi." +msgid "Unique files and folders are navigated in the same way as different ones." +msgstr "I file e le cartelle univoci vengono esplorati allo stesso modo di quelli diversi." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:467 -msgid "" -"You can select multiple files and folders. However, some operations (like " -"<command>Rename</command>) are not available with multiple selections." +msgid "You can select multiple files and folders. However, some operations (like <command>Rename</command>) are not available with multiple selections." msgstr "" -"È possibile selezionare più file e cartelle.Tuttavia, alcune operazioni " -"(come <command>Rinomina</command>) non sono disponibili con selezioni " +"È possibile selezionare più file e cartelle.Tuttavia, alcune operazioni (come <command>Rinomina</command>) non sono disponibili con selezioni " "multiple." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:471 msgid "" -"Use the navigation buttons (<guibutton>Next Difference</guibutton>, " -"<guibutton>Previous Difference</guibutton>, and so on) to step through " -"differences in the compared files. Use WinMerge functions to merge contents " -"by copying, moving, or delete one or more files or subfolders." +"Use the navigation buttons (<guibutton>Next Difference</guibutton>, <guibutton>Previous Difference</guibutton>, and so on) to step through " +"differences in the compared files. Use WinMerge functions to merge contents by copying, moving, or delete one or more files or subfolders." msgstr "" -"Usa i pulsanti di navigazione (<guibutton >Differenza successiva</guibutton " -">, <guibutton >Differenza precedente</guibutton > e così via) per scorrere " -"le differenze nei file confrontati.Utilizza le funzioni WinMerge per unire i " -"contenuti copiando, spostando o eliminando uno o più file o sottocartelle." +"Usa i pulsanti di navigazione (<guibutton >Differenza successiva</guibutton >, <guibutton >Differenza precedente</guibutton > e così via) per " +"scorrere le differenze nei file confrontati.Utilizza le funzioni WinMerge per unire i contenuti copiando, spostando o eliminando uno o più file o " +"sottocartelle." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Compare_dirs.xml:481 English/Compare_dirs.xml:487 @@ -2944,40 +2237,28 @@ msgstr "operazioni sui file" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:480 -msgid "" -"File operations in Folder Compare<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Operazioni sui file nel confronto delle cartelle<placeholder " -"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "File operations in Folder Compare<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Operazioni sui file nel confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:490 msgid "" -"The Folder Compare window supports common operations on files, like editing, " -"copying, deleting, moving, and renaming (moving is equivalent to a copy " -"operation followed by a delete). You can use these file operations and some " -"special WinMerge functions to merge the contents of folders. You can also " +"The Folder Compare window supports common operations on files, like editing, copying, deleting, moving, and renaming (moving is equivalent to a copy " +"operation followed by a delete). You can use these file operations and some special WinMerge functions to merge the contents of folders. You can also " "open files using associated programs or external editors." msgstr "" -"La finestra Confronto cartelle supporta operazioni comuni sui file, come " -"modifica, copia, eliminazione, spostamento e ridenominazione (lo spostamento " -"equivale a un'operazione di copia seguita da un'eliminazione).È possibile " -"utilizzare queste operazioni sui file e alcune funzioni speciali di WinMerge " -"per unire il contenuto delle cartelle.Puoi anche aprire file utilizzando " -"programmi associati o editor esterni." +"La finestra Confronto cartelle supporta operazioni comuni sui file, come modifica, copia, eliminazione, spostamento e ridenominazione (lo spostamento " +"equivale a un'operazione di copia seguita da un'eliminazione).È possibile utilizzare queste operazioni sui file e alcune funzioni speciali di " +"WinMerge per unire il contenuto delle cartelle.Puoi anche aprire file utilizzando programmi associati o editor esterni." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:496 msgid "" -"The most convenient way to perform most of these tasks is to right-click one " -"or more items and use the context menu, where all file operations are " +"The most convenient way to perform most of these tasks is to right-click one or more items and use the context menu, where all file operations are " "available." msgstr "" -"Il modo più conveniente per eseguire la maggior parte di queste attività è " -"fare clic con il pulsante destro del mouse su uno o più elementi e " -"utilizzare il menu contestuale, dove sono disponibili tutte le operazioni " -"sui file." +"Il modo più conveniente per eseguire la maggior parte di queste attività è fare clic con il pulsante destro del mouse su uno o più elementi e " +"utilizzare il menu contestuale, dove sono disponibili tutte le operazioni sui file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:502 @@ -2992,16 +2273,12 @@ msgstr "Copia dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:507 msgid "" -"The most common file operation in the Folder Compare window is copying files " -"from side to side. There are several forms of the WinMerge copy function: " -"all of them copy only files that are different, because copying identical " -"files is of no use in merging. The copy functions are available in the " -"context menu, in the WinMerge menu, and in the toolbar:" +"The most common file operation in the Folder Compare window is copying files from side to side. There are several forms of the WinMerge copy " +"function: all of them copy only files that are different, because copying identical files is of no use in merging. The copy functions are available " +"in the context menu, in the WinMerge menu, and in the toolbar:" msgstr "" -"L'operazione di file più comune nella finestra Confronto cartelle è la copia " -"di file da un lato all'altro.Esistono diverse forme della funzione di copia " -"di WinMerge: tutte copiano solo file diversi, perché copiare file identici " -"non serve a unire.Le funzioni di copia sono disponibili nel menu " +"L'operazione di file più comune nella finestra Confronto cartelle è la copia di file da un lato all'altro.Esistono diverse forme della funzione di " +"copia di WinMerge: tutte copiano solo file diversi, perché copiare file identici non serve a unire.Le funzioni di copia sono disponibili nel menu " "contestuale, nel menu WinMerge e nella barra degli strumenti:" #. type: Content of: <article><section><section><section><title> @@ -3011,21 +2288,13 @@ msgstr "Menu contestuale Copia collegamenti" #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:517 -msgid "" -"In the Folder Compare window's context menu, the <guimenuitem>Copy</" -"guimenuitem> item has a submenu with four shortcuts:" -msgstr "" -"Nel menu contestuale della finestra Confronta cartelle, la voce <guimenuitem " -">Copia</guimenuitem > ha un sottomenu con quattro scorciatoie:" +msgid "In the Folder Compare window's context menu, the <guimenuitem>Copy</guimenuitem> item has a submenu with four shortcuts:" +msgstr "Nel menu contestuale della finestra Confronta cartelle, la voce <guimenuitem >Copia</guimenuitem > ha un sottomenu con quattro scorciatoie:" #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_dirs.xml:522 -msgid "" -"<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/" -"ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/" -"ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:528 English/Compare_dirs.xml:564 @@ -3035,55 +2304,36 @@ msgstr "Finestra Confronta cartelle Copia menu contestuale" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:534 msgid "" -"<guimenuitem>Left to Right</guimenuitem> and <guimenuitem>Right to Left</" -"guimenuitem> copy the selection (or just the items in the selection that can " -"be copied) from one side to the other. In the example, the suffix " -"<guilabel>(2 of 4)</guilabel> indicates that only the two files that are " -"different will be copied; the identical files will not. These shortcuts " -"available only if any of the files you select is different: if you select " -"only identical files, the shortcuts are unavailable." -msgstr "" -"<guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra " -"a sinistra</guimenuitem > copiano la selezione (o solo gli elementi della " -"selezione che possono essere copiati) da un lato all'altro.Nell'esempio, il " -"suffisso <guilabel >(2 di 4)</guilabel > indica che verranno copiati solo i " -"due file diversi;i file identici no.Queste scorciatoie sono disponibili solo " -"se uno qualsiasi dei file selezionati è diverso: se selezioni solo file " -"identici, le scorciatoie non saranno disponibili." +"<guimenuitem>Left to Right</guimenuitem> and <guimenuitem>Right to Left</guimenuitem> copy the selection (or just the items in the selection that can " +"be copied) from one side to the other. In the example, the suffix <guilabel>(2 of 4)</guilabel> indicates that only the two files that are different " +"will be copied; the identical files will not. These shortcuts available only if any of the files you select is different: if you select only " +"identical files, the shortcuts are unavailable." +msgstr "" +"<guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra a sinistra</guimenuitem > copiano la selezione (o solo gli elementi della " +"selezione che possono essere copiati) da un lato all'altro.Nell'esempio, il suffisso <guilabel >(2 di 4)</guilabel > indica che verranno copiati solo " +"i due file diversi;i file identici no.Queste scorciatoie sono disponibili solo se uno qualsiasi dei file selezionati è diverso: se selezioni solo " +"file identici, le scorciatoie non saranno disponibili." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:545 msgid "" -"<guimenuitem>Left to...</guimenuitem> and <guimenuitem>Right to...</" -"guimenuitem> enable you to specify a copy target directory in your system, " -"instead of a compared folder. When the Browse for Folder dialog opens, " -"navigate to the target directory on your system (or create a new target " +"<guimenuitem>Left to...</guimenuitem> and <guimenuitem>Right to...</guimenuitem> enable you to specify a copy target directory in your system, " +"instead of a compared folder. When the Browse for Folder dialog opens, navigate to the target directory on your system (or create a new target " "folder) and click <guibutton>OK</guibutton>." msgstr "" -"<guimenuitem >Da sinistra a...</guimenuitem > e <guimenuitem >Diritto da...</" -"guimenuitem > ti permettono di specificare una cartella di destinazione " -"della copia nel tuo sistema, invece di una cartella confrontata. Quando si " -"apre la finestra di dialogo Sfoglia per cartelle, vai alla cartella di " -"destinazione sul tuo sistema (o crea una nuova cartella di destinazione) e " -"fai clic su <guibutton >OK</guibutton >." +"<guimenuitem >Da sinistra a...</guimenuitem > e <guimenuitem >Diritto da...</guimenuitem > ti permettono di specificare una cartella di destinazione " +"della copia nel tuo sistema, invece di una cartella confrontata. Quando si apre la finestra di dialogo Sfoglia per cartelle, vai alla cartella di " +"destinazione sul tuo sistema (o crea una nuova cartella di destinazione) e fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:553 -msgid "" -"In the Folder Compare window with three folders, the <guimenuitem>Copy</" -"guimenuitem> item has a submenu with nine shortcuts:" -msgstr "" -"Nella finestra Confronto cartelle con tre cartelle, la voce <guimenuitem " -">Copia</guimenuitem > ha un sottomenu con nove scorciatoie:" +msgid "In the Folder Compare window with three folders, the <guimenuitem>Copy</guimenuitem> item has a submenu with nine shortcuts:" +msgstr "Nella finestra Confronto cartelle con tre cartelle, la voce <guimenuitem >Copia</guimenuitem > ha un sottomenu con nove scorciatoie:" #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_dirs.xml:558 -msgid "" -"<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/" -"ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/" -"ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><title> #: English/Compare_dirs.xml:571 @@ -3091,74 +2341,49 @@ msgid "Toolbar and menu Copy commands" msgstr "Barra degli strumenti e menu Copia comandi" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:574 English/Compare_files.xml:1576 -#: English/Intro_diffs.xml:326 -msgid "" -"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" -"copyr_button.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" -"copyr_button.png\" /> </imageobject>" +#: English/Compare_dirs.xml:574 English/Compare_files.xml:1576 English/Intro_diffs.xml:326 +msgid "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyr_button.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyr_button.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:580 English/Compare_files.xml:1582 -#: English/Intro_diffs.xml:332 +#: English/Compare_dirs.xml:580 English/Compare_files.xml:1582 English/Intro_diffs.xml:332 msgid "Copy Right button" msgstr "Copia pulsante destro" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:584 English/Compare_files.xml:1608 -#: English/Intro_diffs.xml:360 -msgid "" -"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" -"copyl_button.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" -"copyl_button.png\" /> </imageobject>" +#: English/Compare_dirs.xml:584 English/Compare_files.xml:1608 English/Intro_diffs.xml:360 +msgid "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyl_button.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyl_button.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:590 English/Compare_files.xml:1614 -#: English/Intro_diffs.xml:366 +#: English/Compare_dirs.xml:590 English/Compare_files.xml:1614 English/Intro_diffs.xml:366 msgid "Copy Left button" msgstr "Copia pulsante sinistro" #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:573 msgid "" -"In the Folder Compare toolbar, <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> <guibutton>Copy Right</guibutton> and <placeholder " -"type=\"inlinemediaobject\" id=\"1\"/> <guibutton>Copy Left</guibutton> " -"accomplish the same task as the <guimenuitem>Left to Right</guimenuitem> and " -"<guimenuitem>Right to Left</guimenuitem> context menu shortcuts: they copy " -"from side to side only files that are valid to copy. However, these commands " -"do not directly display the number of files to be copied; instead, they " -"display a confirmation dialog where you can check a list of source and " -"target file paths." -msgstr "" -"Nella barra degli strumenti Confronto cartelle, <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton " -"> e <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton >Copia a " -"sinistra</guibutton > svolgono lo stesso compito delle scorciatoie del menu " -"contestuale <guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem " -">Da destra a sinistra</guimenuitem >: copiano da lato a lato solo i file che " -"sonovalido per la copia.Tuttavia questi comandi non visualizzano " -"direttamente il numero di file da copiare;invece, visualizzano una finestra " -"di dialogo di conferma in cui è possibile controllare un elenco di percorsi " -"di file di origine e di destinazione." +"In the Folder Compare toolbar, <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Right</guibutton> and <placeholder " +"type=\"inlinemediaobject\" id=\"1\"/> <guibutton>Copy Left</guibutton> accomplish the same task as the <guimenuitem>Left to Right</guimenuitem> and " +"<guimenuitem>Right to Left</guimenuitem> context menu shortcuts: they copy from side to side only files that are valid to copy. However, these " +"commands do not directly display the number of files to be copied; instead, they display a confirmation dialog where you can check a list of source " +"and target file paths." +msgstr "" +"Nella barra degli strumenti Confronto cartelle, <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton > e " +"<placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton >Copia a sinistra</guibutton > svolgono lo stesso compito delle scorciatoie del menu " +"contestuale <guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra a sinistra</guimenuitem >: copiano da lato a lato solo i file " +"che sonovalido per la copia.Tuttavia questi comandi non visualizzano direttamente il numero di file da copiare;invece, visualizzano una finestra di " +"dialogo di conferma in cui è possibile controllare un elenco di percorsi di file di origine e di destinazione." #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:600 msgid "" -"In the WinMerge menu, <menuchoice> <guimenu>Merge</guimenu> " -"<guimenuitem>Copy to Right</guimenuitem> </menuchoice> and <menuchoice> " -"<guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" -"menuchoice> behave the same way as the toolbar Copy commands." +"In the WinMerge menu, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</guimenuitem> </menuchoice> and <menuchoice> <guimenu>Merge</" +"guimenu> <guimenuitem>Copy to Left</guimenuitem> </menuchoice> behave the same way as the toolbar Copy commands." msgstr "" -"Nel menu WinMerge, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem " -">Copia a destra</guimenuitem > </menuchoice > e <menuchoice> <guimenu " -">Unisci</guimenu > <guimenuitem >Copia a sinistra</guimenuitem > </" -"menuchoice > si comportano allo stesso modo dei comandi Copia della barra " -"degli strumenti." +"Nel menu WinMerge, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a destra</guimenuitem > </menuchoice > e <menuchoice> <guimenu " +">Unisci</guimenu > <guimenuitem >Copia a sinistra</guimenuitem > </menuchoice > si comportano allo stesso modo dei comandi Copia della barra degli " +"strumenti." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:614 English/Configuration.xml:2853 @@ -3173,38 +2398,26 @@ msgstr "Eliminazione di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:619 msgid "" -"You can use the <guimenuitem>Delete</guimenuitem> context menu item to " -"delete selected items in either or all sides. Like other file operations, " -"<guimenuitem>Delete</guimenuitem> has a submenu with <guimenuitem>Left</" -"guimenuitem>, <guimenuitem>Middle</guimenuitem>, <guimenuitem>Right</" +"You can use the <guimenuitem>Delete</guimenuitem> context menu item to delete selected items in either or all sides. Like other file operations, " +"<guimenuitem>Delete</guimenuitem> has a submenu with <guimenuitem>Left</guimenuitem>, <guimenuitem>Middle</guimenuitem>, <guimenuitem>Right</" "guimenuitem>, and <guimenuitem>All</guimenuitem> shortcuts." msgstr "" -"Puoi usare la voce del menu contestuale <guimenuitem >Elimina</guimenuitem > " -"per eliminare gli elementi selezionati su uno o tutti i lati.Come altre " -"operazioni sui file, <guimenuitem >Elimina</guimenuitem > ha un sottomenu " -"con le scorciatoie <guimenuitem >Sinistra</guimenuitem >, <guimenuitem " -">Centro</guimenuitem >, <guimenuitem >Destra</guimenuitem > e <guimenuitem " -">Tutto</guimenuitem >." +"Puoi usare la voce del menu contestuale <guimenuitem >Elimina</guimenuitem > per eliminare gli elementi selezionati su uno o tutti i lati.Come altre " +"operazioni sui file, <guimenuitem >Elimina</guimenuitem > ha un sottomenu con le scorciatoie <guimenuitem >Sinistra</guimenuitem >, <guimenuitem " +">Centro</guimenuitem >, <guimenuitem >Destra</guimenuitem > e <guimenuitem >Tutto</guimenuitem >." #. type: Content of: <article><section><section><warning><para> #: English/Compare_dirs.xml:627 msgid "" -"We highly recommend that you keep the <guilabel>Send deleted files into " -"Recycle Bin</guilabel> option enabled See <xref linkend=\"Configuration\" /" -">), so that you can undo deletions in case of accidents. In addition, you " -"should keep Recycle Bin enabled: the WinMerge option does not work if you " -"disable the Recycle Bin in Windows. Again, you cannot undo file or folder " -"deletion unless you use both the WinMerge <guilabel>Send deleted files into " -"Recycle Bin</guilabel> option and the Windows Recycle Bin!" -msgstr "" -"Ti consigliamo vivamente di mantenere abilitata l'opzione <guilabel >Invia i " -"file eliminati nel cestino</guilabel > (Vedi <xref " -"linkend=\"Configuration\" />), in modo da poter annullare le eliminazioni in " -"caso di incidenti.Inoltre, dovresti mantenere abilitato il Cestino: " -"l'opzione WinMerge non funziona se disabiliti il ​​Cestino in Windows.Ancora " -"una volta, non puoi annullare l'eliminazione di file o cartelle a meno che " -"non utilizzi sia l'opzione <guilabel >Invia i file eliminati nel Cestino</" -"guilabel > di WinMerge sia il Cestino di Windows!" +"We highly recommend that you keep the <guilabel>Send deleted files into Recycle Bin</guilabel> option enabled See <xref linkend=\"Configuration\" /" +">), so that you can undo deletions in case of accidents. In addition, you should keep Recycle Bin enabled: the WinMerge option does not work if you " +"disable the Recycle Bin in Windows. Again, you cannot undo file or folder deletion unless you use both the WinMerge <guilabel>Send deleted files " +"into Recycle Bin</guilabel> option and the Windows Recycle Bin!" +msgstr "" +"Ti consigliamo vivamente di mantenere abilitata l'opzione <guilabel >Invia i file eliminati nel cestino</guilabel > (Vedi <xref " +"linkend=\"Configuration\" />), in modo da poter annullare le eliminazioni in caso di incidenti.Inoltre, dovresti mantenere abilitato il Cestino: " +"l'opzione WinMerge non funziona se disabiliti il ​​Cestino in Windows.Ancora una volta, non puoi annullare l'eliminazione di file o cartelle a meno che " +"non utilizzi sia l'opzione <guilabel >Invia i file eliminati nel Cestino</guilabel > di WinMerge sia il Cestino di Windows!" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:640 @@ -3219,19 +2432,13 @@ msgstr "Rinominazione dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:645 msgid "" -"To rename a file or folder, choose <guimenuitem>Rename</guimenuitem> in its " -"context menu or press <keycap>F2</keycap>. Then change the name in the edit " -"box and press <keycap>Enter</keycap>, or press <keycap>Esc</keycap> to " -"cancel. You can only rename a single file or folder. Note that renaming " -"changes items in both or all three sides: it is not currently possible to " -"rename an item on just one side." -msgstr "" -"Per rinominare un file o una cartella, scegli <guimenuitem >Rinomina</" -"guimenuitem > nel suo menu contestuale o premi <keycap >F2</keycap >.Quindi " -"cambia il nome nella casella di modifica e premi <keycap>Invio</keycap>, " -"oppure premi <keycap>Esc</keycap> per annullare.Puoi rinominare solo un " -"singolo file o cartella.Tieni presente che la ridenominazione modifica gli " -"elementi su entrambi o su tutti e tre i lati: al momento non è possibile " +"To rename a file or folder, choose <guimenuitem>Rename</guimenuitem> in its context menu or press <keycap>F2</keycap>. Then change the name in the " +"edit box and press <keycap>Enter</keycap>, or press <keycap>Esc</keycap> to cancel. You can only rename a single file or folder. Note that renaming " +"changes items in both or all three sides: it is not currently possible to rename an item on just one side." +msgstr "" +"Per rinominare un file o una cartella, scegli <guimenuitem >Rinomina</guimenuitem > nel suo menu contestuale o premi <keycap >F2</keycap >.Quindi " +"cambia il nome nella casella di modifica e premi <keycap>Invio</keycap>, oppure premi <keycap>Esc</keycap> per annullare.Puoi rinominare solo un " +"singolo file o cartella.Tieni presente che la ridenominazione modifica gli elementi su entrambi o su tutti e tre i lati: al momento non è possibile " "rinominare un elemento solo su un lato." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -3247,15 +2454,11 @@ msgstr "Apertura dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:660 msgid "" -"In the context menu, you can use <guimenuitem>Open Left</guimenuitem>, " -"<guimenuitem>Open Middle</guimenuitem> or <guimenuitem>Open Right</" -"guimenuitem>, depending on which side you want to operate on. Each " -"<guimenuitem>Open</guimenuitem> menu item has a submenu with these shortcuts:" +"In the context menu, you can use <guimenuitem>Open Left</guimenuitem>, <guimenuitem>Open Middle</guimenuitem> or <guimenuitem>Open Right</" +"guimenuitem>, depending on which side you want to operate on. Each <guimenuitem>Open</guimenuitem> menu item has a submenu with these shortcuts:" msgstr "" -"Nel menu contestuale, puoi usare <guimenuitem >Apri a sinistra</guimenuitem " -">, <guimenuitem >Apri al centro</guimenuitem > o <guimenuitem >Apri a " -"destra</guimenuitem >, a seconda del lato su cui vuoi operare.Ogni voce del " -"menu <guimenuitem >Apri</guimenuitem > ha un sottomenu con queste " +"Nel menu contestuale, puoi usare <guimenuitem >Apri a sinistra</guimenuitem >, <guimenuitem >Apri al centro</guimenuitem > o <guimenuitem >Apri a " +"destra</guimenuitem >, a seconda del lato su cui vuoi operare.Ogni voce del menu <guimenuitem >Apri</guimenuitem > ha un sottomenu con queste " "scorciatoie:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -3265,18 +2468,13 @@ msgstr "Con domanda registrata" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:671 -msgid "" -"Opens the file with the application (if any) that is registered in Windows " -"for the file's type." -msgstr "" -"Apre il file con l'applicazione (se presente) registrata in Windows per il " -"tipo di file." +msgid "Opens the file with the application (if any) that is registered in Windows for the file's type." +msgstr "Apre il file con l'applicazione (se presente) registrata in Windows per il tipo di file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_dirs.xml:675 msgid "This shortcut usually opens a folder in a new Windows Explorer." -msgstr "" -"Questo collegamento di solito apre una cartella in un nuovo Esplora risorse." +msgstr "Questo collegamento di solito apre una cartella in un nuovo Esplora risorse." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:683 @@ -3285,12 +2483,8 @@ msgstr "Con editor esterno" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:686 -msgid "" -"Opens the file with an external editor. The default editor is Notepad, but " -"you can configure a different one in WinMerge options." -msgstr "" -"Apre il file con un editor esterno.L'editor predefinito è Blocco note, ma " -"puoi configurarne uno diverso nelle opzioni WinMerge." +msgid "Opens the file with an external editor. The default editor is Notepad, but you can configure a different one in WinMerge options." +msgstr "Apre il file con un editor esterno.L'editor predefinito è Blocco note, ma puoi configurarne uno diverso nelle opzioni WinMerge." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:693 @@ -3299,12 +2493,8 @@ msgstr "Con..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:696 -msgid "" -"Opens the <guilabel>Open With</guilabel> dialog, where you can specify an " -"application to open your file with." -msgstr "" -"Apre la finestra di dialogo <guilabel >Apri con</guilabel >, dove puoi " -"specificare un'applicazione con cui aprire il file." +msgid "Opens the <guilabel>Open With</guilabel> dialog, where you can specify an application to open your file with." +msgstr "Apre la finestra di dialogo <guilabel >Apri con</guilabel >, dove puoi specificare un'applicazione con cui aprire il file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:705 @@ -3323,48 +2513,33 @@ msgstr "nomi di file" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:704 -msgid "" -"Copying pathnames or filenames<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Copia di percorsi o nomi di file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Copying pathnames or filenames<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Copia di percorsi o nomi di file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:714 msgid "" -"The context menu <guimenuitem>Copy Pathname</guimenuitem> and " -"<guimenuitem>Copy Filenames</guimenuitem> shortcuts copy the pathname or " -"filename of selected items to the Windows clipboard. You can then paste the " -"copied information into a file or application, for example to create a list " -"of changed files or a change log." +"The context menu <guimenuitem>Copy Pathname</guimenuitem> and <guimenuitem>Copy Filenames</guimenuitem> shortcuts copy the pathname or filename of " +"selected items to the Windows clipboard. You can then paste the copied information into a file or application, for example to create a list of " +"changed files or a change log." msgstr "" -"Le scorciatoie <guimenuitem >Copia percorso</guimenuitem > e <guimenuitem " -">Copia nomi file</guimenuitem > del menu contestuale copiano il percorso o " -"il nome file degli elementi selezionati negli appunti di Windows.È quindi " -"possibile incollare le informazioni copiate in un file o in un'applicazione, " -"ad esempio per creare un elenco di file modificati o un registro delle " -"modifiche." +"Le scorciatoie <guimenuitem >Copia percorso</guimenuitem > e <guimenuitem >Copia nomi file</guimenuitem > del menu contestuale copiano il percorso o " +"il nome file degli elementi selezionati negli appunti di Windows.È quindi possibile incollare le informazioni copiate in un file o in " +"un'applicazione, ad esempio per creare un elenco di file modificati o un registro delle modifiche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:722 msgid "" -"<guimenuitem>Copy Pathnames</guimenuitem> has a menu with three shortcuts, " -"similar to other file operations. It copies the full pathnames of one or " +"<guimenuitem>Copy Pathnames</guimenuitem> has a menu with three shortcuts, similar to other file operations. It copies the full pathnames of one or " "more selected items to the clipboard, one per line." msgstr "" -"<guimenuitem >Copia nomi di percorso</guimenuitem > ha un menu con tre " -"scorciatoie, simili ad altre operazioni sui file.Copia i percorsi completi " -"di uno o più elementi selezionati negli appunti, uno per riga." +"<guimenuitem >Copia nomi di percorso</guimenuitem > ha un menu con tre scorciatoie, simili ad altre operazioni sui file.Copia i percorsi completi di " +"uno o più elementi selezionati negli appunti, uno per riga." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:729 -msgid "" -"<guimenuitem>Copy Filenames</guimenuitem> copies only filenames without " -"paths." -msgstr "" -"<guimenuitem >Copia nomi di file</guimenuitem > copia solo i nomi di file " -"senza percorsi." +msgid "<guimenuitem>Copy Filenames</guimenuitem> copies only filenames without paths." +msgstr "<guimenuitem >Copia nomi di file</guimenuitem > copia solo i nomi di file senza percorsi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Compare_dirs.xml:739 @@ -3378,64 +2553,46 @@ msgstr "file di sola lettura" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:736 -msgid "" -"Protecting files<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "Protecting files<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Protezione dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" id=\"2\"/>" +"Protezione dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:748 msgid "" -"To protect the files and folders on either side of a compare from changes, " -"enable the <menuchoice> <guimenu>File</guimenu> <guimenuitem>Left Read-only</" -"guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Middle Read-only</guimenuitem> </menuchoice> or <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Right Read-only</guimenuitem> </" -"menuchoice> check box." +"To protect the files and folders on either side of a compare from changes, enable the <menuchoice> <guimenu>File</guimenu> <guimenuitem>Left Read-" +"only</guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Middle Read-only</guimenuitem> </menuchoice> or <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Right Read-only</guimenuitem> </menuchoice> check box." msgstr "" -"Per proteggere i file e le cartelle su entrambi i lati di un confronto dalle " -"modifiche, attiva <menuchoice> <guimenu >File</guimenu > <guimenuitem >Sola " -"lettura sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu " -">File</guimenu > <guimenuitem >Sola lettura centrale</guimenuitem > </" -"menuchoice > o <menuchoice > <guimenu >File</guimenu >Casella di controllo " -"<guimenuitem >Sola lettura destra</guimenuitem > </menuchoice >." +"Per proteggere i file e le cartelle su entrambi i lati di un confronto dalle modifiche, attiva <menuchoice> <guimenu >File</guimenu > <guimenuitem " +">Sola lettura sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu >File</guimenu > <guimenuitem >Sola lettura centrale</guimenuitem > </" +"menuchoice > o <menuchoice > <guimenu >File</guimenu >Casella di controllo <guimenuitem >Sola lettura destra</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><important><para> #: English/Compare_dirs.xml:764 -msgid "" -"Setting the read-only option protects files and folders only in the current " -"compare view; it does not affect their Windows file attributes." +msgid "Setting the read-only option protects files and folders only in the current compare view; it does not affect their Windows file attributes." msgstr "" -"L'impostazione dell'opzione di sola lettura protegge file e cartelle solo " -"nella visualizzazione di confronto corrente;non influisce sugli attributi " +"L'impostazione dell'opzione di sola lettura protegge file e cartelle solo nella visualizzazione di confronto corrente;non influisce sugli attributi " "dei file Windows." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:769 msgid "" -"This protected status is inherited by files that you open in the folder " -"compare. For example, if you compare two folders, set one side read-only, " -"and open two files for comparing, the open file on the protected side is " -"write-protected. Similarly, you cannot copy a file from the unprotected side " -"to the protected side." +"This protected status is inherited by files that you open in the folder compare. For example, if you compare two folders, set one side read-only, and " +"open two files for comparing, the open file on the protected side is write-protected. Similarly, you cannot copy a file from the unprotected side to " +"the protected side." msgstr "" -"Questo stato protetto viene ereditato dai file aperti nel confronto cartelle." -"Ad esempio, se si confrontano due cartelle, si imposta un lato in sola " -"lettura e si aprono due file per il confronto, il file aperto sul lato " -"protetto sarà protetto da scrittura.Allo stesso modo, non è possibile " -"copiare un file dal lato non protetto a quello protetto." +"Questo stato protetto viene ereditato dai file aperti nel confronto cartelle.Ad esempio, se si confrontano due cartelle, si imposta un lato in sola " +"lettura e si aprono due file per il confronto, il file aperto sul lato protetto sarà protetto da scrittura.Allo stesso modo, non è possibile copiare " +"un file dal lato non protetto a quello protetto." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:775 msgid "" -"The <guilabel>RO</guilabel> code in the left side's, middle or right side's " -"pane in the status bar (near the bottom right of the window) indicates that " -"the side is currently read-only." +"The <guilabel>RO</guilabel> code in the left side's, middle or right side's pane in the status bar (near the bottom right of the window) indicates " +"that the side is currently read-only." msgstr "" -"Il codice <guilabel >RO</guilabel > nel riquadro sinistro, centrale o destro " -"della barra di stato (vicino all'angolo inferiore destro della finestra) " +"Il codice <guilabel >RO</guilabel > nel riquadro sinistro, centrale o destro della barra di stato (vicino all'angolo inferiore destro della finestra) " "indica che il lato è attualmente di sola lettura." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -3445,31 +2602,20 @@ msgstr "vista rinfrescante" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:781 -msgid "" -"Refreshing selected items in the view<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Aggiornamento degli elementi selezionati nella vista<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Refreshing selected items in the view<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Aggiornamento degli elementi selezionati nella vista<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:785 msgid "" -"A full refresh of large folders can take a long time. In WinMerge 2.2 and " -"earlier, you always had to do a full refresh to update files after editing " -"them outside WinMerge. Starting in Version 2.4, WinMerge can refresh just " -"selected items: choose <guimenuitem>Refresh</guimenuitem> from the context " -"menu or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh Selected</" -"guimenuitem> </menuchoice> from the main menu." -msgstr "" -"Un aggiornamento completo di cartelle di grandi dimensioni può richiedere " -"molto tempo.In WinMerge 2.2 e versioni precedenti, dovevi sempre eseguire un " -"aggiornamento completo per aggiornare i file dopo averli modificati " -"all'esterno di WinMerge.A partire dalla versione 2.4, WinMerge può " -"aggiornare solo gli elementi selezionati: scegli <guimenuitem >Aggiorna</" -"guimenuitem > dal menu contestuale o <menuchoice > <guimenu >Visualizza</" -"guimenu > <guimenuitem >Aggiorna selezionati</guimenuitem > </menuchoice > " -"dal menu principale." +"A full refresh of large folders can take a long time. In WinMerge 2.2 and earlier, you always had to do a full refresh to update files after editing " +"them outside WinMerge. Starting in Version 2.4, WinMerge can refresh just selected items: choose <guimenuitem>Refresh</guimenuitem> from the context " +"menu or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh Selected</guimenuitem> </menuchoice> from the main menu." +msgstr "" +"Un aggiornamento completo di cartelle di grandi dimensioni può richiedere molto tempo.In WinMerge 2.2 e versioni precedenti, dovevi sempre eseguire " +"un aggiornamento completo per aggiornare i file dopo averli modificati all'esterno di WinMerge.A partire dalla versione 2.4, WinMerge può aggiornare " +"solo gli elementi selezionati: scegli <guimenuitem >Aggiorna</guimenuitem > dal menu contestuale o <menuchoice > <guimenu >Visualizza</guimenu > " +"<guimenuitem >Aggiorna selezionati</guimenuitem > </menuchoice > dal menu principale." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_dirs.xml:798 English/Configuration.xml:2758 @@ -3483,27 +2629,18 @@ msgstr "Archiviazione file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:803 -msgid "" -"Use the context menu <guimenu>Zip</guimenu> menu item to create a new " -"archive file containing the items you select." -msgstr "" -"Usa la voce del menu <guimenu >Zip</guimenu > del menu contestuale per " -"creare un nuovo file di archivio contenente gli elementi selezionati." +msgid "Use the context menu <guimenu>Zip</guimenu> menu item to create a new archive file containing the items you select." +msgstr "Usa la voce del menu <guimenu >Zip</guimenu > del menu contestuale per creare un nuovo file di archivio contenente gli elementi selezionati." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:807 -msgid "" -"Archive support requires that you have installed the WinMerge 7-Zip plugin." -msgstr "" -"Il supporto dell'archivio richiede l'installazione del plug-in WinMerge 7-" -"Zip." +msgid "Archive support requires that you have installed the WinMerge 7-Zip plugin." +msgstr "Il supporto dell'archivio richiede l'installazione del plug-in WinMerge 7-Zip." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:811 msgid "The <guimenu>Zip</guimenu> menu item has a submenu with five shortcuts:" -msgstr "" -"La voce di menu <guimenu >Zip</guimenu > ha un sottomenu con cinque " -"scorciatoie:" +msgstr "La voce di menu <guimenu >Zip</guimenu > ha un sottomenu con cinque scorciatoie:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:815 @@ -3513,9 +2650,7 @@ msgstr "Sinistra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:818 msgid "Adds left-side files and folders recursively to the archive file" -msgstr "" -"Aggiunge in modo ricorsivo i file e le cartelle del lato sinistro al file di " -"archivio" +msgstr "Aggiunge in modo ricorsivo i file e le cartelle del lato sinistro al file di archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:824 @@ -3525,8 +2660,7 @@ msgstr "In mezzo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:827 msgid "Adds middle files and folders recursively to the archive file" -msgstr "" -"Aggiunge file e cartelle centrali in modo ricorsivo al file di archivio" +msgstr "Aggiunge file e cartelle centrali in modo ricorsivo al file di archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:833 @@ -3536,9 +2670,7 @@ msgstr "Destra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:836 msgid "Adds right-side files and folders recursively to the archive file" -msgstr "" -"Aggiunge file e cartelle sul lato destro in modo ricorsivo al file di " -"archivio" +msgstr "Aggiunge file e cartelle sul lato destro in modo ricorsivo al file di archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:842 @@ -3548,19 +2680,13 @@ msgstr "Entrambi" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:845 msgid "" -"Adds files and folders recursively from both sides to the archive file. " -"Because the filenames are same, they are added to different subfolders, " -"named <filename class=\"directory\">Original</filename> and <filename " -"class=\"directory\">Altered</filename>, inside the archive: left-side files " -"are put to <filename class=\"directory\">Original</filename>, and right-side " -"files are put into <filename class=\"directory\">Altered</filename>." -msgstr "" -"Aggiunge file e cartelle in modo ricorsivo da entrambi i lati al file di " -"archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " -"sottocartelle diverse, denominate <filename class=\"directory\">Original</" -"filename> e <filename class=\"directory\">Altered</filename>, all'interno " -"dell'archivio: i file sul lato sinistro vengono inseriti in <filename " -"class=\"directory\">Original</filename>, e i file sul lato destro vengono " +"Adds files and folders recursively from both sides to the archive file. Because the filenames are same, they are added to different subfolders, named " +"<filename class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename>, inside the archive: left-side files are put " +"to <filename class=\"directory\">Original</filename>, and right-side files are put into <filename class=\"directory\">Altered</filename>." +msgstr "" +"Aggiunge file e cartelle in modo ricorsivo da entrambi i lati al file di archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " +"sottocartelle diverse, denominate <filename class=\"directory\">Original</filename> e <filename class=\"directory\">Altered</filename>, all'interno " +"dell'archivio: i file sul lato sinistro vengono inseriti in <filename class=\"directory\">Original</filename>, e i file sul lato destro vengono " "inseriti in <filename class=\"directory\">Altered</filename>." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -3571,19 +2697,13 @@ msgstr "Tutto" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:860 msgid "" -"Adds files and folders recursively from all sides to the archive file. " -"Because the filenames are same, they are added to different subfolders, " -"named <filename class=\"directory\">Original</filename> and <filename " -"class=\"directory\">Altered</filename>, inside the archive: left-side files " -"are put to <filename class=\"directory\">Original</filename>, and right-side " -"files are put into <filename class=\"directory\">Altered</filename>." -msgstr "" -"Aggiunge file e cartelle in modo ricorsivo da tutti i lati al file di " -"archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " -"sottocartelle diverse, denominate <filename class=\"directory\">Original</" -"filename> e <filename class=\"directory\">Altered</filename>, all'interno " -"dell'archivio: i file sul lato sinistro vengono inseriti in <filename " -"class=\"directory\">Original</filename>, e i file sul lato destro vengono " +"Adds files and folders recursively from all sides to the archive file. Because the filenames are same, they are added to different subfolders, named " +"<filename class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename>, inside the archive: left-side files are put " +"to <filename class=\"directory\">Original</filename>, and right-side files are put into <filename class=\"directory\">Altered</filename>." +msgstr "" +"Aggiunge file e cartelle in modo ricorsivo da tutti i lati al file di archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " +"sottocartelle diverse, denominate <filename class=\"directory\">Original</filename> e <filename class=\"directory\">Altered</filename>, all'interno " +"dell'archivio: i file sul lato sinistro vengono inseriti in <filename class=\"directory\">Original</filename>, e i file sul lato destro vengono " "inseriti in <filename class=\"directory\">Altered</filename>." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -3593,59 +2713,40 @@ msgstr "Differenze" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:875 -msgid "" -"Like <guimenuitem>Both</guimenuitem>, but adds only different files " -"(including unique files) from both sides." -msgstr "" -"Come <guimenuitem >Entrambi</guimenuitem >, ma aggiunge solo file diversi " -"(inclusi file univoci) da entrambi i lati." +msgid "Like <guimenuitem>Both</guimenuitem>, but adds only different files (including unique files) from both sides." +msgstr "Come <guimenuitem >Entrambi</guimenuitem >, ma aggiunge solo file diversi (inclusi file univoci) da entrambi i lati." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:881 msgid "" -"When you select one of the <guimenu>Zip</guimenu> shortcuts, the Save As " -"dialog prompts you for the archive filename and type. WinMerge cannot add " +"When you select one of the <guimenu>Zip</guimenu> shortcuts, the Save As dialog prompts you for the archive filename and type. WinMerge cannot add " "files to existing archive files: it always creates a new archive file." msgstr "" -"Quando selezioni una delle scorciatoie <guimenu >Zip</guimenu >, la finestra " -"di dialogo Salva con nome ti chiederà il nome e il tipo del file di archivio." -"WinMerge non può aggiungere file a file di archivio esistenti: crea sempre " -"un nuovo file di archivio." +"Quando selezioni una delle scorciatoie <guimenu >Zip</guimenu >, la finestra di dialogo Salva con nome ti chiederà il nome e il tipo del file di " +"archivio.WinMerge non può aggiungere file a file di archivio esistenti: crea sempre un nuovo file di archivio." #. type: Content of: <article><section><section><tip><para> #: English/Compare_dirs.xml:896 msgid "" -"WinMerge can compare the contents of archive files that have the same name " -"on both sides: WinMerge looks for the <filename " -"class=\"directory\">Original</filename> and <filename " -"class=\"directory\">Altered</filename> subfolders, and compares the contents " -"of those two folders." +"WinMerge can compare the contents of archive files that have the same name on both sides: WinMerge looks for the <filename " +"class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename> subfolders, and compares the contents of those two " +"folders." msgstr "" -"WinMerge può confrontare il contenuto dei file di archivio che hanno lo " -"stesso nome su entrambi i lati: WinMerge cerca le sottocartelle <filename " -"class=\"directory\">Originale</filename> e <filename " -"class=\"directory\">Altered</filename> e confronta il contenuto di queste " -"due cartelle." +"WinMerge può confrontare il contenuto dei file di archivio che hanno lo stesso nome su entrambi i lati: WinMerge cerca le sottocartelle <filename " +"class=\"directory\">Originale</filename> e <filename class=\"directory\">Altered</filename> e confronta il contenuto di queste due cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:903 msgid "" -"If a folder compare includes the contents of an archive file, any changes " -"made to the included files in WinMerge (for example, using an " -"<guimenuitem>Open</guimenuitem> file operation to edit the file) are saved " -"in the archive file. But you cannot update archive contents by using the " -"WinMerge <guimenuitem>Copy</guimenuitem>, <guimenuitem>Move</guimenuitem>, " -"or <guimenuitem>Delete</guimenuitem> file operations. Instead, create a new " -"archive file using one of the <guimenuitem>Zip</guimenuitem> shortcuts." -msgstr "" -"Se un confronto di cartelle include il contenuto di un file di archivio, " -"qualsiasi modifica apportata ai file inclusi in WinMerge (ad esempio, " -"utilizzando un'operazione <guimenuitem >Apri</guimenuitem > per modificare " -"il file) viene salvata nel file di archivio.Ma non puoi aggiornare il " -"contenuto dell'archivio utilizzando le operazioni sui file <guimenuitem " -">Copia</guimenuitem >, <guimenuitem >Sposta</guimenuitem > o <guimenuitem " -">Elimina</guimenuitem > di WinMerge.Crea invece un nuovo file di archivio " -"utilizzando una delle scorciatoie <guimenuitem >Zip</guimenuitem >." +"If a folder compare includes the contents of an archive file, any changes made to the included files in WinMerge (for example, using an " +"<guimenuitem>Open</guimenuitem> file operation to edit the file) are saved in the archive file. But you cannot update archive contents by using the " +"WinMerge <guimenuitem>Copy</guimenuitem>, <guimenuitem>Move</guimenuitem>, or <guimenuitem>Delete</guimenuitem> file operations. Instead, create a " +"new archive file using one of the <guimenuitem>Zip</guimenuitem> shortcuts." +msgstr "" +"Se un confronto di cartelle include il contenuto di un file di archivio, qualsiasi modifica apportata ai file inclusi in WinMerge (ad esempio, " +"utilizzando un'operazione <guimenuitem >Apri</guimenuitem > per modificare il file) viene salvata nel file di archivio.Ma non puoi aggiornare il " +"contenuto dell'archivio utilizzando le operazioni sui file <guimenuitem >Copia</guimenuitem >, <guimenuitem >Sposta</guimenuitem > o <guimenuitem " +">Elimina</guimenuitem > di WinMerge.Crea invece un nuovo file di archivio utilizzando una delle scorciatoie <guimenuitem >Zip</guimenuitem >." #. type: Content of: <article><para><indexterm><primary> #: English/Compare_dirs.xml:916 English/Faq.xml:56 English/Open_paths.xml:9 @@ -3659,24 +2760,17 @@ msgstr "navigando nella finestra Confronto cartelle" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:915 -msgid "" -"Browsing folders in the Folder Compare window<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Esplorazione delle cartelle nella finestra Confronto cartelle<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Browsing folders in the Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Esplorazione delle cartelle nella finestra Confronto cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:921 msgid "" -"This section discusses ways to browse folders that are listed in a Folder " -"Compare window. When you browse a folder, you perform a completely new " +"This section discusses ways to browse folders that are listed in a Folder Compare window. When you browse a folder, you perform a completely new " "compare operation. Its result overwrites the current result in the window." msgstr "" -"In questa sezione vengono illustrate le modalità per sfogliare le cartelle " -"elencate in una finestra Confronto cartelle.Quando sfogli una cartella, " -"esegui un'operazione di confronto completamente nuova.Il suo risultato " -"sovrascrive il risultato corrente nella finestra." +"In questa sezione vengono illustrate le modalità per sfogliare le cartelle elencate in una finestra Confronto cartelle.Quando sfogli una cartella, " +"esegui un'operazione di confronto completamente nuova.Il suo risultato sovrascrive il risultato corrente nella finestra." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:927 @@ -3686,22 +2780,15 @@ msgstr "Esplorazione delle cartelle in un confronto non ricorsivo" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:929 msgid "" -"Even though a nonrecursive folder compare does not include the contents of " -"subfolders, the subfolders themselves are listed as files in the result. " -"Similarly, the compared folder's parent folder is listed as a file at the " -"top of the table. By opening these folders directly in the Folder Compare " -"window, you can selectively browse a directory tree. This approach — " -"comparing just the subdirectories you are interested in — can be more " -"efficient than performing a recursive compare on the entire directory tree." -msgstr "" -"Anche se un confronto di cartelle non ricorsivo non include il contenuto " -"delle sottocartelle, le sottocartelle stesse vengono elencate come file nel " -"risultato. Allo stesso modo, la cartella principale della cartella " -"confrontata è elencata come file nella parte superiore della tabella. " -"Aprendo queste cartelle direttamente nella finestra Confronto cartelle, è " -"possibile sfogliare selettivamente una struttura di cartelle. Questo " -"approccio, ovvero il confronto solo delle sottodirectory che ti interessano, " -"può essere più efficiente rispetto all'esecuzione di un confronto ricorsivo " +"Even though a nonrecursive folder compare does not include the contents of subfolders, the subfolders themselves are listed as files in the result. " +"Similarly, the compared folder's parent folder is listed as a file at the top of the table. By opening these folders directly in the Folder Compare " +"window, you can selectively browse a directory tree. This approach — comparing just the subdirectories you are interested in — can be more efficient " +"than performing a recursive compare on the entire directory tree." +msgstr "" +"Anche se un confronto di cartelle non ricorsivo non include il contenuto delle sottocartelle, le sottocartelle stesse vengono elencate come file nel " +"risultato. Allo stesso modo, la cartella principale della cartella confrontata è elencata come file nella parte superiore della tabella. Aprendo " +"queste cartelle direttamente nella finestra Confronto cartelle, è possibile sfogliare selettivamente una struttura di cartelle. Questo approccio, " +"ovvero il confronto solo delle sottodirectory che ti interessano, può essere più efficiente rispetto all'esecuzione di un confronto ricorsivo " "sull'intera struttura di cartelle." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -3711,78 +2798,52 @@ msgstr "Esplorazione della cartella principale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:944 English/Compare_dirs.xml:957 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/folderup.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/folderup.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/folderup.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/folderup.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:943 msgid "" -"To compare the <placeholder type=\"inlinemediaobject\" id=\"0\"/> parent " -"folder (the <guilabel>..</guilabel> path at the top), double-click its row, " +"To compare the <placeholder type=\"inlinemediaobject\" id=\"0\"/> parent folder (the <guilabel>..</guilabel> path at the top), double-click its row, " "or select the row and press <keycap>Enter</keycap>." msgstr "" -"Per confrontare la cartella principale <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> (il percorso <guilabel>..</guilabel> " -"in alto), fai doppio clic sulla sua riga o seleziona la riga e premi <keycap " -">Invio</keycap >." +"Per confrontare la cartella principale <placeholder type=\"inlinemediaobject\" id=\"0\"/> (il percorso <guilabel>..</guilabel> in alto), fai doppio " +"clic sulla sua riga o seleziona la riga e premi <keycap >Invio</keycap >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:951 msgid "" -"Sometimes the parent folder cannot be opened (for example if you do not have " -"permissions to access it). These two icons indicate whether a parent folder " -"can be opened:" +"Sometimes the parent folder cannot be opened (for example if you do not have permissions to access it). These two icons indicate whether a parent " +"folder can be opened:" msgstr "" -"A volte non è possibile aprire la cartella principale (ad esempio se non si " -"dispone dei permessi per accedervi).Queste due icone indicano se è possibile " -"aprire una cartella principale:" +"A volte non è possibile aprire la cartella principale (ad esempio se non si dispone dei permessi per accedervi).Queste due icone indicano se è " +"possibile aprire una cartella principale:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_dirs.xml:956 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder can be " -"opened." -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> È possibile aprire la " -"cartella principale." +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder can be opened." +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> È possibile aprire la cartella principale." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:963 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_dirs.xml:962 -msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder cannot be " -"opened." -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Impossibile aprire la " -"cartella principale." +msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder cannot be opened." +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Impossibile aprire la cartella principale." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:975 msgid "Browsing a single subfolder that exists on both or all three sides" -msgstr "" -"Esplorazione di una singola sottocartella esistente su entrambi o su tutti e " -"tre i lati" +msgstr "Esplorazione di una singola sottocartella esistente su entrambi o su tutti e tre i lati" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:979 -msgid "" -"To compare a single subfolder that exists on both or all three sides, double-" -"click the folder in the folder compare window." +msgid "To compare a single subfolder that exists on both or all three sides, double-click the folder in the folder compare window." msgstr "" -"Per confrontare una singola sottocartella esistente su entrambi o su tutti e " -"tre i lati, fare doppio clic sulla cartella nella finestra di confronto " +"Per confrontare una singola sottocartella esistente su entrambi o su tutti e tre i lati, fare doppio clic sulla cartella nella finestra di confronto " "cartelle." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -3793,14 +2854,11 @@ msgstr "Navigazione in una singola sottocartella che esiste solo su un lato" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:990 msgid "" -"If you browse to a subfolder that exists only one side, WinMerge can create " -"a new, matching folder on the other side respective both other sides. See " +"If you browse to a subfolder that exists only one side, WinMerge can create a new, matching folder on the other side respective both other sides. See " "<xref linkend=\"CompareDirs_browse_unique\" /> for details." msgstr "" -"Se si accede a una sottocartella che esiste solo su un lato, WinMerge può " -"creare una nuova cartella corrispondente sull'altro lato, rispettivamente su " -"entrambi gli altri lati.Vedi <xref linkend=\"CompareDirs_browse_unique\" /> " -"per i dettagli." +"Se si accede a una sottocartella che esiste solo su un lato, WinMerge può creare una nuova cartella corrispondente sull'altro lato, rispettivamente " +"su entrambi gli altri lati.Vedi <xref linkend=\"CompareDirs_browse_unique\" /> per i dettagli." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:1000 @@ -3810,27 +2868,18 @@ msgstr "Navigazione in due diverse sottocartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1003 msgid "" -"You cannot compare two subfolders (that is, selecting two rows) where the " -"subfolders on each side are different. Only if you have previously compared " -"identical folders (for example, by browsing a single subfolder in a compare " -"result) can you compare two subfolders. First select the two folders in the " -"Folder Compare window, as shown in the following figure:" +"You cannot compare two subfolders (that is, selecting two rows) where the subfolders on each side are different. Only if you have previously compared " +"identical folders (for example, by browsing a single subfolder in a compare result) can you compare two subfolders. First select the two folders in " +"the Folder Compare window, as shown in the following figure:" msgstr "" -"Non è possibile confrontare due sottocartelle (ovvero selezionando due " -"righe) in cui le sottocartelle su ciascun lato sono diverse.Solo se hai " -"precedentemente confrontato cartelle identiche (ad esempio, esplorando una " -"singola sottocartella in un risultato di confronto) puoi confrontare due " -"sottocartelle.Selezionare innanzitutto le due cartelle nella finestra " -"Confronto cartelle, come mostrato nella figura seguente:" +"Non è possibile confrontare due sottocartelle (ovvero selezionando due righe) in cui le sottocartelle su ciascun lato sono diverse.Solo se hai " +"precedentemente confrontato cartelle identiche (ad esempio, esplorando una singola sottocartella in un risultato di confronto) puoi confrontare due " +"sottocartelle.Selezionare innanzitutto le due cartelle nella finestra Confronto cartelle, come mostrato nella figura seguente:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_dirs.xml:1011 -msgid "" -"<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/" -"foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/" -"foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1018 @@ -3840,38 +2889,29 @@ msgstr "Finestra Confronta cartelle, due cartelle selezionate" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1023 msgid "" -"The order of selection is significant: the folder you select first is the " -"left folder in the result; the second selected folder becomes the right " +"The order of selection is significant: the folder you select first is the left folder in the result; the second selected folder becomes the right " "folder in the result." msgstr "" -"L'ordine di selezione è significativo: la cartella selezionata per prima è " -"la cartella a sinistra nel risultato;la seconda cartella selezionata diventa " -"la cartella giusta nel risultato." +"L'ordine di selezione è significativo: la cartella selezionata per prima è la cartella a sinistra nel risultato;la seconda cartella selezionata " +"diventa la cartella giusta nel risultato." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1027 msgid "" -"With the two folders selected, right-click and choose <guimenuitem>Compare</" -"guimenuitem> (or click <menuchoice> <guimenu>Merge</guimenu> " +"With the two folders selected, right-click and choose <guimenuitem>Compare</guimenuitem> (or click <menuchoice> <guimenu>Merge</guimenu> " "<guimenuitem>Compare</guimenuitem> </menuchoice> in the menu)." msgstr "" -"Con le due cartelle selezionate, fai clic con il pulsante destro del mouse e " -"scegli <guimenuitem >Confronta</guimenuitem > (o fai clic su <menuchoice> " -"<guimenu >Unisci</guimenu > <guimenuitem >Confronta</guimenuitem > </" -"menuchoice > nel menu)." +"Con le due cartelle selezionate, fai clic con il pulsante destro del mouse e scegli <guimenuitem >Confronta</guimenuitem > (o fai clic su " +"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Confronta</guimenuitem > </menuchoice > nel menu)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_dirs.xml:1035 msgid "" -"Again, the <guimenuitem>Compare</guimenuitem> operation is available only " -"when the current left and right folder paths are identical in the Folder " -"Compare window, as shown in the preceding screenshot. For example, it is not " -"available if the current window compares two different folders." +"Again, the <guimenuitem>Compare</guimenuitem> operation is available only when the current left and right folder paths are identical in the Folder " +"Compare window, as shown in the preceding screenshot. For example, it is not available if the current window compares two different folders." msgstr "" -"Ancora una volta, l'operazione <guimenuitem >Confronta</guimenuitem > è " -"disponibile solo quando i percorsi correnti delle cartelle sinistra e destra " -"sono identici nella finestra Confronta cartelle, come mostrato nello " -"screenshot precedente.Ad esempio, non è disponibile se la finestra corrente " +"Ancora una volta, l'operazione <guimenuitem >Confronta</guimenuitem > è disponibile solo quando i percorsi correnti delle cartelle sinistra e destra " +"sono identici nella finestra Confronta cartelle, come mostrato nello screenshot precedente.Ad esempio, non è disponibile se la finestra corrente " "confronta due cartelle diverse." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -3880,68 +2920,50 @@ msgid "unique folders" msgstr "cartelle uniche" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: English/Compare_dirs.xml:1050 English/Configuration.xml:1140 -#: English/Configuration.xml:1169 +#: English/Compare_dirs.xml:1050 English/Configuration.xml:1140 English/Configuration.xml:1169 msgid "comparing" msgstr "confrontando" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1047 msgid "Browsing unique folders<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Esplorazione di cartelle univoche<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Esplorazione di cartelle univoche<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1053 msgid "" -"In WinMerge 2.6 and earlier, you could not browse to unique folders (folders " -"that exist only in one side of a compare result), because WinMerge cannot " -"compare an existing folder to a non-existing folder. To copy anything from a " -"unique folder in WinMerge, you had to first create a copy of the entire " -"folder structure." -msgstr "" -"In WinMerge 2.6 e versioni precedenti non era possibile esplorare cartelle " -"univoche (cartelle che esistono solo in un lato del risultato del " -"confronto), perché WinMerge non può confrontare una cartella esistente con " -"una cartella inesistente.Per copiare qualsiasi cosa da una cartella univoca " -"in WinMerge, dovevi prima creare una copia dell'intera struttura delle " -"cartelle." +"In WinMerge 2.6 and earlier, you could not browse to unique folders (folders that exist only in one side of a compare result), because WinMerge " +"cannot compare an existing folder to a non-existing folder. To copy anything from a unique folder in WinMerge, you had to first create a copy of the " +"entire folder structure." +msgstr "" +"In WinMerge 2.6 e versioni precedenti non era possibile esplorare cartelle univoche (cartelle che esistono solo in un lato del risultato del " +"confronto), perché WinMerge non può confrontare una cartella esistente con una cartella inesistente.Per copiare qualsiasi cosa da una cartella " +"univoca in WinMerge, dovevi prima creare una copia dell'intera struttura delle cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1059 msgid "" -"However, you might prefer not to copy the whole folder structure. Starting " -"in Version 2.8, WinMerge provides an alternate way to create a new, empty " -"folder instead. This enables you to copy just the elements you want from the " -"original, unique folder to the created empty folder. This procedure " +"However, you might prefer not to copy the whole folder structure. Starting in Version 2.8, WinMerge provides an alternate way to create a new, empty " +"folder instead. This enables you to copy just the elements you want from the original, unique folder to the created empty folder. This procedure " "demonstrates:" msgstr "" -"Tuttavia, potresti preferire non copiare l'intera struttura delle cartelle.A " -"partire dalla versione 2.8, WinMerge fornisce invece un modo alternativo per " -"creare una nuova cartella vuota.Ciò ti consente di copiare solo gli elementi " -"desiderati dalla cartella originale e univoca alla cartella vuota creata." -"Questa procedura dimostra:" +"Tuttavia, potresti preferire non copiare l'intera struttura delle cartelle.A partire dalla versione 2.8, WinMerge fornisce invece un modo alternativo " +"per creare una nuova cartella vuota.Ciò ti consente di copiare solo gli elementi desiderati dalla cartella originale e univoca alla cartella vuota " +"creata.Questa procedura dimostra:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1067 msgid "" -"Browse to the unique folder (select the folder and press <keycap>Enter,</" -"keycap> double-click it, or right-click it and choose <guimenuitem>Compare</" +"Browse to the unique folder (select the folder and press <keycap>Enter,</keycap> double-click it, or right-click it and choose <guimenuitem>Compare</" "guimenuitem>). For example:" msgstr "" -"Sfoglia fino alla cartella univoca (seleziona la cartella e premi <keycap " -">Invio,</keycap> fai doppio clic su di essa o fai clic con il pulsante " -"destro del mouse e scegli <guimenuitem >Confronta</guimenuitem >).Per " -"esempio:" +"Sfoglia fino alla cartella univoca (seleziona la cartella e premi <keycap >Invio,</keycap> fai doppio clic su di essa o fai clic con il pulsante " +"destro del mouse e scegli <guimenuitem >Confronta</guimenuitem >).Per esempio:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Compare_dirs.xml:1072 -msgid "" -"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" -"foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" -"foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1079 @@ -3951,51 +2973,37 @@ msgstr "Finestra Confronta cartelle, confrontando cartelle univoche" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1083 msgid "" -"A WinMerge message informs you that the folder exists on only one side and " -"cannot be opened. The message then prompts you to confirm whether you want " -"to create a matching folder and open it as the other side of the compare " -"result." +"A WinMerge message informs you that the folder exists on only one side and cannot be opened. The message then prompts you to confirm whether you want " +"to create a matching folder and open it as the other side of the compare result." msgstr "" -"Un messaggio WinMerge informa che la cartella esiste solo su un lato e non " -"può essere aperta.Il messaggio richiede quindi di confermare se si desidera " -"creare una cartella corrispondente e aprirla come l'altro lato del risultato " -"del confronto." +"Un messaggio WinMerge informa che la cartella esiste solo su un lato e non può essere aperta.Il messaggio richiede quindi di confermare se si " +"desidera creare una cartella corrispondente e aprirla come l'altro lato del risultato del confronto." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1090 msgid "" -"Click <guibutton>Yes</guibutton> to confirm (<guibutton>No</guibutton> " -"cancels the compare). In the new compare result, the unique folder is opened " +"Click <guibutton>Yes</guibutton> to confirm (<guibutton>No</guibutton> cancels the compare). In the new compare result, the unique folder is opened " "on the left side, and the new empty created folder is on the right:" msgstr "" -"Fai clic su <guibutton >Sì</guibutton > per confermare (<guibutton >No</" -"guibutton > annulla il confronto).Nel nuovo risultato del confronto, la " -"cartella univoca viene aperta sul lato sinistro e la nuova cartella creata " -"vuota è sulla destra:" +"Fai clic su <guibutton >Sì</guibutton > per confermare (<guibutton >No</guibutton > annulla il confronto).Nel nuovo risultato del confronto, la " +"cartella univoca viene aperta sul lato sinistro e la nuova cartella creata vuota è sulla destra:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Compare_dirs.xml:1096 -msgid "" -"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" -"foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" -"foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1103 msgid "Folder Compare window after browsing to unique and created folders" -msgstr "" -"Finestra Confronta cartelle dopo aver sfogliato le cartelle univoche e create" +msgstr "Finestra Confronta cartelle dopo aver sfogliato le cartelle univoche e create" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1108 msgid "" -"In the compare result, you can copy or move items (for example, using the " -"right-click context menu) from the unique folder to the created folder." +"In the compare result, you can copy or move items (for example, using the right-click context menu) from the unique folder to the created folder." msgstr "" -"Nel risultato del confronto, puoi copiare o spostare elementi (ad esempio, " -"utilizzando il menu contestuale del tasto destro) dalla cartella univoca " +"Nel risultato del confronto, puoi copiare o spostare elementi (ad esempio, utilizzando il menu contestuale del tasto destro) dalla cartella univoca " "alla cartella creata." #. type: Content of: <article><section><title><indexterm><secondary> @@ -4005,24 +3013,17 @@ msgstr "personalizzazione" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:1117 -msgid "" -"Customizing the Folder Compare window<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Personalizzazione della finestra di confronto delle cartelle<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Customizing the Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Personalizzazione della finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1123 msgid "" -"This section describes how to control the way Folder Compare window displays " -"results. You can customize the view by showing, hiding, and reordering the " -"table columns." +"This section describes how to control the way Folder Compare window displays results. You can customize the view by showing, hiding, and reordering " +"the table columns." msgstr "" -"Questa sezione descrive come controllare il modo in cui la finestra " -"Confronto cartelle visualizza i risultati.Puoi personalizzare la " -"visualizzazione mostrando, nascondendo e riordinando le colonne della " -"tabella." +"Questa sezione descrive come controllare il modo in cui la finestra Confronto cartelle visualizza i risultati.Puoi personalizzare la visualizzazione " +"mostrando, nascondendo e riordinando le colonne della tabella." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:1129 @@ -4031,82 +3032,52 @@ msgstr "Visualizza il menu" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1128 -msgid "" -"Showing and hiding types of files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Mostrare e nascondere i tipi di file<placeholder type=\"indexterm\" id=\"0\"/" -">" +msgid "Showing and hiding types of files<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Mostrare e nascondere i tipi di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1134 msgid "" -"The <guimenu>View</guimenu> menu contains these shortcuts to show or hide " -"types of items. Enable (check) a menu option to show the item; disable it to " -"hide the item." +"The <guimenu>View</guimenu> menu contains these shortcuts to show or hide types of items. Enable (check) a menu option to show the item; disable it " +"to hide the item." msgstr "" -"Il menu <guimenu >Visualizza</guimenu > contiene queste scorciatoie per " -"mostrare o nascondere tipi di elementi.Abilita (seleziona) un'opzione di " -"menu per mostrare l'elemento;disabilitarlo per nascondere l'elemento." +"Il menu <guimenu >Visualizza</guimenu > contiene queste scorciatoie per mostrare o nascondere tipi di elementi.Abilita (seleziona) un'opzione di menu " +"per mostrare l'elemento;disabilitarlo per nascondere l'elemento." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1140 -msgid "" -"<guimenuitem>Show Identical Items</guimenuitem>: Files detected as identical" -msgstr "" -"<guimenuitem >Visualizza elementi identici</guimenuitem >: file rilevati " -"come identici" +msgid "<guimenuitem>Show Identical Items</guimenuitem>: Files detected as identical" +msgstr "<guimenuitem >Visualizza elementi identici</guimenuitem >: file rilevati come identici" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1145 -msgid "" -"<guimenuitem>Show Different Items</guimenuitem>: Files detected as different" -msgstr "" -"<guimenuitem >Visualizza elementi diversi</guimenuitem >: file rilevati come " -"diversi" +msgid "<guimenuitem>Show Different Items</guimenuitem>: Files detected as different" +msgstr "<guimenuitem >Visualizza elementi diversi</guimenuitem >: file rilevati come diversi" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1150 -msgid "" -"<guimenuitem>Show Left Unique Items</guimenuitem>: Files and directories " -"present only in left side" -msgstr "" -"<guimenuitem >Visualizza elementi univoci a sinistra</guimenuitem >: file e " -"cartelle presenti solo sul lato sinistro" +msgid "<guimenuitem>Show Left Unique Items</guimenuitem>: Files and directories present only in left side" +msgstr "<guimenuitem >Visualizza elementi univoci a sinistra</guimenuitem >: file e cartelle presenti solo sul lato sinistro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1155 -msgid "" -"<guimenuitem>Show Middle Unique Items</guimenuitem>: Files and directories " -"present only in the middle" -msgstr "" -"<guimenuitem >Visualizza elementi univoci al centro</guimenuitem >: file e " -"cartelle presenti solo al centro" +msgid "<guimenuitem>Show Middle Unique Items</guimenuitem>: Files and directories present only in the middle" +msgstr "<guimenuitem >Visualizza elementi univoci al centro</guimenuitem >: file e cartelle presenti solo al centro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1160 -msgid "" -"<guimenuitem>Show Right Unique Items</guimenuitem>: Files and directories " -"present only in right side" -msgstr "" -"<guimenuitem >Visualizza elementi univoci a destra</guimenuitem >: file e " -"cartelle presenti solo sul lato destro" +msgid "<guimenuitem>Show Right Unique Items</guimenuitem>: Files and directories present only in right side" +msgstr "<guimenuitem >Visualizza elementi univoci a destra</guimenuitem >: file e cartelle presenti solo sul lato destro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1165 -msgid "" -"<guimenuitem>Show Skipped Items</guimenuitem>: Files and directories omitted " -"by file filters" -msgstr "" -"<guimenuitem >Visualizza elementi saltati</guimenuitem >: file e cartelle " -"omessi dai filtri dei file" +msgid "<guimenuitem>Show Skipped Items</guimenuitem>: Files and directories omitted by file filters" +msgstr "<guimenuitem >Visualizza elementi saltati</guimenuitem >: file e cartelle omessi dai filtri dei file" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1170 -msgid "" -"<guimenuitem>Show Binary Files</guimenuitem>: Files detected as binaries" -msgstr "" -"<guimenuitem >Visualizza file binari</guimenuitem >: file rilevati come " -"binari" +msgid "<guimenuitem>Show Binary Files</guimenuitem>: Files detected as binaries" +msgstr "<guimenuitem >Visualizza file binari</guimenuitem >: file rilevati come binari" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1177 @@ -4116,43 +3087,32 @@ msgstr "Modifica dell'ordinamento delle colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1179 msgid "" -"The rows in the Folder Compare window are ordered according to the sort " -"order of a particular column. This sort column is indicated by a small arrow " -"in its heading. The arrow points up if the column is sorted in ascending " -"order, down if descending. The Folder Compare example at the top of this " +"The rows in the Folder Compare window are ordered according to the sort order of a particular column. This sort column is indicated by a small arrow " +"in its heading. The arrow points up if the column is sorted in ascending order, down if descending. The Folder Compare example at the top of this " "topic is sorted by the Filename column, in ascending order." msgstr "" -"Le righe nella finestra Confronto cartelle vengono ordinate in base " -"all'ordinamento di una particolare colonna.Questa colonna di ordinamento è " -"indicata da una piccola freccia nella sua intestazione.La freccia punta " -"verso l'alto se la colonna è ordinata in ordine crescente, verso il basso se " -"discendente.L'esempio di confronto delle cartelle nella parte superiore di " -"questo argomento è ordinato in base alla colonna Nome file, in ordine " +"Le righe nella finestra Confronto cartelle vengono ordinate in base all'ordinamento di una particolare colonna.Questa colonna di ordinamento è " +"indicata da una piccola freccia nella sua intestazione.La freccia punta verso l'alto se la colonna è ordinata in ordine crescente, verso il basso se " +"discendente.L'esempio di confronto delle cartelle nella parte superiore di questo argomento è ordinato in base alla colonna Nome file, in ordine " "crescente." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1185 msgid "" -"To choose another order column, simply click in that column's heading. The " -"selected column is set to its default sort order and all the rows are " +"To choose another order column, simply click in that column's heading. The selected column is set to its default sort order and all the rows are " "reordered by that column's sort order." msgstr "" -"Per scegliere un'altra colonna dell'ordine, fai semplicemente clic " -"sull'intestazione di quella colonna.La colonna selezionata viene impostata " -"sul suo ordinamento predefinito e tutte le righe vengono riordinate in base " -"all'ordinamento di quella colonna." +"Per scegliere un'altra colonna dell'ordine, fai semplicemente clic sull'intestazione di quella colonna.La colonna selezionata viene impostata sul suo " +"ordinamento predefinito e tutte le righe vengono riordinate in base all'ordinamento di quella colonna." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1189 msgid "" -"To change the sort direction of a column that is already the sort column, " -"click in its header again. That is, clicking in a sort column header " +"To change the sort direction of a column that is already the sort column, click in its header again. That is, clicking in a sort column header " "reverses its order (toggling between ascending and descending order)." msgstr "" -"Per modificare la direzione di ordinamento di una colonna che è già la " -"colonna di ordinamento, fare nuovamente clic sulla sua intestazione.Cioè, " -"facendo clic sull'intestazione di una colonna di ordinamento si inverte " -"l'ordine (alternando tra ordine ascendente e discendente)." +"Per modificare la direzione di ordinamento di una colonna che è già la colonna di ordinamento, fare nuovamente clic sulla sua intestazione.Cioè, " +"facendo clic sull'intestazione di una colonna di ordinamento si inverte l'ordine (alternando tra ordine ascendente e discendente)." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1196 @@ -4162,40 +3122,30 @@ msgstr "Aggiunta, rimozione e riordino delle colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1198 msgid "To modify the columns that are displayed in the Folder Compare window:" -msgstr "" -"Per modificare le colonne visualizzate nella finestra Confronto cartelle:" +msgstr "Per modificare le colonne visualizzate nella finestra Confronto cartelle:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1203 msgid "" -"Right-click any column heading and choose <guimenuitem>Customize Columns</" -"guimenuitem>. Or, click <menuchoice> <guimenu>Tools</guimenu> " +"Right-click any column heading and choose <guimenuitem>Customize Columns</guimenuitem>. Or, click <menuchoice> <guimenu>Tools</guimenu> " "<guimenuitem>Customize Columns</guimenuitem> </menuchoice>" msgstr "" -"Fai clic con il tasto destro su qualsiasi intestazione di colonna e scegli " -"<guimenuitem >Personalizza colonne</guimenuitem >.Oppure fai clic su " -"<menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Personalizza " -"colonne</guimenuitem > </menuchoice >" +"Fai clic con il tasto destro su qualsiasi intestazione di colonna e scegli <guimenuitem >Personalizza colonne</guimenuitem >.Oppure fai clic su " +"<menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Personalizza colonne</guimenuitem > </menuchoice >" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1212 msgid "" -"The Display Columns dialog contains a list of all the available column " -"names, each with a check box. Configure the columns using any combination of " +"The Display Columns dialog contains a list of all the available column names, each with a check box. Configure the columns using any combination of " "these actions:" msgstr "" -"La finestra di dialogo Visualizza colonne contiene un elenco di tutti i nomi " -"di colonne disponibili, ciascuna con una casella di controllo.Configura le " -"colonne utilizzando qualsiasi combinazione di queste azioni:" +"La finestra di dialogo Visualizza colonne contiene un elenco di tutti i nomi di colonne disponibili, ciascuna con una casella di controllo.Configura " +"le colonne utilizzando qualsiasi combinazione di queste azioni:" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1218 -msgid "" -"Check the columns you want to display (note that selecting the item in the " -"list is not enough)" -msgstr "" -"Seleziona le colonne che vuoi visualizzare (nota che selezionare la voce " -"nell'elenco non è sufficiente)" +msgid "Check the columns you want to display (note that selecting the item in the list is not enough)" +msgstr "Seleziona le colonne che vuoi visualizzare (nota che selezionare la voce nell'elenco non è sufficiente)" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1223 @@ -4204,21 +3154,16 @@ msgstr "Deseleziona le colonne che desideri nascondere." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1227 -msgid "" -"To change the order of columns, select one or more items and click " -"<guibutton>Move Up</guibutton> or <guibutton>Move Down</guibutton>." +msgid "To change the order of columns, select one or more items and click <guibutton>Move Up</guibutton> or <guibutton>Move Down</guibutton>." msgstr "" -"Per cambiare l'ordine delle colonne, seleziona uno o più elementi e fai clic " -"su <guibutton >Sposta su</guibutton > o <guibutton >Sposta giù</guibutton >." +"Per cambiare l'ordine delle colonne, seleziona uno o più elementi e fai clic su <guibutton >Sposta su</guibutton > o <guibutton >Sposta giù</" +"guibutton >." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1233 -msgid "" -"Click <guibutton>Defaults</guibutton> if you want to restore the default " -"WinMerge column configuration, overriding your custom configuration." +msgid "Click <guibutton>Defaults</guibutton> if you want to restore the default WinMerge column configuration, overriding your custom configuration." msgstr "" -"Fai clic su <guibutton >Predefiniti</guibutton > se vuoi ripristinare la " -"configurazione predefinita delle colonne WinMerge, sovrascrivendo la tua " +"Fai clic su <guibutton >Predefiniti</guibutton > se vuoi ripristinare la configurazione predefinita delle colonne WinMerge, sovrascrivendo la tua " "configurazione personalizzata." #. type: Content of: <article><section><section><para><indexterm><primary> @@ -4229,194 +3174,138 @@ msgstr "Finestra di dialogo Visualizza colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1245 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>The following columns in the " -"Display Columns dialog are displayed by default in the Folder Compare window:" +"<placeholder type=\"indexterm\" id=\"0\"/>The following columns in the Display Columns dialog are displayed by default in the Folder Compare window:" msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Le seguenti colonne nella finestra " -"di dialogo Visualizza colonne vengono visualizzate per impostazione " +"<placeholder type=\"indexterm\" id=\"0\"/>Le seguenti colonne nella finestra di dialogo Visualizza colonne vengono visualizzate per impostazione " "predefinita nella finestra Confronto cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1252 msgid "" -"<guilabel>Filename</guilabel>: Name of compared item. In a nonrecursive " -"compare, this column includes both files and folders; in a recursive " -"compare, it does not include folders: instead, folders are listed in the " -"Folder column." +"<guilabel>Filename</guilabel>: Name of compared item. In a nonrecursive compare, this column includes both files and folders; in a recursive " +"compare, it does not include folders: instead, folders are listed in the Folder column." msgstr "" -"<guilabel >Nome file</guilabel >: nome dell'elemento confrontato.In un " -"confronto non ricorsivo, questa colonna include sia file che cartelle;in un " -"confronto ricorsivo, non include le cartelle: le cartelle sono invece " -"elencate nella colonna Cartella." +"<guilabel >Nome file</guilabel >: nome dell'elemento confrontato.In un confronto non ricorsivo, questa colonna include sia file che cartelle;in un " +"confronto ricorsivo, non include le cartelle: le cartelle sono invece elencate nella colonna Cartella." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1259 msgid "" -"<guilabel>Folder</guilabel>: Path of compared subfolder, relative to the " -"compared folder. For a nonrecursive compare this column is always empty: " +"<guilabel>Folder</guilabel>: Path of compared subfolder, relative to the compared folder. For a nonrecursive compare this column is always empty: " "folders are listed in the <guilabel>Filename</guilabel> column instead." msgstr "" -"<guilabel >Cartella</guilabel >: percorso della sottocartella confrontata, " -"relativa alla cartella confrontata.Per un confronto non ricorsivo questa " -"colonna è sempre vuota: le cartelle sono invece elencate nella colonna " -"<guilabel >Nome file</guilabel >." +"<guilabel >Cartella</guilabel >: percorso della sottocartella confrontata, relativa alla cartella confrontata.Per un confronto non ricorsivo questa " +"colonna è sempre vuota: le cartelle sono invece elencate nella colonna <guilabel >Nome file</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1266 -msgid "" -"<guilabel>Comparison Result</guilabel>: Verbose comparison result (see also " -"<guilabel>Short Result</guilabel>)." -msgstr "" -"<guilabel >Risultato del confronto</guilabel >: risultato del confronto " -"dettagliato (vedi anche <guilabel >Risultato breve</guilabel >)." +msgid "<guilabel>Comparison Result</guilabel>: Verbose comparison result (see also <guilabel>Short Result</guilabel>)." +msgstr "<guilabel >Risultato del confronto</guilabel >: risultato del confronto dettagliato (vedi anche <guilabel >Risultato breve</guilabel >)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1271 msgid "" -"<guilabel>Left Date</guilabel>, <guilabel>Middle Date</guilabel>, " -"<guilabel>Right Date</guilabel>: Modification dates of item in each side. " -"The newer of the two dates (or the date for any unique item) is prefixed " -"with an asterisk ( * )." +"<guilabel>Left Date</guilabel>, <guilabel>Middle Date</guilabel>, <guilabel>Right Date</guilabel>: Modification dates of item in each side. The newer " +"of the two dates (or the date for any unique item) is prefixed with an asterisk ( * )." msgstr "" -"<guilabel >Data sinistra</guilabel >, <guilabel >Data centrale</guilabel >, " -"<guilabel >Data destra</guilabel >: date di modifica dell'elemento su " -"ciascun lato.La più recente delle due date (o la data per qualsiasi elemento " -"univoco) è preceduta da un asterisco ( * )." +"<guilabel >Data sinistra</guilabel >, <guilabel >Data centrale</guilabel >, <guilabel >Data destra</guilabel >: date di modifica dell'elemento su " +"ciascun lato.La più recente delle due date (o la data per qualsiasi elemento univoco) è preceduta da un asterisco ( * )." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1278 msgid "<guilabel>Extension</guilabel>: File extension, handy for sorting." -msgstr "" -"<guilabel >Estensione</guilabel >: estensione del file, comoda per " -"l'ordinamento." +msgstr "<guilabel >Estensione</guilabel >: estensione del file, comoda per l'ordinamento." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1283 -msgid "" -"The following additional columns are available in the Display Columns dialog:" -msgstr "" -"Nella finestra di dialogo Visualizza colonne sono disponibili le seguenti " -"colonne aggiuntive:" +msgid "The following additional columns are available in the Display Columns dialog:" +msgstr "Nella finestra di dialogo Visualizza colonne sono disponibili le seguenti colonne aggiuntive:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1288 -msgid "" -"<guilabel>Short Result</guilabel>: Displays the <guilabel>Comparison Result</" -"guilabel> column in a brief (Right only) form." -msgstr "" -"<guilabel >Risultato breve</guilabel >: mostra la colonna <guilabel " -">Risultato del confronto</guilabel > in una forma breve (solo a destra)." +msgid "<guilabel>Short Result</guilabel>: Displays the <guilabel>Comparison Result</guilabel> column in a brief (Right only) form." +msgstr "<guilabel >Risultato breve</guilabel >: mostra la colonna <guilabel >Risultato del confronto</guilabel > in una forma breve (solo a destra)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1294 msgid "" -"<guilabel>Binary</guilabel>: Column contains an asterisk ( * ) when the " -"file is a binary file. This is handy for sorting and for use with the " +"<guilabel>Binary</guilabel>: Column contains an asterisk ( * ) when the file is a binary file. This is handy for sorting and for use with the " "<guilabel>Short Result</guilabel> column." msgstr "" -"<guilabel >Binario</guilabel >: la colonna contiene un asterisco (*) quando " -"il file è un file binario.Questo è utile per l'ordinamento e per l'uso con " -"la colonna <guilabel >Risultato breve</guilabel >." +"<guilabel >Binario</guilabel >: la colonna contiene un asterisco (*) quando il file è un file binario.Questo è utile per l'ordinamento e per l'uso " +"con la colonna <guilabel >Risultato breve</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1300 -msgid "" -"<guilabel>Left Attributes</guilabel>, <guilabel>Middle Attributes</" -"guilabel>, <guilabel>Right Attributes</guilabel>: Shows file attributes." +msgid "<guilabel>Left Attributes</guilabel>, <guilabel>Middle Attributes</guilabel>, <guilabel>Right Attributes</guilabel>: Shows file attributes." msgstr "" -"<guilabel >Attributi sinistra</guilabel >, <guilabel >Attributi centrali</" -"guilabel >, <guilabel >Attributi destra</guilabel >: mostra gli attributi " +"<guilabel >Attributi sinistra</guilabel >, <guilabel >Attributi centrali</guilabel >, <guilabel >Attributi destra</guilabel >: mostra gli attributi " "del file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1306 msgid "" -"<guilabel>Left Creation Time</guilabel>, <guilabel>Middle Creation Time</" -"guilabel>, <guilabel>Right Creation Time</guilabel>: Item creation time." +"<guilabel>Left Creation Time</guilabel>, <guilabel>Middle Creation Time</guilabel>, <guilabel>Right Creation Time</guilabel>: Item creation time." msgstr "" -"<guilabel >Ora di creazione sinistra</guilabel >, <guilabel >Ora di " -"creazione centrale</guilabel >, <guilabel >Ora di creazione destra</guilabel " -">: ora di creazione dell'oggetto." +"<guilabel >Ora di creazione sinistra</guilabel >, <guilabel >Ora di creazione centrale</guilabel >, <guilabel >Ora di creazione destra</guilabel >: " +"ora di creazione dell'oggetto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1312 msgid "" -"<guilabel>Left Encoding</guilabel>, <guilabel>Middle Encoding</guilabel>, " -"<guilabel>Right Encoding</guilabel>: File encoding. Shows the codepage " +"<guilabel>Left Encoding</guilabel>, <guilabel>Middle Encoding</guilabel>, <guilabel>Right Encoding</guilabel>: File encoding. Shows the codepage " "number for ANSI files and Unicode encoding for Unicode files." msgstr "" -"<guilabel >Codifica sinistra</guilabel >, <guilabel >Codifica centrale</" -"guilabel >, <guilabel >Codifica destra</guilabel >: codifica del file. " -"Visualizza il numero di tabella codici per i file ANSI e la codifica Unicode " -"per i file Unicode." +"<guilabel >Codifica sinistra</guilabel >, <guilabel >Codifica centrale</guilabel >, <guilabel >Codifica destra</guilabel >: codifica del file. " +"Visualizza il numero di tabella codici per i file ANSI e la codifica Unicode per i file Unicode." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1319 msgid "" -"<guilabel>Left File Version</guilabel>, <guilabel>Middle File Version</" -"guilabel>, <guilabel>Right File Version</guilabel>: Version number from the " -"file, if present. Note that the version is read only for some binary file " -"types known to usually have a version resource." +"<guilabel>Left File Version</guilabel>, <guilabel>Middle File Version</guilabel>, <guilabel>Right File Version</guilabel>: Version number from the " +"file, if present. Note that the version is read only for some binary file types known to usually have a version resource." msgstr "" -"<guilabel >Versione del file a sinistra</guilabel >, <guilabel >Versione del " -"file centrale</guilabel >, <guilabel >Versione del file a destra</guilabel " -">: numero di versione del file, se presente.Tieni presente che la versione " -"viene letta solo per alcuni tipi di file binari noti per avere solitamente " -"una risorsa di versione." +"<guilabel >Versione del file a sinistra</guilabel >, <guilabel >Versione del file centrale</guilabel >, <guilabel >Versione del file a destra</" +"guilabel >: numero di versione del file, se presente.Tieni presente che la versione viene letta solo per alcuni tipi di file binari noti per avere " +"solitamente una risorsa di versione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1327 -msgid "" -"<guilabel>Left Size</guilabel>, <guilabel>Middle Size</guilabel>, " -"<guilabel>Right Size</guilabel>: File size in bytes." +msgid "<guilabel>Left Size</guilabel>, <guilabel>Middle Size</guilabel>, <guilabel>Right Size</guilabel>: File size in bytes." msgstr "" -"<guilabel >dimensione sinistra</guilabel >, <guilabel >dimensione media</" -"guilabel >, <guilabel >dimensione destra</guilabel >: dimensione del file in " +"<guilabel >dimensione sinistra</guilabel >, <guilabel >dimensione media</guilabel >, <guilabel >dimensione destra</guilabel >: dimensione del file in " "byte." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1333 msgid "" -"<guilabel>Left Size (Short)</guilabel>, <guilabel>Middle Size (Short)</" -"guilabel>, <guilabel>Right Size (Short)</guilabel>: Shorter versions of file " +"<guilabel>Left Size (Short)</guilabel>, <guilabel>Middle Size (Short)</guilabel>, <guilabel>Right Size (Short)</guilabel>: Shorter versions of file " "sizes, rounded to KB, MB, or GB." msgstr "" -"<guilabel >Dimensione sinistra (corta)</guilabel >, <guilabel >Dimensione " -"media (corta)</guilabel >, <guilabel >Dimensione destra (corta)</guilabel >: " -"versioni più brevi delle dimensioni dei file, arrotondate a KB, MB o GB." +"<guilabel >Dimensione sinistra (corta)</guilabel >, <guilabel >Dimensione media (corta)</guilabel >, <guilabel >Dimensione destra (corta)</guilabel " +">: versioni più brevi delle dimensioni dei file, arrotondate a KB, MB o GB." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1339 msgid "<guilabel>Newer File</guilabel>: Shows which side is newer." -msgstr "" -"<guilabel >File più recente</guilabel >: mostra quale lato è più recente." +msgstr "<guilabel >File più recente</guilabel >: mostra quale lato è più recente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1344 -msgid "" -"<guilabel>Differences</guilabel>: Number of differences found between files, " -"excluding possibly ignored differences." -msgstr "" -"<guilabel >Differenze</guilabel >: numero di differenze trovate tra i file, " -"escluse le differenze eventualmente ignorate." +msgid "<guilabel>Differences</guilabel>: Number of differences found between files, excluding possibly ignored differences." +msgstr "<guilabel >Differenze</guilabel >: numero di differenze trovate tra i file, escluse le differenze eventualmente ignorate." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1349 -msgid "" -"<guilabel>Ignored Diff</guilabel>: Number of ignored differences within " -"files. These are differences ignored by line filters." +msgid "<guilabel>Ignored Diff</guilabel>: Number of ignored differences within files. These are differences ignored by line filters." msgstr "" -"<guilabel >Differenze ignorate</guilabel >: numero di differenze ignorate " -"all'interno dei file.Queste sono differenze ignorate dai filtri di linea." +"<guilabel >Differenze ignorate</guilabel >: numero di differenze ignorate all'interno dei file.Queste sono differenze ignorate dai filtri di linea." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1354 -msgid "" -"<guilabel>Left EOL</guilabel>, <guilabel>Middle EOL</guilabel>, " -"<guilabel>Right EOL</guilabel>: Shows the EOL (linefeed) style of files." +msgid "<guilabel>Left EOL</guilabel>, <guilabel>Middle EOL</guilabel>, <guilabel>Right EOL</guilabel>: Shows the EOL (linefeed) style of files." msgstr "" -"<guilabel >EOL sinistro</guilabel >, <guilabel >EOL centrale</guilabel >, " -"<guilabel >EOL destro</guilabel >: mostra lo stile EOL (avanzamento riga) " +"<guilabel >EOL sinistro</guilabel >, <guilabel >EOL centrale</guilabel >, <guilabel >EOL destro</guilabel >: mostra lo stile EOL (avanzamento riga) " "dei file." #. type: Content of: <article><section><section><title> @@ -4427,106 +3316,75 @@ msgstr "Nascondere oggetti" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1364 msgid "" -"You can quickly hide one or more selected items by using the " -"<guimenuitem>Hide Items</guimenuitem> context menu shortcut. The items " -"remain hidden until you refresh the view (press <keycap>F5</keycap>) or " -"click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Hidden Items</" -"guimenuitem> </menuchoice>." +"You can quickly hide one or more selected items by using the <guimenuitem>Hide Items</guimenuitem> context menu shortcut. The items remain hidden " +"until you refresh the view (press <keycap>F5</keycap>) or click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Hidden Items</guimenuitem> </" +"menuchoice>." msgstr "" -"Puoi nascondere rapidamente uno o più elementi selezionati utilizzando la " -"scorciatoia del menu contestuale <guimenuitem >Nascondi elementi</" -"guimenuitem >.Gli elementi rimangono nascosti finché non aggiorni la vista " -"(premi <keycap >F5</keycap >) o fai clic su <menuchoice > <guimenu " -">Visualizza</guimenu > <guimenuitem >Visualizza elementi nascosti</" -"guimenuitem > </menuchoice >." +"Puoi nascondere rapidamente uno o più elementi selezionati utilizzando la scorciatoia del menu contestuale <guimenuitem >Nascondi elementi</" +"guimenuitem >.Gli elementi rimangono nascosti finché non aggiorni la vista (premi <keycap >F5</keycap >) o fai clic su <menuchoice > <guimenu " +">Visualizza</guimenu > <guimenuitem >Visualizza elementi nascosti</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><tip><para> #: English/Compare_dirs.xml:1374 msgid "" -"Get to know <guimenuitem>Hide Items</guimenuitem>: it can save you a lot of " -"time by eliminating items that you already handled, or that are not " -"currently of interest, from the view. For example, you might hide files " -"after merging them, making it easier to see what items are left to merge." +"Get to know <guimenuitem>Hide Items</guimenuitem>: it can save you a lot of time by eliminating items that you already handled, or that are not " +"currently of interest, from the view. For example, you might hide files after merging them, making it easier to see what items are left to merge." msgstr "" -"Impara a conoscere <guimenuitem >Nascondi elementi</guimenuitem >: può farti " -"risparmiare molto tempo eliminando dalla vista gli elementi che hai già " -"gestito o che al momento non ti interessano.Ad esempio, potresti nascondere " -"i file dopo averli uniti, rendendo più semplice vedere quali elementi " +"Impara a conoscere <guimenuitem >Nascondi elementi</guimenuitem >: può farti risparmiare molto tempo eliminando dalla vista gli elementi che hai già " +"gestito o che al momento non ti interessano.Ad esempio, potresti nascondere i file dopo averli uniti, rendendo più semplice vedere quali elementi " "restano da unire." #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:1384 msgid "Using Windows shell commands from the Folder Compare window" -msgstr "" -"Utilizzando i comandi della shell di Windows dalla finestra Confronto " -"cartelle" +msgstr "Utilizzando i comandi della shell di Windows dalla finestra Confronto cartelle" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1386 -msgid "" -"You can right-click a selection in the Folder Compare window and launch " -"Windows shell commands directly from the context menu." +msgid "You can right-click a selection in the Folder Compare window and launch Windows shell commands directly from the context menu." msgstr "" -"È possibile fare clic con il pulsante destro del mouse su una selezione " -"nella finestra Confronto cartelle e avviare i comandi della shell di Windows " +"È possibile fare clic con il pulsante destro del mouse su una selezione nella finestra Confronto cartelle e avviare i comandi della shell di Windows " "direttamente dal menu contestuale." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1390 msgid "" -"If the selection occurs on both sides, you can choose either the " -"<guimenu>Left Shell Menu</guimenu> or <guimenu>Right Shell Menu</guimenu>. " -"If the selection occurs on all sides, you can choose the <guimenu>Left Shell " -"Menu</guimenu>, <guimenu>Middle Shell Menu</guimenu> or <guimenu>Right Shell " -"Menu</guimenu>. If the item occurs only on one side, only that side's shell " -"menu is available." -msgstr "" -"Se la selezione avviene su entrambi i lati, puoi scegliere il <guimenu >menu " -"della shell sinistra</guimenu > o il <guimenu >menu della shell destra</" -"guimenu >.Se la selezione avviene su tutti i lati, puoi scegliere il " -"<guimenu >menu della conchiglia sinistra</guimenu >, <guimenu >menu della " -"conchiglia centrale</guimenu > o <guimenu >menu della conchiglia destra</" -"guimenu >.Se l'elemento è presente solo su un lato, sarà disponibile solo il " +"If the selection occurs on both sides, you can choose either the <guimenu>Left Shell Menu</guimenu> or <guimenu>Right Shell Menu</guimenu>. If the " +"selection occurs on all sides, you can choose the <guimenu>Left Shell Menu</guimenu>, <guimenu>Middle Shell Menu</guimenu> or <guimenu>Right Shell " +"Menu</guimenu>. If the item occurs only on one side, only that side's shell menu is available." +msgstr "" +"Se la selezione avviene su entrambi i lati, puoi scegliere il <guimenu >menu della shell sinistra</guimenu > o il <guimenu >menu della shell destra</" +"guimenu >.Se la selezione avviene su tutti i lati, puoi scegliere il <guimenu >menu della conchiglia sinistra</guimenu >, <guimenu >menu della " +"conchiglia centrale</guimenu > o <guimenu >menu della conchiglia destra</guimenu >.Se l'elemento è presente solo su un lato, sarà disponibile solo il " "menu della shell di quel lato." #. type: Content of: <article><section><caution><para> #: English/Compare_dirs.xml:1398 msgid "" -"Please consider that shell menu commands run entirely outside of WinMerge. " -"Consequently, WinMerge might not respond to some operations in the same way " -"as operations performed inside WinMerge. For example, if you delete a file " -"through this integration instead of using the WinMerge <command>Delete</" -"command> command, the change is not automatically shown in the Folder " -"Compare window (you have to manually refresh the window to see the change)." -msgstr "" -"Tieni presente che i comandi del menu della shell vengono eseguiti " -"interamente al di fuori di WinMerge.Di conseguenza, WinMerge potrebbe non " -"rispondere ad alcune operazioni nello stesso modo delle operazioni eseguite " -"all'interno di WinMerge.Ad esempio, se elimini un file tramite questa " -"integrazione invece di utilizzare il comando WinMerge <command>Delete</" -"command>, la modifica non viene mostrata automaticamente nella finestra " -"Confronto cartelle (devi aggiornare manualmente la finestra per vedere la " -"modifica)." +"Please consider that shell menu commands run entirely outside of WinMerge. Consequently, WinMerge might not respond to some operations in the same " +"way as operations performed inside WinMerge. For example, if you delete a file through this integration instead of using the WinMerge " +"<command>Delete</command> command, the change is not automatically shown in the Folder Compare window (you have to manually refresh the window to see " +"the change)." +msgstr "" +"Tieni presente che i comandi del menu della shell vengono eseguiti interamente al di fuori di WinMerge.Di conseguenza, WinMerge potrebbe non " +"rispondere ad alcune operazioni nello stesso modo delle operazioni eseguite all'interno di WinMerge.Ad esempio, se elimini un file tramite questa " +"integrazione invece di utilizzare il comando WinMerge <command>Delete</command>, la modifica non viene mostrata automaticamente nella finestra " +"Confronto cartelle (devi aggiornare manualmente la finestra per vedere la modifica)." #. type: Content of: <article><title> #: English/Compare_files.xml:5 -msgid "" -"Comparing and merging text files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronto e unione di file di testo<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Comparing and merging text files<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronto e unione di file di testo<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Compare_files.xml:9 msgid "" -"This topic describes how to use the WinMerge File Compare window to compare " -"and merge text files. To understand the basic concepts about differences " -"discussed here, we suggest you read <xref linkend=\"Intro_diffs\" /> first. " -"See <xref linkend=\"Compare_bin\" /> for related information about hex files." +"This topic describes how to use the WinMerge File Compare window to compare and merge text files. To understand the basic concepts about differences " +"discussed here, we suggest you read <xref linkend=\"Intro_diffs\" /> first. See <xref linkend=\"Compare_bin\" /> for related information about hex " +"files." msgstr "" -"In questo argomento viene descritto come utilizzare la finestra Confronta " -"file WinMerge per confrontare e unire file di testo.Per comprendere i " -"concetti di base sulle differenze discussi qui, ti suggeriamo di leggere " -"prima <xref linkend=\"Intro_diffs\" />.Vedi <xref linkend=\"Compare_bin\" /> " +"In questo argomento viene descritto come utilizzare la finestra Confronta file WinMerge per confrontare e unire file di testo.Per comprendere i " +"concetti di base sulle differenze discussi qui, ti suggeriamo di leggere prima <xref linkend=\"Intro_diffs\" />.Vedi <xref linkend=\"Compare_bin\" /> " "per informazioni correlate sui file esadecimali." #. type: Content of: <article><section><title> @@ -4536,43 +3394,30 @@ msgstr "Avvio di un'operazione di confronto di file" #. type: Content of: <article><section><para> #: English/Compare_files.xml:18 -msgid "" -"You can start a file compare operation from either the WinMerge window or a " -"Command Prompt window." -msgstr "" -"È possibile avviare un'operazione di confronto dei file dalla finestra " -"WinMerge o da una finestra del prompt dei comandi." +msgid "You can start a file compare operation from either the WinMerge window or a Command Prompt window." +msgstr "È possibile avviare un'operazione di confronto dei file dalla finestra WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:26 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" -"menuchoice>. Use the Select Files or Folders dialog to specify the left and " -"right source files to compare. For more details about the Select Files or " -"Folder dialog, see <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " +"and right source files to compare. For more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" -"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " -"file o cartelle per specificare i file di origine sinistro e destro da " -"confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file " -"o cartella, vedi <xref linkend=\"Open_paths\" />." +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " +"o cartelle per specificare i file di origine sinistro e destro da confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file o " +"cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:41 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " -"directory. In your command arguments, include the left and right files to " -"compare. For more information about using the command line, see <xref " -"linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right files to " +"compare. For more information about using the command line, see <xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " -"installazione di WinMerge. Negli argomenti del comando, includi i file " -"sinistro e destro da confrontare. Per ulteriori informazioni sull'utilizzo " -"della riga di comando, vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi i file " +"sinistro e destro da confrontare. Per ulteriori informazioni sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><mediaobject><textobject><phrase> -#: English/Compare_files.xml:52 English/Compare_files.xml:1118 -#: English/Quick_start.xml:329 English/Quick_start.xml:341 +#: English/Compare_files.xml:52 English/Compare_files.xml:1118 English/Quick_start.xml:329 English/Quick_start.xml:341 msgid "File Compare window" msgstr "Finestra Confronta file" @@ -4583,34 +3428,22 @@ msgstr "File" #. type: Content of: <article><section><title> #: English/Compare_files.xml:51 -msgid "" -"File Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Finestra di confronto file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "File Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Finestra di confronto file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:61 msgid "" -"The File Compare window displays compared files in two File panes, side by " -"side. The WinMerge toolbar and context menu provides functions for viewing, " -"navigating, and merging differences. The screenshot below shows a comparison " -"of two versions of a file." +"The File Compare window displays compared files in two File panes, side by side. The WinMerge toolbar and context menu provides functions for " +"viewing, navigating, and merging differences. The screenshot below shows a comparison of two versions of a file." msgstr "" -"La finestra Confronto file visualizza i file confrontati in due riquadri " -"File, affiancati.La barra degli strumenti e il menu contestuale di WinMerge " -"forniscono funzioni per visualizzare, navigare e unire le differenze.Lo " -"screenshot seguente mostra un confronto tra due versioni di un file." +"La finestra Confronto file visualizza i file confrontati in due riquadri File, affiancati.La barra degli strumenti e il menu contestuale di WinMerge " +"forniscono funzioni per visualizzare, navigare e unire le differenze.Lo screenshot seguente mostra un confronto tra due versioni di un file." #. type: Content of: <article><section><mediaobject> #: English/Compare_files.xml:67 English/Quick_start.xml:335 -msgid "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"filecomp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"filecomp1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filecomp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filecomp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:73 @@ -4630,18 +3463,13 @@ msgstr "Riquadri file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:82 msgid "" -"The left and right File panes show the text contents and differences of the " -"two files being compared. The File panes are the main area for navigating " -"and merging differences, and also allow you to edit the text directly. This " -"section describes the features that support these actions, and ways that you " -"can customize the File panes." +"The left and right File panes show the text contents and differences of the two files being compared. The File panes are the main area for navigating " +"and merging differences, and also allow you to edit the text directly. This section describes the features that support these actions, and ways that " +"you can customize the File panes." msgstr "" -"I riquadri File sinistro e destro mostrano il contenuto del testo e le " -"differenze dei due file confrontati.I riquadri File sono l'area principale " -"per la navigazione e l'unione delle differenze e consentono anche di " -"modificare direttamente il testo.In questa sezione vengono descritte le " -"funzionalità che supportano queste azioni e le modalità con cui è possibile " -"personalizzare i riquadri File." +"I riquadri File sinistro e destro mostrano il contenuto del testo e le differenze dei due file confrontati.I riquadri File sono l'area principale per " +"la navigazione e l'unione delle differenze e consentono anche di modificare direttamente il testo.In questa sezione vengono descritte le funzionalità " +"che supportano queste azioni e le modalità con cui è possibile personalizzare i riquadri File." #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:89 @@ -4651,47 +3479,32 @@ msgstr "Intestazione del riquadro file" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:91 msgid "" -"The header at the top of each File pane shows the full path of the source " -"file. The left and right file names are also identified in the header of the " -"Compare Window, above the File panes." +"The header at the top of each File pane shows the full path of the source file. The left and right file names are also identified in the header of " +"the Compare Window, above the File panes." msgstr "" -"L'intestazione nella parte superiore di ciascun riquadro File mostra il " -"percorso completo del file di origine.I nomi dei file sinistro e destro sono " -"identificati anche nell'intestazione della finestra Confronta, sopra i " -"riquadri File." +"L'intestazione nella parte superiore di ciascun riquadro File mostra il percorso completo del file di origine.I nomi dei file sinistro e destro sono " +"identificati anche nell'intestazione della finestra Confronta, sopra i riquadri File." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:95 msgid "" -"One of the File panes is always active (indicated by the dark header " -"background); the other is inactive and has a lighter header bar. You can " -"edit only in the active pane (as described in <xref " -"linkend=\"CompareFiles_editing\" />). Click in either side to make it active " -"and make the other side inactive." +"One of the File panes is always active (indicated by the dark header background); the other is inactive and has a lighter header bar. You can edit " +"only in the active pane (as described in <xref linkend=\"CompareFiles_editing\" />). Click in either side to make it active and make the other side " +"inactive." msgstr "" -"Uno dei riquadri File è sempre attivo (indicato dallo sfondo scuro " -"dell'intestazione);l'altro è inattivo e ha una barra dell'intestazione più " -"chiara.Puoi modificare solo nel riquadro attivo (come descritto in <xref " -"linkend=\"CompareFiles_editing\" />).Fare clic su uno dei lati per renderlo " +"Uno dei riquadri File è sempre attivo (indicato dallo sfondo scuro dell'intestazione);l'altro è inattivo e ha una barra dell'intestazione più " +"chiara.Puoi modificare solo nel riquadro attivo (come descritto in <xref linkend=\"CompareFiles_editing\" />).Fare clic su uno dei lati per renderlo " "attivo e rendere inattivo l'altro lato." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:101 -msgid "" -"An asterisk (*) before the filename in the header indicates that there are " -"unsaved changes in the file." -msgstr "" -"Un asterisco (*) prima del nome file nell'intestazione indica che nel file " -"sono presenti modifiche non salvate." +msgid "An asterisk (*) before the filename in the header indicates that there are unsaved changes in the file." +msgstr "Un asterisco (*) prima del nome file nell'intestazione indica che nel file sono presenti modifiche non salvate." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:104 -msgid "" -"The header bar's context menu has shortcuts that are useful for copying and " -"pasting file information:" -msgstr "" -"Il menu contestuale della barra dell'intestazione dispone di scorciatoie " -"utili per copiare e incollare le informazioni sul file:" +msgid "The header bar's context menu has shortcuts that are useful for copying and pasting file information:" +msgstr "Il menu contestuale della barra dell'intestazione dispone di scorciatoie utili per copiare e incollare le informazioni sul file:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:110 @@ -4729,32 +3542,25 @@ msgid "difference colors" msgstr "colori diversi" #. type: Content of: <article><section><section><section><indexterm><secondary> -#: English/Compare_files.xml:136 English/Compare_files.xml:592 -#: English/Compare_files.xml:607 English/Compare_files.xml:617 +#: English/Compare_files.xml:136 English/Compare_files.xml:592 English/Compare_files.xml:607 English/Compare_files.xml:617 msgid "in File panes" msgstr "nei riquadri File" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:133 msgid "Difference highlighting<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Evidenziazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Evidenziazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:139 msgid "" -"WinMerge highlights several types of differences in the File panes. The " -"Colors page in the Options dialog defines a set of background and text " -"colors for most difference types, with variations indicating their state: " -"unselected, selected, or deleted. This section describes how each of the " -"basic difference types is detected and displayed." +"WinMerge highlights several types of differences in the File panes. The Colors page in the Options dialog defines a set of background and text colors " +"for most difference types, with variations indicating their state: unselected, selected, or deleted. This section describes how each of the basic " +"difference types is detected and displayed." msgstr "" -"WinMerge evidenzia diversi tipi di differenze nei riquadri File.La pagina " -"Colori nella finestra di dialogo Opzioni definisce un insieme di colori di " -"sfondo e testo per la maggior parte dei tipi di differenza, con variazioni " -"che ne indicano lo stato: non selezionato, selezionato o eliminato.Questa " -"sezione descrive come viene rilevato e visualizzato ciascuno dei tipi di " -"differenza di base." +"WinMerge evidenzia diversi tipi di differenze nei riquadri File.La pagina Colori nella finestra di dialogo Opzioni definisce un insieme di colori di " +"sfondo e testo per la maggior parte dei tipi di differenza, con variazioni che ne indicano lo stato: non selezionato, selezionato o eliminato.Questa " +"sezione descrive come viene rilevato e visualizzato ciascuno dei tipi di differenza di base." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:147 @@ -4764,32 +3570,23 @@ msgstr "Differenza" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:150 msgid "" -"A difference block contains one or more contiguous lines that are different. " -"The default difference background color is gold, but blank lines are marked " -"with the deleted color." +"A difference block contains one or more contiguous lines that are different. The default difference background color is gold, but blank lines are " +"marked with the deleted color." msgstr "" -"Un blocco differenza contiene una o più linee contigue diverse.Il colore di " -"sfondo diverso predefinito è oro, ma le righe vuote sono contrassegnate con " -"il colore eliminato." +"Un blocco differenza contiene una o più linee contigue diverse.Il colore di sfondo diverso predefinito è oro, ma le righe vuote sono contrassegnate " +"con il colore eliminato." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:154 -msgid "" -"For this and other screens in this section, we enabled <option>View line " -"numbers</option> to show which lines in the source files are compared." +msgid "For this and other screens in this section, we enabled <option>View line numbers</option> to show which lines in the source files are compared." msgstr "" -"Per questa e altre schermate in questa sezione, abbiamo abilitato " -"<option>Visualizza numeri di riga</option> per mostrare quali righe nei file " +"Per questa e altre schermate in questa sezione, abbiamo abilitato <option>Visualizza numeri di riga</option> per mostrare quali righe nei file " "sorgente vengono confrontate." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:159 -msgid "" -"<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-" -"blocks-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-" -"blocks-01.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-blocks-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-blocks-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:166 @@ -4809,14 +3606,11 @@ msgstr "La prima differenza è una singola riga." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><orderedlist><listitem><para> #: English/Compare_files.xml:179 msgid "" -"The blank line in <filename>file2</filename> has no corresponding blank line " -"in <filename>file1</filename>. WinMerge treats the missing blank line as a " -"deleted difference, marked here with the default gray color." +"The blank line in <filename>file2</filename> has no corresponding blank line in <filename>file1</filename>. WinMerge treats the missing blank line " +"as a deleted difference, marked here with the default gray color." msgstr "" -"La riga vuota in <filename>file2</filename> non ha una riga vuota " -"corrispondente in <filename>file1</filename>.WinMerge tratta la riga vuota " -"mancante come una differenza cancellata, contrassegnata qui con il colore " -"grigio predefinito." +"La riga vuota in <filename>file2</filename> non ha una riga vuota corrispondente in <filename>file1</filename>.WinMerge tratta la riga vuota mancante " +"come una differenza cancellata, contrassegnata qui con il colore grigio predefinito." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><orderedlist><listitem><para> #: English/Compare_files.xml:186 @@ -4836,55 +3630,35 @@ msgstr "Differenza ignorata<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:198 msgid "" -"This color marks content that you have configured WinMerge to ignore. In " -"contrast to difference blocks, ignored content is not compared, it is simply " -"highlighted to help you see what has been ignored. Ignored differences " -"include:" +"This color marks content that you have configured WinMerge to ignore. In contrast to difference blocks, ignored content is not compared, it is simply " +"highlighted to help you see what has been ignored. Ignored differences include:" msgstr "" -"Questo colore contrassegna il contenuto che hai configurato WinMerge per " -"ignorare.A differenza dei blocchi di differenza, il contenuto ignorato non " -"viene confrontato, viene semplicemente evidenziato per aiutarti a vedere " -"cosa è stato ignorato.Le differenze ignorate includono:" +"Questo colore contrassegna il contenuto che hai configurato WinMerge per ignorare.A differenza dei blocchi di differenza, il contenuto ignorato non " +"viene confrontato, viene semplicemente evidenziato per aiutarti a vedere cosa è stato ignorato.Le differenze ignorate includono:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:205 -msgid "" -"Blank lines, if you have enabled <option>Ignore blank lines</option> in the " -"Options dialog Compare page." -msgstr "" -"Righe vuote, se hai abilitato <option>Ignora righe vuote</option> nella " -"pagina Confronta della finestra di dialogo Opzioni." +msgid "Blank lines, if you have enabled <option>Ignore blank lines</option> in the Options dialog Compare page." +msgstr "Righe vuote, se hai abilitato <option>Ignora righe vuote</option> nella pagina Confronta della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:210 -msgid "" -"Differences that match patterns in line filters that you have defined (see " -"<xref linkend=\"Filters\" /> to learn how)." -msgstr "" -"Differenze che corrispondono ai modelli nei filtri di linea che hai definito " -"(vedi <xref linkend=\"Filters\" /> per sapere come)." +msgid "Differences that match patterns in line filters that you have defined (see <xref linkend=\"Filters\" /> to learn how)." +msgstr "Differenze che corrispondono ai modelli nei filtri di linea che hai definito (vedi <xref linkend=\"Filters\" /> per sapere come)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:216 msgid "" -"The next example repeats the previous comparison, this time with " -"<option>Ignore blank lines</option> enabled. There are now only two " -"differences. The blank line on the right side is marked with the Ignored " -"Differences color." +"The next example repeats the previous comparison, this time with <option>Ignore blank lines</option> enabled. There are now only two differences. The " +"blank line on the right side is marked with the Ignored Differences color." msgstr "" -"L'esempio successivo ripete il confronto precedente, questa volta con " -"<option>Ignora righe vuote</option> abilitata.Ora ci sono solo due " -"differenze.La riga vuota sul lato destro è contrassegnata con il colore " -"Differenze ignorate." +"L'esempio successivo ripete il confronto precedente, questa volta con <option>Ignora righe vuote</option> abilitata.Ora ci sono solo due " +"differenze.La riga vuota sul lato destro è contrassegnata con il colore Differenze ignorate." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:222 -msgid "" -"<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-" -"blank-lines.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-" -"blank-lines.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-blank-lines.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-blank-lines.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:229 @@ -4892,8 +3666,7 @@ msgid "Difference block colors with ignored diff" msgstr "Colori dei blocchi di differenza con differenza ignorata" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:238 English/Compare_files.xml:917 -#: English/Configuration.xml:906 +#: English/Compare_files.xml:238 English/Compare_files.xml:917 English/Configuration.xml:906 msgid "moved differences" msgstr "spostato le differenze" @@ -4905,25 +3678,17 @@ msgstr "Spostato<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:242 msgid "" -"Moved differences are identical lines found in different locations in the " -"compared files, if <option>Moved block detection</option> is enabled in the " -"Options dialog Compare page. The next screenshot repeats the previous " -"comparison, this time with moved block detection enabled." +"Moved differences are identical lines found in different locations in the compared files, if <option>Moved block detection</option> is enabled in the " +"Options dialog Compare page. The next screenshot repeats the previous comparison, this time with moved block detection enabled." msgstr "" -"Le differenze spostate sono linee identiche trovate in posizioni diverse nei " -"file confrontati, se <option>Rilevamento blocchi spostati</option> è " -"abilitato nella pagina Confronta della finestra di dialogo Opzioni.Lo " -"screenshot successivo ripete il confronto precedente, questa volta con il " +"Le differenze spostate sono linee identiche trovate in posizioni diverse nei file confrontati, se <option>Rilevamento blocchi spostati</option> è " +"abilitato nella pagina Confronta della finestra di dialogo Opzioni.Lo screenshot successivo ripete il confronto precedente, questa volta con il " "rilevamento dei blocchi spostati abilitato." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:249 -msgid "" -"<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:255 @@ -4933,30 +3698,22 @@ msgstr "Differenza colori blocco con rilevamento blocco spostato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:261 msgid "" -"Notice that the two identical lines (containing <literal>a</literal> and " -"<literal>c</literal>) that are in different locations are marked with the " -"default orange moved color. Another effect of moved block detection in this " -"case is that the last two lines are now two separate differences instead of " -"a single difference block." -msgstr "" -"Nota che le due righe identiche (contenenti <literal>a</literal> e " -"<literal>c</literal>) che si trovano in posizioni diverse sono " -"contrassegnate con il colore spostato arancione predefinito.Un altro effetto " -"del rilevamento dei blocchi spostati in questo caso è che le ultime due " -"righe ora rappresentano due differenze separate anziché un singolo blocco di " -"differenze." +"Notice that the two identical lines (containing <literal>a</literal> and <literal>c</literal>) that are in different locations are marked with the " +"default orange moved color. Another effect of moved block detection in this case is that the last two lines are now two separate differences instead " +"of a single difference block." +msgstr "" +"Nota che le due righe identiche (contenenti <literal>a</literal> e <literal>c</literal>) che si trovano in posizioni diverse sono contrassegnate con " +"il colore spostato arancione predefinito.Un altro effetto del rilevamento dei blocchi spostati in questo caso è che le ultime due righe ora " +"rappresentano due differenze separate anziché un singolo blocco di differenze." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:268 msgid "" -"In some cases, showing moved differences can make it easier to visualize " -"changes in files. However, too many moved lines might make your comparison " +"In some cases, showing moved differences can make it easier to visualize changes in files. However, too many moved lines might make your comparison " "hard to navigate. Use your own judgement!" msgstr "" -"In alcuni casi, mostrare le differenze spostate può rendere più semplice la " -"visualizzazione delle modifiche nei file.Tuttavia, troppe linee spostate " -"potrebbero rendere difficile la navigazione nel confronto.Usa il tuo " -"giudizio!" +"In alcuni casi, mostrare le differenze spostate può rendere più semplice la visualizzazione delle modifiche nei file.Tuttavia, troppe linee spostate " +"potrebbero rendere difficile la navigazione nel confronto.Usa il tuo giudizio!" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:276 @@ -4966,13 +3723,11 @@ msgstr "Differenza di parole" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:279 msgid "" -"WinMerge can mark the text that is changed with difference blocks. Line " -"differences are marked with the word difference color. See <xref " +"WinMerge can mark the text that is changed with difference blocks. Line differences are marked with the word difference color. See <xref " "linkend=\"CompareFiles_linediff-highlight\" /> for details." msgstr "" -"WinMerge può contrassegnare il testo modificato con blocchi di differenza.Le " -"differenze di linea sono contrassegnate dalla parola colore differenza.Vedi " -"<xref linkend=\"CompareFiles_linediff-highlight\" /> per i dettagli." +"WinMerge può contrassegnare il testo modificato con blocchi di differenza.Le differenze di linea sono contrassegnate dalla parola colore " +"differenza.Vedi <xref linkend=\"CompareFiles_linediff-highlight\" /> per i dettagli." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:288 @@ -4987,31 +3742,20 @@ msgstr "Righe simili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:292 msgid "" -"WinMerge tries to align similar lines within difference blocks when you " -"enable <option>Align similar lines</option> in the Options dialog Compare " -"page. What does <quote>similar</quote> mean? Generally, this feature works " -"best in simple cases, for example where lines that have strong similarities. " -"When detected, similar lines are adjusted to align in the File pane. The " -"next figure shows comparisons of the same two files, before and after " -"enabling the <option>Align similar lines</option> option:" -msgstr "" -"WinMerge tenta di allineare linee simili all'interno di blocchi di " -"differenza quando abiliti <option>Allinea linee simili</option> nella pagina " -"Confronta della finestra di dialogo Opzioni.Cosa significa <quote>simile</" -"quote>?In genere, questa funzionalità funziona meglio nei casi semplici, ad " -"esempio nel caso di linee che presentano forti somiglianze.Quando vengono " -"rilevate, linee simili vengono regolate per allinearsi nel riquadro File.La " -"figura successiva mostra i confronti degli stessi due file, prima e dopo " -"aver abilitato l'opzione <option>Allinea linee simili</option>:" +"WinMerge tries to align similar lines within difference blocks when you enable <option>Align similar lines</option> in the Options dialog Compare " +"page. What does <quote>similar</quote> mean? Generally, this feature works best in simple cases, for example where lines that have strong " +"similarities. When detected, similar lines are adjusted to align in the File pane. The next figure shows comparisons of the same two files, before " +"and after enabling the <option>Align similar lines</option> option:" +msgstr "" +"WinMerge tenta di allineare linee simili all'interno di blocchi di differenza quando abiliti <option>Allinea linee simili</option> nella pagina " +"Confronta della finestra di dialogo Opzioni.Cosa significa <quote>simile</quote>?In genere, questa funzionalità funziona meglio nei casi semplici, ad " +"esempio nel caso di linee che presentano forti somiglianze.Quando vengono rilevate, linee simili vengono regolate per allinearsi nel riquadro File.La " +"figura successiva mostra i confronti degli stessi due file, prima e dopo aver abilitato l'opzione <option>Allinea linee simili</option>:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_files.xml:304 -msgid "" -"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" -"diffs-off.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" -"diffs-off.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-off.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-off.png\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:310 @@ -5020,21 +3764,13 @@ msgstr "Confronta senza abbinare linee simili" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_files.xml:302 -msgid "" -"<emphasis role=\"strong\">Disabled</emphasis>: <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/>" -msgstr "" -"<emphasis role=\"strong\">Disabilitato</emphasis>: <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/>" +msgid "<emphasis role=\"strong\">Disabled</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" +msgstr "<emphasis role=\"strong\">Disabilitato</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_files.xml:316 -msgid "" -"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" -"diffs-on.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" -"diffs-on.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-on.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-on.png\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:322 @@ -5043,24 +3779,17 @@ msgstr "Confronta linee simili corrispondenti" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_files.xml:314 -msgid "" -"<emphasis role=\"strong\">Enabled</emphasis>: <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/>" -msgstr "" -"<emphasis role=\"strong\">Abilitato</emphasis>: <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/>" +msgid "<emphasis role=\"strong\">Enabled</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" +msgstr "<emphasis role=\"strong\">Abilitato</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:327 msgid "" -"In the second comparison, the lines <quote>mice</quote> and <quote>mice and " -"a</quote> are detected as similar. WinMerge adds blank lines in the display " -"to make these lines appear at the same level within the difference block." +"In the second comparison, the lines <quote>mice</quote> and <quote>mice and a</quote> are detected as similar. WinMerge adds blank lines in the " +"display to make these lines appear at the same level within the difference block." msgstr "" -"Nel secondo confronto, le righe <quote>mice</quote> e <quote>mice e a</" -"quote> vengono rilevate come simili.WinMerge aggiunge righe vuote sul " -"display per farle apparire allo stesso livello all'interno del blocco " -"differenza." +"Nel secondo confronto, le righe <quote>mice</quote> e <quote>mice e a</quote> vengono rilevate come simili.WinMerge aggiunge righe vuote sul display " +"per farle apparire allo stesso livello all'interno del blocco differenza." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:338 English/Configuration.xml:2436 @@ -5084,63 +3813,47 @@ msgstr "nelle differenze di linea" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:337 -msgid "" -"Line difference highlighting<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Evidenziazione della differenza di linea<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Line difference highlighting<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Evidenziazione della differenza di linea<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:347 msgid "" -"Sometimes it's useful to highlight not just difference blocks, but also the " -"text within them that is changed. You can disable or enable them in two ways:" +"Sometimes it's useful to highlight not just difference blocks, but also the text within them that is changed. You can disable or enable them in two " +"ways:" msgstr "" -"A volte è utile evidenziare non solo i blocchi di differenza, ma anche il " -"testo modificato al loro interno.Puoi disabilitarli o abilitarli in due modi:" +"A volte è utile evidenziare non solo i blocchi di differenza, ma anche il testo modificato al loro interno.Puoi disabilitarli o abilitarli in due " +"modi:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:353 -msgid "" -"Set all <option>View line differences</option> options in the Options dialog " -"Editor page." -msgstr "" -"Imposta tutte le opzioni <option>Visualizza differenze di linea</option> " -"nella pagina Editor della finestra di dialogo Opzioni." +msgid "Set all <option>View line differences</option> options in the Options dialog Editor page." +msgstr "Imposta tutte le opzioni <option>Visualizza differenze di linea</option> nella pagina Editor della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:358 -msgid "" -"Click <menuchoice> <guimenu>View</guimenu> <guimenuitem>View line " -"differences</guimenuitem> </menuchoice> to toggle line differences on or off." +msgid "Click <menuchoice> <guimenu>View</guimenu> <guimenuitem>View line differences</guimenuitem> </menuchoice> to toggle line differences on or off." msgstr "" -"Fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " -">Visualizza differenze di linea</guimenuitem > </menuchoice > per attivare o " +"Fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di linea</guimenuitem > </menuchoice > per attivare o " "disattivare le differenze di linea." #. type: Content of: <article><section><section><section><note><para> #: English/Compare_files.xml:367 msgid "" -"Remember that WinMerge navigation and merging functions (like Next " -"Difference or Copy Left) work on difference blocks, not on line differences " -"within them." +"Remember that WinMerge navigation and merging functions (like Next Difference or Copy Left) work on difference blocks, not on line differences within " +"them." msgstr "" -"Ricorda che le funzioni di navigazione e unione di WinMerge (come Differenza " -"successiva o Copia a sinistra) funzionano sui blocchi di differenze, non " +"Ricorda che le funzioni di navigazione e unione di WinMerge (come Differenza successiva o Copia a sinistra) funzionano sui blocchi di differenze, non " "sulle differenze in linea al loro interno." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:372 msgid "" -"This section describes how line differences are detected and marked. Note " -"that the effect of these options is also affected by your current whitespace " -"settings in the Options dialog Compare page." +"This section describes how line differences are detected and marked. Note that the effect of these options is also affected by your current " +"whitespace settings in the Options dialog Compare page." msgstr "" -"Questa sezione descrive come vengono rilevate e contrassegnate le differenze " -"di linea.Tieni presente che l'effetto di queste opzioni è influenzato anche " -"dalle impostazioni attuali degli spazi bianchi nella pagina Confronta della " -"finestra di dialogo Opzioni." +"Questa sezione descrive come vengono rilevate e contrassegnate le differenze di linea.Tieni presente che l'effetto di queste opzioni è influenzato " +"anche dalle impostazioni attuali degli spazi bianchi nella pagina Confronta della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:379 @@ -5150,18 +3863,13 @@ msgstr "differenze di parole" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:378 msgid "Word-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Differenze di riga a livello di parola<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Differenze di riga a livello di parola<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:383 -msgid "" -"The following examples show how word-level line differences are displayed " -"with each of the whitespace settings:" +msgid "The following examples show how word-level line differences are displayed with each of the whitespace settings:" msgstr "" -"I seguenti esempi mostrano come vengono visualizzate le differenze di riga a " -"livello di parola con ciascuna delle impostazioni degli spazi bianchi:" +"I seguenti esempi mostrano come vengono visualizzate le differenze di riga a livello di parola con ciascuna delle impostazioni degli spazi bianchi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><title> #: English/Compare_files.xml:387 @@ -5175,12 +3883,8 @@ msgstr "WinMerge rileva tutte le parole e gli spazi diversi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:392 -msgid "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-allwhite.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-allwhite.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-allwhite.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-allwhite.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:399 @@ -5188,8 +3892,7 @@ msgid "Word-level line diff comparing whitespace" msgstr "Differenza di riga a livello di parola che confronta gli spazi bianchi" #. type: Content of: <article><section><section><para> -#: English/Compare_files.xml:391 English/Compare_files.xml:411 -#: English/Compare_files.xml:431 English/Quick_start.xml:79 +#: English/Compare_files.xml:391 English/Compare_files.xml:411 English/Compare_files.xml:431 English/Quick_start.xml:79 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>" @@ -5200,28 +3903,18 @@ msgstr "Differenze di linea con spazi bianchi: ignora la modifica" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_files.xml:407 -msgid "" -"Multiple spaces and tabs are treated the same as a single space. In the " -"example, the extra space between the last two words is not marked:" -msgstr "" -"Spazi e tabulazioni multipli vengono trattati come un unico spazio." -"Nell'esempio, lo spazio extra tra le ultime due parole non è contrassegnato:" +msgid "Multiple spaces and tabs are treated the same as a single space. In the example, the extra space between the last two words is not marked:" +msgstr "Spazi e tabulazioni multipli vengono trattati come un unico spazio.Nell'esempio, lo spazio extra tra le ultime due parole non è contrassegnato:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:412 -msgid "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-nochange.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-nochange.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nochange.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nochange.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:419 msgid "Word-level line diff comparing no whitespace changes" -msgstr "" -"Differenza di riga a livello di parola che confronta senza modifiche agli " -"spazi bianchi" +msgstr "Differenza di riga a livello di parola che confronta senza modifiche agli spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><title> #: English/Compare_files.xml:426 @@ -5230,27 +3923,18 @@ msgstr "Differenze di linea con gli spazi bianchi: ignorare tutto" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_files.xml:428 -msgid "" -"No spaces between words are compared, so these lines are treated as " -"identical:" -msgstr "" -"Non vengono confrontati spazi tra le parole, quindi queste righe vengono " -"trattate come identiche:" +msgid "No spaces between words are compared, so these lines are treated as identical:" +msgstr "Non vengono confrontati spazi tra le parole, quindi queste righe vengono trattate come identiche:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:432 -msgid "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-nowhite.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" -"diff-nowhite.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nowhite.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nowhite.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:439 msgid "Word-level line diff comparing no whitespace" -msgstr "" -"Differenza di riga a livello di parola che confronta senza spazi bianchi" +msgstr "Differenza di riga a livello di parola che confronta senza spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:449 @@ -5259,53 +3943,37 @@ msgstr "differenza di linea a livello di carattere" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:448 -msgid "" -"Character-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Differenze di riga a livello di carattere<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Character-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Differenze di riga a livello di carattere<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:453 msgid "" -"A character-level line difference includes the first and last different " -"characters in a word, and all the characters between them. A single " -"character-level difference can span adjacent words. The following example " -"illustrates:" +"A character-level line difference includes the first and last different characters in a word, and all the characters between them. A single character-" +"level difference can span adjacent words. The following example illustrates:" msgstr "" -"Una differenza di riga a livello di carattere include il primo e l'ultimo " -"carattere diverso in una parola e tutti i caratteri tra di essi.Una singola " -"differenza a livello di carattere può estendersi a parole adiacenti." -"L'esempio seguente illustra:" +"Una differenza di riga a livello di carattere include il primo e l'ultimo carattere diverso in una parola e tutti i caratteri tra di essi.Una singola " +"differenza a livello di carattere può estendersi a parole adiacenti.L'esempio seguente illustra:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:459 -msgid "" -"<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-" -"diff-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-" -"diff-01.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-diff-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-diff-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:465 English/Compare_files.xml:509 msgid "Character-level line diff comparing no whitespace" -msgstr "" -"Differenza di riga a livello di carattere che confronta senza spazi bianchi" +msgstr "Differenza di riga a livello di carattere che confronta senza spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><note><para> #: English/Compare_files.xml:472 msgid "" -"As with word-level line differences, character highlighting varies according " -"to how WinMerge is configured to detect word breaks. In the example, the " -"extra space after the word <literal>cure</literal> in <filename>file2</" -"filename> is highlighted only if whitespace is compared." +"As with word-level line differences, character highlighting varies according to how WinMerge is configured to detect word breaks. In the example, the " +"extra space after the word <literal>cure</literal> in <filename>file2</filename> is highlighted only if whitespace is compared." msgstr "" -"Come per le differenze di riga a livello di parola, l'evidenziazione dei " -"caratteri varia a seconda di come WinMerge è configurato per rilevare le " -"interruzioni di parola.Nell'esempio, lo spazio extra dopo la parola " -"<literal>cure</literal> in <filename>file2</filename> viene evidenziato solo " -"se viene confrontato lo spazio bianco." +"Come per le differenze di riga a livello di parola, l'evidenziazione dei caratteri varia a seconda di come WinMerge è configurato per rilevare le " +"interruzioni di parola.Nell'esempio, lo spazio extra dopo la parola <literal>cure</literal> in <filename>file2</filename> viene evidenziato solo se " +"viene confrontato lo spazio bianco." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:485 @@ -5315,49 +3983,35 @@ msgstr "interruzioni di parole nelle differenze di riga" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:484 msgid "Breaks for words or character<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Interruzioni per parole o caratteri<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Interruzioni per parole o caratteri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:489 msgid "" -"Words and characters in line differences can be separated by whitespace, or " -"by a combination of whitespace and punctuation. Whitespace (the default) is " -"the typical choice for comparing most text files. All the preceding line " -"difference examples use whitespace to break words and characters." +"Words and characters in line differences can be separated by whitespace, or by a combination of whitespace and punctuation. Whitespace (the default) " +"is the typical choice for comparing most text files. All the preceding line difference examples use whitespace to break words and characters." msgstr "" -"Le parole e i caratteri nelle differenze di riga possono essere separati da " -"spazi o da una combinazione di spazi e punteggiatura.Lo spazio bianco " -"(l'impostazione predefinita) è la scelta tipica per confrontare la maggior " -"parte dei file di testo.Tutti gli esempi di differenze di riga precedenti " +"Le parole e i caratteri nelle differenze di riga possono essere separati da spazi o da una combinazione di spazi e punteggiatura.Lo spazio bianco " +"(l'impostazione predefinita) è la scelta tipica per confrontare la maggior parte dei file di testo.Tutti gli esempi di differenze di riga precedenti " "utilizzano spazi bianchi per separare parole e caratteri." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:495 msgid "" -"In some cases it's useful to break at punctuation. For example, the next " -"screenshot compares a comma-separated list. To highlight meaningful line " -"differences, we have enabled <option>Break at whitespace or punctuation</" -"option> in the Options dialog Editor page." +"In some cases it's useful to break at punctuation. For example, the next screenshot compares a comma-separated list. To highlight meaningful line " +"differences, we have enabled <option>Break at whitespace or punctuation</option> in the Options dialog Editor page." msgstr "" -"In alcuni casi è utile interrompere la punteggiatura.Ad esempio, lo " -"screenshot successivo confronta un elenco separato da virgole.Per " -"evidenziare differenze di riga significative, abbiamo abilitato " -"<option>Interrompi in corrispondenza di spazi bianchi o punteggiatura</" -"option> nella pagina Editor della finestra di dialogo Opzioni." +"In alcuni casi è utile interrompere la punteggiatura.Ad esempio, lo screenshot successivo confronta un elenco separato da virgole.Per evidenziare " +"differenze di riga significative, abbiamo abilitato <option>Interrompi in corrispondenza di spazi bianchi o punteggiatura</option> nella pagina " +"Editor della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:502 -msgid "" -"<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-" -"diff-punctuation.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-" -"diff-punctuation.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-diff-punctuation.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-diff-punctuation.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_files.xml:520 English/Configuration.xml:2175 -#: English/Configuration.xml:2346 English/Configuration.xml:2551 +#: English/Compare_files.xml:520 English/Configuration.xml:2175 English/Configuration.xml:2346 English/Configuration.xml:2551 msgid "editing" msgstr "modifica" @@ -5369,58 +4023,41 @@ msgstr "funzionalità nella finestra Confronta file" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:519 msgid "File pane editing features<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Funzionalità di modifica del riquadro file<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Funzionalità di modifica del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:525 msgid "" -"Although WinMerge is a not a full-featured editor or IDE, it does provide " -"basic editing functions, like <guilabel>Undo</guilabel> and <guilabel>Redo</" -"guilabel>, <guilabel>Find</guilabel> and <guilabel>Replace</guilabel>, and " -"<guilabel>Go to</guilabel>. These basic editing tasks are often needed " -"during merging (for example, to change text within differences). You can " -"edit in the active File pane (remember, click in a pane to make it active). " +"Although WinMerge is a not a full-featured editor or IDE, it does provide basic editing functions, like <guilabel>Undo</guilabel> and <guilabel>Redo</" +"guilabel>, <guilabel>Find</guilabel> and <guilabel>Replace</guilabel>, and <guilabel>Go to</guilabel>. These basic editing tasks are often needed " +"during merging (for example, to change text within differences). You can edit in the active File pane (remember, click in a pane to make it active). " "Changes are not written to a file until you save a pane to a result file." msgstr "" -"Sebbene WinMerge non sia un editor o IDE completo, fornisce funzioni di " -"modifica di base, come <guilabel >Annulla</guilabel > e <guilabel >Ripeti</" -"guilabel >, <guilabel >Trova</guilabel > e <guilabel >Sostituisci</guilabel " -"> e <guilabel >Vai a</guilabel >.Queste attività di modifica di base sono " -"spesso necessarie durante l'unione (ad esempio, per modificare il testo " -"all'interno delle differenze).Puoi apportare modifiche nel riquadro File " -"attivo (ricorda di fare clic in un riquadro per renderlo attivo).Le " -"modifiche non vengono scritte in un file finché non si salva un riquadro in " -"un file di risultati." +"Sebbene WinMerge non sia un editor o IDE completo, fornisce funzioni di modifica di base, come <guilabel >Annulla</guilabel > e <guilabel >Ripeti</" +"guilabel >, <guilabel >Trova</guilabel > e <guilabel >Sostituisci</guilabel > e <guilabel >Vai a</guilabel >.Queste attività di modifica di base sono " +"spesso necessarie durante l'unione (ad esempio, per modificare il testo all'interno delle differenze).Puoi apportare modifiche nel riquadro File " +"attivo (ricorda di fare clic in un riquadro per renderlo attivo).Le modifiche non vengono scritte in un file finché non si salva un riquadro in un " +"file di risultati." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:534 msgid "" -"WinMerge editing features also include syntax highlighting. This optional " -"feature supports several file formats, and you can configure the colors " -"used. Note that syntax highlighting is not applied within differences, as " -"the preceding screenshot shows." +"WinMerge editing features also include syntax highlighting. This optional feature supports several file formats, and you can configure the colors " +"used. Note that syntax highlighting is not applied within differences, as the preceding screenshot shows." msgstr "" -"Le funzionalità di modifica di WinMerge includono anche l'evidenziazione " -"della sintassi.Questa funzionalità opzionale supporta diversi formati di " -"file ed è possibile configurare i colori utilizzati.Tieni presente che " -"l'evidenziazione della sintassi non viene applicata all'interno delle " +"Le funzionalità di modifica di WinMerge includono anche l'evidenziazione della sintassi.Questa funzionalità opzionale supporta diversi formati di " +"file ed è possibile configurare i colori utilizzati.Tieni presente che l'evidenziazione della sintassi non viene applicata all'interno delle " "differenze, come mostra lo screenshot precedente." #. type: Content of: <article><section><section><section><tip><para> #: English/Compare_files.xml:540 msgid "" -"Make sure that <guilabel>Automatic rescan</guilabel> is enabled, as " -"described in <xref linkend=\"Compare_files_scan\" />. If it is not, manually " -"refresh your view (press F5) before and after editing a file, to ensure that " -"WinMerge difference detection is up to date." +"Make sure that <guilabel>Automatic rescan</guilabel> is enabled, as described in <xref linkend=\"Compare_files_scan\" />. If it is not, manually " +"refresh your view (press F5) before and after editing a file, to ensure that WinMerge difference detection is up to date." msgstr "" -"Assicurati che la <guilabel >Riscansione automatica</guilabel > sia " -"abilitata, come descritto in <xref linkend=\"Compare_files_scan\" />.In caso " -"contrario, aggiorna manualmente la visualizzazione (premi F5) prima e dopo " -"la modifica di un file, per assicurarti che il rilevamento delle differenze " -"WinMerge sia aggiornato." +"Assicurati che la <guilabel >Riscansione automatica</guilabel > sia abilitata, come descritto in <xref linkend=\"Compare_files_scan\" />.In caso " +"contrario, aggiorna manualmente la visualizzazione (premi F5) prima e dopo la modifica di un file, per assicurarti che il rilevamento delle " +"differenze WinMerge sia aggiornato." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:549 @@ -5440,58 +4077,40 @@ msgstr "Caratteri del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:554 msgid "" -"You can choose fonts for the File pane by clicking <menuchoice> " -"<guimenu>View</guimenu> <guimenuitem>Select Font</guimenuitem> </" -"menuchoice>. WinMerge supports only fixed width fonts." +"You can choose fonts for the File pane by clicking <menuchoice> <guimenu>View</guimenu> <guimenuitem>Select Font</guimenuitem> </menuchoice>. " +"WinMerge supports only fixed width fonts." msgstr "" -"Puoi scegliere i caratteri per il pannello File facendo clic su <menuchoice> " -"<guimenu >Visualizza</guimenu > <guimenuitem >Seleziona carattere</" -"guimenuitem > </menuchoice >.WinMerge supporta solo i caratteri a larghezza " -"fissa." +"Puoi scegliere i caratteri per il pannello File facendo clic su <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Seleziona carattere</" +"guimenuitem > </menuchoice >.WinMerge supporta solo i caratteri a larghezza fissa." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:560 msgid "Here are font suggestions for using WinMerge with East Asian languages:" -msgstr "" -"Ecco alcuni suggerimenti sui caratteri per utilizzare WinMerge con le lingue " -"dell'Asia orientale:" +msgstr "Ecco alcuni suggerimenti sui caratteri per utilizzare WinMerge con le lingue dell'Asia orientale:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:565 -msgid "" -"Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</" -"guilabel> fixed-width fonts" -msgstr "" -"Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</" -"guilabel> fixed-width fonts" +msgid "Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</guilabel> fixed-width fonts" +msgstr "Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</guilabel> fixed-width fonts" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:570 msgid "Traditional Chinese: <guilabel>MingLiU</guilabel> fixed-width font" -msgstr "" -"Cinese tradizionale: carattere <guilabel >MingLiU</guilabel > a larghezza " -"fissa" +msgstr "Cinese tradizionale: carattere <guilabel >MingLiU</guilabel > a larghezza fissa" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:575 -msgid "" -"Japanese: <guilabel>MS Gothic</guilabel> or <guilabel>MS Mincho</guilabel> " -"fixed-width fonts" -msgstr "" -"Giapponese: caratteri <guilabel >MS Gothic</guilabel > o <guilabel >MS " -"Mincho</guilabel > a larghezza fissa" +msgid "Japanese: <guilabel>MS Gothic</guilabel> or <guilabel>MS Mincho</guilabel> fixed-width fonts" +msgstr "Giapponese: caratteri <guilabel >MS Gothic</guilabel > o <guilabel >MS Mincho</guilabel > a larghezza fissa" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:580 msgid "" -"Korean: <guilabel>GulimChe</guilabel> fixed-width font (not <guilabel>Gulim</" -"guilabel>, because this variant uses proportional-spacing glyphs that are " -"not centered in grid cells and poorly aligned in fixed-width mode)." +"Korean: <guilabel>GulimChe</guilabel> fixed-width font (not <guilabel>Gulim</guilabel>, because this variant uses proportional-spacing glyphs that " +"are not centered in grid cells and poorly aligned in fixed-width mode)." msgstr "" -"Coreano: <guilabel >GulimChe</guilabel > carattere a larghezza fissa (non " -"<guilabel >Gulim</guilabel >, perché questa variante utilizza glifi a " -"spaziatura proporzionale che non sono centrati nelle celle della griglia e " -"scarsamente allineati in modalità a larghezza fissa)." +"Coreano: <guilabel >GulimChe</guilabel > carattere a larghezza fissa (non <guilabel >Gulim</guilabel >, perché questa variante utilizza glifi a " +"spaziatura proporzionale che non sono centrati nelle celle della griglia e scarsamente allineati in modalità a larghezza fissa)." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:590 @@ -5506,18 +4125,13 @@ msgstr "Margini del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:595 msgid "" -"The File panes have optional gray margins that show line numbers and some " -"symbols. To show or hide the margins, clicking <menuchoice> <guimenu>View</" -"guimenu> <guimenuitem>View Margins</guimenuitem> </menuchoice>. If you are " -"using multiple File Compare windows, you can control margins for each window " -"independently. The margin can show any or all of these features:" +"The File panes have optional gray margins that show line numbers and some symbols. To show or hide the margins, clicking <menuchoice> <guimenu>View</" +"guimenu> <guimenuitem>View Margins</guimenuitem> </menuchoice>. If you are using multiple File Compare windows, you can control margins for each " +"window independently. The margin can show any or all of these features:" msgstr "" -"I riquadri File hanno margini grigi opzionali che mostrano i numeri di riga " -"e alcuni simboli.Per mostrare o nascondere i margini, fai clic su " -"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Visualizza " -"margini</guimenuitem > </menuchoice >.Se utilizzi più finestre di confronto " -"file, puoi controllare i margini per ciascuna finestra in modo indipendente." -"Il margine può mostrare alcune o tutte queste funzionalità:" +"I riquadri File hanno margini grigi opzionali che mostrano i numeri di riga e alcuni simboli.Per mostrare o nascondere i margini, fai clic su " +"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Visualizza margini</guimenuitem > </menuchoice >.Se utilizzi più finestre di confronto " +"file, puoi controllare i margini per ciascuna finestra in modo indipendente.Il margine può mostrare alcune o tutte queste funzionalità:" #. type: Content of: <article><section><section><section><indexterm><primary> #: English/Compare_files.xml:605 @@ -5536,130 +4150,90 @@ msgstr "avvolgimento delle parole" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:622 -msgid "" -"Line numbers, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line " -"Numbers</guimenuitem> </menuchoice> is enabled." +msgid "Line numbers, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Numbers</guimenuitem> </menuchoice> is enabled." msgstr "" -"Numeri di riga, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " -">Visualizza numeri di riga</guimenuitem > </menuchoice > è abilitato." +"Numeri di riga, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza numeri di riga</guimenuitem > </menuchoice > è abilitato." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:630 msgid "" -"Bookmarks, if <menuchoice> <guimenu>Edit</guimenu> <guisubmenu>Bookmarks</" -"guisubmenu> </menuchoice> is enabled. A bookmark is a blue circle, in the " +"Bookmarks, if <menuchoice> <guimenu>Edit</guimenu> <guisubmenu>Bookmarks</guisubmenu> </menuchoice> is enabled. A bookmark is a blue circle, in the " "margin next to a line, that you can make WinMerge remember and return to." msgstr "" -"Segnalibri, se <menuchoice> <guimenu >Modifica</guimenu > <guisubmenu " -">Segnalibri</guisubmenu > </menuchoice > è abilitato.Un segnalibro è un " -"cerchio blu, nel margine accanto a una riga, che puoi far ricordare a " -"WinMerge e a cui tornare." +"Segnalibri, se <menuchoice> <guimenu >Modifica</guimenu > <guisubmenu >Segnalibri</guisubmenu > </menuchoice > è abilitato.Un segnalibro è un cerchio " +"blu, nel margine accanto a una riga, che puoi far ricordare a WinMerge e a cui tornare." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:640 msgid "" -"To set a bookmark on a line, double-click in its margin (or press <keycombo> " -"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>). The same action " +"To set a bookmark on a line, double-click in its margin (or press <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>). The same action " "deletes an existing bookmark." msgstr "" -"Per impostare un segnalibro su una riga, fai doppio clic sul suo margine (o " -"premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>).La " -"stessa azione elimina un segnalibro esistente." +"Per impostare un segnalibro su una riga, fai doppio clic sul suo margine (o premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </" +"keycombo>).La stessa azione elimina un segnalibro esistente." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:650 msgid "" -"To navigate bookmarks, click <menuchoice> <guimenu>Edit</guimenu> " -"<guimenuitem>Bookmarks</guimenuitem> </menuchoice> and choose " -"<guimenuitem>Next</guimenuitem> or <guimenuitem>Previous</guimenuitem>." +"To navigate bookmarks, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</guimenuitem> </menuchoice> and choose <guimenuitem>Next</" +"guimenuitem> or <guimenuitem>Previous</guimenuitem>." msgstr "" -"Per navigare tra i segnalibri, fai clic su <menuchoice> <guimenu >Modifica</" -"guimenu > <guimenuitem >Segnalibri</guimenuitem > </menuchoice > e scegli " -"<guimenuitem >Avanti</guimenuitem > o <guimenuitem >Precedente</guimenuitem " -">." +"Per navigare tra i segnalibri, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Segnalibri</guimenuitem > </menuchoice > e scegli " +"<guimenuitem >Avanti</guimenuitem > o <guimenuitem >Precedente</guimenuitem >." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:659 -msgid "" -"Double-click a single bookmark to delete it (or press <keycombo> " -"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." -msgstr "" -"Fai doppio clic su un singolo segnalibro per eliminarlo (o premi <keycombo> " -"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." +msgid "Double-click a single bookmark to delete it (or press <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." +msgstr "Fai doppio clic su un singolo segnalibro per eliminarlo (o premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:668 msgid "" -"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</" -"guimenuitem> <guimenuitem>Clear All Bookmarks</guimenuitem> </menuchoice> to " +"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</guimenuitem> <guimenuitem>Clear All Bookmarks</guimenuitem> </menuchoice> to " "delete all bookmarks." msgstr "" -"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem " -">Segnalibri</guimenuitem > <guimenuitem >Cancella tutti i segnalibri</" -"guimenuitem > </menuchoice > per eliminare tutti i segnalibri." +"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Segnalibri</guimenuitem > <guimenuitem >Cancella tutti i segnalibri</guimenuitem " +"> </menuchoice > per eliminare tutti i segnalibri." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:680 -msgid "" -"Word wrap arrow symbols, if <menuchoice> <guimenu>View</guimenu> " -"<guimenuitem>Wrap Lines</guimenuitem> </menuchoice> is enabled." -msgstr "" -"Simboli freccia a capo, se <menuchoice> <guimenu >Visualizza</guimenu> " -"<guimenuitem >Righe a capo</guimenuitem > </menuchoice > è abilitato." +msgid "Word wrap arrow symbols, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</guimenuitem> </menuchoice> is enabled." +msgstr "Simboli freccia a capo, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice > è abilitato." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:688 -msgid "" -"The following screenshot shows a margin with bookmarks and word wrap " -"enabled. Without line numbers, the margin width is minimal." -msgstr "" -"La schermata seguente mostra un margine con i segnalibri e il ritorno a capo " -"abilitati.Senza numeri di riga, la larghezza del margine è minima." +msgid "The following screenshot shows a margin with bookmarks and word wrap enabled. Without line numbers, the margin width is minimal." +msgstr "La schermata seguente mostra un margine con i segnalibri e il ritorno a capo abilitati.Senza numeri di riga, la larghezza del margine è minima." #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_files.xml:692 -msgid "" -"<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/" -"filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/" -"filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:698 msgid "File Compare window margin with bookmark and word wrap" -msgstr "" -"File Confronta il margine della finestra con il segnalibro e il ritorno a " -"capo automatico" +msgstr "File Confronta il margine della finestra con il segnalibro e il ritorno a capo automatico" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:703 msgid "" -"The next screenshot shows a margin with bookmarks and line numbers enabled. " -"Notice that the margin is wider. In fact, the margin is wide enough for the " -"largest line number. Thus, the margins for large files with many lines can " -"be quite wide." +"The next screenshot shows a margin with bookmarks and line numbers enabled. Notice that the margin is wider. In fact, the margin is wide enough for " +"the largest line number. Thus, the margins for large files with many lines can be quite wide." msgstr "" -"Lo screenshot successivo mostra un margine con segnalibri e numeri di riga " -"abilitati.Si noti che il margine è più ampio.In effetti, il margine è " -"sufficientemente ampio per contenere il numero di riga più grande.Pertanto, " -"i margini per file di grandi dimensioni con molte righe possono essere " +"Lo screenshot successivo mostra un margine con segnalibri e numeri di riga abilitati.Si noti che il margine è più ampio.In effetti, il margine è " +"sufficientemente ampio per contenere il numero di riga più grande.Pertanto, i margini per file di grandi dimensioni con molte righe possono essere " "piuttosto ampi." #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_files.xml:709 -msgid "" -"<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" " -"fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" " -"fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:715 msgid "File Compare window margin with bookmark and line numbers" -msgstr "" -"File Confronta il margine della finestra con i segnalibri e i numeri di riga" +msgstr "File Confronta il margine della finestra con i segnalibri e i numeri di riga" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:724 @@ -5673,65 +4247,42 @@ msgstr "menu, con la finestra Confronta file" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:723 -msgid "" -"Toolbar and menus<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Barra degli strumenti e menu<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Toolbar and menus<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Barra degli strumenti e menu<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:729 -msgid "" -"The WinMerge toolbar and menus provide a range of functions to navigate, " -"select, and merge differences within files." +msgid "The WinMerge toolbar and menus provide a range of functions to navigate, select, and merge differences within files." msgstr "" -"La barra degli strumenti e i menu di WinMerge forniscono una gamma di " -"funzioni per navigare, selezionare e unire le differenze all'interno dei " -"file." +"La barra degli strumenti e i menu di WinMerge forniscono una gamma di funzioni per navigare, selezionare e unire le differenze all'interno dei file." #. type: Content of: <article><section><section><note><para> #: English/Compare_files.xml:733 msgid "" -"WinMerge shortcuts have the same names and buttons whether you open a Folder " -"Compare or File Compare window. However, the functions behave differently: " -"with a File Compare window, the functions operate on differences within " -"files, not on differences within folders." +"WinMerge shortcuts have the same names and buttons whether you open a Folder Compare or File Compare window. However, the functions behave " +"differently: with a File Compare window, the functions operate on differences within files, not on differences within folders." msgstr "" -"Le scorciatoie di WinMerge hanno gli stessi nomi e pulsanti sia che si apra " -"una finestra Confronto cartelle o Confronto file.Tuttavia, le funzioni si " -"comportano diversamente: con una finestra Confronta file, le funzioni " -"operano sulle differenze all'interno dei file, non sulle differenze " -"all'interno delle cartelle." +"Le scorciatoie di WinMerge hanno gli stessi nomi e pulsanti sia che si apra una finestra Confronto cartelle o Confronto file.Tuttavia, le funzioni si " +"comportano diversamente: con una finestra Confronta file, le funzioni operano sulle differenze all'interno dei file, non sulle differenze all'interno " +"delle cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:739 msgid "" -"The difference functions you can use depend on your context, which often " -"changes as you work. This means that a function is available only when its " -"operation is possible for a given location or other condition in your " -"WinMerge environment. For example, if you click in a line of text within a " -"difference, you might notice several navigation and merge buttons become " -"enabled in the toolbar. If you click in another area of text that is not " +"The difference functions you can use depend on your context, which often changes as you work. This means that a function is available only when its " +"operation is possible for a given location or other condition in your WinMerge environment. For example, if you click in a line of text within a " +"difference, you might notice several navigation and merge buttons become enabled in the toolbar. If you click in another area of text that is not " "within a difference, these functions become unavailable." msgstr "" -"Le diverse funzioni che puoi utilizzare dipendono dal contesto, che spesso " -"cambia mentre lavori.Ciò significa che una funzione è disponibile solo " -"quando il suo funzionamento è possibile per una determinata posizione o " -"altra condizione nell'ambiente WinMerge.Ad esempio, se fai clic su una riga " -"di testo all'interno di una differenza, potresti notare che diversi pulsanti " -"di navigazione e unione vengono abilitati nella barra degli strumenti.Se si " -"fa clic in un'altra area di testo che non si trova all'interno di una " -"differenza, queste funzioni non saranno più disponibili." +"Le diverse funzioni che puoi utilizzare dipendono dal contesto, che spesso cambia mentre lavori.Ciò significa che una funzione è disponibile solo " +"quando il suo funzionamento è possibile per una determinata posizione o altra condizione nell'ambiente WinMerge.Ad esempio, se fai clic su una riga " +"di testo all'interno di una differenza, potresti notare che diversi pulsanti di navigazione e unione vengono abilitati nella barra degli strumenti.Se " +"si fa clic in un'altra area di testo che non si trova all'interno di una differenza, queste funzioni non saranno più disponibili." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:747 -msgid "" -"Difference functions are available in the WinMerge toolbar,and also through " -"these alternate mechanisms:" -msgstr "" -"Le funzioni di differenza sono disponibili nella barra degli strumenti " -"WinMerge e anche attraverso questi meccanismi alternativi:" +msgid "Difference functions are available in the WinMerge toolbar,and also through these alternate mechanisms:" +msgstr "Le funzioni di differenza sono disponibili nella barra degli strumenti WinMerge e anche attraverso questi meccanismi alternativi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:752 @@ -5740,11 +4291,8 @@ msgstr "Menu di WinMerge, in particolare <guimenu >Unisci</guimenu >" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:756 -msgid "" -"Context menus within the File Compare window (when you right-click in text)" -msgstr "" -"Menu contestuali nella finestra Confronta file (quando fai clic con il " -"pulsante destro del mouse sul testo)" +msgid "Context menus within the File Compare window (when you right-click in text)" +msgstr "Menu contestuali nella finestra Confronta file (quando fai clic con il pulsante destro del mouse sul testo)" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:761 @@ -5754,15 +4302,11 @@ msgstr "Scorciatoie da tastiera" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:765 msgid "" -"Difference functions are described in <xref linkend=\"Compare_files_nav\" /> " -"and <xref linkend=\"Compare_files_merge\" />, later in this topic. <xref " -"linkend=\"Quick_start\" /> and <xref linkend=\"Intro_diffs\" /> provide " -"examples of comparing and merging." +"Difference functions are described in <xref linkend=\"Compare_files_nav\" /> and <xref linkend=\"Compare_files_merge\" />, later in this topic. <xref " +"linkend=\"Quick_start\" /> and <xref linkend=\"Intro_diffs\" /> provide examples of comparing and merging." msgstr "" -"Le funzioni di differenza sono descritte in <xref " -"linkend=\"Compare_files_nav\" /> e <xref linkend=\"Compare_files_merge\" />, " -"più avanti in questo argomento.<xref linkend=\"Quick_start\" /> e <xref " -"linkend=\"Intro_diffs\" /> forniscono esempi di confronto e unione." +"Le funzioni di differenza sono descritte in <xref linkend=\"Compare_files_nav\" /> e <xref linkend=\"Compare_files_merge\" />, più avanti in questo " +"argomento.<xref linkend=\"Quick_start\" /> e <xref linkend=\"Intro_diffs\" /> forniscono esempi di confronto e unione." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:772 @@ -5777,57 +4321,39 @@ msgstr "Modalità di unione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:775 msgid "" -"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Merge Mode</guimenuitem> </" -"menuchoice> (or press <keycap>F9</keycap>) restores these WinMerge 1.7.1 " +"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Merge Mode</guimenuitem> </menuchoice> (or press <keycap>F9</keycap>) restores these WinMerge 1.7.1 " "single keyboard shortcuts for difference merging and navigating functions:" msgstr "" -"<menuchoice> <guimenu >File</guimenu> <guimenuitem >Modalità unione</" -"guimenuitem> </menuchoice > (o premi <keycap >F9</keycap >) ripristina " -"queste singole scorciatoie da tastiera di WinMerge 1.7.1 per le funzioni di " -"fusione e navigazione delle differenze:" +"<menuchoice> <guimenu >File</guimenu> <guimenuitem >Modalità unione</guimenuitem> </menuchoice > (o premi <keycap >F9</keycap >) ripristina queste " +"singole scorciatoie da tastiera di WinMerge 1.7.1 per le funzioni di fusione e navigazione delle differenze:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:785 msgid "" -"<keycap>Up</keycap> and <keycap>Down</keycap> keys for the " -"<function>Previous Difference</function> and <function>Next Difference</" -"function> functions." +"<keycap>Up</keycap> and <keycap>Down</keycap> keys for the <function>Previous Difference</function> and <function>Next Difference</function> " +"functions." msgstr "" -"Tasti <keycap>Su</keycap> e <keycap>Giù</keycap> per le funzioni " -"<function>Previous Difference</function> e <function>Next Difference</" -"function>." +"Tasti <keycap>Su</keycap> e <keycap>Giù</keycap> per le funzioni <function>Previous Difference</function> e <function>Next Difference</function>." #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:792 -msgid "" -"<keycap>Left</keycap> and <keycap>Right</keycap> keys for the <function>Copy " -"Left</function> and <function>Copy Right</function> functions." -msgstr "" -"Tasti <keycap>Sinistra</keycap> e <keycap>Destra</keycap> per le funzioni " -"<function>Copy Left</function> e <function>>Copy Right</function>." +msgid "<keycap>Left</keycap> and <keycap>Right</keycap> keys for the <function>Copy Left</function> and <function>Copy Right</function> functions." +msgstr "Tasti <keycap>Sinistra</keycap> e <keycap>Destra</keycap> per le funzioni <function>Copy Left</function> e <function>>Copy Right</function>." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:798 msgid "" -"Merge mode omits the <keycap>Alt</keycap> key for these common operations " -"(making them quicker to use than the normal mode). Note that the " -"<keycap>Shift</keycap> and <keycap>Alt</keycap> <keycap>Arrow</keycap> key " -"combinations work in merge mode in the same way as normal mode." +"Merge mode omits the <keycap>Alt</keycap> key for these common operations (making them quicker to use than the normal mode). Note that the " +"<keycap>Shift</keycap> and <keycap>Alt</keycap> <keycap>Arrow</keycap> key combinations work in merge mode in the same way as normal mode." msgstr "" -"La modalità unione omette il tasto <keycap>Alt</keycap> per queste " -"operazioni comuni (rendendole più veloci da usare rispetto alla modalità " -"normale).Tieni presente che le combinazioni di tasti <keycap>Maiusc</keycap> " -"e <keycap>Alt</keycap> <keycap>Freccia</keycap> funzionano in modalità " +"La modalità unione omette il tasto <keycap>Alt</keycap> per queste operazioni comuni (rendendole più veloci da usare rispetto alla modalità " +"normale).Tieni presente che le combinazioni di tasti <keycap>Maiusc</keycap> e <keycap>Alt</keycap> <keycap>Freccia</keycap> funzionano in modalità " "unione allo stesso modo della modalità normale." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:804 -msgid "" -"Merge mode is indicated in the status bar by the text <guilabel>Merge</" -"guilabel>." -msgstr "" -"La modalità di unione è indicata nella barra di stato dal testo <guilabel " -">Unisci</guilabel >." +msgid "Merge mode is indicated in the status bar by the text <guilabel>Merge</guilabel>." +msgstr "La modalità di unione è indicata nella barra di stato dal testo <guilabel >Unisci</guilabel >." #. type: Content of: <article><section><section><para><indexterm><secondary> #: English/Compare_files.xml:810 English/Compare_files.xml:947 @@ -5847,15 +4373,11 @@ msgstr "navigazione differenziale" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:820 msgid "" -"The Location pane, to the left of the File panes, maps the entire length of " -"the compared files into two vertical bars (corresponding to the left and " -"right File panes). It is especially useful for working with files that are " -"too long to easily navigate in the File panes." +"The Location pane, to the left of the File panes, maps the entire length of the compared files into two vertical bars (corresponding to the left and " +"right File panes). It is especially useful for working with files that are too long to easily navigate in the File panes." msgstr "" -"Il riquadro Posizione, a sinistra dei riquadri File, mappa l'intera " -"lunghezza dei file confrontati in due barre verticali (corrispondenti ai " -"riquadri File sinistro e destro).È particolarmente utile per lavorare con " -"file troppo lunghi per essere spostati facilmente nei riquadri File." +"Il riquadro Posizione, a sinistra dei riquadri File, mappa l'intera lunghezza dei file confrontati in due barre verticali (corrispondenti ai riquadri " +"File sinistro e destro).È particolarmente utile per lavorare con file troppo lunghi per essere spostati facilmente nei riquadri File." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:825 @@ -5864,12 +4386,8 @@ msgstr "Il riquadro Posizione mostra diversi tipi di elementi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:830 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_diffs.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_diffs.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_diffs.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_diffs.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:836 @@ -5879,37 +4397,25 @@ msgstr "Linee di differenza del riquadro Posizione" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:829 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Difference blocks" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Blocchi di differenza" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Blocchi di differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:841 msgid "" -"Each difference block in the File panes is indicated in the Location pane by " -"a horizontal line across each vertical bar. The thickness, color , and " -"locations of these lines are clues about of the size (number of lines), " -"types and distribution of all differences in the files. For example, the " -"color of a line is the same as the color of the corresponding difference " -"block. The Location pane in the preceding screenshot shows many basic " +"Each difference block in the File panes is indicated in the Location pane by a horizontal line across each vertical bar. The thickness, color , and " +"locations of these lines are clues about of the size (number of lines), types and distribution of all differences in the files. For example, the " +"color of a line is the same as the color of the corresponding difference block. The Location pane in the preceding screenshot shows many basic " "differences (gold) and some empty difference blocks (gray)." msgstr "" -"Ogni blocco di differenze nei riquadri File è indicato nel riquadro " -"Posizione da una linea orizzontale su ciascuna barra verticale.Lo spessore, " -"il colore e la posizione di queste linee sono indizi sulla dimensione " -"(numero di linee), sui tipi e sulla distribuzione di tutte le differenze nei " -"file.Ad esempio, il colore di una linea è uguale al colore del blocco " -"differenza corrispondente.Il riquadro Posizione nello screenshot precedente " -"mostra molte differenze di base (oro) e alcuni blocchi di differenze vuoti " -"(grigio)." +"Ogni blocco di differenze nei riquadri File è indicato nel riquadro Posizione da una linea orizzontale su ciascuna barra verticale.Lo spessore, il " +"colore e la posizione di queste linee sono indizi sulla dimensione (numero di linee), sui tipi e sulla distribuzione di tutte le differenze nei " +"file.Ad esempio, il colore di una linea è uguale al colore del blocco differenza corrispondente.Il riquadro Posizione nello screenshot precedente " +"mostra molte differenze di base (oro) e alcuni blocchi di differenze vuoti (grigio)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:854 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_currentdiff.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_currentdiff.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_currentdiff.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_currentdiff.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:860 @@ -5924,28 +4430,19 @@ msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Differenza attuale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:865 msgid "" -"If you have selected a difference, the Location pane marks the current " -"difference line with a pair of small triangles on either side of the " -"vertical bars. If you navigate to another difference, the pointer moves up " -"or down with the location. Scrolling the File pane does not change the " -"location of the difference pointer (or any of the difference lines) in the " -"location pane." +"If you have selected a difference, the Location pane marks the current difference line with a pair of small triangles on either side of the vertical " +"bars. If you navigate to another difference, the pointer moves up or down with the location. Scrolling the File pane does not change the location of " +"the difference pointer (or any of the difference lines) in the location pane." msgstr "" -"Se hai selezionato una differenza, il riquadro Posizione contrassegna la " -"linea della differenza corrente con una coppia di piccoli triangoli su " -"entrambi i lati delle barre verticali.Se navighi verso un'altra differenza, " -"il puntatore si sposta verso l'alto o verso il basso insieme alla posizione." -"Lo scorrimento del riquadro File non modifica la posizione del puntatore di " -"differenza (o delle linee di differenza) nel riquadro della posizione." +"Se hai selezionato una differenza, il riquadro Posizione contrassegna la linea della differenza corrente con una coppia di piccoli triangoli su " +"entrambi i lati delle barre verticali.Se navighi verso un'altra differenza, il puntatore si sposta verso l'alto o verso il basso insieme alla " +"posizione.Lo scorrimento del riquadro File non modifica la posizione del puntatore di differenza (o delle linee di differenza) nel riquadro della " +"posizione." #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:876 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_viewbar.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"locpane_viewbar.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_viewbar.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_viewbar.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:882 @@ -5955,58 +4452,39 @@ msgstr "Barra dell'area di visualizzazione del riquadro posizione" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:875 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> View area" -msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Area di visualizzazione" +msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Area di visualizzazione" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:887 msgid "" -"The area of the files currently visible in the File panes is indicated by a " -"shaded (translucent) view bar over the Location pane. The area bar's height " -"and location correspond to the portion of the files that is visible in the " -"scroll region. For example, you might see the bar expand or shrink if you " -"change the height of your File panes. This synchronization of the Location " -"pane view bar and File panes enables quick navigation, and some useful " -"actions:" -msgstr "" -"L'area dei file attualmente visibili nei riquadri File è indicata da una " -"barra di visualizzazione ombreggiata (traslucida) sopra il riquadro " -"Posizione.L'altezza e la posizione della barra dell'area corrispondono alla " -"parte dei file visibile nella regione di scorrimento.Ad esempio, potresti " -"vedere la barra espandersi o ridursi se modifichi l'altezza dei riquadri " -"File.Questa sincronizzazione della barra di visualizzazione del riquadro " -"Posizione e dei riquadri File consente una navigazione rapida e alcune " -"azioni utili:" +"The area of the files currently visible in the File panes is indicated by a shaded (translucent) view bar over the Location pane. The area bar's " +"height and location correspond to the portion of the files that is visible in the scroll region. For example, you might see the bar expand or shrink " +"if you change the height of your File panes. This synchronization of the Location pane view bar and File panes enables quick navigation, and some " +"useful actions:" +msgstr "" +"L'area dei file attualmente visibili nei riquadri File è indicata da una barra di visualizzazione ombreggiata (traslucida) sopra il riquadro " +"Posizione.L'altezza e la posizione della barra dell'area corrispondono alla parte dei file visibile nella regione di scorrimento.Ad esempio, potresti " +"vedere la barra espandersi o ridursi se modifichi l'altezza dei riquadri File.Questa sincronizzazione della barra di visualizzazione del riquadro " +"Posizione e dei riquadri File consente una navigazione rapida e alcune azioni utili:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:897 -msgid "" -"When you scroll the File panes, the view area in the Location pane moves " -"with it." -msgstr "" -"Quando scorri i riquadri File, l'area di visualizzazione nel riquadro " -"Posizione si sposta con esso." +msgid "When you scroll the File panes, the view area in the Location pane moves with it." +msgstr "Quando scorri i riquadri File, l'area di visualizzazione nel riquadro Posizione si sposta con esso." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:902 msgid "" -"Conversely, you can drag the view area bar in the Location pane up or down " -"to scroll the File panes. This scrollbar thumb action is very handy for " +"Conversely, you can drag the view area bar in the Location pane up or down to scroll the File panes. This scrollbar thumb action is very handy for " "navigating long files." msgstr "" -"Al contrario, puoi trascinare la barra dell'area di visualizzazione nel " -"riquadro Posizione verso l'alto o verso il basso per scorrere i riquadri " -"File.Questa azione del pollice della barra di scorrimento è molto utile per " -"navigare in file lunghi." +"Al contrario, puoi trascinare la barra dell'area di visualizzazione nel riquadro Posizione verso l'alto o verso il basso per scorrere i riquadri " +"File.Questa azione del pollice della barra di scorrimento è molto utile per navigare in file lunghi." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:908 -msgid "" -"Click anywhere in the Location pane to jump to the corresponding location in " -"the File panes." -msgstr "" -"Fare clic in un punto qualsiasi nel riquadro Posizione per passare alla " -"posizione corrispondente nei riquadri File." +msgid "Click anywhere in the Location pane to jump to the corresponding location in the File panes." +msgstr "Fare clic in un punto qualsiasi nel riquadro Posizione per passare alla posizione corrispondente nei riquadri File." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:916 @@ -6016,29 +4494,19 @@ msgstr "Differenze spostate<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:921 msgid "" -"Moved differences are identical lines in different locations. They are " -"shown only if the Enable moved block detection is checked in the Options " -"dialog Compare page. See <xref linkend=\"CompareFiles_diffcolors\" /> for " -"more details about moved differences in the File pane. The Location pane " -"draws a line connecting moved differences in the left and right location " -"bars. For example:" -msgstr "" -"Le differenze spostate sono linee identiche in posizioni diverse.Vengono " -"visualizzati solo se è selezionata l'opzione Abilita rilevamento blocchi " -"spostati nella pagina Confronta della finestra di dialogo Opzioni.Vedi <xref " -"linkend=\"CompareFiles_diffcolors\" /> per maggiori dettagli sulle " -"differenze spostate nel riquadro File.Il riquadro Posizione disegna una " -"linea che collega le differenze spostate nelle barre di posizione sinistra e " +"Moved differences are identical lines in different locations. They are shown only if the Enable moved block detection is checked in the Options " +"dialog Compare page. See <xref linkend=\"CompareFiles_diffcolors\" /> for more details about moved differences in the File pane. The Location pane " +"draws a line connecting moved differences in the left and right location bars. For example:" +msgstr "" +"Le differenze spostate sono linee identiche in posizioni diverse.Vengono visualizzati solo se è selezionata l'opzione Abilita rilevamento blocchi " +"spostati nella pagina Confronta della finestra di dialogo Opzioni.Vedi <xref linkend=\"CompareFiles_diffcolors\" /> per maggiori dettagli sulle " +"differenze spostate nel riquadro File.Il riquadro Posizione disegna una linea che collega le differenze spostate nelle barre di posizione sinistra e " "destra.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:930 -msgid "" -"<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/" -"locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/" -"locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:937 @@ -6057,58 +4525,36 @@ msgstr "Funzioni Blocchi spostati" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:944 -msgid "" -"The Location pane's context menu contains these shortcuts:<placeholder " -"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "The Location pane's context menu contains these shortcuts:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Il menu contestuale del riquadro Posizione contiene queste scorciatoie:" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"Il menu contestuale del riquadro Posizione contiene queste scorciatoie:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " "id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:954 -msgid "" -"<guimenuitem>Go to Line 1</guimenuitem>: Moves the cursor to the top of the " -"file." -msgstr "" -"<guimenuitem >Vai alla riga 1</guimenuitem >: sposta il cursore all'inizio " -"del file." +msgid "<guimenuitem>Go to Line 1</guimenuitem>: Moves the cursor to the top of the file." +msgstr "<guimenuitem >Vai alla riga 1</guimenuitem >: sposta il cursore all'inizio del file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:959 -msgid "" -"<guimenuitem>Go to</guimenuitem>: Moves the cursor to a line you specify " -"(described in <xref linkend=\"Compare_files_nav_functions\" />)." -msgstr "" -"<guimenuitem >Vai a</guimenuitem >: sposta il cursore su una riga " -"specificata (descritta in <xref linkend=\"Compare_files_nav_functions\" />)." +msgid "<guimenuitem>Go to</guimenuitem>: Moves the cursor to a line you specify (described in <xref linkend=\"Compare_files_nav_functions\" />)." +msgstr "<guimenuitem >Vai a</guimenuitem >: sposta il cursore su una riga specificata (descritta in <xref linkend=\"Compare_files_nav_functions\" />)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:965 -msgid "" -"<guimenuitem>No Moved Blocks</guimenuitem>: Turns off moved difference color " -"for moved blocks." -msgstr "" -"<guimenuitem >Nessun blocco spostato</guimenuitem >: disattiva il colore " -"della differenza spostata per i blocchi spostati." +msgid "<guimenuitem>No Moved Blocks</guimenuitem>: Turns off moved difference color for moved blocks." +msgstr "<guimenuitem >Nessun blocco spostato</guimenuitem >: disattiva il colore della differenza spostata per i blocchi spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:970 -msgid "" -"<guimenuitem>All Moved Blocks</guimenuitem>: Turns on moved difference color " -"for all moved blocks." -msgstr "" -"<guimenuitem >Blox di tutte le mosse</guimenuitem >: attiva le mosse con " -"colori diversi per tutti i blocchi spostati." +msgid "<guimenuitem>All Moved Blocks</guimenuitem>: Turns on moved difference color for all moved blocks." +msgstr "<guimenuitem >Blox di tutte le mosse</guimenuitem >: attiva le mosse con colori diversi per tutti i blocchi spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:975 -msgid "" -"<guimenuitem>Moved Block for Current Diff</guimenuitem>: Turns on moved " -"difference color only for current selected moved difference." +msgid "<guimenuitem>Moved Block for Current Diff</guimenuitem>: Turns on moved difference color only for current selected moved difference." msgstr "" -"<guimenuitem >Blocco spostato per differenza attuale</guimenuitem >: attiva " -"il colore della differenza spostata solo per la differenza spostata " +"<guimenuitem >Blocco spostato per differenza attuale</guimenuitem >: attiva il colore della differenza spostata solo per la differenza spostata " "attualmente selezionata." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -6123,36 +4569,26 @@ msgstr "Riquadro differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:987 -msgid "" -"The Diff pane shows the contents of the two sides of a selected difference." -msgstr "" -"Il riquadro Diff mostra il contenuto dei due lati di una differenza " -"selezionata." +msgid "The Diff pane shows the contents of the two sides of a selected difference." +msgstr "Il riquadro Diff mostra il contenuto dei due lati di una differenza selezionata." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:990 msgid "" -"When you select a difference, the two versions are loaded in the upper and " -"lower sides of the Diff pane. In this way, the Diff pane confirms which " -"lines are included in a difference, and lets you examine them in isolation " -"from the rest of the file." +"When you select a difference, the two versions are loaded in the upper and lower sides of the Diff pane. In this way, the Diff pane confirms which " +"lines are included in a difference, and lets you examine them in isolation from the rest of the file." msgstr "" -"Quando selezioni una differenza, le due versioni vengono caricate nei lati " -"superiore e inferiore del riquadro Diff.In questo modo, il riquadro Diff " -"conferma quali righe sono incluse in una differenza e consente di esaminarle " -"separatamente dal resto del file." +"Quando selezioni una differenza, le due versioni vengono caricate nei lati superiore e inferiore del riquadro Diff.In questo modo, il riquadro Diff " +"conferma quali righe sono incluse in una differenza e consente di esaminarle separatamente dal resto del file." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:995 msgid "" -"You can merge differences directly in the Diff pane by right-clicking in " -"either the top or bottom side and choosing <guimenuitem>Copy to Right</" +"You can merge differences directly in the Diff pane by right-clicking in either the top or bottom side and choosing <guimenuitem>Copy to Right</" "guimenuitem> or <guimenuitem>Copy to Left</guimenuitem>." msgstr "" -"Puoi unire le differenze direttamente nel pannello Diff facendo clic con il " -"pulsante destro del mouse sul lato superiore o inferiore e scegliendo " -"<guimenuitem >Copia a destra</guimenuitem > o <guimenuitem >Copia a " -"sinistra</guimenuitem >." +"Puoi unire le differenze direttamente nel pannello Diff facendo clic con il pulsante destro del mouse sul lato superiore o inferiore e scegliendo " +"<guimenuitem >Copia a destra</guimenuitem > o <guimenuitem >Copia a sinistra</guimenuitem >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:1003 @@ -6176,23 +4612,17 @@ msgstr "codifica dei caratteri" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1002 -msgid "" -"Status bars<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Barre di stato<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>" +msgid "Status bars<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Barre di stato<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1012 msgid "" -"Each File pane contains a status bar at the bottom. The status bar contains " -"several panes with different types of information about the document and " +"Each File pane contains a status bar at the bottom. The status bar contains several panes with different types of information about the document and " "your location in it:" msgstr "" -"Ogni riquadro File contiene una barra di stato nella parte inferiore.La " -"barra di stato contiene diversi riquadri con diversi tipi di informazioni " -"sul documento e sulla tua posizione al suo interno:" +"Ogni riquadro File contiene una barra di stato nella parte inferiore.La barra di stato contiene diversi riquadri con diversi tipi di informazioni sul " +"documento e sulla tua posizione al suo interno:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1018 @@ -6206,53 +4636,37 @@ msgstr "<guilabel >Ln</guilabel >: numero di riga nel file sorgente." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1028 -msgid "" -"<guilabel>Col</guilabel>: Column location of the cursor and the total number " -"of columns in the line." -msgstr "" -"<guilabel >Col</guilabel >: posizione del cursore nella colonna e numero " -"totale di colonne nella riga." +msgid "<guilabel>Col</guilabel>: Column location of the cursor and the total number of columns in the line." +msgstr "<guilabel >Col</guilabel >: posizione del cursore nella colonna e numero totale di colonne nella riga." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1031 msgid "" -"<guilabel>Col</guilabel> counts tabs as <replaceable>n</replaceable> spaces, " -"where <replaceable>n</replaceable> is the number of characters defined as " -"the <guilabel>Tab size</guilabel> in the Editor page of WinMerge options (4 " -"by default)." +"<guilabel>Col</guilabel> counts tabs as <replaceable>n</replaceable> spaces, where <replaceable>n</replaceable> is the number of characters defined " +"as the <guilabel>Tab size</guilabel> in the Editor page of WinMerge options (4 by default)." msgstr "" -"<guilabel >Col</guilabel > conta le tabulazioni come <replaceable >n</" -"replaceable > spazi, dove <replaceable >n</replaceable > è il numero di " -"caratteri definiti come <guilabel >dimensione delle tabulazioni</guilabel > " -"nella pagina Editor delle opzioni di WinMerge (4 per impostazione " +"<guilabel >Col</guilabel > conta le tabulazioni come <replaceable >n</replaceable > spazi, dove <replaceable >n</replaceable > è il numero di " +"caratteri definiti come <guilabel >dimensione delle tabulazioni</guilabel > nella pagina Editor delle opzioni di WinMerge (4 per impostazione " "predefinita)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1039 -msgid "" -"<guilabel>Ch</guilabel>: Character location of cursor and the total number " -"of chars in the line." -msgstr "" -"<guilabel >Ch</guilabel >: posizione del carattere del cursore e numero " -"totale di caratteri nella riga." +msgid "<guilabel>Ch</guilabel>: Character location of cursor and the total number of chars in the line." +msgstr "<guilabel >Ch</guilabel >: posizione del carattere del cursore e numero totale di caratteri nella riga." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1042 msgid "<guilabel>Ch</guilabel> counts tabs as single tab characters." -msgstr "" -"<guilabel >Ch</guilabel > conta le tabulazioni come singoli caratteri di " -"tabulazione." +msgstr "<guilabel >Ch</guilabel > conta le tabulazioni come singoli caratteri di tabulazione." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1047 msgid "" -"<guilabel>EOL</guilabel>: Linefeed style of the current line (shown only " -"when the <guilabel>Preserve original EOL </guilabel> option is enabled in " +"<guilabel>EOL</guilabel>: Linefeed style of the current line (shown only when the <guilabel>Preserve original EOL </guilabel> option is enabled in " "the Editor page of WinMerge options)." msgstr "" -"<guilabel >EOL</guilabel >: stile di avanzamento riga della riga corrente " -"(mostrato solo quando l'opzione <guilabel >Preserva EOL originale </guilabel " -"> è abilitata nella pagina Editor delle opzioni di WinMerge)." +"<guilabel >EOL</guilabel >: stile di avanzamento riga della riga corrente (mostrato solo quando l'opzione <guilabel >Preserva EOL originale </" +"guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge)." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1057 @@ -6262,13 +4676,11 @@ msgstr "Stato di sola lettura" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1060 msgid "" -"<guilabel>RO</guilabel> is shown in the pane if the file is set to read-only " -"(as described in <xref linkend=\"protectingfiles\" />). Otherwise the pane " -"is empty." +"<guilabel>RO</guilabel> is shown in the pane if the file is set to read-only (as described in <xref linkend=\"protectingfiles\" />). Otherwise the " +"pane is empty." msgstr "" -"<guilabel >RO</guilabel > viene mostrato nel pannello se il file è impostato " -"in sola lettura (come descritto in <xref linkend=\"protectingfiles\" />)." -"Altrimenti il ​​riquadro è vuoto." +"<guilabel >RO</guilabel > viene mostrato nel pannello se il file è impostato in sola lettura (come descritto in <xref linkend=\"protectingfiles\" /" +">).Altrimenti il ​​riquadro è vuoto." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1067 @@ -6277,11 +4689,8 @@ msgstr "Codifica dei file" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1070 -msgid "" -"Codepage number for ANSI files, Unicode encoding type for Unicode files." -msgstr "" -"Numero di tabella codici per file ANSI, tipo di codifica Unicode per file " -"Unicode." +msgid "Codepage number for ANSI files, Unicode encoding type for Unicode files." +msgstr "Numero di tabella codici per file ANSI, tipo di codifica Unicode per file Unicode." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1076 @@ -6291,31 +4700,21 @@ msgstr "Stile EOL" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1079 msgid "" -"EOL style of the file: <guilabel>Win</guilabel> for Windows/DOS files " -"(CRLF), <guilabel>Unix</guilabel> (LF), <guilabel>Mac</guilabel> (CR), or " +"EOL style of the file: <guilabel>Win</guilabel> for Windows/DOS files (CRLF), <guilabel>Unix</guilabel> (LF), <guilabel>Mac</guilabel> (CR), or " "<guilabel>Mixed</guilabel>." msgstr "" -"Stile EOL del file: <guilabel >Win</guilabel > per file Windows/DOS (CRLF), " -"<guilabel >Unix</guilabel > (LF), <guilabel >Mac</guilabel > (CR), o " +"Stile EOL del file: <guilabel >Win</guilabel > per file Windows/DOS (CRLF), <guilabel >Unix</guilabel > (LF), <guilabel >Mac</guilabel > (CR), o " "<guilabel >Misto</guilabel >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><note><para> #: English/Compare_files.xml:1084 -msgid "" -"When the per-line EOL style is used, the file EOL style is not shown (this " -"pane is blank)." -msgstr "" -"Quando viene utilizzato lo stile EOL per riga, lo stile EOL del file non " -"viene visualizzato (questo riquadro è vuoto)." +msgid "When the per-line EOL style is used, the file EOL style is not shown (this pane is blank)." +msgstr "Quando viene utilizzato lo stile EOL per riga, lo stile EOL del file non viene visualizzato (questo riquadro è vuoto)." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1091 -msgid "" -"When a File Compare window is open, the WinMerge window status bar shows one " -"of these messages about the compared files:" -msgstr "" -"Quando una finestra Confronta file è aperta, la barra di stato della " -"finestra WinMerge mostra uno di questi messaggi sui file confrontati:" +msgid "When a File Compare window is open, the WinMerge window status bar shows one of these messages about the compared files:" +msgstr "Quando una finestra Confronta file è aperta, la barra di stato della finestra WinMerge mostra uno di questi messaggi sui file confrontati:" #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1094 @@ -6325,51 +4724,42 @@ msgstr "<guilabel >Identici</guilabel >: i file non contengono differenze" #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1099 msgid "" -"<guilabel><replaceable>n</replaceable> Differences Found</guilabel>: The " -"number of differences detected, displayed only when no difference is " +"<guilabel><replaceable>n</replaceable> Differences Found</guilabel>: The number of differences detected, displayed only when no difference is " "selected." msgstr "" -"<guilabel ><replaceable>n</replaceable>differenze trovate</guilabel>: il " -"numero di differenze rilevate, visualizzato solo quando non è selezionata " +"<guilabel ><replaceable>n</replaceable>differenze trovate</guilabel>: il numero di differenze rilevate, visualizzato solo quando non è selezionata " "alcuna differenza." #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1105 msgid "" -"<guilabel>Difference <replaceable>x</replaceable> of <replaceable>n</" -"replaceable></guilabel>: The selected difference's sequence number in the " -"total number of differences, starting with 1." +"<guilabel>Difference <replaceable>x</replaceable> of <replaceable>n</replaceable></guilabel>: The selected difference's sequence number in the total " +"number of differences, starting with 1." msgstr "" -"<guilabel >Differenza <replaceable>x</replaceable> di <replaceable>n</" -"replaceable></guilabel>: il numero di sequenza della differenza selezionata " -"nel numero totale di differenze, a partire da 1." +"<guilabel >Differenza <replaceable>x</replaceable> di <replaceable>n</replaceable></guilabel>: il numero di sequenza della differenza selezionata nel " +"numero totale di differenze, a partire da 1." #. type: Content of: <article><section><title> #: English/Compare_files.xml:1115 msgid "Navigating differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Esplorazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Esplorazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:1121 msgid "" -"This section describes how to navigate and select differences in the File " -"Compare window. Note that when you select a difference, it is always " +"This section describes how to navigate and select differences in the File Compare window. Note that when you select a difference, it is always " "selected in both or all three File panes." msgstr "" -"Questa sezione descrive come navigare e selezionare le differenze nella " -"finestra Confronto file.Tieni presente che quando selezioni una differenza, " +"Questa sezione descrive come navigare e selezionare le differenze nella finestra Confronto file.Tieni presente che quando selezioni una differenza, " "questa viene sempre selezionata in entrambi o in tutti e tre i riquadri File." #. type: Content of: <article><section><tip><para> #: English/Compare_files.xml:1126 msgid "" -"To save time, enable <guilabel>Automatically scroll to first difference</" -"guilabel> in the General page of WinMerge options. Then you don't have to " +"To save time, enable <guilabel>Automatically scroll to first difference</guilabel> in the General page of WinMerge options. Then you don't have to " "manually navigate to the first difference and select it." msgstr "" -"To save time, enable <guilabel>Automatically scroll to first difference</" -"guilabel> in the General page of WinMerge options.Quindi non è necessario " +"To save time, enable <guilabel>Automatically scroll to first difference</guilabel> in the General page of WinMerge options.Quindi non è necessario " "passare manualmente alla prima differenza e selezionarla." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -6389,21 +4779,13 @@ msgstr "confronto file" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1133 -msgid "" -"Navigation functions<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Funzioni di navigazione<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Navigation functions<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Funzioni di navigazione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1143 -msgid "" -"Here are the functions for navigating differences in the File Compare " -"window, and their shortcuts in the toolbar and menus:" -msgstr "" -"Ecco le funzioni per esplorare le differenze nella finestra Confronto file e " -"le relative scorciatoie nella barra degli strumenti e nei menu:" +msgid "Here are the functions for navigating differences in the File Compare window, and their shortcuts in the toolbar and menus:" +msgstr "Ecco le funzioni per esplorare le differenze nella finestra Confronto file e le relative scorciatoie nella barra degli strumenti e nei menu:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1149 @@ -6417,31 +4799,20 @@ msgstr "Selezionare la funzione Differenza di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1148 -msgid "" -"Difference in the Current Line/Select Line Difference<placeholder " -"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Differenza nella riga corrente/Differenza riga selezionata<placeholder " -"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Difference in the Current Line/Select Line Difference<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Differenza nella riga corrente/Differenza riga selezionata<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1155 -msgid "" -"Enabled if you have clicked in (or selected) text within a difference in a " -"File pane. Selects the word differences within the line. For example:" +msgid "Enabled if you have clicked in (or selected) text within a difference in a File pane. Selects the word differences within the line. For example:" msgstr "" -"Abilitato se hai fatto clic (o selezionato) il testo all'interno di una " -"differenza in un riquadro File.Seleziona le differenze di parole all'interno " +"Abilitato se hai fatto clic (o selezionato) il testo all'interno di una differenza in un riquadro File.Seleziona le differenze di parole all'interno " "della riga.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:1160 -msgid "" -"<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:1166 @@ -6450,21 +4821,13 @@ msgstr "Selezionare l'esempio di differenza di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1171 -msgid "" -"If you want to select the difference block itself, use <command>Current " -"Difference</command> instead." -msgstr "" -"Se vuoi selezionare il blocco differenza stesso, usa invece " -"<command>Differenza corrente</command>." +msgid "If you want to select the difference block itself, use <command>Current Difference</command> instead." +msgstr "Se vuoi selezionare il blocco differenza stesso, usa invece <command>Differenza corrente</command>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1175 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"diff_inline_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"diff_inline_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/diff_inline_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/diff_inline_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1181 @@ -6474,15 +4837,11 @@ msgstr "Differenza nel pulsante Linea corrente" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1174 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Select Line Difference</" -"guimenuitem> </menuchoice>, <keycap>F4</keycap>, context menu in File pane " -"within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Select Line Difference</" +"guimenuitem> </menuchoice>, <keycap>F4</keycap>, context menu in File pane within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Seleziona " -"differenza di linea</guimenuitem > </menuchoice >, <keycap >F4</keycap >, " -"menu contestuale nel pannello File all'interno di una differenza." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Seleziona " +"differenza di linea</guimenuitem > </menuchoice >, <keycap >F4</keycap >, menu contestuale nel pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1194 @@ -6490,8 +4849,7 @@ msgid "Next Difference function" msgstr "Funzione Differenza successiva" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: English/Compare_files.xml:1196 English/Compare_files.xml:1231 -#: English/Compare_files.xml:1265 English/Compare_files.xml:1299 +#: English/Compare_files.xml:1196 English/Compare_files.xml:1231 English/Compare_files.xml:1265 English/Compare_files.xml:1299 #: English/Compare_files.xml:1346 msgid "with Compare Files" msgstr "con Confronta file" @@ -6504,28 +4862,22 @@ msgstr "Differenza successiva<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1200 msgid "" -"Selects the next difference below your current cursor location in the " -"document (not necessarily relative to the current difference). Use to step " -"through differences sequentially from any point. Available except when the " -"last difference is currently selected." +"Selects the next difference below your current cursor location in the document (not necessarily relative to the current difference). Use to step " +"through differences sequentially from any point. Available except when the last difference is currently selected." msgstr "" -"Seleziona la differenza successiva sotto la posizione corrente del cursore " -"nel documento (non necessariamente relativa alla differenza corrente)." -"Utilizzare per scorrere le differenze in sequenza da qualsiasi punto." -"Disponibile tranne quando è attualmente selezionata l'ultima differenza." +"Seleziona la differenza successiva sotto la posizione corrente del cursore nel documento (non necessariamente relativa alla differenza " +"corrente).Utilizzare per scorrere le differenze in sequenza da qualsiasi punto.Disponibile tranne quando è attualmente selezionata l'ultima " +"differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1206 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Next Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Down</" -"keycap> </keycombo> (or <keycap>Down</keycap> in merge mode)." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Next Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Down</keycap> </keycombo> (or <keycap>Down</keycap> in merge mode)." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza successiva</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Giù</" -"keycap> </keycombo > (o <keycap >Giù</keycap> in modalità unione)." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza " +"successiva</guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Giù</keycap> </keycombo > (o <keycap >Giù</keycap> in modalità " +"unione)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1229 @@ -6540,24 +4892,16 @@ msgstr "Differenza precedente<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1235 msgid "" -"Selects the previous difference above your current cursor location (not " -"necessarily relative to the current difference). Use to step backwards " -"sequentially through differences. Available except when the first difference " -"is currently selected." +"Selects the previous difference above your current cursor location (not necessarily relative to the current difference). Use to step backwards " +"sequentially through differences. Available except when the first difference is currently selected." msgstr "" -"Seleziona la differenza precedente sopra la posizione corrente del cursore " -"(non necessariamente relativa alla differenza corrente).Utilizzare per " -"tornare indietro in sequenza attraverso le differenze.Disponibile tranne " -"quando è attualmente selezionata la prima differenza." +"Seleziona la differenza precedente sopra la posizione corrente del cursore (non necessariamente relativa alla differenza corrente).Utilizzare per " +"tornare indietro in sequenza attraverso le differenze.Disponibile tranne quando è attualmente selezionata la prima differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1241 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"prevdiff_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"prevdiff_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/prevdiff_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/prevdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1247 @@ -6567,15 +4911,12 @@ msgstr "Pulsante Differenza precedente" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1240 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Previous Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Up</" -"keycap> </keycombo> (or <keycap>Up</keycap> in merge mode)." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Previous Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Up</keycap> </keycombo> (or <keycap>Up</keycap> in merge mode)." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza precedente</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Su</" -"keycap> </keycombo > (o <keycap >Su</keycap > in modalità unione)." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza " +"precedente</guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Su</keycap> </keycombo > (o <keycap >Su</keycap > in modalità " +"unione)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1263 @@ -6590,44 +4931,30 @@ msgstr "Prima differenza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1269 msgid "" -"Use this to begin comparing or merging differences, or to locate the first " -"difference from any other location. Available except when the first " -"difference is currently selected. You can also select a difference by double-" -"clicking its text." +"Use this to begin comparing or merging differences, or to locate the first difference from any other location. Available except when the first " +"difference is currently selected. You can also select a difference by double-clicking its text." msgstr "" -"Utilizzalo per iniziare a confrontare o unire le differenze o per " -"individuare la prima differenza da qualsiasi altra posizione.Disponibile " -"tranne quando è attualmente selezionata la prima differenza.Puoi anche " -"selezionare una differenza facendo doppio clic sul suo testo." +"Utilizzalo per iniziare a confrontare o unire le differenze o per individuare la prima differenza da qualsiasi altra posizione.Disponibile tranne " +"quando è attualmente selezionata la prima differenza.Puoi anche selezionare una differenza facendo doppio clic sul suo testo." #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_files.xml:1275 English/Intro_diffs.xml:191 -#: English/Intro_diffs.xml:312 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"firstdiff_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"firstdiff_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1275 English/Intro_diffs.xml:191 English/Intro_diffs.xml:312 +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/firstdiff_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/firstdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1281 English/Intro_diffs.xml:197 -#: English/Intro_diffs.xml:318 +#: English/Compare_files.xml:1281 English/Intro_diffs.xml:197 English/Intro_diffs.xml:318 msgid "First Difference button" msgstr "Pulsante Prima differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1274 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>First Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Home</" -"keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>First Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Prima differenza</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Home</" -"keycap> </keycombo>." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Prima differenza</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Home</keycap> </keycombo>." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1297 @@ -6647,53 +4974,39 @@ msgstr "Questa funzione ha due modalità di azione:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><itemizedlist><listitem><simpara> #: English/Compare_files.xml:1307 msgid "" -"If your cursor is inside a difference but no difference is selected, this " -"function selects the entire difference. This is a very handy way to select a " -"difference using the keyboard." +"If your cursor is inside a difference but no difference is selected, this function selects the entire difference. This is a very handy way to select " +"a difference using the keyboard." msgstr "" -"Se il cursore si trova all'interno di una differenza ma non è selezionata " -"alcuna differenza, questa funzione seleziona l'intera differenza.Questo è un " -"modo molto pratico per selezionare una differenza utilizzando la tastiera." +"Se il cursore si trova all'interno di una differenza ma non è selezionata alcuna differenza, questa funzione seleziona l'intera differenza.Questo è " +"un modo molto pratico per selezionare una differenza utilizzando la tastiera." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><itemizedlist><listitem><simpara> #: English/Compare_files.xml:1314 msgid "" -"When there is a current difference, the function jumps to that location. " -"This is handy if you have scrolled the selected difference out of view, and " +"When there is a current difference, the function jumps to that location. This is handy if you have scrolled the selected difference out of view, and " "want to quickly return to its location." msgstr "" -"Quando c'è una differenza di corrente, la funzione passa a quella posizione." -"Ciò è utile se hai fatto scorrere la differenza selezionata fuori dalla " +"Quando c'è una differenza di corrente, la funzione passa a quella posizione.Ciò è utile se hai fatto scorrere la differenza selezionata fuori dalla " "vista e desideri tornare rapidamente alla sua posizione." #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_files.xml:1322 English/Intro_diffs.xml:176 -#: English/Intro_diffs.xml:301 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"currentdiff_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"currentdiff_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1322 English/Intro_diffs.xml:176 English/Intro_diffs.xml:301 +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/currentdiff_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/currentdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1328 English/Intro_diffs.xml:182 -#: English/Intro_diffs.xml:307 +#: English/Compare_files.xml:1328 English/Intro_diffs.xml:182 English/Intro_diffs.xml:307 msgid "Current Difference button" msgstr "Pulsante Differenza attuale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1321 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Current Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Enter</" -"keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Current Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Enter</keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Differenza corrente</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " -">Invio</keycap> </keycombo >." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Differenza corrente</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1344 @@ -6712,12 +5025,8 @@ msgstr "Abilitato tranne quando è attualmente selezionata l'ultima differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1354 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"lastdiff_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"lastdiff_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/lastdiff_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/lastdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1360 @@ -6727,19 +5036,14 @@ msgstr "Pulsante Ultima differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1353 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Last Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>End</" -"keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Last Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>End</keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Ultima differenza</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Fine</" -"keycap> </keycombo >." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Ultima differenza</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Fine</keycap> </keycombo >." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> -#: English/Compare_files.xml:1376 English/Compare_files.xml:1409 -#: English/Compare_files.xml:1427 English/Compare_files.xml:1445 +#: English/Compare_files.xml:1376 English/Compare_files.xml:1409 English/Compare_files.xml:1427 English/Compare_files.xml:1445 msgid "Go to function" msgstr "Vai alla funzione" @@ -6751,40 +5055,29 @@ msgstr "Vai a<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1380 msgid "" -"Enables you to jump to either a line number or a difference number (for " -"example, difference 2 is the second difference). Opens the Go to dialog, " -"where you specify the number, which file to use (either the left or right), " -"and the type of location (either line or difference)." +"Enables you to jump to either a line number or a difference number (for example, difference 2 is the second difference). Opens the Go to dialog, " +"where you specify the number, which file to use (either the left or right), and the type of location (either line or difference)." msgstr "" -"Consente di passare a un numero di riga o a un numero di differenza (ad " -"esempio, la differenza 2 è la seconda differenza).Apre la finestra di " -"dialogo Vai a, in cui si specifica il numero, quale file utilizzare " -"(sinistro o destro) e il tipo di posizione (riga o differenza)." +"Consente di passare a un numero di riga o a un numero di differenza (ad esempio, la differenza 2 è la seconda differenza).Apre la finestra di dialogo " +"Vai a, in cui si specifica il numero, quale file utilizzare (sinistro o destro) e il tipo di posizione (riga o differenza)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_files.xml:1387 msgid "" -"The Go to line number can be useful when you need to merge the same change " -"from one file to several target files. Jumping to a particular difference " -"can be quicker than using <guimenuitem>Find</guimenuitem> to search text, or " -"stepping through differences." +"The Go to line number can be useful when you need to merge the same change from one file to several target files. Jumping to a particular difference " +"can be quicker than using <guimenuitem>Find</guimenuitem> to search text, or stepping through differences." msgstr "" -"Il numero Vai a riga può essere utile quando è necessario unire la stessa " -"modifica da un file a più file di destinazione.Saltare a una particolare " -"differenza può essere più rapido che usare <guimenuitem >Trova</guimenuitem " -"> per cercare testo o scorrere le differenze." +"Il numero Vai a riga può essere utile quando è necessario unire la stessa modifica da un file a più file di destinazione.Saltare a una particolare " +"differenza può essere più rapido che usare <guimenuitem >Trova</guimenuitem > per cercare testo o scorrere le differenze." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1395 msgid "" -"Shortcuts: <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Go to</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>G</" -"keycap> </keycombo>, context menu in File pane and Location pane." +"Shortcuts: <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Go to</guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>G</keycap> </" +"keycombo>, context menu in File pane and Location pane." msgstr "" -"Scorciatoie: <menuchoice> <guimenu >Modifica</guimenu> <guimenuitem >Vai a</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >G</" -"keycap> </keycombo >, menu contestuale nel pannello File e nel pannello " -"Posizione." +"Scorciatoie: <menuchoice> <guimenu >Modifica</guimenu> <guimenuitem >Vai a</guimenuitem> </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " +">G</keycap> </keycombo >, menu contestuale nel pannello File e nel pannello Posizione." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1408 @@ -6793,59 +5086,37 @@ msgstr "Vai a Linea spostata<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1413 -msgid "" -"Enables to jump to the moved from/to of current diff on the other panel (2 " -"panes)." -msgstr "" -"Consente di passare allo spostamento da/a della differenza corrente " -"sull'altro pannello (2 riquadri)." +msgid "Enables to jump to the moved from/to of current diff on the other panel (2 panes)." +msgstr "Consente di passare allo spostamento da/a della differenza corrente sull'altro pannello (2 riquadri)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1415 English/Compare_files.xml:1433 -msgid "" -"Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> " -"<keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." +msgid "Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." msgstr "" -"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> " -"<keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " +"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " "riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1426 -msgid "" -"Go to Moved Line Between Left and Middle<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Vai a Linea spostata tra sinistra e centro<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Go to Moved Line Between Left and Middle<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Vai a Linea spostata tra sinistra e centro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1431 English/Compare_files.xml:1449 -msgid "" -"Enables to jump to the moved from/to of current diff on the other panel (3 " -"panes)." -msgstr "" -"Consente di passare allo spostamento da/a della differenza corrente " -"sull'altro pannello (3 riquadri)." +msgid "Enables to jump to the moved from/to of current diff on the other panel (3 panes)." +msgstr "Consente di passare allo spostamento da/a della differenza corrente sull'altro pannello (3 riquadri)." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1444 -msgid "" -"Go to Moved Line Between Middle and Right<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Vai a Linea spostata tra il centro e la destra<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Go to Moved Line Between Middle and Right<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Vai a Linea spostata tra il centro e la destra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1451 -msgid "" -"Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</" -"keycap> </keycombo>, context menu in File pane and Diff pane." +msgid "Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." msgstr "" -"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> " -"<keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " -"riquadro Diff." +"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel riquadro " +"Diff." #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Compare_files.xml:1462 English/Shortcut_keys.xml:190 @@ -6868,10 +5139,8 @@ msgid "Synchronization points<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "Punti di sincronizzazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> -#: English/Compare_files.xml:1476 English/Compare_images.xml:117 -#: English/Configuration.xml:2558 English/Configuration.xml:2724 -#: English/Configuration.xml:2843 English/Configuration.xml:3272 -#: English/Filters.xml:1871 English/Filters.xml:2302 English/Filters.xml:2307 +#: English/Compare_files.xml:1476 English/Compare_images.xml:117 English/Configuration.xml:2558 English/Configuration.xml:2724 +#: English/Configuration.xml:2843 English/Configuration.xml:3272 English/Filters.xml:1871 English/Filters.xml:2302 English/Filters.xml:2307 #: English/Filters.xml:2318 msgid "TBD" msgstr "Da definire" @@ -6884,18 +5153,14 @@ msgstr "Unione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:1484 msgid "" -"Merging copies differences from one File pane to the other: either left to " -"right, or right to left. This is different from directly editing text using " -"WinMerge's editing functions (described earlier in this topic)." +"Merging copies differences from one File pane to the other: either left to right, or right to left. This is different from directly editing text " +"using WinMerge's editing functions (described earlier in this topic)." msgstr "" -"L'unione copia le differenze da un riquadro File all'altro: da sinistra a " -"destra o da destra a sinistra.Ciò è diverso dalla modifica diretta del testo " -"utilizzando le funzioni di modifica di WinMerge (descritte in precedenza in " -"questo argomento)." +"L'unione copia le differenze da un riquadro File all'altro: da sinistra a destra o da destra a sinistra.Ciò è diverso dalla modifica diretta del " +"testo utilizzando le funzioni di modifica di WinMerge (descritte in precedenza in questo argomento)." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:1491 English/Compare_files.xml:1776 -#: English/Configuration.xml:2355 +#: English/Compare_files.xml:1491 English/Compare_files.xml:1776 English/Configuration.xml:2355 msgid "rescanning files" msgstr "nuova scansione dei file" @@ -6907,92 +5172,65 @@ msgstr "Nuova scansione dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1494 msgid "" -"By default, the <guilabel>Automatic rescan</guilabel> option is enabled in " -"the Editor page of WinMerge options. Rescanning keeps your compare and merge " -"operations up to date. Without rescanning, WinMerge differences does not " -"detect changes that might occur to files while you are comparing them, for " -"example in an external editor." +"By default, the <guilabel>Automatic rescan</guilabel> option is enabled in the Editor page of WinMerge options. Rescanning keeps your compare and " +"merge operations up to date. Without rescanning, WinMerge differences does not detect changes that might occur to files while you are comparing them, " +"for example in an external editor." msgstr "" -"Per impostazione predefinita, l'opzione <guilabel >Riscansione automatica</" -"guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge.La " -"nuova scansione mantiene aggiornate le operazioni di confronto e unione." -"Senza una nuova scansione, le differenze WinMerge non rilevano le modifiche " -"che potrebbero verificarsi nei file mentre li confronti, ad esempio in un " -"editor esterno." +"Per impostazione predefinita, l'opzione <guilabel >Riscansione automatica</guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge.La " +"nuova scansione mantiene aggiornate le operazioni di confronto e unione.Senza una nuova scansione, le differenze WinMerge non rilevano le modifiche " +"che potrebbero verificarsi nei file mentre li confronti, ad esempio in un editor esterno." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1500 msgid "" -"Rescanning occurs when you perform certain actions (like merging a " -"difference or editing a file) during a file compare. If a file has changed, " -"WinMerge displays a dialog advising you that another application has updated " -"the file, and asks whether you want to reload the file." +"Rescanning occurs when you perform certain actions (like merging a difference or editing a file) during a file compare. If a file has changed, " +"WinMerge displays a dialog advising you that another application has updated the file, and asks whether you want to reload the file." msgstr "" -"La nuova scansione si verifica quando esegui determinate azioni (come unire " -"una differenza o modificare un file) durante un confronto di file.Se un file " -"è cambiato, WinMerge visualizza una finestra di dialogo che informa che " -"un'altra applicazione ha aggiornato il file e chiede se desideri ricaricare " -"il file." +"La nuova scansione si verifica quando esegui determinate azioni (come unire una differenza o modificare un file) durante un confronto di file.Se un " +"file è cambiato, WinMerge visualizza una finestra di dialogo che informa che un'altra applicazione ha aggiornato il file e chiede se desideri " +"ricaricare il file." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1505 msgid "" -"Click <guibutton>Yes</guibutton> to reload the file before proceeding, or " -"<guibutton>No</guibutton> to ignore the changes and work with the earlier " +"Click <guibutton>Yes</guibutton> to reload the file before proceeding, or <guibutton>No</guibutton> to ignore the changes and work with the earlier " "loaded version of the file." msgstr "" -"Fai clic su <guibutton >Sì</guibutton > per ricaricare il file prima di " -"procedere, oppure su <guibutton >No</guibutton > per ignorare le modifiche e " +"Fai clic su <guibutton >Sì</guibutton > per ricaricare il file prima di procedere, oppure su <guibutton >No</guibutton > per ignorare le modifiche e " "lavorare con la versione del file caricata in precedenza." #. type: Content of: <article><section><para><inlinemediaobject> -#: English/Compare_files.xml:1518 English/Compare_files.xml:1785 -#: English/Quick_start.xml:369 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"refresh_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"refresh_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1518 English/Compare_files.xml:1785 English/Quick_start.xml:369 +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/refresh_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/refresh_btn.png\" /> </imageobject>" #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1523 English/Compare_files.xml:1712 -#: English/Compare_files.xml:1791 English/Quick_start.xml:374 +#: English/Compare_files.xml:1523 English/Compare_files.xml:1712 English/Compare_files.xml:1791 English/Quick_start.xml:374 msgid "Refresh button" msgstr "Pulsante Aggiorna" #. type: Content of: <article><section><section><important><para> #: English/Compare_files.xml:1510 msgid "" -"If <guilabel>Automatic rescan</guilabel> is disabled, or if you suspect that " -"a file might have changed, we strongly advise that you run " -"<guimenuitem>Refresh</guimenuitem> <emphasis>before</emphasis> performing " -"any merge operation: click <menuchoice> <guimenu>Edit</guimenu> " -"<guimenuitem>Refresh</guimenuitem> </menuchoice> or the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or press <keycap>F5</" +"If <guilabel>Automatic rescan</guilabel> is disabled, or if you suspect that a file might have changed, we strongly advise that you run " +"<guimenuitem>Refresh</guimenuitem> <emphasis>before</emphasis> performing any merge operation: click <menuchoice> <guimenu>Edit</guimenu> " +"<guimenuitem>Refresh</guimenuitem> </menuchoice> or the <placeholder type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or press <keycap>F5</" "keycap>." msgstr "" -"Se la <guilabel >Riscansione automatica</guilabel > è disabilitata, o se " -"sospetti che un file possa essere cambiato, ti consigliamo vivamente di " -"eseguire <guimenuitem >Aggiorna</guimenuitem > <emphasis >prima</emphasis > " -"di eseguire qualsiasi operazione di unione: fai clic su <menuchoice> " -"<guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </" -"menuchoice > o su <placeholder type=\"inlinemediaobject\" id=\"0\"/> " -"pulsante della barra degli strumenti oppure premi <keycap>F5</keycap>." +"Se la <guilabel >Riscansione automatica</guilabel > è disabilitata, o se sospetti che un file possa essere cambiato, ti consigliamo vivamente di " +"eseguire <guimenuitem >Aggiorna</guimenuitem > <emphasis >prima</emphasis > di eseguire qualsiasi operazione di unione: fai clic su <menuchoice> " +"<guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </menuchoice > o su <placeholder type=\"inlinemediaobject\" id=\"0\"/> pulsante " +"della barra degli strumenti oppure premi <keycap>F5</keycap>." #. type: Content of: <article><section><section><important><para> #: English/Compare_files.xml:1528 msgid "" -"If a merge result looks incorrect, click <menuchoice> <guimenu>Edit</" -"guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice> or press <keycombo> " -"<keycap>Ctrl</keycap> <keycap>Z</keycap> </keycombo> to undo the merge. Then " -"rescan the files and try merging again." +"If a merge result looks incorrect, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice> or press <keycombo> " +"<keycap>Ctrl</keycap> <keycap>Z</keycap> </keycombo> to undo the merge. Then rescan the files and try merging again." msgstr "" -"Se il risultato di un'unione sembra errato, fai clic su <menuchoice> " -"<guimenu >Modifica</guimenu > <guimenuitem >Annulla</guimenuitem > </" -"menuchoice > o premi <keycombo> <keycap >Ctrl</keycap > <keycap >Z</keycap > " -"</keycombo > per annullare l'unione.Quindi esegui nuovamente la scansione " -"dei file e prova a unirli nuovamente." +"Se il risultato di un'unione sembra errato, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Annulla</guimenuitem > </menuchoice " +"> o premi <keycombo> <keycap >Ctrl</keycap > <keycap >Z</keycap > </keycombo > per annullare l'unione.Quindi esegui nuovamente la scansione dei file " +"e prova a unirli nuovamente." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Compare_files.xml:1545 @@ -7007,40 +5245,27 @@ msgstr "Unisci funzioni<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1548 msgid "" -"The merging functions can implicitly select differences based on a cursor " -"location or text selection. For example, if you click anywhere in a " -"difference and then click the <guibutton>Copy Right</guibutton> toolbar " -"button, the entire difference block is merged. This makes it easy to merge " -"many small differences. Similarly, if you select text that spans all or part " -"of multiple differences, all the included differences are merged with a " +"The merging functions can implicitly select differences based on a cursor location or text selection. For example, if you click anywhere in a " +"difference and then click the <guibutton>Copy Right</guibutton> toolbar button, the entire difference block is merged. This makes it easy to merge " +"many small differences. Similarly, if you select text that spans all or part of multiple differences, all the included differences are merged with a " "single merge command." msgstr "" -"Le funzioni di unione possono selezionare implicitamente le differenze in " -"base alla posizione del cursore o alla selezione del testo.Ad esempio, se " -"fai clic in un punto qualsiasi di una differenza e poi fai clic sul pulsante " -"<guibutton >Copia a destra</guibutton > nella barra degli strumenti, " -"l'intero blocco della differenza verrà unito.Ciò rende facile unire molte " -"piccole differenze.Allo stesso modo, se selezioni un testo che si estende su " -"tutte o parte di più differenze, tutte le differenze incluse verranno unite " -"con un unico comando di unione." +"Le funzioni di unione possono selezionare implicitamente le differenze in base alla posizione del cursore o alla selezione del testo.Ad esempio, se " +"fai clic in un punto qualsiasi di una differenza e poi fai clic sul pulsante <guibutton >Copia a destra</guibutton > nella barra degli strumenti, " +"l'intero blocco della differenza verrà unito.Ciò rende facile unire molte piccole differenze.Allo stesso modo, se selezioni un testo che si estende " +"su tutte o parte di più differenze, tutte le differenze incluse verranno unite con un unico comando di unione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1556 -msgid "" -"If the result of a merge operation is not what you expected, you can click " -"<guibutton>Undo</guibutton> to reverse the operation." +msgid "If the result of a merge operation is not what you expected, you can click <guibutton>Undo</guibutton> to reverse the operation." msgstr "" -"Se il risultato di un'operazione di unione non è quello che ti aspettavi, " -"puoi fare clic su <guibutton >Annulla</guibutton > per invertire " +"Se il risultato di un'operazione di unione non è quello che ti aspettavi, puoi fare clic su <guibutton >Annulla</guibutton > per invertire " "l'operazione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1559 -msgid "" -"Here are the merge functions and their shortcuts in the toolbar and menus:" -msgstr "" -"Ecco le funzioni di unione e le relative scorciatoie nella barra degli " -"strumenti e nei menu:" +msgid "Here are the merge functions and their shortcuts in the toolbar and menus:" +msgstr "Ecco le funzioni di unione e le relative scorciatoie nella barra degli strumenti e nei menu:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1565 @@ -7055,34 +5280,23 @@ msgstr "Copia a destra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1569 msgid "" -"Copies one or more difference from left to right. Note that differences do " -"not need to be fully selected: At its simplest, this means replacing text in " -"the target difference with text in source difference. But because " -"differences can also contain empty lines, new lines may be created or " -"removed." +"Copies one or more difference from left to right. Note that differences do not need to be fully selected: At its simplest, this means replacing text " +"in the target difference with text in source difference. But because differences can also contain empty lines, new lines may be created or removed." msgstr "" -"Copia una o più differenze da sinistra a destra.Tieni presente che non è " -"necessario che le differenze siano completamente selezionate: nella sua " -"forma più semplice, ciò significa sostituire il testo nella differenza di " -"destinazione con il testo nella differenza di origine.Ma poiché le " -"differenze possono contenere anche righe vuote, è possibile che vengano " -"create o rimosse nuove righe." +"Copia una o più differenze da sinistra a destra.Tieni presente che non è necessario che le differenze siano completamente selezionate: nella sua " +"forma più semplice, ciò significa sostituire il testo nella differenza di destinazione con il testo nella differenza di origine.Ma poiché le " +"differenze possono contenere anche righe vuote, è possibile che vengano create o rimosse nuove righe." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1575 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Right</" -"keycap> </keycombo> (or <keycap>Right</keycap> in merge mode), context menu " -"in File pane within a difference, and in Diff pane." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</guimenuitem> " +"</menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Right</keycap> </keycombo> (or <keycap>Right</keycap> in merge mode), context menu in File " +"pane within a difference, and in Diff pane." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Copia a destra</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " -">Destra</keycap> </keycombo > (o <keycap >Destra</keycap > in modalità " -"unione), menu contestuale nel pannello File all'interno di undifferenza e " -"nel riquadro Diff." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Copia a destra</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Destra</keycap> </keycombo > (o <keycap >Destra</keycap > in modalità unione), " +"menu contestuale nel pannello File all'interno di undifferenza e nel riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1599 @@ -7096,28 +5310,19 @@ msgstr "Copia a sinistra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1603 -msgid "" -"Copies the current difference from the right to the left File pane. See " -"<command>Copy Right</command> description for details." -msgstr "" -"Copia la differenza corrente dal riquadro File di destra a quello di " -"sinistra.Vedi la descrizione <command>Copy Right</command> per i dettagli." +msgid "Copies the current difference from the right to the left File pane. See <command>Copy Right</command> description for details." +msgstr "Copia la differenza corrente dal riquadro File di destra a quello di sinistra.Vedi la descrizione <command>Copy Right</command> per i dettagli." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1607 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</" -"keycap> </keycombo> (or <keycap>Left</keycap> in merge mode), context menu " -"in File pane within a difference, and in Diff pane." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" +"menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo> (or <keycap>Left</keycap> in merge mode), context menu in File pane " +"within a difference, and in Diff pane." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " -">Sinistra</keycap> </keycombo > (o <keycap >Sinistra</keycap > in modalità " -"unione), menu contestuale nel pannello File all'interno di undifferenza e " -"nel riquadro Diff." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo > (o <keycap >Sinistra</keycap > in modalità " +"unione), menu contestuale nel pannello File all'interno di undifferenza e nel riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1631 @@ -7132,23 +5337,16 @@ msgstr "Copia a destra e avanza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1635 msgid "" -"Merges the current difference from the right to the left File pane, then " -"selects the next difference (if one exists). Equivalent to <command>Copy " +"Merges the current difference from the right to the left File pane, then selects the next difference (if one exists). Equivalent to <command>Copy " "Right</command> and <command>Next Difference</command> in one step." msgstr "" -"Unisce la differenza corrente dal riquadro File di destra a quello di " -"sinistra, quindi seleziona la differenza successiva (se ne esiste una)." -"Equivalente a <command>Copia a destra</command> e <command>Differenza " -"successiva</command> in un unico passaggio." +"Unisce la differenza corrente dal riquadro File di destra a quello di sinistra, quindi seleziona la differenza successiva (se ne esiste " +"una).Equivalente a <command>Copia a destra</command> e <command>Differenza successiva</command> in un unico passaggio." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1641 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"copyr_adv_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"copyr_adv_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyr_adv_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyr_adv_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1647 @@ -7158,16 +5356,11 @@ msgstr "Pulsante Copyright e Avanzamento" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1640 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</" -"keycap> <keycap>Right</keycap> </keycombo>, context menu in File pane within " -"a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" +"menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right</keycap> </keycombo>, context menu in File pane within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " -">Alt</keycap> <keycap >Destra</keycap> </keycombo >, menu contestuale nel " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >Alt</keycap> <keycap >Destra</keycap> </keycombo >, menu contestuale nel " "pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -7183,23 +5376,16 @@ msgstr "Copia a sinistra e avanza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1669 msgid "" -"Merges the current difference from left to right, then selects the next " -"difference (if one exists). Equivalent to <command>Copy Left</command> and " +"Merges the current difference from left to right, then selects the next difference (if one exists). Equivalent to <command>Copy Left</command> and " "<command>Next Difference</command> in one step." msgstr "" -"Unisce la differenza corrente da sinistra a destra, quindi seleziona la " -"differenza successiva (se ne esiste una).Equivalente a <command>Copia a " -"sinistra</command> e <command>Differenza successiva</command> in un unico " -"passaggio." +"Unisce la differenza corrente da sinistra a destra, quindi seleziona la differenza successiva (se ne esiste una).Equivalente a <command>Copia a " +"sinistra</command> e <command>Differenza successiva</command> in un unico passaggio." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1675 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"copyl_adv_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"copyl_adv_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyl_adv_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyl_adv_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1681 @@ -7209,16 +5395,11 @@ msgstr "Pulsante Copia sinistra e Avanza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1674 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</" -"keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within " -"a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" +"menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " -">Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel " "pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -7233,36 +5414,24 @@ msgstr "Va bene<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1706 -msgid "" -"<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn." -"png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn." -"png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1703 msgid "" -"Copies all differences from the left to the right File pane. Use to " -"synchronize two files with one command. Similarly, you can back out the " -"entire merge by clicking the <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> Undo or pressing <keycombo> <keycap>Ctrl</keycap> <keycap>Z</" -"keycap> </keycombo>." +"Copies all differences from the left to the right File pane. Use to synchronize two files with one command. Similarly, you can back out the entire " +"merge by clicking the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Undo or pressing <keycombo> <keycap>Ctrl</keycap> <keycap>Z</keycap> </" +"keycombo>." msgstr "" -"Copia tutte le differenze dal riquadro File da sinistra a destra.Utilizzare " -"per sincronizzare due file con un comando.Allo stesso modo, puoi annullare " -"l'intera unione facendo clic su <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> Annulla o premendo <keycombo> <keycap>Ctrl</keycap> <keycap>Z</" -"keycap> </keycombo>." +"Copia tutte le differenze dal riquadro File da sinistra a destra.Utilizzare per sincronizzare due file con un comando.Allo stesso modo, puoi " +"annullare l'intera unione facendo clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> Annulla o premendo <keycombo> <keycap>Ctrl</keycap> " +"<keycap>Z</keycap> </keycombo>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1721 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"allright_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"allright_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allright_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allright_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1727 @@ -7272,15 +5441,11 @@ msgstr "Pulsante Tutto a destra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1720 English/Compare_files.xml:1751 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</" -"keycap> </keycombo>, context menu in File pane within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" +"menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"pulsante <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a " -"sinistra</guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> " -"<keycap >Sinistra</keycap> </keycombo >, menu contestuale nel pannello File " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, pulsante <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a " +"sinistra</guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel pannello File " "all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -7296,22 +5461,16 @@ msgstr "Tutto a sinistra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1747 msgid "" -"Copies all differences from the right to the left File pane. Effectively, " -"replaces the content of the left File pane. See similar to <command>All " +"Copies all differences from the right to the left File pane. Effectively, replaces the content of the left File pane. See similar to <command>All " "Right</command>." msgstr "" -"Copia tutte le differenze dal riquadro File da destra a sinistra.Di fatto, " -"sostituisce il contenuto del riquadro File sinistro.Vedi simile a " +"Copia tutte le differenze dal riquadro File da destra a sinistra.Di fatto, sostituisce il contenuto del riquadro File sinistro.Vedi simile a " "<command>Tutto bene</command>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1752 -msgid "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"allleft_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" -"allleft_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allleft_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allleft_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1758 @@ -7331,162 +5490,118 @@ msgstr "Aggiorna<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1780 msgid "" -"Rescans files to update differences. Use after changes are made to files, if " -"automatic scanning is disabled (see <xref linkend=\"Compare_files_scan\" /> " -"for details)." +"Rescans files to update differences. Use after changes are made to files, if automatic scanning is disabled (see <xref " +"linkend=\"Compare_files_scan\" /> for details)." msgstr "" -"Esegue nuovamente la scansione dei file per aggiornare le differenze.Da " -"utilizzare dopo aver apportato modifiche ai file, se la scansione automatica " +"Esegue nuovamente la scansione dei file per aggiornare le differenze.Da utilizzare dopo aver apportato modifiche ai file, se la scansione automatica " "è disabilitata (vedi <xref linkend=\"Compare_files_scan\" /> per i dettagli)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1784 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " -"<menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh</guimenuitem> </" +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh</guimenuitem> </" "menuchoice>, <keycap>F5</keycap>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " -"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Aggiorna</" +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Aggiorna</" "guimenuitem > </menuchoice >, <keycap >F5</keycap >." #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1804 msgid "Resolving conflict files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Risoluzione dei file in conflitto<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Risoluzione dei file in conflitto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1808 msgid "" -"You can use WinMerge to resolve conflict files that some version control " -"systems produce during their merge operations. A conflict file is created " -"when a merge encounters differences that cannot be automatically resolved. " -"It is a single file containing the incompletely merged content of the two " -"files. WinMerge separates the conflict file into separate files and opens " -"those files in file Compare window. You can then use WinMerge's compare and " +"You can use WinMerge to resolve conflict files that some version control systems produce during their merge operations. A conflict file is created " +"when a merge encounters differences that cannot be automatically resolved. It is a single file containing the incompletely merged content of the two " +"files. WinMerge separates the conflict file into separate files and opens those files in file Compare window. You can then use WinMerge's compare and " "merge functions to resolve the conflicts and save the merged result file." msgstr "" -"È possibile utilizzare WinMerge per risolvere i file di conflitto che alcuni " -"sistemi di controllo della versione producono durante le operazioni di " -"unione.Viene creato un file di conflitto quando un'unione rileva differenze " -"che non possono essere risolte automaticamente.È un singolo file contenente " -"il contenuto unito in modo incompleto dei due file.WinMerge separa il file " -"in conflitto in file separati e apre tali file nella finestra Confronta file." -"È quindi possibile utilizzare le funzioni di confronto e unione di WinMerge " -"per risolvere i conflitti e salvare il file dei risultati uniti." +"È possibile utilizzare WinMerge per risolvere i file di conflitto che alcuni sistemi di controllo della versione producono durante le operazioni di " +"unione.Viene creato un file di conflitto quando un'unione rileva differenze che non possono essere risolte automaticamente.È un singolo file " +"contenente il contenuto unito in modo incompleto dei due file.WinMerge separa il file in conflitto in file separati e apre tali file nella finestra " +"Confronta file.È quindi possibile utilizzare le funzioni di confronto e unione di WinMerge per risolvere i conflitti e salvare il file dei risultati " +"uniti." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1819 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Conflict File</" -"guimenuitem> </menuchoice>, and use the Open dialog to select the conflict " -"file in your file system. The conflict file opens in the File Compare window:" +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Conflict File</guimenuitem> </menuchoice>, and use the Open dialog to select the " +"conflict file in your file system. The conflict file opens in the File Compare window:" msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri file " -"di conflitto</guimenuitem > </menuchoice > e usa la finestra di dialogo Apri " -"per selezionare il file di conflitto nel tuo file system.Il file in " -"conflitto si apre nella finestra Confronta file:" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri file di conflitto</guimenuitem > </menuchoice > e usa la finestra di dialogo " +"Apri per selezionare il file di conflitto nel tuo file system.Il file in conflitto si apre nella finestra Confronta file:" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1829 msgid "" -"The left File pane file header is titled, <guilabel>Theirs File</guilabel>. " -"This side represents the file that is usually in the version control " -"system's repository. This file usually cannot be edited, so WinMerge sets " -"the left File pane to be read-only. This means that differences can be " +"The left File pane file header is titled, <guilabel>Theirs File</guilabel>. This side represents the file that is usually in the version control " +"system's repository. This file usually cannot be edited, so WinMerge sets the left File pane to be read-only. This means that differences can be " "merged only from this file to the other file." msgstr "" -"L'intestazione del file nel riquadro File di sinistra è intitolata <guilabel " -">Il loro file</guilabel >.Questo lato rappresenta il file che di solito si " -"trova nel repository del sistema di controllo della versione.Questo file " -"solitamente non può essere modificato, quindi WinMerge imposta il riquadro " -"File sinistro in sola lettura.Ciò significa che le differenze possono essere " -"unite solo da questo file all'altro file." +"L'intestazione del file nel riquadro File di sinistra è intitolata <guilabel >Il loro file</guilabel >.Questo lato rappresenta il file che di solito " +"si trova nel repository del sistema di controllo della versione.Questo file solitamente non può essere modificato, quindi WinMerge imposta il " +"riquadro File sinistro in sola lettura.Ciò significa che le differenze possono essere unite solo da questo file all'altro file." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1838 msgid "" -"The right File pane is titled, <guilabel>Mine File</guilabel>. This side is " -"the working copy of the file. All changes should be done to this file, which " -"is the result file." +"The right File pane is titled, <guilabel>Mine File</guilabel>. This side is the working copy of the file. All changes should be done to this file, " +"which is the result file." msgstr "" -"Il pannello File di destra è intitolato <guilabel >Estrai file</guilabel >." -"Questo lato è la copia di lavoro del file.Tutte le modifiche dovrebbero " +"Il pannello File di destra è intitolato <guilabel >Estrai file</guilabel >.Questo lato è la copia di lavoro del file.Tutte le modifiche dovrebbero " "essere apportate a questo file, che è il file dei risultati." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1843 msgid "" -"The <guilabel>Mine File</guilabel> side is set to modified after opening " -"conflict file (you will notice the asterisk in the File pane header). This " -"allows you to save the file quickly if the it does not require any changes. " -"It also ensures that you do not forget to resolve the files. If you choose " -"not to save the file, the original conflict file is not modified." +"The <guilabel>Mine File</guilabel> side is set to modified after opening conflict file (you will notice the asterisk in the File pane header). This " +"allows you to save the file quickly if the it does not require any changes. It also ensures that you do not forget to resolve the files. If you " +"choose not to save the file, the original conflict file is not modified." msgstr "" -"Il lato <guilabel >File estratto</guilabel > viene impostato su modificato " -"dopo l'apertura del file in conflitto (noterai l'asterisco nell'intestazione " -"del riquadro File).Ciò consente di salvare rapidamente il file se non " -"richiede alcuna modifica.Garantisce inoltre che non ti dimentichi di " -"risolvere i file.Se scegli di non salvare il file, il file in conflitto " -"originale non verrà modificato." +"Il lato <guilabel >File estratto</guilabel > viene impostato su modificato dopo l'apertura del file in conflitto (noterai l'asterisco " +"nell'intestazione del riquadro File).Ciò consente di salvare rapidamente il file se non richiede alcuna modifica.Garantisce inoltre che non ti " +"dimentichi di risolvere i file.Se scegli di non salvare il file, il file in conflitto originale non verrà modificato." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1854 -msgid "" -"Use all the normal compare and merge functions described earlier in this " -"topic to resolve the conflicts in the Mine File pane." +msgid "Use all the normal compare and merge functions described earlier in this topic to resolve the conflicts in the Mine File pane." msgstr "" -"Utilizzare tutte le normali funzioni di confronto e unione descritte in " -"precedenza in questo argomento per risolvere i conflitti nel riquadro File " -"di miniera." +"Utilizzare tutte le normali funzioni di confronto e unione descritte in precedenza in questo argomento per risolvere i conflitti nel riquadro File di " +"miniera." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1859 msgid "" -"When you are done, click <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> " -"</keycombo> to save the <guilabel>Mine File</guilabel> side as the result " -"file. By default, the new version overwrites the original conflict file. " -"Alternatively, you can click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Save Right</guimenuitem> <guimenuitem>Save As</guimenuitem> </" -"menuchoice>, and choose a different file name." -msgstr "" -"Quando hai finito, fai clic su <keycombo> <keycap >Ctrl</keycap> <keycap >S</" -"keycap> </keycombo > per salvare il lato <guilabel >File estratto</guilabel " -"> come file risultato.Per impostazione predefinita, la nuova versione " -"sovrascrive il file di conflitto originale.In alternativa, puoi fare clic su " -"<menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva con destra</" -"guimenuitem > <guimenuitem >Salva con nome</guimenuitem > </menuchoice > e " -"scegliere un nome file diverso." +"When you are done, click <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to save the <guilabel>Mine File</guilabel> side as the " +"result file. By default, the new version overwrites the original conflict file. Alternatively, you can click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Save Right</guimenuitem> <guimenuitem>Save As</guimenuitem> </menuchoice>, and choose a different file name." +msgstr "" +"Quando hai finito, fai clic su <keycombo> <keycap >Ctrl</keycap> <keycap >S</keycap> </keycombo > per salvare il lato <guilabel >File estratto</" +"guilabel > come file risultato.Per impostazione predefinita, la nuova versione sovrascrive il file di conflitto originale.In alternativa, puoi fare " +"clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva con destra</guimenuitem > <guimenuitem >Salva con nome</guimenuitem > </menuchoice " +"> e scegliere un nome file diverso." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1875 msgid "" -"Many version control systems allow you to configure an external merge tool. " -"If yours does, you might be able to have your version control system launch " -"WinMerge automatically when a merge conflict occurs." +"Many version control systems allow you to configure an external merge tool. If yours does, you might be able to have your version control system " +"launch WinMerge automatically when a merge conflict occurs." msgstr "" -"Molti sistemi di controllo della versione consentono di configurare uno " -"strumento di unione esterno.Se il tuo lo fa, potresti essere in grado di " -"fare in modo che il tuo sistema di controllo della versione avvii WinMerge " -"automaticamente quando si verifica un conflitto di unione." +"Molti sistemi di controllo della versione consentono di configurare uno strumento di unione esterno.Se il tuo lo fa, potresti essere in grado di fare " +"in modo che il tuo sistema di controllo della versione avvii WinMerge automaticamente quando si verifica un conflitto di unione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1879 msgid "" -"You can also open a conflict file from the WinMerge command line, which " -"accepts three filename parameters: <option>Theirs</option>, <option>Mine</" -"option>, and optionally, <option>Resolved</option> (if you want a different " -"result file from the conflict file). For more information, see <xref " -"linkend=\"Command_line\" />. Single path to the conflict file is also " -"accepted in command line." +"You can also open a conflict file from the WinMerge command line, which accepts three filename parameters: <option>Theirs</option>, <option>Mine</" +"option>, and optionally, <option>Resolved</option> (if you want a different result file from the conflict file). For more information, see <xref " +"linkend=\"Command_line\" />. Single path to the conflict file is also accepted in command line." msgstr "" -"Puoi anche aprire un file di conflitto dalla riga di comando di WinMerge, " -"che accetta tre parametri del nome file: <option>Loro</option>, " -"<option>Mine</option> e, facoltativamente, <option>Resolved</option> (se " -"desideri un file di risultati diverso dal file di conflitto).Per ulteriori " -"informazioni, vedi <xref linkend=\"Command_line\" />.Nella riga di comando è " -"accettato anche il percorso singolo al file in conflitto." +"Puoi anche aprire un file di conflitto dalla riga di comando di WinMerge, che accetta tre parametri del nome file: <option>Loro</option>, " +"<option>Mine</option> e, facoltativamente, <option>Resolved</option> (se desideri un file di risultati diverso dal file di conflitto).Per ulteriori " +"informazioni, vedi <xref linkend=\"Command_line\" />.Nella riga di comando è accettato anche il percorso singolo al file in conflitto." #. type: Content of: <article><title> #: English/Compare_images.xml:5 @@ -7500,11 +5615,8 @@ msgstr "immagini" #. type: Content of: <article><para> #: English/Compare_images.xml:12 -msgid "" -"This topic describes how to compare images using the Image Compare window." -msgstr "" -"Questo argomento descrive come confrontare le immagini utilizzando la " -"finestra Confronto immagini." +msgid "This topic describes how to compare images using the Image Compare window." +msgstr "Questo argomento descrive come confrontare le immagini utilizzando la finestra Confronto immagini." #. type: Content of: <article><section><title> #: English/Compare_images.xml:16 @@ -7513,39 +5625,27 @@ msgstr "Avvio di un'operazione di confronto delle immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:18 -msgid "" -"You can start an image compare operation from either the WinMerge window or " -"a Command Prompt window." -msgstr "" -"È possibile avviare un'operazione di confronto delle immagini dalla finestra " -"WinMerge o da una finestra del prompt dei comandi." +msgid "You can start an image compare operation from either the WinMerge window or a Command Prompt window." +msgstr "È possibile avviare un'operazione di confronto delle immagini dalla finestra WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:26 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" -"menuchoice>. Use the Select Files or Folders dialog to specify the left and " -"right source images to compare. For more details about the Select Files or " -"Folder dialog, see <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " +"and right source images to compare. For more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" -"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " -"file o cartelle per specificare le immagini di origine sinistra e destra da " -"confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file " -"o cartella, vedi <xref linkend=\"Open_paths\" />." +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " +"o cartelle per specificare le immagini di origine sinistra e destra da confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file o " +"cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:41 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " -"directory. In your command arguments, include the left and right images to " -"compare. For more information about using the command line, see <xref " -"linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right images to " +"compare. For more information about using the command line, see <xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " -"installazione di WinMerge. Negli argomenti del comando, includi le immagini " -"sinistra e destra da confrontare. Per ulteriori informazioni sull'utilizzo " -"della riga di comando, vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi le immagini " +"sinistra e destra da confrontare. Per ulteriori informazioni sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><title> #: English/Compare_images.xml:51 @@ -7554,21 +5654,13 @@ msgstr "Finestra Confronta immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:53 -msgid "" -"WinMerge support many types of images and can highlight the differences with " -"blocks. Overlaying of the pictures is also possible." -msgstr "" -"WinMerge supporta molti tipi di immagini e può evidenziare le differenze con " -"i blocchi.È anche possibile la sovrapposizione delle immagini." +msgid "WinMerge support many types of images and can highlight the differences with blocks. Overlaying of the pictures is also possible." +msgstr "WinMerge supporta molti tipi di immagini e può evidenziare le differenze con i blocchi.È anche possibile la sovrapposizione delle immagini." #. type: Content of: <article><section><mediaobject> #: English/Compare_images.xml:57 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /" -"> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /" -"> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_images.xml:62 @@ -7578,9 +5670,7 @@ msgstr "Finestra di confronto delle immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:66 msgid "You can set the most options in the <guilabel>Location Pane</guilabel>:" -msgstr "" -"Puoi impostare la maggior parte delle opzioni nel <guilabel >pannello " -"Posizione</guilabel >:" +msgstr "Puoi impostare la maggior parte delle opzioni nel <guilabel >pannello Posizione</guilabel >:" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_images.xml:70 @@ -7599,12 +5689,8 @@ msgstr "Evidenziare" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:77 -msgid "" -"With the check box <guilabel>Highlight</guilabel> you can enable or disable " -"the highlighting of the image differences." -msgstr "" -"Con la casella <guilabel >Evidenzia</guilabel > puoi abilitare o " -"disabilitare l'evidenziazione delle differenze tra le immagini." +msgid "With the check box <guilabel>Highlight</guilabel> you can enable or disable the highlighting of the image differences." +msgstr "Con la casella <guilabel >Evidenzia</guilabel > puoi abilitare o disabilitare l'evidenziazione delle differenze tra le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:83 @@ -7613,12 +5699,8 @@ msgstr "Battito di ciglia" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:85 -msgid "" -"If the highlighting is enabled you can even make it blinking by checking the " -"check box <guilabel>Blink</guilabel>." -msgstr "" -"Se l'evidenziazione è abilitata puoi anche farla lampeggiare selezionando la " -"casella <guilabel >Lampeggia</guilabel >." +msgid "If the highlighting is enabled you can even make it blinking by checking the check box <guilabel>Blink</guilabel>." +msgstr "Se l'evidenziazione è abilitata puoi anche farla lampeggiare selezionando la casella <guilabel >Lampeggia</guilabel >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:91 @@ -7627,12 +5709,8 @@ msgstr "Dimensione del blocco" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:93 -msgid "" -"The slider <guilabel>Block Size</guilabel> defines the size of the blocks " -"which highlighting the image differences." -msgstr "" -"Il cursore <guilabel >Dimensione blocco</guilabel > definisce la dimensione " -"dei blocchi che evidenziano le differenze tra le immagini." +msgid "The slider <guilabel>Block Size</guilabel> defines the size of the blocks which highlighting the image differences." +msgstr "Il cursore <guilabel >Dimensione blocco</guilabel > definisce la dimensione dei blocchi che evidenziano le differenze tra le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:99 @@ -7641,12 +5719,8 @@ msgstr "Blocco Alfa" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:101 -msgid "" -"The <guilabel>Block Alpha</guilabel> slider defines how strong the alpha " -"blending of the blocks is." -msgstr "" -"Il cursore <guilabel >Blocco alfa</guilabel > definisce quanto è forte la " -"fusione alfa dei blocchi." +msgid "The <guilabel>Block Alpha</guilabel> slider defines how strong the alpha blending of the blocks is." +msgstr "Il cursore <guilabel >Blocco alfa</guilabel > definisce quanto è forte la fusione alfa dei blocchi." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:107 @@ -7655,12 +5729,8 @@ msgstr "Soglia distanza colore" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:109 -msgid "" -"The slider <guilabel>CD</guilabel> sets the <emphasis>Color Distance " -"Threshold</emphasis> which helps to ignore color differences." -msgstr "" -"Il cursore <guilabel >CD</guilabel > imposta la <emphasis >Soglia distanza " -"colore</emphasis > che aiuta a ignorare le differenze di colore." +msgid "The slider <guilabel>CD</guilabel> sets the <emphasis>Color Distance Threshold</emphasis> which helps to ignore color differences." +msgstr "Il cursore <guilabel >CD</guilabel > imposta la <emphasis >Soglia distanza colore</emphasis > che aiuta a ignorare le differenze di colore." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:115 @@ -7699,11 +5769,8 @@ msgstr "Modalità" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:139 -msgid "" -"Currently the following <emphasis>Overlay Modes</emphasis> are possible:" -msgstr "" -"Attualmente sono possibili le seguenti <emphasis>Modalità di " -"sovrapposizione</emphasis>:" +msgid "Currently the following <emphasis>Overlay Modes</emphasis> are possible:" +msgstr "Attualmente sono possibili le seguenti <emphasis>Modalità di sovrapposizione</emphasis>:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><guilabel> #: English/Compare_images.xml:142 @@ -7728,17 +5795,14 @@ msgstr "Alfa" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:153 msgid "" -"The <guilabel>Alpha</guilabel> slider defines how strong the alpha blending " -"of the overlay nodes <guilabel>Alpha Blend</guilabel> or <guilabel>Alpha " +"The <guilabel>Alpha</guilabel> slider defines how strong the alpha blending of the overlay nodes <guilabel>Alpha Blend</guilabel> or <guilabel>Alpha " "Blend Animation</guilabel> is." msgstr "" -"Il cursore <guilabel >Alfa</guilabel > definisce quanto è forte la fusione " -"alfa dei nodi di sovrapposizione <guilabel >Miscela alfa</guilabel > o " +"Il cursore <guilabel >Alfa</guilabel > definisce quanto è forte la fusione alfa dei nodi di sovrapposizione <guilabel >Miscela alfa</guilabel > o " "<guilabel >Animazione fusione alfa</guilabel >." #. type: Content of: <appendix><table><title> -#: English/Compare_images.xml:163 English/Compare_images.xml:168 -#: English/Shortcut_keys.xml:735 +#: English/Compare_images.xml:163 English/Compare_images.xml:168 English/Shortcut_keys.xml:735 msgid "Zoom" msgstr "Zoom" @@ -7749,12 +5813,8 @@ msgstr "Zoom<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:170 -msgid "" -"With the <guilabel>Zoom</guilabel> slider you can zoom in or out of the " -"images." -msgstr "" -"Con il cursore <guilabel >Zoom</guilabel > puoi ingrandire o rimpicciolire " -"le immagini." +msgid "With the <guilabel>Zoom</guilabel> slider you can zoom in or out of the images." +msgstr "Con il cursore <guilabel >Zoom</guilabel > puoi ingrandire o rimpicciolire le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:175 @@ -7763,12 +5823,8 @@ msgstr "Pagina" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:177 -msgid "" -"If the image format support multiple pages you can select the current page " -"with the <guilabel>Page</guilabel> number box." -msgstr "" -"Se il formato dell'immagine supporta più pagine puoi selezionare la pagina " -"corrente con la casella numerica <guilabel >Pagina</guilabel >." +msgid "If the image format support multiple pages you can select the current page with the <guilabel>Page</guilabel> number box." +msgstr "Se il formato dell'immagine supporta più pagine puoi selezionare la pagina corrente con la casella numerica <guilabel >Pagina</guilabel >." #. type: Content of: <article><mediaobject><textobject><phrase> #: English/Compare_table.xml:5 English/Compare_table.xml:24 @@ -7783,25 +5839,17 @@ msgstr "tavolo" #. type: Content of: <article><para> #: English/Compare_table.xml:13 msgid "" -"In version 2.16.7 or later, it is possible to display and edit delimiter-" -"separated values files such as CSV and TSV in table format like spreadsheet " -"software. Editing operations, moving to differences, and merging operations " -"in this format are the same as in a normal text file window." +"In version 2.16.7 or later, it is possible to display and edit delimiter-separated values files such as CSV and TSV in table format like spreadsheet " +"software. Editing operations, moving to differences, and merging operations in this format are the same as in a normal text file window." msgstr "" -"Nella versione 2.16.7 o successiva, è possibile visualizzare e modificare " -"file con valori separati da delimitatori come CSV e TSV in formato tabella " -"come un software per fogli di calcolo.Le operazioni di modifica, spostamento " -"alle differenze e unione in questo formato sono le stesse di una normale " +"Nella versione 2.16.7 o successiva, è possibile visualizzare e modificare file con valori separati da delimitatori come CSV e TSV in formato tabella " +"come un software per fogli di calcolo.Le operazioni di modifica, spostamento alle differenze e unione in questo formato sono le stesse di una normale " "finestra di file di testo." #. type: Content of: <article><mediaobject> #: English/Compare_table.xml:18 -msgid "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1." -"png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1." -"png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:30 @@ -7816,43 +5864,31 @@ msgstr "Confronto in formato tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_table.xml:33 msgid "" -"Whether files are opened in table format depends on whether the file name " -"matches defined patterns. By default, if the file extension is .csv or ." -"tsv, it will be opened in table format. If you want to change the patterns, " -"specify it on the Compare/Table page in the Options dialog." +"Whether files are opened in table format depends on whether the file name matches defined patterns. By default, if the file extension is .csv " +"or .tsv, it will be opened in table format. If you want to change the patterns, specify it on the Compare/Table page in the Options dialog." msgstr "" -"L'apertura dei file in formato tabella dipende dalla corrispondenza del nome " -"file ai modelli definiti.Per impostazione predefinita, se l'estensione del " -"file è .csv o .tsv, verrà aperto in formato tabella.Se desideri modificare i " -"modelli, specificalo nella pagina Confronta/Tabella nella finestra di " -"dialogo Opzioni." +"L'apertura dei file in formato tabella dipende dalla corrispondenza del nome file ai modelli definiti.Per impostazione predefinita, se l'estensione " +"del file è .csv o .tsv, verrà aperto in formato tabella.Se desideri modificare i modelli, specificalo nella pagina Confronta/Tabella nella finestra " +"di dialogo Opzioni." #. type: Content of: <article><section><para> #: English/Compare_table.xml:38 msgid "" -"If you want to temporarily open it in table format after opening it as plain " -"text, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</" -"guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. If the Table " -"dialog appears, select the File type and click <guilabel>OK</guilabel>." +"If you want to temporarily open it in table format after opening it as plain text, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare " +"As</guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. If the Table dialog appears, select the File type and click <guilabel>OK</guilabel>." msgstr "" -"Se vuoi aprirlo temporaneamente in formato tabella dopo averlo aperto come " -"testo semplice, fai clic su <menuchoice> <guimenu >File</guimenu > " -"<guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Tabella</" -"guimenuitem > </menuchoice >.Se appare la finestra di dialogo Tabella, " -"seleziona il Tipo di file e fai clic su <guilabel >OK</guilabel >." +"Se vuoi aprirlo temporaneamente in formato tabella dopo averlo aperto come testo semplice, fai clic su <menuchoice> <guimenu >File</guimenu > " +"<guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Tabella</guimenuitem > </menuchoice >.Se appare la finestra di dialogo Tabella, seleziona " +"il Tipo di file e fai clic su <guilabel >OK</guilabel >." #. type: Content of: <article><section><para> #: English/Compare_table.xml:48 msgid "" -"If you want to temporarily open files that have been opened in table format " -"as regular text files, click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Recompare As</guimenuitem> <guimenuitem>Text</guimenuitem> </" -"menuchoice>." +"If you want to temporarily open files that have been opened in table format as regular text files, click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Recompare As</guimenuitem> <guimenuitem>Text</guimenuitem> </menuchoice>." msgstr "" -"Se vuoi aprire temporaneamente file che sono stati aperti in formato tabella " -"come normali file di testo, fai clic su <menuchoice > <guimenu >File</" -"guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Testo</" -"guimenuitem > </menuchoice >." +"Se vuoi aprire temporaneamente file che sono stati aperti in formato tabella come normali file di testo, fai clic su <menuchoice > <guimenu >File</" +"guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Testo</guimenuitem > </menuchoice >." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:59 @@ -7862,61 +5898,38 @@ msgstr "impostazioni del formato della tabella" #. type: Content of: <article><section><title> #: English/Compare_table.xml:58 msgid "Table format settings<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Impostazioni del formato della tabella<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Impostazioni del formato della tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_table.xml:63 -msgid "" -"By default, data in delimiter-separated values text files are treated as " -"follows" -msgstr "" -"Per impostazione predefinita, i dati nei file di testo con valori separati " -"da delimitatori vengono trattati come segue" +msgid "By default, data in delimiter-separated values text files are treated as follows" +msgstr "Per impostazione predefinita, i dati nei file di testo con valori separati da delimitatori vengono trattati come segue" #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:66 -msgid "" -"CSV files are separated by commas and TSV files are separated by tabs, and " -"values are displayed by columns." -msgstr "" -"I file CSV sono separati da virgole e i file TSV sono separati da " -"tabulazioni e i valori vengono visualizzati in colonne." +msgid "CSV files are separated by commas and TSV files are separated by tabs, and values are displayed by columns." +msgstr "I file CSV sono separati da virgole e i file TSV sono separati da tabulazioni e i valori vengono visualizzati in colonne." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:70 -msgid "" -"However, delimiter characters within the quoted range (double quotes) are " -"treated as values." -msgstr "" -"Tuttavia, i caratteri delimitatori all'interno dell'intervallo tra " -"virgolette (virgolette doppie) vengono trattati come valori." +msgid "However, delimiter characters within the quoted range (double quotes) are treated as values." +msgstr "Tuttavia, i caratteri delimitatori all'interno dell'intervallo tra virgolette (virgolette doppie) vengono trattati come valori." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:74 -msgid "" -"Also, EOL characters (CR or LF) within the quoted range are treated as " -"values." -msgstr "" -"Inoltre, i caratteri EOL (CR o LF) all'interno dell'intervallo tra " -"virgolette vengono trattati come valori." +msgid "Also, EOL characters (CR or LF) within the quoted range are treated as values." +msgstr "Inoltre, i caratteri EOL (CR o LF) all'interno dell'intervallo tra virgolette vengono trattati come valori." #. type: Content of: <article><section><para> #: English/Compare_table.xml:81 msgid "" -"If you want to change the above settings, you can do so in the Compare/Table " -"page in the Options dialog or in the table dialog that appears when clicking " -"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</guimenuitem> " -"<guimenuitem>Table</guimenuitem> </menuchoice>. See <xref " +"If you want to change the above settings, you can do so in the Compare/Table page in the Options dialog or in the table dialog that appears when " +"clicking <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. See <xref " "linkend=\"Configuration_compare_table\" /> for details." msgstr "" -"Se vuoi cambiare le impostazioni di cui sopra, puoi farlo nella pagina " -"Confronta/Tabella della finestra di dialogo Opzioni o nella finestra di " -"dialogo della tabella che appare quando si fa clic su <menuchoice> <guimenu " -">File</guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem " -">Tabella</guimenuitem > </menuchoice >.Vedi <xref " -"linkend=\"Configuration_compare_table\" /> per i dettagli." +"Se vuoi cambiare le impostazioni di cui sopra, puoi farlo nella pagina Confronta/Tabella della finestra di dialogo Opzioni o nella finestra di " +"dialogo della tabella che appare quando si fa clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Riconfronta come</guimenuitem > " +"<guimenuitem >Tabella</guimenuitem > </menuchoice >.Vedi <xref linkend=\"Configuration_compare_table\" /> per i dettagli." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:96 @@ -7925,49 +5938,34 @@ msgstr "operazioni specifiche del formato della tabella" #. type: Content of: <article><section><title> #: English/Compare_table.xml:95 -msgid "" -"Table format-specific operations<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Operazioni specifiche del formato tabella<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Table format-specific operations<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Operazioni specifiche del formato tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:102 -msgid "" -"You can change the column width by dragging the column boundary of a column " -"heading." -msgstr "" -"È possibile modificare la larghezza della colonna trascinando il limite " -"della colonna dell'intestazione di colonna." +msgid "You can change the column width by dragging the column boundary of a column heading." +msgstr "È possibile modificare la larghezza della colonna trascinando il limite della colonna dell'intestazione di colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:106 -msgid "" -"Double-clicking on a column boundary in a column heading automatically " -"adjusts the column width according to the content of the column." +msgid "Double-clicking on a column boundary in a column heading automatically adjusts the column width according to the content of the column." msgstr "" -"Facendo doppio clic sul limite di una colonna nell'intestazione di una " -"colonna si regola automaticamente la larghezza della colonna in base al " +"Facendo doppio clic sul limite di una colonna nell'intestazione di una colonna si regola automaticamente la larghezza della colonna in base al " "contenuto della colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:110 msgid "Text is selected vertically by dragging a column in the column heading." -msgstr "" -"Il testo viene selezionato verticalmente trascinando una colonna " -"nell'intestazione della colonna." +msgstr "Il testo viene selezionato verticalmente trascinando una colonna nell'intestazione della colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:115 msgid "" -"When <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</" -"guimenuitem> </menuchoice> menu item is checked, the text will be wrapped in " -"each column. Check this menu item if you want to see multiline field values." +"When <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</guimenuitem> </menuchoice> menu item is checked, the text will be wrapped in each " +"column. Check this menu item if you want to see multiline field values." msgstr "" -"Quando è selezionata la voce di menu <menuchoice> <guimenu >Visualizza</" -"guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice >, il testo " -"andrà a capo in ogni colonna.Controlla questa voce di menu se vuoi vedere i " -"valori dei campi multilinea." +"Quando è selezionata la voce di menu <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice >, il testo " +"andrà a capo in ogni colonna.Controlla questa voce di menu se vuoi vedere i valori dei campi multilinea." #. type: Content of: <article><title> #: English/Compare_webpages.xml:5 @@ -7981,19 +5979,13 @@ msgstr "Pagine Web" #. type: Content of: <article><para><note> #: English/Compare_webpages.xml:13 -msgid "" -"This topic describes how to compare webpages using the Webpage Compare " -"window. <note>" -msgstr "" -"Questo argomento descrive come confrontare le pagine Web utilizzando la " -"finestra Confronto pagine Web.<note>" +msgid "This topic describes how to compare webpages using the Webpage Compare window. <note>" +msgstr "Questo argomento descrive come confrontare le pagine Web utilizzando la finestra Confronto pagine Web.<note>" #. type: Content of: <article><para><note><para> #: English/Compare_webpages.xml:17 msgid "This feature is still experimental and may be unstable and very slow." -msgstr "" -"Questa funzionalità è ancora sperimentale e potrebbe essere instabile e " -"molto lenta." +msgstr "Questa funzionalità è ancora sperimentale e potrebbe essere instabile e molto lenta." #. type: Content of: <article><section><section><section><para> #: English/Compare_webpages.xml:19 English/Quick_start.xml:159 @@ -8007,21 +5999,13 @@ msgstr "Avvio di un'operazione di confronto di pagine Web" #. type: Content of: <article><section><para> #: English/Compare_webpages.xml:25 -msgid "" -"You can start an webpage compare operation from either the WinMerge window " -"or a Command Prompt window." -msgstr "" -"È possibile avviare un'operazione di confronto di pagine Web dalla finestra " -"WinMerge o da una finestra del prompt dei comandi." +msgid "You can start an webpage compare operation from either the WinMerge window or a Command Prompt window." +msgstr "È possibile avviare un'operazione di confronto di pagine Web dalla finestra WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para><mediaobject> #: English/Compare_webpages.xml:43 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><para><mediaobject><textobject><phrase> #: English/Compare_webpages.xml:48 English/Quick_start.xml:84 @@ -8031,32 +6015,23 @@ msgstr "Seleziona la finestra File o Cartelle" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:34 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" -"menuchoice>. Specify the two or three URLs you want to compare in the " -"\"Select File or Folder\" dialog and select the <guimenuitem>Webpage</" -"guimenuitem> menu item from the <guibutton>Compare</guibutton> button's drop-" +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Specify the two or three URLs you want to compare in the " +"\"Select File or Folder\" dialog and select the <guimenuitem>Webpage</guimenuitem> menu item from the <guibutton>Compare</guibutton> button's drop-" "down menu. <placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" -"guimenuitem > </menuchoice >.Specifica i due o tre URL che vuoi confrontare " -"nella finestra di dialogo \"Seleziona file o cartella\" e seleziona la voce " -"di menu <guimenuitem >Pagina web</guimenuitem > dal menu a discesa del " -"pulsante <guibutton >Confronta</guibutton >.<placeholder " -"type=\"mediaobject\" id=\"0\"/>" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Specifica i due o tre URL che vuoi confrontare " +"nella finestra di dialogo \"Seleziona file o cartella\" e seleziona la voce di menu <guimenuitem >Pagina web</guimenuitem > dal menu a discesa del " +"pulsante <guibutton >Confronta</guibutton >.<placeholder type=\"mediaobject\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:60 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " -"directory. In your command arguments, include two or three URLs of the web " -"pages you want to compare and specify the <option>/t webpage</option> " -"command line option. For more information about using the command line, see " +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include two or three URLs of the web " +"pages you want to compare and specify the <option>/t webpage</option> command line option. For more information about using the command line, see " "<xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " -"installazione di WinMerge. Negli argomenti del comando, includi due o tre " -"URL delle pagine web che desideri confrontare e specifica l'opzione della " -"riga di comando <option>/t webpage</option>. Per ulteriori informazioni " +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi due o tre URL " +"delle pagine web che desideri confrontare e specifica l'opzione della riga di comando <option>/t webpage</option>. Per ulteriori informazioni " "sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><example><title> @@ -8066,12 +6041,8 @@ msgstr "Riga di comando" #. type: Content of: <article><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_webpages.xml:71 -msgid "" -"<userinput> \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" /t webpage " -"https://example.net https://example.com </userinput>" -msgstr "" -"<userinput> \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /t pagina web https://" -"example.net https://example.com </userinput>" +msgid "<userinput> \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" /t webpage https://example.net https://example.com </userinput>" +msgstr "<userinput> \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /t pagina web https://example.net https://example.com </userinput>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_webpages.xml:83 English/Compare_webpages.xml:94 @@ -8080,25 +6051,17 @@ msgstr "Finestra di confronto delle pagine Web" #. type: Content of: <article><section><mediaobject> #: English/Compare_webpages.xml:89 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /" -"> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /" -"> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><para> #: English/Compare_webpages.xml:99 msgid "" -"When the Webpage comparison window is displayed, the Webpage menu will be " -"added to the menu bar. The menu items in the Webpage menu are as follows. " -"Some of the same functionality as these menu items is available in the " -"Location Pane." +"When the Webpage comparison window is displayed, the Webpage menu will be added to the menu bar. The menu items in the Webpage menu are as follows. " +"Some of the same functionality as these menu items is available in the Location Pane." msgstr "" -"Quando viene visualizzata la finestra di confronto delle pagine Web, il menu " -"della pagina Web verrà aggiunto alla barra dei menu.Le voci di menu nel menu " -"Pagina Web sono le seguenti.Alcune delle stesse funzionalità di queste voci " -"di menu sono disponibili nel riquadro Posizione." +"Quando viene visualizzata la finestra di confronto delle pagine Web, il menu della pagina Web verrà aggiunto alla barra dei menu.Le voci di menu nel " +"menu Pagina Web sono le seguenti.Alcune delle stesse funzionalità di queste voci di menu sono disponibili nel riquadro Posizione." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:109 @@ -8118,9 +6081,7 @@ msgstr "Visualizza differenze" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:118 msgid "Enables or disables text difference coloring for webpages." -msgstr "" -"Abilita o disabilita la colorazione della differenza del testo per le pagine " -"Web." +msgstr "Abilita o disabilita la colorazione della differenza del testo per le pagine Web." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:127 @@ -8139,12 +6100,8 @@ msgstr "Schermate" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:136 -msgid "" -"Converts the currently displayed range of web pages into images and compares " -"them in the image comparison window." -msgstr "" -"Converte l'intervallo di pagine Web attualmente visualizzato in immagini e " -"le confronta nella finestra di confronto delle immagini." +msgid "Converts the currently displayed range of web pages into images and compares them in the image comparison window." +msgstr "Converte l'intervallo di pagine Web attualmente visualizzato in immagini e le confronta nella finestra di confronto delle immagini." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:145 @@ -8153,12 +6110,8 @@ msgstr "Schermate a grandezza naturale" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:148 -msgid "" -"Creates images of the entire area of web pages and compares them in the " -"image comparison window." -msgstr "" -"Crea immagini dell'intera area delle pagine web e le confronta nella " -"finestra di confronto delle immagini." +msgid "Creates images of the entire area of web pages and compares them in the image comparison window." +msgstr "Crea immagini dell'intera area delle pagine web e le confronta nella finestra di confronto delle immagini." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:157 @@ -8168,8 +6121,7 @@ msgstr "HTML" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:160 msgid "Compare the HTML contents of web pages in the file comparison window." -msgstr "" -"Confronta i contenuti HTML delle pagine web nella finestra di confronto file." +msgstr "Confronta i contenuti HTML delle pagine web nella finestra di confronto file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:169 @@ -8178,12 +6130,8 @@ msgstr "Testi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:172 -msgid "" -"Extracts text parts of web pages and compares them in the file comparison " -"window." -msgstr "" -"Estrae parti di testo delle pagine Web e le confronta nella finestra di " -"confronto dei file." +msgid "Extracts text parts of web pages and compares them in the file comparison window." +msgstr "Estrae parti di testo delle pagine Web e le confronta nella finestra di confronto dei file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:181 @@ -8193,9 +6141,7 @@ msgstr "Alberi delle risorse" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:184 msgid "Compare resource trees of web pages in the folder comparison window." -msgstr "" -"Confronta gli alberi delle risorse delle pagine web nella finestra di " -"confronto delle cartelle." +msgstr "Confronta gli alberi delle risorse delle pagine web nella finestra di confronto delle cartelle." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:196 @@ -8215,9 +6161,7 @@ msgstr "Adatta alla finestra" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:205 msgid "Fits the display size of the web page to the size of each pane." -msgstr "" -"Adatta la dimensione di visualizzazione della pagina Web alla dimensione di " -"ciascun riquadro." +msgstr "Adatta la dimensione di visualizzazione della pagina Web alla dimensione di ciascun riquadro." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:213 @@ -8227,9 +6171,7 @@ msgstr "Larghezza x Altezza" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:216 msgid "Changes the display size of the web page to the specified size." -msgstr "" -"Modifica la dimensione di visualizzazione della pagina Web nella dimensione " -"specificata." +msgstr "Modifica la dimensione di visualizzazione della pagina Web nella dimensione specificata." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:227 @@ -8248,12 +6190,8 @@ msgstr "Abilitato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:236 -msgid "" -"Enable or disable the synchronization function of events such as Scroll and " -"Click." -msgstr "" -"Abilita o disabilita la funzione di sincronizzazione di eventi come " -"Scorrimento e Clic." +msgid "Enable or disable the synchronization function of events such as Scroll and Click." +msgstr "Abilita o disabilita la funzione di sincronizzazione di eventi come Scorrimento e Clic." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:244 @@ -8292,12 +6230,8 @@ msgstr "Vai indietro/Vai avanti" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:280 -msgid "" -"Enable or disable synchronization of going back to the previous page or " -"forward to the next page." -msgstr "" -"Abilita o disabilita la sincronizzazione per tornare alla pagina precedente " -"o passare alla pagina successiva." +msgid "Enable or disable synchronization of going back to the previous page or forward to the next page." +msgstr "Abilita o disabilita la sincronizzazione per tornare alla pagina precedente o passare alla pagina successiva." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:293 @@ -8307,9 +6241,7 @@ msgstr "Cancella il menu Dati di navigazione" #. type: Content of: <article><section><section><section><title> #: English/Compare_webpages.xml:292 msgid "Clear Browsing Data menu<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Cancella il menu Dati di navigazione<placeholder type=\"indexterm\" id=\"0\"/" -">" +msgstr "Cancella il menu Dati di navigazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:299 @@ -8363,34 +6295,22 @@ msgstr "Limitazioni attuali<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:358 -msgid "" -"Webpages that use the currently deprecated FRAMESET element cannot be " -"compared." -msgstr "" -"Non è possibile confrontare le pagine Web che utilizzano l'elemento FRAMESET " -"attualmente deprecato." +msgid "Webpages that use the currently deprecated FRAMESET element cannot be compared." +msgstr "Non è possibile confrontare le pagine Web che utilizzano l'elemento FRAMESET attualmente deprecato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:365 -msgid "" -"The contents within the IFRAME element may not be compared or events may not " -"be synchronized." -msgstr "" -"I contenuti all'interno dell'elemento IFRAME potrebbero non essere " -"confrontati o gli eventi potrebbero non essere sincronizzati." +msgid "The contents within the IFRAME element may not be compared or events may not be synchronized." +msgstr "I contenuti all'interno dell'elemento IFRAME potrebbero non essere confrontati o gli eventi potrebbero non essere sincronizzati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:372 msgid "Comparing web pages with very different content may take a lot of time." -msgstr "" -"Il confronto di pagine Web con contenuti molto diversi può richiedere molto " -"tempo." +msgstr "Il confronto di pagine Web con contenuti molto diversi può richiedere molto tempo." #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:5 English/Configuration.xml:2553 -#: English/Configuration.xml:2567 English/Configuration.xml:2651 -#: English/Configuration.xml:2702 English/Configuration.xml:2720 -#: English/Configuration.xml:2732 English/Configuration.xml:2838 +#: English/Configuration.xml:5 English/Configuration.xml:2553 English/Configuration.xml:2567 English/Configuration.xml:2651 +#: English/Configuration.xml:2702 English/Configuration.xml:2720 English/Configuration.xml:2732 English/Configuration.xml:2838 #: English/Configuration.xml:2855 English/Configuration.xml:3126 msgid "options" msgstr "opzioni" @@ -8402,21 +6322,13 @@ msgstr "Opzioni e configurazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Configuration.xml:10 -msgid "" -"The Options dialog enables you to customize many WinMerge features. To set " -"WinMerge options:" -msgstr "" -"La finestra di dialogo Opzioni consente di personalizzare molte funzionalità " -"di WinMerge.Per impostare le opzioni WinMerge:" +msgid "The Options dialog enables you to customize many WinMerge features. To set WinMerge options:" +msgstr "La finestra di dialogo Opzioni consente di personalizzare molte funzionalità di WinMerge.Per impostare le opzioni WinMerge:" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject> #: English/Configuration.xml:22 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"options_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" -"options_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/options_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/options_btn.png\" /> </imageobject>" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Configuration.xml:27 @@ -8426,35 +6338,25 @@ msgstr "Pulsante Opzioni WinMerge" #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:17 msgid "" -"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" -"guimenuitem> </menuchoice> in the menu or the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Options</guibutton> button " -"in the toolbar." +"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice> in the menu or the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Options</guibutton> button in the toolbar." msgstr "" -"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem " -">Opzioni</guimenuitem > </menuchoice > nel menu o sul pulsante <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Opzioni</guibutton > nella " -"barra degli strumenti." +"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice > nel menu o sul pulsante <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Opzioni</guibutton > nella barra degli strumenti." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:34 msgid "" -"The Options dialog contains a number of pages, each containing a group of " -"related options. You can open any page by clicking its title in the " +"The Options dialog contains a number of pages, each containing a group of related options. You can open any page by clicking its title in the " "<guilabel>Categories</guilabel> list, on the left side of the dialog." msgstr "" -"La finestra di dialogo Opzioni contiene diverse pagine, ciascuna contenente " -"un gruppo di opzioni correlate.Puoi aprire qualsiasi pagina facendo clic sul " -"suo titolo nell'elenco <guilabel >Categorie</guilabel >, sul lato sinistro " -"della finestra di dialogo." +"La finestra di dialogo Opzioni contiene diverse pagine, ciascuna contenente un gruppo di opzioni correlate.Puoi aprire qualsiasi pagina facendo clic " +"sul suo titolo nell'elenco <guilabel >Categorie</guilabel >, sul lato sinistro della finestra di dialogo." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:43 -msgid "" -"Configure the options you want to change using one or both of these methods:" -msgstr "" -"Configura le opzioni che desideri modificare utilizzando uno o entrambi " -"questi metodi:" +msgid "Configure the options you want to change using one or both of these methods:" +msgstr "Configura le opzioni che desideri modificare utilizzando uno o entrambi questi metodi:" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:49 @@ -8464,30 +6366,20 @@ msgstr "Direttamente nelle pagine delle opzioni." #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:54 msgid "" -"Importing an options <filename>.ini</filename> file that you exported " -"previously (see <xref linkend=\"Configuration_importexport\" /> for details)." +"Importing an options <filename>.ini</filename> file that you exported previously (see <xref linkend=\"Configuration_importexport\" /> for details)." msgstr "" -"Importazione di un file di opzioni <filename>.ini</filename> esportato in " -"precedenza (vedi <xref linkend=\"Configuration_importexport\" /> per i " +"Importazione di un file di opzioni <filename>.ini</filename> esportato in precedenza (vedi <xref linkend=\"Configuration_importexport\" /> per i " "dettagli)." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:64 -msgid "" -"When you have set all your options, click <guibutton>OK</guibutton> to save " -"them and dismiss the dialog." -msgstr "" -"Dopo aver impostato tutte le opzioni, fai clic su <guibutton >OK</guibutton " -"> per salvarle e chiudere la finestra di dialogo." +msgid "When you have set all your options, click <guibutton>OK</guibutton> to save them and dismiss the dialog." +msgstr "Dopo aver impostato tutte le opzioni, fai clic su <guibutton >OK</guibutton > per salvarle e chiudere la finestra di dialogo." #. type: Content of: <article><para> #: English/Configuration.xml:71 -msgid "" -"This topic describes the options in detail. There is a section for each page " -"in the Options dialog." -msgstr "" -"Questo argomento descrive le opzioni in dettaglio.C'è una sezione per ogni " -"pagina nella finestra di dialogo Opzioni." +msgid "This topic describes the options in detail. There is a section for each page in the Options dialog." +msgstr "Questo argomento descrive le opzioni in dettaglio.C'è una sezione per ogni pagina nella finestra di dialogo Opzioni." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:78 @@ -8501,28 +6393,19 @@ msgstr "esportare file di opzioni" #. type: Content of: <article><section><title> #: English/Configuration.xml:77 -msgid "" -"Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Opzioni di importazione ed esportazione<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Opzioni di importazione ed esportazione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:85 msgid "" -"If you change options frequently for different compare or merge scenarios, " -"or if you want to share your settings with other WinMerge users, consider " -"saving your settings by exporting them to an options file. Then, whenever " -"you want to use those settings, you can simply import the options file " +"If you change options frequently for different compare or merge scenarios, or if you want to share your settings with other WinMerge users, consider " +"saving your settings by exporting them to an options file. Then, whenever you want to use those settings, you can simply import the options file " "instead of setting options manually." msgstr "" -"Se modifichi frequentemente le opzioni per diversi scenari di confronto o " -"unione o se desideri condividere le tue impostazioni con altri utenti " -"WinMerge, valuta la possibilità di salvare le impostazioni esportandole in " -"un file di opzioni.Quindi, ogni volta che desideri utilizzare tali " -"impostazioni, puoi semplicemente importare il file delle opzioni invece di " -"impostare le opzioni manualmente." +"Se modifichi frequentemente le opzioni per diversi scenari di confronto o unione o se desideri condividere le tue impostazioni con altri utenti " +"WinMerge, valuta la possibilità di salvare le impostazioni esportandole in un file di opzioni.Quindi, ogni volta che desideri utilizzare tali " +"impostazioni, puoi semplicemente importare il file delle opzioni invece di impostare le opzioni manualmente." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:94 @@ -8532,21 +6415,16 @@ msgstr "Per importare le opzioni" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:98 msgid "" -"When you want to reuse your saved options, click <guibutton>Import</" -"guibutton>. In the Select file for import dialog, navigate to the saved " +"When you want to reuse your saved options, click <guibutton>Import</guibutton>. In the Select file for import dialog, navigate to the saved " "<filename>ini</filename> file and click <guibutton>Open</guibutton>." msgstr "" -"Quando vuoi riutilizzare le opzioni salvate, fai clic su <guibutton " -">Importa</guibutton >.Nella finestra di dialogo Seleziona file per " -"l'importazione, vai al file <filename>ini</filename> salvato e fai clic su " -"<guibutton >Apri</guibutton >." +"Quando vuoi riutilizzare le opzioni salvate, fai clic su <guibutton >Importa</guibutton >.Nella finestra di dialogo Seleziona file per " +"l'importazione, vai al file <filename>ini</filename> salvato e fai clic su <guibutton >Apri</guibutton >." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:105 msgid "The values in your imported options file replace all existing settings." -msgstr "" -"I valori nel file delle opzioni importati sostituiscono tutte le " -"impostazioni esistenti." +msgstr "I valori nel file delle opzioni importati sostituiscono tutte le impostazioni esistenti." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:112 @@ -8556,25 +6434,17 @@ msgstr "Per esportare le opzioni" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:116 msgid "" -"When you have set your options the way you want them, click " -"<guibutton>Export</guibutton>. In the Select file for export dialog, specify " -"a path and name for your options file (the type <filename>ini</filename> is " -"automatically appended), and click <guibutton>Save</guibutton>." +"When you have set your options the way you want them, click <guibutton>Export</guibutton>. In the Select file for export dialog, specify a path and " +"name for your options file (the type <filename>ini</filename> is automatically appended), and click <guibutton>Save</guibutton>." msgstr "" -"Dopo aver impostato le opzioni nel modo desiderato, fai clic su <guibutton " -">Esporta</guibutton >.Nella finestra di dialogo Seleziona file per " -"l'esportazione, specifica un percorso e un nome per il tuo file di opzioni " -"(il tipo <filename>ini</filename> verrà aggiunto automaticamente) e fai clic " -"su <guibutton >Salva</guibutton >." +"Dopo aver impostato le opzioni nel modo desiderato, fai clic su <guibutton >Esporta</guibutton >.Nella finestra di dialogo Seleziona file per " +"l'esportazione, specifica un percorso e un nome per il tuo file di opzioni (il tipo <filename>ini</filename> verrà aggiunto automaticamente) e fai " +"clic su <guibutton >Salva</guibutton >." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:124 -msgid "" -"In the generated text <filename>ini</filename> file, each line contains a " -"name-value pair that defines a single option." -msgstr "" -"Nel file di testo <filename>ini</filename> generato, ogni riga contiene una " -"coppia nome-valore che definisce una singola opzione." +msgid "In the generated text <filename>ini</filename> file, each line contains a name-value pair that defines a single option." +msgstr "Nel file di testo <filename>ini</filename> generato, ogni riga contiene una coppia nome-valore che definisce una singola opzione." #. type: Content of: <article><section><title> #: English/Configuration.xml:133 @@ -8593,44 +6463,31 @@ msgstr "scorrimento automatico fino alla prima differenza" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:139 -msgid "" -"Automatically scroll to first difference<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Scorri automaticamente fino alla prima differenza<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Automatically scroll to first difference<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Scorri automaticamente fino alla prima differenza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:147 -msgid "" -"<option>Disabled</option> (default): Compare window opens to the top of the " -"folder or file, with no difference selected." +msgid "<option>Disabled</option> (default): Compare window opens to the top of the folder or file, with no difference selected." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): la finestra di " -"confronto si apre nella parte superiore della cartella o del file, senza " +"<option>Disabilitato</option> (impostazione predefinita): la finestra di confronto si apre nella parte superiore della cartella o del file, senza " "alcuna differenza selezionata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:154 -msgid "" -"<option>Enabled</option>: When it first opens, the Compare window selects " -"the first difference, scrolling to the location if necessary." +msgid "<option>Enabled</option>: When it first opens, the Compare window selects the first difference, scrolling to the location if necessary." msgstr "" -"<option>Abilitato</option>: alla prima apertura, la finestra Confronta " -"seleziona la prima differenza, scorrendo fino alla posizione se necessario." +"<option>Abilitato</option>: alla prima apertura, la finestra Confronta seleziona la prima differenza, scorrendo fino alla posizione se necessario." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:162 msgid "For a folder compare, selects the first different file or folders." -msgstr "" -"Per un confronto di cartelle, seleziona il primo file o le prime cartelle " -"diverse." +msgstr "Per un confronto di cartelle, seleziona il primo file o le prime cartelle diverse." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:169 msgid "For a file compare, selects the first difference block in the files." -msgstr "" -"Per un confronto di file, seleziona il primo blocco di differenza nei file." +msgstr "Per un confronto di file, seleziona il primo blocco di differenza nei file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:181 @@ -8639,33 +6496,24 @@ msgstr "scorrimento automatico fino alla prima differenza in linea" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:180 -msgid "" -"Automatically scroll to first inline difference<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Scorri automaticamente fino alla prima differenza in linea<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Automatically scroll to first inline difference<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Scorri automaticamente fino alla prima differenza in linea<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:188 msgid "" -"<option>Disabled</option> (default): When moving to a difference block, does " -"not automatically scroll to the first inline difference within the lines of " -"text." +"<option>Disabled</option> (default): When moving to a difference block, does not automatically scroll to the first inline difference within the lines " +"of text." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): quando ci si " -"sposta su un blocco di differenze, non scorre automaticamente fino alla " -"prima differenza in linea all'interno delle righe di testo." +"<option>Disabilitato</option> (impostazione predefinita): quando ci si sposta su un blocco di differenze, non scorre automaticamente fino alla prima " +"differenza in linea all'interno delle righe di testo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:194 -msgid "" -"<option>Enabled</option>: When moving to a difference block, automatically " -"scrolls to the first inline difference within the lines of text." +msgid "<option>Enabled</option>: When moving to a difference block, automatically scrolls to the first inline difference within the lines of text." msgstr "" -"<option>Abilitato</option>: quando ci si sposta su un blocco di differenze, " -"scorre automaticamente fino alla prima differenza in linea all'interno delle " -"righe di testo." +"<option>Abilitato</option>: quando ci si sposta su un blocco di differenze, scorre automaticamente fino alla prima differenza in linea all'interno " +"delle righe di testo." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:203 @@ -8674,71 +6522,50 @@ msgstr "chiudere le finestre utilizzando il tasto Esc" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:202 -msgid "" -"Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Chiudi Windows con '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Chiudi Windows con '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:210 msgid "" -"<option>MDI child window or main window</option> (default): Lets you use the " -"<keycap>Esc</keycap> key to close WinMerge windows. Pressing <keycap>Esc</" -"keycap> once closes one window, so with one File Compare window open, it " -"takes three key presses to close WinMerge: first the File Compare window, " -"then the Folder Compare window, and finally the WinMerge window." -msgstr "" -"<option>Finestra secondaria MDI o finestra principale</option> (impostazione " -"predefinita): consente di utilizzare il tasto <keycap>Esc</keycap> per " -"chiudere le finestre WinMerge.Premendo <keycap>Esc</keycap> una volta si " -"chiude una finestra, quindi con una finestra di confronto file aperta, sono " -"necessarie tre pressioni di tasti per chiudere WinMerge: prima la finestra " -"di confronto file, quindi la finestra di confronto cartelle e infine la " +"<option>MDI child window or main window</option> (default): Lets you use the <keycap>Esc</keycap> key to close WinMerge windows. Pressing " +"<keycap>Esc</keycap> once closes one window, so with one File Compare window open, it takes three key presses to close WinMerge: first the File " +"Compare window, then the Folder Compare window, and finally the WinMerge window." +msgstr "" +"<option>Finestra secondaria MDI o finestra principale</option> (impostazione predefinita): consente di utilizzare il tasto <keycap>Esc</keycap> per " +"chiudere le finestre WinMerge.Premendo <keycap>Esc</keycap> una volta si chiude una finestra, quindi con una finestra di confronto file aperta, sono " +"necessarie tre pressioni di tasti per chiudere WinMerge: prima la finestra di confronto file, quindi la finestra di confronto cartelle e infine la " "finestra WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:219 msgid "" -"Note that in the WinMerge command line, the <parameter>-e</parameter> " -"parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> " -"just once." +"Note that in the WinMerge command line, the <parameter>-e</parameter> parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> just " +"once." msgstr "" -"Tieni presente che nella riga di comando di WinMerge, il parametro " -"<parameter>-e</parameter> ti consente di chiudere WinMerge premendo " -"<keycap>Esc</keycap> solo una volta." +"Tieni presente che nella riga di comando di WinMerge, il parametro <parameter>-e</parameter> ti consente di chiudere WinMerge premendo <keycap>Esc</" +"keycap> solo una volta." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:227 -msgid "" -"<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes " -"a child window, but not the last remaining main window." +msgid "<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes a child window, but not the last remaining main window." msgstr "" -"<option>Solo finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> " -"si chiude una finestra secondaria, ma non l'ultima finestra principale " +"<option>Solo finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra secondaria, ma non l'ultima finestra principale " "rimanente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:234 msgid "" -"<option>Close main window if there is on one MDI child window</option>: " -"Pressing <keycap>Esc</keycap> closes a child window, and if there is only " -"one child window, it will also close the main window." +"<option>Close main window if there is on one MDI child window</option>: Pressing <keycap>Esc</keycap> closes a child window, and if there is only one " +"child window, it will also close the main window." msgstr "" -"<option>Chiudi la finestra principale se è presente una finestra secondaria " -"MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra " -"secondaria e, se è presente una sola finestra secondaria, verrà chiusa anche " -"la finestra principale." +"<option>Chiudi la finestra principale se è presente una finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra " +"secondaria e, se è presente una sola finestra secondaria, verrà chiusa anche la finestra principale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:241 -msgid "" -"<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any " -"WinMerge windows." -msgstr "" -"<option>Disabilitato</option>: premendo <keycap>Esc</keycap> non si chiude " -"alcuna finestra WinMerge." +msgid "<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any WinMerge windows." +msgstr "<option>Disabilitato</option>: premendo <keycap>Esc</keycap> non si chiude alcuna finestra WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:249 @@ -8748,32 +6575,23 @@ msgstr "Verifica automaticamente i percorsi nella finestra di dialogo Apri" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:254 msgid "" -"<option>Enabled</option> (default): The Select Files or Folders dialog " -"checks both or all three paths as you enter them. The <guibutton>Compare</" -"guibutton> button remains disabled until both or all three paths are " -"validated. Note that this checking can cause some delay." +"<option>Enabled</option> (default): The Select Files or Folders dialog checks both or all three paths as you enter them. The <guibutton>Compare</" +"guibutton> button remains disabled until both or all three paths are validated. Note that this checking can cause some delay." msgstr "" -"<option>Abilitato</option> (predefinito): la finestra di dialogo Seleziona " -"file o cartelle controlla entrambi o tutti e tre i percorsi quando li " -"inserisci.Il pulsante <guibutton >Confronta</guibutton > rimane disabilitato " -"finché entrambi o tutti e tre i percorsi non vengono convalidati.Tieni " +"<option>Abilitato</option> (predefinito): la finestra di dialogo Seleziona file o cartelle controlla entrambi o tutti e tre i percorsi quando li " +"inserisci.Il pulsante <guibutton >Confronta</guibutton > rimane disabilitato finché entrambi o tutti e tre i percorsi non vengono convalidati.Tieni " "presente che questo controllo può causare qualche ritardo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:264 msgid "" -"<option>Disabled</option>: The <guibutton>Compare</guibutton> button in the " -"Select Files or Folders dialog is always enabled, and attempts to open any " -"paths you specify. Since there is no delay during validation, this can speed " -"up the selection of paths. However, if the path cannot be opened, an error " -"dialog is displayed." +"<option>Disabled</option>: The <guibutton>Compare</guibutton> button in the Select Files or Folders dialog is always enabled, and attempts to open " +"any paths you specify. Since there is no delay during validation, this can speed up the selection of paths. However, if the path cannot be opened, an " +"error dialog is displayed." msgstr "" -"<option >Disabilitato</option >: il pulsante <guibutton >Confronta</" -"guibutton > nella finestra di dialogo Seleziona file o cartelle è sempre " -"abilitato e tenta di aprire qualsiasi percorso specificato.Poiché non vi è " -"alcun ritardo durante la convalida, ciò può accelerare la selezione dei " -"percorsi.Tuttavia, se non è possibile aprire il percorso, viene visualizzata " -"una finestra di dialogo di errore." +"<option >Disabilitato</option >: il pulsante <guibutton >Confronta</guibutton > nella finestra di dialogo Seleziona file o cartelle è sempre " +"abilitato e tenta di aprire qualsiasi percorso specificato.Poiché non vi è alcun ritardo durante la convalida, ciò può accelerare la selezione dei " +"percorsi.Tuttavia, se non è possibile aprire il percorso, viene visualizzata una finestra di dialogo di errore." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:276 @@ -8783,63 +6601,45 @@ msgstr "Modalità a istanza singola<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:286 msgid "" -"<option>Disabled</option> (default): You can run multiple WinMerge " -"instances. For example, if WinMerge is currently running and you click the " +"<option>Disabled</option> (default): You can run multiple WinMerge instances. For example, if WinMerge is currently running and you click the " "WinMerge desktop shortcut, a new WinMerge window is opened." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): puoi eseguire più " -"istanze WinMerge.Ad esempio, se WinMerge è attualmente in esecuzione e si fa " -"clic sul collegamento WinMerge sul desktop, verrà aperta una nuova finestra " -"WinMerge." +"<option>Disabilitato</option> (impostazione predefinita): puoi eseguire più istanze WinMerge.Ad esempio, se WinMerge è attualmente in esecuzione e si " +"fa clic sul collegamento WinMerge sul desktop, verrà aperta una nuova finestra WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:295 -msgid "" -"<option>Allow only one instance to run</option>: Limits the WinMerge program " -"to one instance:" -msgstr "" -"<option>Consenti l'esecuzione di una sola istanza</option>: limita il " -"programma WinMerge a un'istanza:" +msgid "<option>Allow only one instance to run</option>: Limits the WinMerge program to one instance:" +msgstr "<option>Consenti l'esecuzione di una sola istanza</option>: limita il programma WinMerge a un'istanza:" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:302 msgid "" -"If WinMerge is currently running and you try to start a new instance, no new " -"application window is opened: the current WinMerge window is used instead." +"If WinMerge is currently running and you try to start a new instance, no new application window is opened: the current WinMerge window is used " +"instead." msgstr "" -"Se WinMerge è attualmente in esecuzione e si tenta di avviare una nuova " -"istanza, non viene aperta alcuna nuova finestra dell'applicazione: viene " +"Se WinMerge è attualmente in esecuzione e si tenta di avviare una nuova istanza, non viene aperta alcuna nuova finestra dell'applicazione: viene " "invece utilizzata la finestra WinMerge corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:310 -msgid "" -"If you start a new instance with paths (for example on the command line), a " -"new Compare window is opened in the existing WinMerge window." +msgid "If you start a new instance with paths (for example on the command line), a new Compare window is opened in the existing WinMerge window." msgstr "" -"Se si avvia una nuova istanza con percorsi (ad esempio sulla riga di " -"comando), viene aperta una nuova finestra Confronta nella finestra WinMerge " +"Se si avvia una nuova istanza con percorsi (ad esempio sulla riga di comando), viene aperta una nuova finestra Confronta nella finestra WinMerge " "esistente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:320 msgid "" -"<option>Allow only one instance; wait for termination</option>: Similar to " -"the \"Allow only one instance to run\" option, this setting restricts " -"WinMerge to a single application window. However, it also ensures that the " -"WinMerge process does not terminate until the application window is closed. " -"This is useful for situations where external applications, like SourceTree, " -"need to wait for WinMerge to finish before they can safely delete temporary " -"files." +"<option>Allow only one instance; wait for termination</option>: Similar to the \"Allow only one instance to run\" option, this setting restricts " +"WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is " +"closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete " +"temporary files." msgstr "" -"<option>Consenti solo un'istanza;attendi la terminazione</option>: simile " -"all'opzione \"Consenti l'esecuzione di una sola istanza\", questa " -"impostazione limita WinMerge a una singola finestra dell'applicazione." -"Tuttavia, garantisce anche che il processo WinMerge non termini fino alla " -"chiusura della finestra dell'applicazione.Ciò è utile per le situazioni in " -"cui le applicazioni esterne, come SourceTree, devono attendere il " -"completamento di WinMerge prima di poter eliminare in sicurezza i file " -"temporanei." +"<option>Consenti solo un'istanza;attendi la terminazione</option>: simile all'opzione \"Consenti l'esecuzione di una sola istanza\", questa " +"impostazione limita WinMerge a una singola finestra dell'applicazione.Tuttavia, garantisce anche che il processo WinMerge non termini fino alla " +"chiusura della finestra dell'applicazione.Ciò è utile per le situazioni in cui le applicazioni esterne, come SourceTree, devono attendere il " +"completamento di WinMerge prima di poter eliminare in sicurezza i file temporanei." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:327 @@ -8849,26 +6649,21 @@ msgstr "Chiedi quando si chiudono più finestre" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:332 msgid "" -"<option>Disabled</option> (default): If you exit WinMerge while multiple " -"Compare windows are open, WinMerge prompts you to confirm whether to close " +"<option>Disabled</option> (default): If you exit WinMerge while multiple Compare windows are open, WinMerge prompts you to confirm whether to close " "all the windows." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): se esci da " -"WinMerge mentre sono aperte più finestre di confronto, WinMerge ti chiede di " +"<option>Disabilitato</option> (impostazione predefinita): se esci da WinMerge mentre sono aperte più finestre di confronto, WinMerge ti chiede di " "confermare se chiudere tutte le finestre." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:340 -msgid "" -"<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there " -"are no pending file changes, WinMerge closes immediately." +msgid "<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there are no pending file changes, WinMerge closes immediately." msgstr "" -"<option >Abilitato</option >: se fai clic su <guibutton >Esci</guibutton > e " -"non ci sono modifiche ai file in sospeso, WinMerge si chiude immediatamente." +"<option >Abilitato</option >: se fai clic su <guibutton >Esci</guibutton > e non ci sono modifiche ai file in sospeso, WinMerge si chiude " +"immediatamente." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:351 English/Configuration.xml:1138 -#: English/Configuration.xml:1245 +#: English/Configuration.xml:351 English/Configuration.xml:1138 English/Configuration.xml:1245 msgid "timestamps" msgstr "timestamp" @@ -8879,33 +6674,21 @@ msgstr "preservando" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:350 -msgid "" -"Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Conserva il tempo del file nel confronto file<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Conserva il tempo del file nel confronto file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:360 -msgid "" -"<option>Disabled</option> (default): If you save changes to a file in " -"WinMerge, the timestamp of the file is updated." -msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): se salvi le " -"modifiche a un file in WinMerge, il timestamp del file viene aggiornato." +msgid "<option>Disabled</option> (default): If you save changes to a file in WinMerge, the timestamp of the file is updated." +msgstr "<option>Disabilitato</option> (impostazione predefinita): se salvi le modifiche a un file in WinMerge, il timestamp del file viene aggiornato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:367 -msgid "" -"<option>Enabled</option>: If you save changes to a file in WinMerge, the " -"timestamp of the file is not changed in your file system." -msgstr "" -"<option>Abilitato</option>: se salvi le modifiche a un file in WinMerge, il " -"timestamp del file non viene modificato nel file system." +msgid "<option>Enabled</option>: If you save changes to a file in WinMerge, the timestamp of the file is not changed in your file system." +msgstr "<option>Abilitato</option>: se salvi le modifiche a un file in WinMerge, il timestamp del file non viene modificato nel file system." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:378 English/Configuration.xml:408 -#: English/Open_paths.xml:38 English/Quick_start.xml:75 +#: English/Configuration.xml:378 English/Configuration.xml:408 English/Open_paths.xml:38 English/Quick_start.xml:75 msgid "Select Files or Folders dialog" msgstr "Seleziona la finestra di dialogo File o Cartelle" @@ -8916,71 +6699,47 @@ msgstr "apertura automatica" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:377 -msgid "" -"Show \"Select Files or Folders\" dialog on startup<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Visualizza la finestra di dialogo \"Seleziona file o cartelle\" " -"all'avvio<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Show \"Select Files or Folders\" dialog on startup<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Visualizza la finestra di dialogo \"Seleziona file o cartelle\" all'avvio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:387 msgid "" -"<option>Disabled</option> (default): The WinMerge window opens when you " -"launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Open</guimenuitem> </menuchoice> to open Select Files or " -"Folders." +"<option>Disabled</option> (default): The WinMerge window opens when you launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Open</guimenuitem> </menuchoice> to open Select Files or Folders." msgstr "" -"<option>Disabilitato</option> (predefinito): la finestra WinMerge si apre " -"quando avvii WinMerge.Devi quindi fare clic su <menuchoice> <guimenu >File</" -"guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice > per aprire " -"Seleziona file o cartelle." +"<option>Disabilitato</option> (predefinito): la finestra WinMerge si apre quando avvii WinMerge.Devi quindi fare clic su <menuchoice> <guimenu >File</" +"guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice > per aprire Seleziona file o cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:398 -msgid "" -"<option>Enabled</option>: The Select Files or Folders dialog opens along " -"with the WinMerge window when you launch WinMerge." -msgstr "" -"<option>Abilitato</option>: la finestra di dialogo Seleziona file o cartelle " -"si apre insieme alla finestra WinMerge quando si avvia WinMerge." +msgid "<option>Enabled</option>: The Select Files or Folders dialog opens along with the WinMerge window when you launch WinMerge." +msgstr "<option>Abilitato</option>: la finestra di dialogo Seleziona file o cartelle si apre insieme alla finestra WinMerge quando si avvia WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:407 -msgid "" -"Close \"Select Files or Folders\" dialog on clicking Compare " -"button<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Chiudi la finestra di dialogo \"Seleziona file o cartelle\" facendo clic sul " -"pulsante Confronta<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Close \"Select Files or Folders\" dialog on clicking Compare button<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Chiudi la finestra di dialogo \"Seleziona file o cartelle\" facendo clic sul pulsante Confronta<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:415 msgid "" -"<option>Disabled</option> (default): When you click <guibutton>Compare</" -"guibutton> button, the Select File or Folders dialog will remain open " -"instead of closing." +"<option>Disabled</option> (default): When you click <guibutton>Compare</guibutton> button, the Select File or Folders dialog will remain open instead " +"of closing." msgstr "" -"<option >Disabilitato</option> (predefinito): quando fai clic sul pulsante " -"<guibutton >Confronta</guibutton >, la finestra di dialogo Seleziona file o " -"cartelle rimarrà aperta invece di chiudersi." +"<option >Disabilitato</option> (predefinito): quando fai clic sul pulsante <guibutton >Confronta</guibutton >, la finestra di dialogo Seleziona file " +"o cartelle rimarrà aperta invece di chiudersi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:421 -msgid "" -"<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button " -"closes the Select Files or Folders dialog." +msgid "<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button closes the Select Files or Folders dialog." msgstr "" -"<option >Abilitato</option >: facendo clic sul pulsante <guibutton " -">Confronta</guibutton > si chiude la finestra di dialogo Seleziona file o " -"cartelle." +"<option >Abilitato</option >: facendo clic sul pulsante <guibutton >Confronta</guibutton > si chiude la finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:429 msgid "Open dialog Auto completion<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Apri la finestra di dialogo Completamento automatico<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgstr "Apri la finestra di dialogo Completamento automatico<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:434 English/Configuration.xml:470 @@ -8989,36 +6748,28 @@ msgstr "Scegli una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:439 -msgid "" -"<guilabel>Disabled</guilabel>: No autocompletion is performed when you enter " -"paths in the Select Files or Folders dialog." +msgid "<guilabel>Disabled</guilabel>: No autocompletion is performed when you enter paths in the Select Files or Folders dialog." msgstr "" -"<guilabel >Disabilitato</guilabel >: non viene eseguito alcun completamento " -"automatico quando inserisci percorsi nella finestra di dialogo Seleziona " +"<guilabel >Disabilitato</guilabel >: non viene eseguito alcun completamento automatico quando inserisci percorsi nella finestra di dialogo Seleziona " "file o cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:447 msgid "" -"<guilabel>From file system</guilabel> (default): Checks paths as you type. " -"It attempts to locate paths in the file system that match the letters you " +"<guilabel>From file system</guilabel> (default): Checks paths as you type. It attempts to locate paths in the file system that match the letters you " "type, and if a matching path is found, completes the path." msgstr "" -"<guilabel >Dal file system</guilabel> (predefinito): controlla i percorsi " -"mentre scrivi.Tenta di individuare i percorsi nel file system che " -"corrispondono alle lettere digitate e, se viene trovato un percorso " -"corrispondente, completa il percorso." +"<guilabel >Dal file system</guilabel> (predefinito): controlla i percorsi mentre scrivi.Tenta di individuare i percorsi nel file system che " +"corrispondono alle lettere digitate e, se viene trovato un percorso corrispondente, completa il percorso." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:455 msgid "" -"<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the " -"most recently used (MRU) list. This is handy when you have a limited set of " -"paths to compare." +"<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the most recently used (MRU) list. This is handy when you have a limited set " +"of paths to compare." msgstr "" -"<guilabel >Dall'elenco degli usi più recenti</guilabel >: controlla i " -"percorsi solo dall'elenco degli usi più recenti (MRU).Ciò è utile quando hai " -"un insieme limitato di percorsi da confrontare." +"<guilabel >Dall'elenco degli usi più recenti</guilabel >: controlla i percorsi solo dall'elenco degli usi più recenti (MRU).Ciò è utile quando hai un " +"insieme limitato di percorsi da confrontare." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:466 @@ -9028,44 +6779,32 @@ msgstr "Ricarica automatica" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:465 msgid "Auto-reload modified files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Ricarica automaticamente i file modificati<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Ricarica automaticamente i file modificati<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:475 msgid "<guilabel>Disabled</guilabel>: Disables automatic reloading." -msgstr "" -"<guilabel >Disabilitato</guilabel >: disabilita il ricaricamento automatico." +msgstr "<guilabel >Disabilitato</guilabel >: disabilita il ricaricamento automatico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:481 msgid "" -"<guilabel>Only on window activated</guilabel> (default): When the WinMerge " -"window is activated, if the file has been modified, it will reload the " -"file. However, a message box asking if you want to reload the file will be " -"displayed at this time. If you do not want to see this message box, check " -"\"Don't ask this question again\" and press the Yes button." +"<guilabel>Only on window activated</guilabel> (default): When the WinMerge window is activated, if the file has been modified, it will reload the " +"file. However, a message box asking if you want to reload the file will be displayed at this time. If you do not want to see this message box, " +"check \"Don't ask this question again\" and press the Yes button." msgstr "" -"<guilabel >Solo su finestra attivata</guilabel> (predefinito): quando la " -"finestra WinMerge è attivata, se il file è stato modificato, ricaricherà il " -"file.Tuttavia, in questo momento verrà visualizzata una finestra di " -"messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere " -"questa finestra di messaggio, seleziona \"Non fare più questa domanda\" e " -"premi il pulsante Sì." +"<guilabel >Solo su finestra attivata</guilabel> (predefinito): quando la finestra WinMerge è attivata, se il file è stato modificato, ricaricherà il " +"file.Tuttavia, in questo momento verrà visualizzata una finestra di messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere questa " +"finestra di messaggio, seleziona \"Non fare più questa domanda\" e premi il pulsante Sì." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:491 msgid "" -"<guilabel>Immediately</guilabel>: Reloads the file immediately when it has " -"been modified. However, a message box asking if you want to reload the file " -"will be displayed at this time. If you do not want to see this message box, " -"check \"Don't ask this question again\" and press the Yes button." +"<guilabel>Immediately</guilabel>: Reloads the file immediately when it has been modified. However, a message box asking if you want to reload the " +"file will be displayed at this time. If you do not want to see this message box, check \"Don't ask this question again\" and press the Yes button." msgstr "" -"<guilabel >Immediatamente</guilabel >: ricarica immediatamente il file " -"quando è stato modificato.Tuttavia, in questo momento verrà visualizzata una " -"finestra di messaggio che chiede se si desidera ricaricare il file.Se non " -"vuoi vedere questa finestra di messaggio, seleziona \"Non fare più questa " +"<guilabel >Immediatamente</guilabel >: ricarica immediatamente il file quando è stato modificato.Tuttavia, in questo momento verrà visualizzata una " +"finestra di messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere questa finestra di messaggio, seleziona \"Non fare più questa " "domanda\" e premi il pulsante Sì." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -9091,59 +6830,44 @@ msgstr "Confronta >Pagina generale" #. type: Content of: <article><section><para> #: English/Configuration.xml:518 msgid "" -"The options in this page enable you to change some of the ways that WinMerge " -"detects differences, such as comparing only file size, or ignoring some " +"The options in this page enable you to change some of the ways that WinMerge detects differences, such as comparing only file size, or ignoring some " "types of differences, like case." msgstr "" -"Le opzioni in questa pagina ti consentono di modificare alcuni dei modi in " -"cui WinMerge rileva le differenze, ad esempio confrontando solo le " -"dimensioni del file o ignorando alcuni tipi di differenze, come le maiuscole " -"e minuscole." +"Le opzioni in questa pagina ti consentono di modificare alcuni dei modi in cui WinMerge rileva le differenze, ad esempio confrontando solo le " +"dimensioni del file o ignorando alcuni tipi di differenze, come le maiuscole e minuscole." #. type: Content of: <article><section><important><para> #: English/Configuration.xml:525 msgid "" -"Customizing difference detection can be useful during comparisons, when you " -"might not be interested in some differences. However, these options also " -"affect merging. For example, if you ignore whitespace changes, then " -"indentation changes in source code files are not preserved when you merge." +"Customizing difference detection can be useful during comparisons, when you might not be interested in some differences. However, these options also " +"affect merging. For example, if you ignore whitespace changes, then indentation changes in source code files are not preserved when you merge." msgstr "" -"La personalizzazione del rilevamento delle differenze può essere utile " -"durante i confronti, quando potresti non essere interessato ad alcune " -"differenze.Tuttavia, queste opzioni influiscono anche sulla fusione.Ad " -"esempio, se ignori le modifiche agli spazi bianchi, le modifiche al rientro " +"La personalizzazione del rilevamento delle differenze può essere utile durante i confronti, quando potresti non essere interessato ad alcune " +"differenze.Tuttavia, queste opzioni influiscono anche sulla fusione.Ad esempio, se ignori le modifiche agli spazi bianchi, le modifiche al rientro " "nei file del codice sorgente non verranno conservate durante l'unione." #. type: Content of: <article><section><important><para> #: English/Configuration.xml:533 msgid "" -"For this reason, before you merge any differences, we strongly recommend " -"resetting the options on this page to their default settings, especially the " -"ignore options. To reset all the options on this page, click the " -"<guibutton>Defaults</guibutton> button." +"For this reason, before you merge any differences, we strongly recommend resetting the options on this page to their default settings, especially the " +"ignore options. To reset all the options on this page, click the <guibutton>Defaults</guibutton> button." msgstr "" -"Per questo motivo, prima di unire eventuali differenze, consigliamo " -"vivamente di ripristinare le opzioni di questa pagina alle impostazioni " -"predefinite, in particolare le opzioni di ignora.Per ripristinare tutte le " -"opzioni in questa pagina, fai clic sul pulsante <guibutton >Predefinite</" +"Per questo motivo, prima di unire eventuali differenze, consigliamo vivamente di ripristinare le opzioni di questa pagina alle impostazioni " +"predefinite, in particolare le opzioni di ignora.Per ripristinare tutte le opzioni in questa pagina, fai clic sul pulsante <guibutton >Predefinite</" "guibutton >." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:542 msgid "About ignore options<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Informazioni sulle opzioni di ignora<placeholder type=\"indexterm\" id=\"0\"/" -">" +msgstr "Informazioni sulle opzioni di ignora<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:548 msgid "" -"A number of options in the Compare page (described later in this section) " -"enable you to ignore certain differences. Ignored differences are treated in " -"special ways in WinMerge:" +"A number of options in the Compare page (described later in this section) enable you to ignore certain differences. Ignored differences are treated " +"in special ways in WinMerge:" msgstr "" -"Numerose opzioni nella pagina Confronta (descritte più avanti in questa " -"sezione) consentono di ignorare alcune differenze.Le differenze ignorate " +"Numerose opzioni nella pagina Confronta (descritte più avanti in questa sezione) consentono di ignorare alcune differenze.Le differenze ignorate " "vengono trattate in modi speciali in WinMerge:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> @@ -9159,17 +6883,12 @@ msgstr "Le differenze ignorate non possono essere unite." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:563 msgid "Ignored differences are not included in difference counts." -msgstr "" -"Le differenze ignorate non vengono incluse nei conteggi delle differenze." +msgstr "Le differenze ignorate non vengono incluse nei conteggi delle differenze." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:568 -msgid "" -"Files containing only ignored differences are marked as identical in a " -"folder comparison." -msgstr "" -"I file contenenti solo differenze ignorate vengono contrassegnati come " -"identici in un confronto di cartelle." +msgid "Files containing only ignored differences are marked as identical in a folder comparison." +msgstr "I file contenenti solo differenze ignorate vengono contrassegnati come identici in un confronto di cartelle." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:578 @@ -9177,11 +6896,9 @@ msgid "whitespaces" msgstr "spazi bianchi" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:580 English/Configuration.xml:690 -#: English/Configuration.xml:745 English/Configuration.xml:774 -#: English/Configuration.xml:798 English/Configuration.xml:1247 -#: English/Configuration.xml:1294 English/Configuration.xml:1318 -#: English/Configuration.xml:1354 English/Configuration.xml:1378 +#: English/Configuration.xml:580 English/Configuration.xml:690 English/Configuration.xml:745 English/Configuration.xml:774 English/Configuration.xml:798 +#: English/Configuration.xml:1247 English/Configuration.xml:1294 English/Configuration.xml:1318 English/Configuration.xml:1354 +#: English/Configuration.xml:1378 msgid "detecting and ignoring differences" msgstr "individuare e ignorare le differenze" @@ -9193,35 +6910,25 @@ msgstr "Spazi bianchi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:585 msgid "" -"Whitespace is the space between words and lines. It is represented in text " -"files by special, nonprinting characters like spaces, tabs, and linefeeds. " -"The significance of whitespace depends on how you want to read or process " -"differences. It might be important to detect all changes in whitespace. " -"Conversely, you might prefer to treat all whitespace the same whether one " -"space, two spaces, an indent, or a tab. And in some structured documents " +"Whitespace is the space between words and lines. It is represented in text files by special, nonprinting characters like spaces, tabs, and linefeeds. " +"The significance of whitespace depends on how you want to read or process differences. It might be important to detect all changes in whitespace. " +"Conversely, you might prefer to treat all whitespace the same whether one space, two spaces, an indent, or a tab. And in some structured documents " "(like comma-separated lists), you might want to disregard all whitespace." msgstr "" -"Lo spazio bianco è lo spazio tra parole e righe.È rappresentato nei file di " -"testo da caratteri speciali, non stampabili come spazi, tabulazioni e " -"avanzamenti di riga.Il significato degli spazi bianchi dipende da come si " -"desidera leggere o elaborare le differenze.Potrebbe essere importante " -"rilevare tutte le modifiche negli spazi bianchi.Al contrario, potresti " -"preferire trattare tutti gli spazi bianchi allo stesso modo: uno spazio, due " -"spazi, un rientro o una tabulazione.E in alcuni documenti strutturati (come " -"gli elenchi separati da virgole), potresti voler ignorare tutti gli spazi " +"Lo spazio bianco è lo spazio tra parole e righe.È rappresentato nei file di testo da caratteri speciali, non stampabili come spazi, tabulazioni e " +"avanzamenti di riga.Il significato degli spazi bianchi dipende da come si desidera leggere o elaborare le differenze.Potrebbe essere importante " +"rilevare tutte le modifiche negli spazi bianchi.Al contrario, potresti preferire trattare tutti gli spazi bianchi allo stesso modo: uno spazio, due " +"spazi, un rientro o una tabulazione.E in alcuni documenti strutturati (come gli elenchi separati da virgole), potresti voler ignorare tutti gli spazi " "bianchi." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:597 msgid "" -"The effects of whitespace on changes within lines are visible only when " -"<option>View line differences</option> is enabled. This is in contrast to " +"The effects of whitespace on changes within lines are visible only when <option>View line differences</option> is enabled. This is in contrast to " "difference blocks, which are always highlighted." msgstr "" -"Gli effetti degli spazi bianchi sulle modifiche all'interno delle righe sono " -"visibili solo quando è abilitata <option>Visualizza differenze di riga</" -"option>.Ciò è in contrasto con i blocchi differenza, che sono sempre " -"evidenziati." +"Gli effetti degli spazi bianchi sulle modifiche all'interno delle righe sono visibili solo quando è abilitata <option>Visualizza differenze di riga</" +"option>.Ciò è in contrasto con i blocchi differenza, che sono sempre evidenziati." #. type: Content of: <article><section><section><example><title> #: English/Configuration.xml:604 @@ -9269,9 +6976,7 @@ msgstr "Nessuno spazio tra le parole:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:624 msgid "You can control whitespace detection by choosing one of these options:" -msgstr "" -"Puoi controllare il rilevamento degli spazi bianchi scegliendo una di queste " -"opzioni:" +msgstr "Puoi controllare il rilevamento degli spazi bianchi scegliendo una di queste opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:630 @@ -9281,14 +6986,11 @@ msgstr "Confrontare" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:634 msgid "" -"All whitespace is compared (default). If you are not sure which option your " -"document requires, this is probably the safest choice. In the example, all " -"lines are detected as different." +"All whitespace is compared (default). If you are not sure which option your document requires, this is probably the safest choice. In the example, " +"all lines are detected as different." msgstr "" -"Tutti gli spazi bianchi vengono confrontati (impostazione predefinita).Se " -"non sei sicuro di quale opzione richieda il tuo documento, questa è " -"probabilmente la scelta più sicura.Nell'esempio, tutte le linee vengono " -"rilevate come diverse." +"Tutti gli spazi bianchi vengono confrontati (impostazione predefinita).Se non sei sicuro di quale opzione richieda il tuo documento, questa è " +"probabilmente la scelta più sicura.Nell'esempio, tutte le linee vengono rilevate come diverse." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:642 @@ -9298,16 +7000,12 @@ msgstr "Ignora il cambiamento" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:646 msgid "" -"Compares differences in whitespace. In the example, the first three lines " -"have different whitespace, but are detected as identical: tabs and multiple " -"are treated as if they are single space. The last line has no whitespace, so " -"the difference is <emphasis>not</emphasis> ignored (in effect, the words in " -"the last two lines are different):" +"Compares differences in whitespace. In the example, the first three lines have different whitespace, but are detected as identical: tabs and multiple " +"are treated as if they are single space. The last line has no whitespace, so the difference is <emphasis>not</emphasis> ignored (in effect, the words " +"in the last two lines are different):" msgstr "" -"Confronta le differenze negli spazi bianchi.Nell'esempio, le prime tre righe " -"hanno spazi diversi, ma vengono rilevate come identiche: tabulazioni e " -"multipli vengono trattati come se fossero spazi singoli.L'ultima riga non ha " -"spazi, quindi la differenza <emphasis>non</emphasis> viene ignorata (in " +"Confronta le differenze negli spazi bianchi.Nell'esempio, le prime tre righe hanno spazi diversi, ma vengono rilevate come identiche: tabulazioni e " +"multipli vengono trattati come se fossero spazi singoli.L'ultima riga non ha spazi, quindi la differenza <emphasis>non</emphasis> viene ignorata (in " "effetti, le parole nelle ultime due righe sono diverse):" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -9318,13 +7016,11 @@ msgstr "Ignora tutto" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:661 msgid "" -"Ignores all whitespace characters, except linefeeds (so lines are detected " -"and preserved in a merge). All lines in the example are detected as " +"Ignores all whitespace characters, except linefeeds (so lines are detected and preserved in a merge). All lines in the example are detected as " "identical." msgstr "" -"Ignora tutti i caratteri di spazio bianco, eccetto gli avanzamenti di riga " -"(quindi le righe vengono rilevate e conservate in un'unione).Tutte le linee " -"nell'esempio vengono rilevate come identiche." +"Ignora tutti i caratteri di spazio bianco, eccetto gli avanzamenti di riga (quindi le righe vengono rilevate e conservate in un'unione).Tutte le " +"linee nell'esempio vengono rilevate come identiche." #. type: Content of: <article><section><section><note><title> #: English/Configuration.xml:670 @@ -9333,24 +7029,18 @@ msgstr "Argomenti correlati" #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:673 -msgid "" -"The effects of whitespace settings on line differences is described in <xref " -"linkend=\"CompareFiles_linediff-highlight\" />." +msgid "The effects of whitespace settings on line differences is described in <xref linkend=\"CompareFiles_linediff-highlight\" />." msgstr "" -"Gli effetti delle impostazioni degli spazi bianchi sulle differenze di riga " -"sono descritti in <xref linkend=\"CompareFiles_linediff-highlight\" />." +"Gli effetti delle impostazioni degli spazi bianchi sulle differenze di riga sono descritti in <xref linkend=\"CompareFiles_linediff-highlight\" />." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:678 msgid "" -"The Options dialog Editor page contains related options that control how " -"whitespace is used to detect breaks between words. See <xref " +"The Options dialog Editor page contains related options that control how whitespace is used to detect breaks between words. See <xref " "linkend=\"Configuration_viewlinediffs\" /> for details." msgstr "" -"La pagina Editor della finestra di dialogo Opzioni contiene opzioni " -"correlate che controllano il modo in cui vengono utilizzati gli spazi " -"bianchi per rilevare le interruzioni tra le parole.Vedi <xref " -"linkend=\"Configuration_viewlinediffs\" /> per i dettagli." +"La pagina Editor della finestra di dialogo Opzioni contiene opzioni correlate che controllano il modo in cui vengono utilizzati gli spazi bianchi per " +"rilevare le interruzioni tra le parole.Vedi <xref linkend=\"Configuration_viewlinediffs\" /> per i dettagli." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:688 @@ -9365,25 +7055,20 @@ msgstr "Ignora le righe vuote<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:697 msgid "" -"<option>Disabled</option> (default): Empty lines in the source files are " -"detected and represented in the File Compare window as blank lines with the " +"<option>Disabled</option> (default): Empty lines in the source files are detected and represented in the File Compare window as blank lines with the " "Deleted Difference colors." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): le righe vuote nei " -"file di origine vengono rilevate e rappresentate nella finestra Confronto " -"file come righe vuote con i colori della differenza eliminata." +"<option>Disabilitato</option> (impostazione predefinita): le righe vuote nei file di origine vengono rilevate e rappresentate nella finestra " +"Confronto file come righe vuote con i colori della differenza eliminata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:705 msgid "" -"<option>Enabled</option>: Empty lines in the source files are ignored. They " -"are represented in the File Compare window as blank lines with the Ignored " -"Difference colors. However the difference cannot be merged." +"<option>Enabled</option>: Empty lines in the source files are ignored. They are represented in the File Compare window as blank lines with the " +"Ignored Difference colors. However the difference cannot be merged." msgstr "" -"<option>Abilitato</option>: le righe vuote nei file di origine vengono " -"ignorate.Sono rappresentati nella finestra Confronto file come righe vuote " -"con i colori della differenza ignorata.Tuttavia la differenza non può essere " -"fusa." +"<option>Abilitato</option>: le righe vuote nei file di origine vengono ignorate.Sono rappresentati nella finestra Confronto file come righe vuote con " +"i colori della differenza ignorata.Tuttavia la differenza non può essere fusa." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:717 @@ -9398,53 +7083,37 @@ msgstr "Ignora maiuscole e minuscole<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:724 msgid "" -"<option>Disabled</option> (default): Comparisons are case-sensitive. For " -"example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and " +"<option>Disabled</option> (default): Comparisons are case-sensitive. For example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and " "<literal>lowercase</literal> are all different." msgstr "" -"<option>Disabilitato</option> (predefinito): i confronti fanno distinzione " -"tra maiuscole e minuscole.Ad esempio, <literal>LowerCase</literal>, " -"<literal>LOWERCASE</literal> e <literal>lowercase</literal> sono tutti " -"diversi." +"<option>Disabilitato</option> (predefinito): i confronti fanno distinzione tra maiuscole e minuscole.Ad esempio, <literal>LowerCase</literal>, " +"<literal>LOWERCASE</literal> e <literal>lowercase</literal> sono tutti diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:733 -msgid "" -"<option>Enabled</option>: Differences between lowercase and uppercase " -"letters are ignored." -msgstr "" -"<option>Abilitato</option>: le differenze tra lettere minuscole e maiuscole " -"vengono ignorate." +msgid "<option>Enabled</option>: Differences between lowercase and uppercase letters are ignored." +msgstr "<option>Abilitato</option>: le differenze tra lettere minuscole e maiuscole vengono ignorate." #. type: Content of: <article><section><section><title><indexterm><see> -#: English/Configuration.xml:743 English/Configuration.xml:849 -#: English/Configuration.xml:2216 English/Configuration.xml:2222 +#: English/Configuration.xml:743 English/Configuration.xml:849 English/Configuration.xml:2216 English/Configuration.xml:2222 msgid "EOL" msgstr "EOL" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:742 -msgid "" -"Ignore carriage return differences (Windows/Unix/Mac)<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Ignora le differenze di ritorno a capo (Windows/Unix/Mac)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Ignore carriage return differences (Windows/Unix/Mac)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ignora le differenze di ritorno a capo (Windows/Unix/Mac)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:752 msgid "" -"<option>Disabled</option> (default): End of line (EOL) style differences are " -"detected. For example, if you compare two lines that have the same contents " -"but different line endings, the lines are considered to be different. When " -"this happens, WinMerge displays a dialog prompting you to confirm whether to " -"detect or ignore the difference." +"<option>Disabled</option> (default): End of line (EOL) style differences are detected. For example, if you compare two lines that have the same " +"contents but different line endings, the lines are considered to be different. When this happens, WinMerge displays a dialog prompting you to confirm " +"whether to detect or ignore the difference." msgstr "" -"<option>Disabilitato</option> (predefinito): vengono rilevate differenze di " -"stile di fine riga (EOL).Ad esempio, se si confrontano due righe che hanno " -"lo stesso contenuto ma terminazioni di riga diverse, le righe vengono " -"considerate diverse.Quando ciò accade, WinMerge visualizza una finestra di " -"dialogo che richiede di confermare se rilevare o ignorare la differenza." +"<option>Disabilitato</option> (predefinito): vengono rilevate differenze di stile di fine riga (EOL).Ad esempio, se si confrontano due righe che " +"hanno lo stesso contenuto ma terminazioni di riga diverse, le righe vengono considerate diverse.Quando ciò accade, WinMerge visualizza una finestra " +"di dialogo che richiede di confermare se rilevare o ignorare la differenza." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:763 @@ -9464,9 +7133,7 @@ msgstr "Ignora i numeri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:781 msgid "<option>Disabled</option> (default): Numeric differences are detected." -msgstr "" -"<option>Disabilitato</option> (predefinito): vengono rilevate differenze " -"numeriche." +msgstr "<option>Disabilitato</option> (predefinito): vengono rilevate differenze numeriche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:787 @@ -9481,26 +7148,20 @@ msgstr "tabella codici" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:795 msgid "Ignore codepage differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Ignora le differenze nella tabella codici<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Ignora le differenze nella tabella codici<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:805 msgid "" -"<option>Disabled</option> (default): File encoding differences are detected. " -"Also, differences between the presence and absence of BOM are detected." +"<option>Disabled</option> (default): File encoding differences are detected. Also, differences between the presence and absence of BOM are detected." msgstr "" -"<option>Disabilitato</option> (predefinito): vengono rilevate le differenze " -"di codifica dei file.Inoltre, vengono rilevate differenze tra la presenza e " -"l'assenza della distinta base." +"<option>Disabilitato</option> (predefinito): vengono rilevate le differenze di codifica dei file.Inoltre, vengono rilevate differenze tra la presenza " +"e l'assenza della distinta base." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:811 msgid "<option>Enabled</option>: File encoding differences are ignored." -msgstr "" -"<option>Abilitato</option>: le differenze di codifica dei file vengono " -"ignorate." +msgstr "<option>Abilitato</option>: le differenze di codifica dei file vengono ignorate." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:822 @@ -9510,31 +7171,22 @@ msgstr "commenti" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:819 msgid "Ignore comment differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Ignora le differenze nei commenti<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ignora le differenze nei commenti<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:829 -msgid "" -"<option>Disabled</option> (default): WinMerge compares comments in code, " -"along with other content." -msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge confronta i commenti " -"nel codice, insieme ad altri contenuti." +msgid "<option>Disabled</option> (default): WinMerge compares comments in code, along with other content." +msgstr "<option>Disabilitato</option> (predefinito): WinMerge confronta i commenti nel codice, insieme ad altri contenuti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:836 msgid "" -"<option>Enabled</option>: This option optimizes comparisons by detecting " -"comments in certain programming language file types (such as C++ and Java), " -"and ignoring them. The detection is based on syntax highlighting, so it has " -"no effect on file types that are not supported by WinMerge." +"<option>Enabled</option>: This option optimizes comparisons by detecting comments in certain programming language file types (such as C++ and Java), " +"and ignoring them. The detection is based on syntax highlighting, so it has no effect on file types that are not supported by WinMerge." msgstr "" -"<option>Abilitato</option>: questa opzione ottimizza i confronti rilevando i " -"commenti in determinati tipi di file del linguaggio di programmazione (come " -"C++ e Java) e ignorandoli.Il rilevamento si basa sull'evidenziazione della " -"sintassi, quindi non ha alcun effetto sui tipi di file non supportati da " -"WinMerge." +"<option>Abilitato</option>: questa opzione ottimizza i confronti rilevando i commenti in determinati tipi di file del linguaggio di programmazione " +"(come C++ e Java) e ignorandoli.Il rilevamento si basa sull'evidenziazione della sintassi, quindi non ha alcun effetto sui tipi di file non " +"supportati da WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:847 @@ -9544,23 +7196,19 @@ msgstr "Ignora l'EOL finale mancante<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:856 msgid "" -"<option>Disabled</option> (default): Differences in the presence or absence " -"of trailing EOL characters are detected as differences, even if the content " -"of the lines matches." +"<option>Disabled</option> (default): Differences in the presence or absence of trailing EOL characters are detected as differences, even if the " +"content of the lines matches." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): le differenze " -"nella presenza o assenza di caratteri EOL finali vengono rilevate come " +"<option>Disabilitato</option> (impostazione predefinita): le differenze nella presenza o assenza di caratteri EOL finali vengono rilevate come " "differenze, anche se il contenuto delle righe corrisponde." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:862 msgid "" -"<option>Enabled</option>: When one file ends with an EOL character (e.g., LF " -"or CRLF) and the other does not, but the line content matches, these " +"<option>Enabled</option>: When one file ends with an EOL character (e.g., LF or CRLF) and the other does not, but the line content matches, these " "differences are ignored." msgstr "" -"<option>Abilitato</option>: quando un file termina con un carattere EOL (ad " -"esempio, LF o CRLF) e l'altro no, ma il contenuto della riga corrisponde, " +"<option>Abilitato</option>: quando un file termina con un carattere EOL (ad esempio, LF o CRLF) e l'altro no, ma il contenuto della riga corrisponde, " "queste differenze vengono ignorate." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -9570,21 +7218,13 @@ msgstr "interruzioni di riga" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:870 -msgid "" -"Ignore line breaks (treat as spaces)<placeholder type=\"indexterm\" id=\"0\"/" -">" -msgstr "" -"Ignora le interruzioni di riga (considera come spazi)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Ignore line breaks (treat as spaces)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ignora le interruzioni di riga (considera come spazi)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:879 -msgid "" -"<option>Disabled</option> (default): Line breaks (EOL characters) are not " -"treated as spaces." -msgstr "" -"<option>Disabilitato</option> (predefinito): le interruzioni di riga " -"(caratteri EOL) non vengono trattate come spazi." +msgid "<option>Disabled</option> (default): Line breaks (EOL characters) are not treated as spaces." +msgstr "<option>Disabilitato</option> (predefinito): le interruzioni di riga (caratteri EOL) non vengono trattate come spazi." #. type: Content of: <article><section><section><itemizedlist><listitem><para><screen> #: English/Configuration.xml:886 @@ -9607,63 +7247,41 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:885 msgid "" -"<option>Enabled</option>: Within a diff hunk, line breaks are treated as " -"spaces. For example, the following difference is ignored: <placeholder " -"type=\"screen\" id=\"0\"/> <note> Useful when combined with whitespace " -"options such as <option>Whitespaces → Ignore change</option> or " +"<option>Enabled</option>: Within a diff hunk, line breaks are treated as spaces. For example, the following difference is ignored: <placeholder " +"type=\"screen\" id=\"0\"/> <note> Useful when combined with whitespace options such as <option>Whitespaces → Ignore change</option> or " "<option>Whitespaces → Ignore all</option>. </note>" msgstr "" -"<option>Abilitato</option>: all'interno di un blocco differenziale, le " -"interruzioni di riga vengono trattate come spazi.Ad esempio, la seguente " -"differenza viene ignorata: <placeholder type=\"screen\" id=\"0\"/> <note> " -"Utile se combinato con opzioni di spazi bianchi come <option>Spazi bianchi → " -"Ignora modifica</option> o <option>Spazi bianchi → Ignora tutto</option>.</" -"note>" +"<option>Abilitato</option>: all'interno di un blocco differenziale, le interruzioni di riga vengono trattate come spazi.Ad esempio, la seguente " +"differenza viene ignorata: <placeholder type=\"screen\" id=\"0\"/> <note> Utile se combinato con opzioni di spazi bianchi come <option>Spazi bianchi " +"→ Ignora modifica</option> o <option>Spazi bianchi → Ignora tutto</option>.</note>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:905 msgid "Enable moved block detection<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Abilita il rilevamento dei blocchi spostati<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Abilita il rilevamento dei blocchi spostati<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:913 -msgid "" -"<option>Disabled</option> (default): WinMerge does not detect when " -"differences are due to moved lines." -msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge non rileva quando le " -"differenze sono dovute allo spostamento delle linee." +#: English/Configuration.xml:913 +msgid "<option>Disabled</option> (default): WinMerge does not detect when differences are due to moved lines." +msgstr "<option>Disabilitato</option> (predefinito): WinMerge non rileva quando le differenze sono dovute allo spostamento delle linee." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:920 msgid "" -"<option>Enabled</option>: WinMerge tries to detect lines that are moved (in " -"different locations in each file). Moved blocks are indicated by the " -"<guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> " -"difference colors. If the Location bar is displayed, corresponding " -"difference locations in the left and right location bars are connected with " -"a line. Showing moved blocks can make it easier to visualize changes in " -"files, if there are not too many." -msgstr "" -"<option>Abilitato</option>: WinMerge tenta di rilevare le righe che vengono " -"spostate (in posizioni diverse in ciascun file).I blocchi spostati sono " -"indicati dalla differenza di colori <guilabel >Spostato</guilabel > e " -"<guilabel >Spostato selezionato </guilabel >.Se viene visualizzata la barra " -"della posizione, le posizioni differenti corrispondenti nelle barre della " -"posizione sinistra e destra sono collegate con una linea.Mostrare i blocchi " -"spostati può rendere più semplice la visualizzazione delle modifiche nei " -"file, se non ce ne sono troppi." +"<option>Enabled</option>: WinMerge tries to detect lines that are moved (in different locations in each file). Moved blocks are indicated by the " +"<guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> difference colors. If the Location bar is displayed, corresponding difference " +"locations in the left and right location bars are connected with a line. Showing moved blocks can make it easier to visualize changes in files, if " +"there are not too many." +msgstr "" +"<option>Abilitato</option>: WinMerge tenta di rilevare le righe che vengono spostate (in posizioni diverse in ciascun file).I blocchi spostati sono " +"indicati dalla differenza di colori <guilabel >Spostato</guilabel > e <guilabel >Spostato selezionato </guilabel >.Se viene visualizzata la barra " +"della posizione, le posizioni differenti corrispondenti nelle barre della posizione sinistra e destra sono collegate con una linea.Mostrare i blocchi " +"spostati può rendere più semplice la visualizzazione delle modifiche nei file, se non ce ne sono troppi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:932 -msgid "" -"For an example, see the Location pane description in <xref " -"linkend=\"Compare_files\" />." -msgstr "" -"Per un esempio, vedi la descrizione del riquadro Posizione in <xref " -"linkend=\"Compare_files\" />." +msgid "For an example, see the Location pane description in <xref linkend=\"Compare_files\" />." +msgstr "Per un esempio, vedi la descrizione del riquadro Posizione in <xref linkend=\"Compare_files\" />." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:942 @@ -9677,35 +7295,24 @@ msgstr "Allinea linee simili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:949 -msgid "" -"<option>Disabled</option> (default): Lines within difference blocks are " -"shown as they occur in the source files." +msgid "<option>Disabled</option> (default): Lines within difference blocks are shown as they occur in the source files." msgstr "" -"<option>Disabilitato</option> (predefinito): le linee all'interno dei " -"blocchi di differenza vengono mostrate così come si presentano nei file di " +"<option>Disabilitato</option> (predefinito): le linee all'interno dei blocchi di differenza vengono mostrate così come si presentano nei file di " "origine." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:956 msgid "" -"<option>Enabled</option>: WinMerge tries to detect lines within a difference " -"blocks that are similar, and adds blank lines in the File panes to align " -"them. This option is most effective when lines are quite similar; less " -"effective if lines are too different." +"<option>Enabled</option>: WinMerge tries to detect lines within a difference blocks that are similar, and adds blank lines in the File panes to align " +"them. This option is most effective when lines are quite similar; less effective if lines are too different." msgstr "" -"<option>Abilitato</option>: WinMerge tenta di rilevare righe simili " -"all'interno di blocchi di differenza e aggiunge righe vuote nei riquadri " -"File per allinearle.Questa opzione è più efficace quando le linee sono " -"abbastanza simili;meno efficace se le linee sono troppo diverse." +"<option>Abilitato</option>: WinMerge tenta di rilevare righe simili all'interno di blocchi di differenza e aggiunge righe vuote nei riquadri File per " +"allinearle.Questa opzione è più efficace quando le linee sono abbastanza simili;meno efficace se le linee sono troppo diverse." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:963 -msgid "" -"For an example, see the <citetitle>Similar lines</citetitle> description in " -"<xref linkend=\"CompareFiles_diffcolors\" />." -msgstr "" -"Per un esempio, vedi la descrizione <citetitle>Righe simili</citetitle> in " -"<xref linkend=\"CompareFiles_diffcolors\" />." +msgid "For an example, see the <citetitle>Similar lines</citetitle> description in <xref linkend=\"CompareFiles_diffcolors\" />." +msgstr "Per un esempio, vedi la descrizione <citetitle>Righe simili</citetitle> in <xref linkend=\"CompareFiles_diffcolors\" />." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:973 @@ -9724,39 +7331,23 @@ msgstr "<option>default</option> (default): l'algoritmo greedy diff di base." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:987 -msgid "" -"<option>minimal</option>: Spend extra time to make sure the smallest " -"possible diff is produced." -msgstr "" -"<option>minimo</option>: dedica più tempo per assicurarti che venga prodotta " -"la differenza più piccola possibile." +msgid "<option>minimal</option>: Spend extra time to make sure the smallest possible diff is produced." +msgstr "<option>minimo</option>: dedica più tempo per assicurarti che venga prodotta la differenza più piccola possibile." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:994 -msgid "" -"<option>patience</option>: Use \"patience diff\" algorithm when generating " -"diff." -msgstr "" -"<option>pazienza</option>: usa l'algoritmo \"pazienza diff\" quando generi " -"diff." +msgid "<option>patience</option>: Use \"patience diff\" algorithm when generating diff." +msgstr "<option>pazienza</option>: usa l'algoritmo \"pazienza diff\" quando generi diff." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1001 -msgid "" -"<option>histogram</option>: This algorithm extends the patience algorithm to " -"\"support low-occurrence common elements\"." -msgstr "" -"<option>istogramma</option>: questo algoritmo estende l'algoritmo della " -"pazienza per \"supportare elementi comuni a bassa frequenza\"." +msgid "<option>histogram</option>: This algorithm extends the patience algorithm to \"support low-occurrence common elements\"." +msgstr "<option>istogramma</option>: questo algoritmo estende l'algoritmo della pazienza per \"supportare elementi comuni a bassa frequenza\"." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1008 -msgid "" -"<option>none</option>: This algorithm does not detect insertions or " -"deletions of lines." -msgstr "" -"<option>nessuno</option>: questo algoritmo non rileva inserimenti o " -"eliminazioni di righe." +msgid "<option>none</option>: This algorithm does not detect insertions or deletions of lines." +msgstr "<option>nessuno</option>: questo algoritmo non rileva inserimenti o eliminazioni di righe." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1018 @@ -9766,19 +7357,16 @@ msgstr "euristica del rientro" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1017 msgid "Enable indent heuristic<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Abilita l'euristica del rientro<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Abilita l'euristica del rientro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1025 msgid "" -"<option>Enabled</option> (default): Enable the heuristic that shifts diff " -"hunk boundaries to make diffs easier to read. It has no effect if the Diff " +"<option>Enabled</option> (default): Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read. It has no effect if the Diff " "algorithm is default." msgstr "" -"<option>Abilitato</option> (predefinito): abilita l'euristica che sposta i " -"confini dei blocchi diff per rendere le differenze più facili da leggere.Non " -"ha alcun effetto se l'algoritmo Diff è predefinito." +"<option>Abilitato</option> (predefinito): abilita l'euristica che sposta i confini dei blocchi diff per rendere le differenze più facili da " +"leggere.Non ha alcun effetto se l'algoritmo Diff è predefinito." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1033 @@ -9792,34 +7380,26 @@ msgstr "eliminare l'evidenziazione delle differenze ignorate" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1041 -msgid "" -"Completely unhighlight the ignored differences<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Deseleziona completamente le differenze ignorate<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Completely unhighlight the ignored differences<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Deseleziona completamente le differenze ignorate<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1049 msgid "" -"<option>Disabled</option> (default): Difference lines ignored by line " -"filters and substitution filters are displayed in the color of Ignored " +"<option>Disabled</option> (default): Difference lines ignored by line filters and substitution filters are displayed in the color of Ignored " "Difference." msgstr "" -"<option>Disabilitato</option> (predefinito): le linee di differenza ignorate " -"dai filtri di linea e dai filtri di sostituzione vengono visualizzate nel " -"colore della Differenza Ignorata." +"<option>Disabilitato</option> (predefinito): le linee di differenza ignorate dai filtri di linea e dai filtri di sostituzione vengono visualizzate " +"nel colore della Differenza Ignorata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1057 msgid "" -"<option>Enabled</option>: Makes the color of the different lines ignored by " -"line filters and substitution filters the same as the color of the identical " -"lines." +"<option>Enabled</option>: Makes the color of the different lines ignored by line filters and substitution filters the same as the color of the " +"identical lines." msgstr "" -"<option>Abilitato</option>: rende il colore delle diverse linee ignorate dai " -"filtri di linea e dai filtri di sostituzione uguale al colore delle linee " -"identiche." +"<option>Abilitato</option>: rende il colore delle diverse linee ignorate dai filtri di linea e dai filtri di sostituzione uguale al colore delle " +"linee identiche." #. type: Content of: <article><section><title> #: English/Configuration.xml:1067 @@ -9838,12 +7418,8 @@ msgstr "Metodo di confronto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1079 -msgid "" -"This option lets you determine how complete your file comparisons are. " -"Choose one of these five choices:" -msgstr "" -"Questa opzione ti consente di determinare quanto sono completi i confronti " -"dei file.Scegli una di queste cinque scelte:" +msgid "This option lets you determine how complete your file comparisons are. Choose one of these five choices:" +msgstr "Questa opzione ti consente di determinare quanto sono completi i confronti dei file.Scegli una di queste cinque scelte:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1085 @@ -9853,15 +7429,11 @@ msgstr "Contenuto completo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1089 msgid "" -"Default: Full comparison of files by content, with all the bells and " -"whistles. This method invokes plugins and uses the diffutils engine for " -"fully accurate differencing and moved block detection. This is the most " -"complete and recommended method." +"Default: Full comparison of files by content, with all the bells and whistles. This method invokes plugins and uses the diffutils engine for fully " +"accurate differencing and moved block detection. This is the most complete and recommended method." msgstr "" -"Impostazione predefinita: confronto completo dei file in base al contenuto, " -"con tutti i fronzoli.Questo metodo richiama plugin e utilizza il motore " -"diffutils per una differenziazione completamente accurata e il rilevamento " -"dei blocchi spostati.Questo è il metodo più completo e consigliato." +"Impostazione predefinita: confronto completo dei file in base al contenuto, con tutti i fronzoli.Questo metodo richiama plugin e utilizza il motore " +"diffutils per una differenziazione completamente accurata e il rilevamento dei blocchi spostati.Questo è il metodo più completo e consigliato." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1098 @@ -9871,25 +7443,19 @@ msgstr "Contenuti rapidi" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1102 msgid "" -"Slimmed-down comparison of files by content. This method uses streamlined " -"file comparison code which skips plugins and moved block detection. This " -"method is faster than <guilabel> Full Contents </guilabel>, because it does " -"not load the files." +"Slimmed-down comparison of files by content. This method uses streamlined file comparison code which skips plugins and moved block detection. This " +"method is faster than <guilabel> Full Contents </guilabel>, because it does not load the files." msgstr "" -"Confronto ridotto dei file in base al contenuto.Questo metodo utilizza un " -"codice di confronto file semplificato che ignora i plug-in e il rilevamento " -"dei blocchi spostati.Questo metodo è più veloce del <guilabel> Contenuto " -"completo </guilabel>, perché non carica i file." +"Confronto ridotto dei file in base al contenuto.Questo metodo utilizza un codice di confronto file semplificato che ignora i plug-in e il rilevamento " +"dei blocchi spostati.Questo metodo è più veloce del <guilabel> Contenuto completo </guilabel>, perché non carica i file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1111 msgid "" -"Its drawback is that line filters are not applied when comparing. For " -"example, this method sees file as different even if line filters are set to " +"Its drawback is that line filters are not applied when comparing. For example, this method sees file as different even if line filters are set to " "ignore all differences in the files." msgstr "" -"Lo svantaggio è che durante il confronto non vengono applicati i filtri di " -"linea.Ad esempio, questo metodo considera il file come diverso anche se i " +"Lo svantaggio è che durante il confronto non vengono applicati i filtri di linea.Ad esempio, questo metodo considera il file come diverso anche se i " "filtri di linea sono impostati per ignorare tutte le differenze nei file." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -9900,23 +7466,16 @@ msgstr "Contenuti binari" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1123 msgid "" -"This method is faster than the Quick contents compare method. However, it " -"does not apply any plugins, line filters, 'Ignore case' option, etc. First, " -"it compares the file sizes, and if they are different, it treats the " -"contents of the file as different without comparing them. If the file sizes " -"match, it simply compares the contents of the file in bytes. No file " -"encoding detection, EOL detection, or binary file detection is performed. " -"This compare method is good for comparing files against backed up files." -msgstr "" -"Questo metodo è più veloce del metodo di confronto rapido dei contenuti." -"Tuttavia, non applica alcun plugin, filtro di linea, opzione 'Ignora " -"maiuscole e minuscole', ecc. Innanzitutto confronta le dimensioni del file " -"e, se sono diverse, tratta i contenuti del file come diversi senza " -"confrontarli.Se le dimensioni del file corrispondono, confronta " -"semplicemente il contenuto del file in byte.Non viene eseguito alcun " -"rilevamento della codifica file, rilevamento EOL o rilevamento file binario." -"Questo metodo di confronto è utile per confrontare i file con i file di cui " -"è stato eseguito il backup." +"This method is faster than the Quick contents compare method. However, it does not apply any plugins, line filters, 'Ignore case' option, etc. First, " +"it compares the file sizes, and if they are different, it treats the contents of the file as different without comparing them. If the file sizes " +"match, it simply compares the contents of the file in bytes. No file encoding detection, EOL detection, or binary file detection is performed. This " +"compare method is good for comparing files against backed up files." +msgstr "" +"Questo metodo è più veloce del metodo di confronto rapido dei contenuti.Tuttavia, non applica alcun plugin, filtro di linea, opzione 'Ignora " +"maiuscole e minuscole', ecc. Innanzitutto confronta le dimensioni del file e, se sono diverse, tratta i contenuti del file come diversi senza " +"confrontarli.Se le dimensioni del file corrispondono, confronta semplicemente il contenuto del file in byte.Non viene eseguito alcun rilevamento " +"della codifica file, rilevamento EOL o rilevamento file binario.Questo metodo di confronto è utile per confrontare i file con i file di cui è stato " +"eseguito il backup." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1137 @@ -9926,12 +7485,10 @@ msgstr "Data di modifica<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1146 msgid "" -"Compares only the modification dates on the files, so it is far faster than " -"either of the contents methods. But obviously, it is only as accurate as the " -"modification dates." +"Compares only the modification dates on the files, so it is far faster than either of the contents methods. But obviously, it is only as accurate as " +"the modification dates." msgstr "" -"Confronta solo le date di modifica sui file, quindi è molto più veloce di " -"entrambi i metodi dei contenuti.Ma ovviamente, è accurato solo quanto lo " +"Confronta solo le date di modifica sui file, quindi è molto più veloce di entrambi i metodi dei contenuti.Ma ovviamente, è accurato solo quanto lo " "sono le date di modifica." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -9941,12 +7498,8 @@ msgstr "Data e dimensione modificate" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1158 -msgid "" -"Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes " -"when dates are identical." -msgstr "" -"Simile a <guilabel >Data modificata</guilabel >, ma controlla anche le " -"dimensioni dei file quando le date sono identiche." +msgid "Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes when dates are identical." +msgstr "Simile a <guilabel >Data modificata</guilabel >, ma controlla anche le dimensioni dei file quando le date sono identiche." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Configuration.xml:1167 @@ -9960,12 +7513,8 @@ msgstr "Dimensioni<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1175 -msgid "" -"Compares only file sizes, so it is fast but not as accurate as the contents " -"methods." -msgstr "" -"Confronta solo le dimensioni dei file, quindi è veloce ma non accurato come " -"i metodi dei contenuti." +msgid "Compares only file sizes, so it is fast but not as accurate as the contents methods." +msgstr "Confronta solo le dimensioni dei file, quindi è veloce ma non accurato come i metodi dei contenuti." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1182 @@ -9975,12 +7524,10 @@ msgstr "Esistenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1186 msgid "" -"Compares only whether files exist on both sides. If a file exists on both " -"the left and right, they are considered identical, without checking " +"Compares only whether files exist on both sides. If a file exists on both the left and right, they are considered identical, without checking " "contents, size, or timestamps." msgstr "" -"Confronta solo se i file esistono su entrambi i lati.Se un file esiste sia a " -"sinistra che a destra, vengono considerati identici, senza controllare " +"Confronta solo se i file esistono su entrambi i lati.Se un file esiste sia a sinistra che a destra, vengono considerati identici, senza controllare " "contenuto, dimensione o timestamp." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -9990,112 +7537,72 @@ msgstr "fermarsi dopo la prima differenza" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1197 -msgid "" -"Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Interrompi dopo la prima differenza<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Interrompi dopo la prima differenza<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1209 -msgid "" -"This option is enabled only when the <guilabel> Quick Contents </guilabel> " -"compare method is selected." -msgstr "" -"Questa opzione è abilitata solo quando è selezionato il metodo di confronto " -"<guilabel > Contenuti rapidi </guilabel >." +msgid "This option is enabled only when the <guilabel> Quick Contents </guilabel> compare method is selected." +msgstr "Questa opzione è abilitata solo quando è selezionato il metodo di confronto <guilabel > Contenuti rapidi </guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1218 -msgid "" -"<option>Disabled</option> (default): WinMerge examines all differences in " -"the files." -msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge esamina tutte le " -"differenze nei file." +msgid "<option>Disabled</option> (default): WinMerge examines all differences in the files." +msgstr "<option>Disabilitato</option> (predefinito): WinMerge esamina tutte le differenze nei file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1225 msgid "" -"<option>Enabled</option>: This option optimizes comparisons by examining " -"files only until the first difference is found, instead always scanning the " +"<option>Enabled</option>: This option optimizes comparisons by examining files only until the first difference is found, instead always scanning the " "entire files." msgstr "" -"<option>Abilitato</option>: questa opzione ottimizza i confronti esaminando " -"i file solo fino a quando non viene trovata la prima differenza, " +"<option>Abilitato</option>: questa opzione ottimizza i confronti esaminando i file solo fino a quando non viene trovata la prima differenza, " "scansionando invece sempre l'intero file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1231 msgid "" -"The drawback is that WinMerge may be unable to identify binary files as " -"binary. This is likely to happen if the first difference is near the " -"beginning of the file. If you know what kind of files you are comparing (for " -"example, which are binary files), this option can be a good way to speed up " -"comparisons. However, don't enable this option if you are not sure what kind " -"of files you are comparing." +"The drawback is that WinMerge may be unable to identify binary files as binary. This is likely to happen if the first difference is near the " +"beginning of the file. If you know what kind of files you are comparing (for example, which are binary files), this option can be a good way to speed " +"up comparisons. However, don't enable this option if you are not sure what kind of files you are comparing." msgstr "" -"Lo svantaggio è che WinMerge potrebbe non essere in grado di identificare i " -"file binari come binari.È probabile che ciò accada se la prima differenza è " -"vicino all'inizio del file.Se sai che tipo di file stai confrontando (ad " -"esempio, quali sono file binari), questa opzione può essere un buon modo per " -"accelerare i confronti.Tuttavia, non abilitare questa opzione se non sei " -"sicuro del tipo di file che stai confrontando." +"Lo svantaggio è che WinMerge potrebbe non essere in grado di identificare i file binari come binari.È probabile che ciò accada se la prima differenza " +"è vicino all'inizio del file.Se sai che tipo di file stai confrontando (ad esempio, quali sono file binari), questa opzione può essere un buon modo " +"per accelerare i confronti.Tuttavia, non abilitare questa opzione se non sei sicuro del tipo di file che stai confrontando." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1244 -msgid "" -"Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Ignora le differenze orarie inferiori a 3 secondi<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ignora le differenze orarie inferiori a 3 secondi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1254 -msgid "" -"<option>Disabled</option> (default): Files with different timestamps are " -"detected as different." -msgstr "" -"<option>Disabilitato</option> (predefinito): i file con timestamp diversi " -"vengono rilevati come diversi." +msgid "<option>Disabled</option> (default): Files with different timestamps are detected as different." +msgstr "<option>Disabilitato</option> (predefinito): i file con timestamp diversi vengono rilevati come diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1261 msgid "" -"<option>Enabled</option>: Sometimes (for example, when you use network " -"shares) small differences in timestamps are not significant. To get more " -"meaningful results in such situations, this option enables you to ignore " -"time differences smaller than three seconds." +"<option>Enabled</option>: Sometimes (for example, when you use network shares) small differences in timestamps are not significant. To get more " +"meaningful results in such situations, this option enables you to ignore time differences smaller than three seconds." msgstr "" -"<option>Abilitato</option>: a volte (ad esempio, quando utilizzi le " -"condivisioni di rete) piccole differenze nei timestamp non sono " -"significative.Per ottenere risultati più significativi in ​​tali situazioni, " -"questa opzione consente di ignorare le differenze orarie inferiori a tre " -"secondi." +"<option>Abilitato</option>: a volte (ad esempio, quando utilizzi le condivisioni di rete) piccole differenze nei timestamp non sono significative.Per " +"ottenere risultati più significativi in ​​tali situazioni, questa opzione consente di ignorare le differenze orarie inferiori a tre secondi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1268 msgid "" -"This option works only with the <guimenuitem> Modified Date </guimenuitem> " -"and <guimenuitem> Modified Date and Size </guimenuitem> compare methods " -"(described in <xref linkend=\"Configuration_compmethod\" />). It has no " -"effect with other methods." +"This option works only with the <guimenuitem> Modified Date </guimenuitem> and <guimenuitem> Modified Date and Size </guimenuitem> compare methods " +"(described in <xref linkend=\"Configuration_compmethod\" />). It has no effect with other methods." msgstr "" -"Questa opzione funziona solo con i metodi di confronto <guimenuitem > Data " -"di modifica </guimenuitem > e <guimenuitem > Data e dimensione di modifica </" -"guimenuitem > (descritti in <xref linkend=\"Configuration_compmethod\" />)." -"Non ha alcun effetto con altri metodi." +"Questa opzione funziona solo con i metodi di confronto <guimenuitem > Data di modifica </guimenuitem > e <guimenuitem > Data e dimensione di modifica " +"</guimenuitem > (descritti in <xref linkend=\"Configuration_compmethod\" />).Non ha alcun effetto con altri metodi." #. type: Content of: <article><section><section><itemizedlist><listitem><warning><para> #: English/Configuration.xml:1281 -msgid "" -"This option should be enabled only when the time difference is detected. " -"Otherwise, it can cause incorrect compare results." +msgid "This option should be enabled only when the time difference is detected. Otherwise, it can cause incorrect compare results." msgstr "" -"Questa opzione dovrebbe essere abilitata solo quando viene rilevata la " -"differenza oraria.In caso contrario, potrebbero verificarsi risultati di " +"Questa opzione dovrebbe essere abilitata solo quando viene rilevata la differenza oraria.In caso contrario, potrebbero verificarsi risultati di " "confronto errati." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -10110,21 +7617,13 @@ msgstr "Includi sottocartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1301 -msgid "" -"<option>Enabled</option> (default): WinMerge doing a recursive comparing and " -"also includes subfolders." -msgstr "" -"<option>Abilitato</option> (predefinito): WinMerge esegue un confronto " -"ricorsivo e include anche le sottocartelle." +msgid "<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders." +msgstr "<option>Abilitato</option> (predefinito): WinMerge esegue un confronto ricorsivo e include anche le sottocartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1307 -msgid "" -"<option>Disabled</option>: WinMerge only comparing the files in the root " -"folder." -msgstr "" -"<option>Disabilitato</option>: WinMerge confronta solo i file nella cartella " -"principale." +msgid "<option>Disabled</option>: WinMerge only comparing the files in the root folder." +msgstr "<option>Disabilitato</option>: WinMerge confronta solo i file nella cartella principale." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1316 @@ -10133,47 +7632,28 @@ msgstr "espandere le sottocartelle" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1315 -msgid "" -"Expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Espandi le sottocartelle dopo il confronto<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Espandi le sottocartelle dopo il confronto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1325 -msgid "" -"<option>Do not expand</option> (default): Subfolders remain collapsed after " -"comparison." -msgstr "" -"<option>Non espandere</option> (impostazione predefinita): le sottocartelle " -"rimangono compresse dopo il confronto." +msgid "<option>Do not expand</option> (default): Subfolders remain collapsed after comparison." +msgstr "<option>Non espandere</option> (impostazione predefinita): le sottocartelle rimangono compresse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1331 -msgid "" -"<option>Expand all subfolders</option>: All subfolders are expanded after " -"comparison." -msgstr "" -"<option>Espandi tutte le sottocartelle</option>: tutte le sottocartelle " -"vengono espanse dopo il confronto." +msgid "<option>Expand all subfolders</option>: All subfolders are expanded after comparison." +msgstr "<option>Espandi tutte le sottocartelle</option>: tutte le sottocartelle vengono espanse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1337 -msgid "" -"<option>Expand different subfolders</option>: Only subfolders with " -"differences are expanded after comparison." -msgstr "" -"<option>Espandi sottocartelle diverse</option>: solo le sottocartelle con " -"differenze vengono espanse dopo il confronto." +msgid "<option>Expand different subfolders</option>: Only subfolders with differences are expanded after comparison." +msgstr "<option>Espandi sottocartelle diverse</option>: solo le sottocartelle con differenze vengono espanse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1343 -msgid "" -"<option>Expand identical subfolders</option>: Only subfolders without " -"differences are expanded after comparison." -msgstr "" -"<option>Espandi sottocartelle identiche</option>: solo le sottocartelle " -"senza differenze vengono espanse dopo il confronto." +msgid "<option>Expand identical subfolders</option>: Only subfolders without differences are expanded after comparison." +msgstr "<option>Espandi sottocartelle identiche</option>: solo le sottocartelle senza differenze vengono espanse dopo il confronto." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1352 @@ -10182,29 +7662,18 @@ msgstr "includere sottocartelle univoche" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1351 -msgid "" -"Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Includi contenuti univoci delle sottocartelle<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Includi contenuti univoci delle sottocartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1361 -msgid "" -"<option>Enabled</option> (default): WinMerge also shows the content from " -"unique subfolders." -msgstr "" -"<option>Abilitato</option> (impostazione predefinita): WinMerge mostra anche " -"il contenuto di sottocartelle univoche." +msgid "<option>Enabled</option> (default): WinMerge also shows the content from unique subfolders." +msgstr "<option>Abilitato</option> (impostazione predefinita): WinMerge mostra anche il contenuto di sottocartelle univoche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1367 -msgid "" -"<option>Disabled</option>: WinMerge ignore unique subfolders when comparing " -"folders." -msgstr "" -"<option>Disabilitato</option>: WinMerge ignora le sottocartelle univoche " -"durante il confronto delle cartelle." +msgid "<option>Disabled</option>: WinMerge ignore unique subfolders when comparing folders." +msgstr "<option>Disabilitato</option>: WinMerge ignora le sottocartelle univoche durante il confronto delle cartelle." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1376 @@ -10218,26 +7687,18 @@ msgstr "Ignora i punti di analisi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1385 -msgid "" -"<option>Disabled</option> (default): Compares the contents of reparse point " -"folders as if they were normal folders." +msgid "<option>Disabled</option> (default): Compares the contents of reparse point folders as if they were normal folders." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): confronta il " -"contenuto delle cartelle dei punti di analisi come se fossero cartelle " -"normali." +"<option>Disabilitato</option> (impostazione predefinita): confronta il contenuto delle cartelle dei punti di analisi come se fossero cartelle normali." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1391 msgid "" -"<option>Enabled</option>: Ignores the contents of folders that are reparse " -"points. For example, C:\\Users\\All Users is a symbolic link to C:" -"\\ProgramData, and enabling this option will skip comparing the C:" -"\\Users\\All Users folder." +"<option>Enabled</option>: Ignores the contents of folders that are reparse points. For example, C:\\Users\\All Users is a symbolic link to C:" +"\\ProgramData, and enabling this option will skip comparing the C:\\Users\\All Users folder." msgstr "" -"<option>Abilitato</option>: ignora il contenuto delle cartelle che sono " -"punti di analisi.Ad esempio, C:\\Users\\All Users è un collegamento " -"simbolico a C:\\ProgramData e l'abilitazione di questa opzione salterà il " -"confronto della cartella C:\\Users\\All Users." +"<option>Abilitato</option>: ignora il contenuto delle cartelle che sono punti di analisi.Ad esempio, C:\\Users\\All Users è un collegamento simbolico " +"a C:\\ProgramData e l'abilitazione di questa opzione salterà il confronto della cartella C:\\Users\\All Users." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1400 @@ -10251,44 +7712,30 @@ msgstr "limite" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1399 -msgid "" -"Switch to quick compare when size exceeds (MB)<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Passa al confronto rapido quando la dimensione supera (MB)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Switch to quick compare when size exceeds (MB)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Passa al confronto rapido quando la dimensione supera (MB)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1409 -msgid "" -"<option>Disabled</option>: Is not active unless the Compare method is set to " -"other than <guilabel>Full Contents</guilabel> compare method." +msgid "<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> compare method." msgstr "" -"<option >Disabilitato</option >: non è attivo a meno che il metodo di " -"confronto non sia impostato su un metodo diverso da <guilabel>Contenuto " +"<option >Disabilitato</option >: non è attivo a meno che il metodo di confronto non sia impostato su un metodo diverso da <guilabel>Contenuto " "completo</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1416 -msgid "" -"<option>Enabled</option>: Is active when the Compare method is set to " -"<guilabel>Full Contents</guilabel> compare method." +msgid "<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> compare method." msgstr "" -"<option >Abilitato</option >: è attivo quando il metodo di confronto è " -"impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel >." +"<option >Abilitato</option >: è attivo quando il metodo di confronto è impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1421 msgid "" -"Threshold size for switching to <guilabel>Quick Contents</guilabel> compare " -"method. When <guilabel>Full Contents</guilabel> compare method is selected, " -"files bigger (in mega bytes) than this value are compared using " -"<guilabel>Quick Contents</guilabel> compare method." +"Threshold size for switching to <guilabel>Quick Contents</guilabel> compare method. When <guilabel>Full Contents</guilabel> compare method is " +"selected, files bigger (in mega bytes) than this value are compared using <guilabel>Quick Contents</guilabel> compare method." msgstr "" -"Dimensione soglia per passare al metodo di confronto <guilabel >Contenuti " -"rapidi</guilabel >.Quando è selezionato il metodo di confronto <guilabel " -">Contenuti completi</guilabel >, i file più grandi (in mega byte) di questo " -"valore vengono confrontati usando il metodo di confronto <guilabel " +"Dimensione soglia per passare al metodo di confronto <guilabel >Contenuti rapidi</guilabel >.Quando è selezionato il metodo di confronto <guilabel " +">Contenuti completi</guilabel >, i file più grandi (in mega byte) di questo valore vengono confrontati usando il metodo di confronto <guilabel " ">Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -10298,48 +7745,36 @@ msgstr "Confronto binario" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1431 -msgid "" -"Switch to binary compare when size exceeds (MB)<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Passa al confronto binario quando la dimensione supera (MB)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Switch to binary compare when size exceeds (MB)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Passa al confronto binario quando la dimensione supera (MB)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1441 msgid "" -"<option>Disabled</option>: Is not active unless the Compare method is set to " -"other than <guilabel>Full Contents</guilabel> and <guilabel>Quick Contents</" -"guilabel> compare method." +"<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> and <guilabel>Quick " +"Contents</guilabel> compare method." msgstr "" -"<option >Disabilitato</option >: non è attivo a meno che il metodo di " -"confronto non sia impostato su un metodo diverso da <guilabel >Contenuti " +"<option >Disabilitato</option >: non è attivo a meno che il metodo di confronto non sia impostato su un metodo diverso da <guilabel >Contenuti " "completi</guilabel > e <guilabel >Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1448 msgid "" -"<option>Enabled</option>: Is active when the Compare method is set to " -"<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " +"<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " "compare method." msgstr "" -"<option >Abilitato</option >: è attivo quando il metodo di confronto è " -"impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel > " -"o <guilabel >Contenuti rapidi</guilabel >." +"<option >Abilitato</option >: è attivo quando il metodo di confronto è impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel > o " +"<guilabel >Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1453 msgid "" -"Threshold size for switching to Binary Contents compare method. When " -"<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " -"compare method is selected, files bigger (in mega bytes) than this value are " -"compared using <guilabel>Binary Contents</guilabel> compare method." +"Threshold size for switching to Binary Contents compare method. When <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " +"compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Binary Contents</guilabel> compare method." msgstr "" -"Dimensione soglia per il passaggio al metodo di confronto dei contenuti " -"binari.Quando è selezionato il metodo di confronto <guilabel >Contenuti " -"completi</guilabel > o <guilabel >Contenuti rapidi</guilabel >, i file più " -"grandi (in mega byte) di questo valore vengono confrontati usando il metodo " -"di confronto <guilabel >Contenuti binari</guilabel >." +"Dimensione soglia per il passaggio al metodo di confronto dei contenuti binari.Quando è selezionato il metodo di confronto <guilabel >Contenuti " +"completi</guilabel > o <guilabel >Contenuti rapidi</guilabel >, i file più grandi (in mega byte) di questo valore vengono confrontati usando il " +"metodo di confronto <guilabel >Contenuti binari</guilabel >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1464 @@ -10353,12 +7788,8 @@ msgstr "Core della CPU da utilizzare<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1469 -msgid "" -"Number of threads which use to comparing. With a negative value WinMerge " -"will use addition of the number of available CPU cores." -msgstr "" -"Numero di thread utilizzati per il confronto.Con un valore negativo WinMerge " -"utilizzerà l'aggiunta del numero di core CPU disponibili." +msgid "Number of threads which use to comparing. With a negative value WinMerge will use addition of the number of available CPU cores." +msgstr "Numero di thread utilizzati per il confronto.Con un valore negativo WinMerge utilizzerà l'aggiunta del numero di core CPU disponibili." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1477 @@ -10367,10 +7798,8 @@ msgstr "espressione del filtro" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1476 -msgid "" -"Additional comparison conditions<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Condizioni di confronto aggiuntive<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Additional comparison conditions<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Condizioni di confronto aggiuntive<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para><screen> #: English/Configuration.xml:1484 @@ -10387,28 +7816,18 @@ msgstr "Data Sinistra = Data Destra" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1482 msgid "" -"Allows specifying additional comparison conditions using filter expressions " -"when comparing folders. For example, even if files are considered identical " -"by the selected comparison method (such as Full Contents), you can add " -"conditions like <placeholder type=\"screen\" id=\"0\"/> or <placeholder " -"type=\"screen\" id=\"1\"/> to require that file modification dates also " -"match. When you click the <guilabel>=</guilabel> button to the right of the " -"input field, a menu appears with items such as <guilabel>Compare Size</" -"guilabel> and <guilabel>Compare Date</guilabel>. Selecting " -"<guilabel>Compare Date</guilabel> automatically inserts " -"<literal>allequal(Date)</literal> into the field." -msgstr "" -"Consente di specificare condizioni di confronto aggiuntive utilizzando " -"espressioni di filtro durante il confronto delle cartelle.Ad esempio, anche " -"se i file sono considerati identici dal metodo di confronto selezionato " -"(come Contenuto completo), puoi aggiungere condizioni come <placeholder " -"type=\"screen\" id=\"0\"/> o <placeholder type=\"screen\" id=\"1\"/> per " -"richiedere che anche le date di modifica del file corrispondano.Quando fai " -"clic sul pulsante <guilabel >=</guilabel > a destra del campo di immissione, " -"appare un menu con elementi come <guilabel >Confronta dimensioni</guilabel > " -"e <guilabel >Confronta data</guilabel >.Selezionando <guilabel >Confronta " -"data</guilabel> si inserisce automaticamente <literal>allequal(Data)</" -"literal> nel campo." +"Allows specifying additional comparison conditions using filter expressions when comparing folders. For example, even if files are considered " +"identical by the selected comparison method (such as Full Contents), you can add conditions like <placeholder type=\"screen\" id=\"0\"/> or " +"<placeholder type=\"screen\" id=\"1\"/> to require that file modification dates also match. When you click the <guilabel>=</guilabel> button to the " +"right of the input field, a menu appears with items such as <guilabel>Compare Size</guilabel> and <guilabel>Compare Date</guilabel>. Selecting " +"<guilabel>Compare Date</guilabel> automatically inserts <literal>allequal(Date)</literal> into the field." +msgstr "" +"Consente di specificare condizioni di confronto aggiuntive utilizzando espressioni di filtro durante il confronto delle cartelle.Ad esempio, anche se " +"i file sono considerati identici dal metodo di confronto selezionato (come Contenuto completo), puoi aggiungere condizioni come <placeholder " +"type=\"screen\" id=\"0\"/> o <placeholder type=\"screen\" id=\"1\"/> per richiedere che anche le date di modifica del file corrispondano.Quando fai " +"clic sul pulsante <guilabel >=</guilabel > a destra del campo di immissione, appare un menu con elementi come <guilabel >Confronta dimensioni</" +"guilabel > e <guilabel >Confronta data</guilabel >.Selezionando <guilabel >Confronta data</guilabel> si inserisce automaticamente " +"<literal>allequal(Data)</literal> nel campo." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1495 @@ -10422,46 +7841,31 @@ msgstr "rilevamento dei movimenti" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1494 -msgid "" -"Rename/move detection<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Rinomina/rilevamento spostamento<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Rename/move detection<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Rinomina/rilevamento spostamento<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1504 -msgid "" -"<option>Disabled</option> (default): WinMerge does not detect renamed or " -"moved files/folders." -msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge non rileva file/" -"cartelle rinominati o spostati." +msgid "<option>Disabled</option> (default): WinMerge does not detect renamed or moved files/folders." +msgstr "<option>Disabilitato</option> (predefinito): WinMerge non rileva file/cartelle rinominati o spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1510 msgid "" -"<option>Rename detection</option>: Detects files or folders with different " -"names but matching detection keys within the same directory. Files/folders " -"are grouped together when they share the same detection key." +"<option>Rename detection</option>: Detects files or folders with different names but matching detection keys within the same directory. Files/" +"folders are grouped together when they share the same detection key." msgstr "" -"<option>Rilevamento ridenominazione</option>: rileva file o cartelle con " -"nomi diversi ma chiavi di rilevamento corrispondenti all'interno della " -"stessa cartella. File/cartelle vengono raggruppati quando condividono la " -"stessa chiave di rilevamento." +"<option>Rilevamento ridenominazione</option>: rileva file o cartelle con nomi diversi ma chiavi di rilevamento corrispondenti all'interno della " +"stessa cartella. File/cartelle vengono raggruppati quando condividono la stessa chiave di rilevamento." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1517 msgid "" -"<option>Rename and move detection</option>: Detects files or folders with " -"different names or in different directories but matching detection keys. " -"This mode detects both renamed items (same directory) and moved items " -"(different directories)." +"<option>Rename and move detection</option>: Detects files or folders with different names or in different directories but matching detection keys. " +"This mode detects both renamed items (same directory) and moved items (different directories)." msgstr "" -"<option>Rinomina e rilevamento spostamento</option>: rileva file o cartelle " -"con nomi diversi o in diverse ma chiavi di rilevamento corrispondenti. " -"Questa modalità rileva sia gli elementi rinominati (stessa cartella) sia gli " -"elementi spostati (cartella diverse)." +"<option>Rinomina e rilevamento spostamento</option>: rileva file o cartelle con nomi diversi o in diverse ma chiavi di rilevamento corrispondenti. " +"Questa modalità rileva sia gli elementi rinominati (stessa cartella) sia gli elementi spostati (cartella diverse)." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1527 @@ -10475,39 +7879,26 @@ msgstr "tasti di rilevamento movimento" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1526 -msgid "" -"Rename/move detection keys<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Rinomina/sposta le chiavi di rilevamento<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Rename/move detection keys<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Rinomina/sposta le chiavi di rilevamento<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1534 msgid "" -"Specifies the filter expression used to generate detection keys for matching " -"files/folders across sides. Items with matching keys are grouped together " -"as potentially renamed or moved items. For example, setting the key to " -"<literal>Size</literal> will group files with the same size, while " -"<literal>Name</literal> will group files with the same filename (useful for " -"detecting moves)." -msgstr "" -"Specifica l'espressione di filtro utilizzata per generare chiavi di " -"rilevamento per la corrispondenza di file/cartelle su tutti i lati.Gli " -"elementi con chiavi corrispondenti vengono raggruppati come elementi " -"potenzialmente rinominati o spostati.Ad esempio, impostando la chiave su " -"<literal>Size</literal> raggrupperà i file con la stessa dimensione, mentre " -"<literal>Name</literal> raggrupperà i file con lo stesso nome (utile per " -"rilevare gli spostamenti)." +"Specifies the filter expression used to generate detection keys for matching files/folders across sides. Items with matching keys are grouped " +"together as potentially renamed or moved items. For example, setting the key to <literal>Size</literal> will group files with the same size, while " +"<literal>Name</literal> will group files with the same filename (useful for detecting moves)." +msgstr "" +"Specifica l'espressione di filtro utilizzata per generare chiavi di rilevamento per la corrispondenza di file/cartelle su tutti i lati.Gli elementi " +"con chiavi corrispondenti vengono raggruppati come elementi potenzialmente rinominati o spostati.Ad esempio, impostando la chiave su <literal>Size</" +"literal> raggrupperà i file con la stessa dimensione, mentre <literal>Name</literal> raggrupperà i file con lo stesso nome (utile per rilevare gli " +"spostamenti)." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1541 -msgid "" -"When you click the <guilabel>=</guilabel> button to the right of the input " -"field, a helper menu appears with common detection key expressions:" +msgid "When you click the <guilabel>=</guilabel> button to the right of the input field, a helper menu appears with common detection key expressions:" msgstr "" -"Quando fai clic sul pulsante <guilabel>=</guilabel> a destra del campo di " -"input, viene visualizzato un menu di supporto con le espressioni chiave di " +"Quando fai clic sul pulsante <guilabel>=</guilabel> a destra del campo di input, viene visualizzato un menu di supporto con le espressioni chiave di " "rilevamento comuni:" #. type: Content of: <article><section><section><section><title> @@ -10522,12 +7913,8 @@ msgstr "Nome" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1552 -msgid "" -"Matches files/folders by name. Useful for detecting files that have been " -"moved to different directories but kept the same name." -msgstr "" -"Abbina file/cartelle per nome. Utile per rilevare file che sono stati " -"spostati in cartelle diverse ma hanno mantenuto lo stesso nome." +msgid "Matches files/folders by name. Useful for detecting files that have been moved to different directories but kept the same name." +msgstr "Abbina file/cartelle per nome. Utile per rilevare file che sono stati spostati in cartelle diverse ma hanno mantenuto lo stesso nome." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1558 @@ -10536,12 +7923,8 @@ msgstr "Nome base (senza estensione)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1561 -msgid "" -"Matches files by name without extension. For example, \"file.txt\" and " -"\"file.doc\" would match." -msgstr "" -"Corrisponde ai file per nome senza estensione.Ad esempio, \"file.txt\" e " -"\"file.doc\" corrisponderebbero." +msgid "Matches files by name without extension. For example, \"file.txt\" and \"file.doc\" would match." +msgstr "Corrisponde ai file per nome senza estensione.Ad esempio, \"file.txt\" e \"file.doc\" corrisponderebbero." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1567 @@ -10551,15 +7934,11 @@ msgstr "Nome Unicode normalizzato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1570 msgid "" -"Inserts <literal>normalizeUnicode(Name, \"NFC\")</literal> which matches " -"files by normalized Unicode filename. Useful for detecting files with " -"equivalent names but different Unicode representations (e.g., composed vs. " -"decomposed characters)." +"Inserts <literal>normalizeUnicode(Name, \"NFC\")</literal> which matches files by normalized Unicode filename. Useful for detecting files with " +"equivalent names but different Unicode representations (e.g., composed vs. decomposed characters)." msgstr "" -"Inserisce <literal>normalizeUnicode(Name, \"NFC\")</literal> che corrisponde " -"ai file in base al nome file Unicode normalizzato.Utile per rilevare file " -"con nomi equivalenti ma diverse rappresentazioni Unicode (ad esempio, " -"caratteri composti e scomposti)." +"Inserisce <literal>normalizeUnicode(Name, \"NFC\")</literal> che corrisponde ai file in base al nome file Unicode normalizzato.Utile per rilevare " +"file con nomi equivalenti ma diverse rappresentazioni Unicode (ad esempio, caratteri composti e scomposti)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1577 @@ -10569,12 +7948,10 @@ msgstr "Percorso relativo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1580 msgid "" -"Matches files by their relative path from the comparison root. Useful for " -"detecting files that have been renamed but maintain their relative directory " -"structure." +"Matches files by their relative path from the comparison root. Useful for detecting files that have been renamed but maintain their relative " +"directory structure." msgstr "" -"Corrisponde ai file in base al percorso relativo dalla radice di confronto. " -"Utile per rilevare file che sono stati rinominati ma che mantengono la " +"Corrisponde ai file in base al percorso relativo dalla radice di confronto. Utile per rilevare file che sono stati rinominati ma che mantengono la " "relativa struttura di cartella." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -10584,12 +7961,8 @@ msgstr "Misurare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1589 -msgid "" -"Matches files by size. Useful for detecting files that have been renamed but " -"have the same size." -msgstr "" -"Corrisponde ai file in base alla dimensione.Utile per rilevare file che sono " -"stati rinominati ma hanno la stessa dimensione." +msgid "Matches files by size. Useful for detecting files that have been renamed but have the same size." +msgstr "Corrisponde ai file in base alla dimensione.Utile per rilevare file che sono stati rinominati ma hanno la stessa dimensione." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1595 @@ -10609,16 +7982,12 @@ msgstr "Hash (MD5)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1607 msgid "" -"Inserts <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>. For " -"folders, matches by name. For files, matches by MD5 hash of content. This " -"is the most accurate method for detecting renamed files, but requires " -"computing MD5 hashes which can be slow for large files." +"Inserts <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>. For folders, matches by name. For files, matches by MD5 hash of content. This is " +"the most accurate method for detecting renamed files, but requires computing MD5 hashes which can be slow for large files." msgstr "" -"Inserisce <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>.Per le " -"cartelle, corrisponde per nome.Per i file, corrisponde all'hash MD5 del " -"contenuto.Questo è il metodo più accurato per rilevare i file rinominati, ma " -"richiede il calcolo degli hash MD5 che può essere lento per i file di grandi " -"dimensioni." +"Inserisce <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>.Per le cartelle, corrisponde per nome.Per i file, corrisponde all'hash MD5 del " +"contenuto.Questo è il metodo più accurato per rilevare i file rinominati, ma richiede il calcolo degli hash MD5 che può essere lento per i file di " +"grandi dimensioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1615 @@ -10628,16 +7997,12 @@ msgstr "Ulteriori proprietà..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1618 msgid "" -"Opens a submenu providing access to Windows file properties such as " -"<literal>System.Author</literal>, <literal>System.Title</literal>, " -"<literal>System.Keywords</literal>, etc. You can use these to match files " -"based on their metadata. The inserted expression will be " +"Opens a submenu providing access to Windows file properties such as <literal>System.Author</literal>, <literal>System.Title</literal>, " +"<literal>System.Keywords</literal>, etc. You can use these to match files based on their metadata. The inserted expression will be " "<literal>if(IsFolder, Name, prop(\"PropertyName\"))</literal>." msgstr "" -"Apre un sottomenu che fornisce accesso alle proprietà dei file Windows come " -"<literal>System.Author</literal>, <literal>System.Title</literal>, " -"<literal>System.Keywords</literal>, ecc. Puoi usarli per abbinare i file in " -"base ai loro metadati.L'espressione inserita sarà <literal>if(IsFolder, " +"Apre un sottomenu che fornisce accesso alle proprietà dei file Windows come <literal>System.Author</literal>, <literal>System.Title</literal>, " +"<literal>System.Keywords</literal>, ecc. Puoi usarli per abbinare i file in base ai loro metadati.L'espressione inserita sarà <literal>if(IsFolder, " "Name, prop(\"PropertyName\"))</literal>." #. type: Content of: <article><section><section><section><title> @@ -10648,12 +8013,10 @@ msgstr "Funzioni di trasformazione delle stringhe" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1631 msgid "" -"The menu includes string transformation functions that can be applied to " -"detection keys. When selected, these functions wrap the current expression " +"The menu includes string transformation functions that can be applied to detection keys. When selected, these functions wrap the current expression " "(or <literal>Name</literal> if empty):" msgstr "" -"Il menu include funzioni di trasformazione delle stringhe che possono essere " -"applicate alle chiavi di rilevamento.Quando selezionate, queste funzioni " +"Il menu include funzioni di trasformazione delle stringhe che possono essere applicate alle chiavi di rilevamento.Quando selezionate, queste funzioni " "racchiudono l'espressione corrente (o <literal>Nome</literal> se vuoto):" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -10664,17 +8027,13 @@ msgstr "Inserisci la funzione replace()" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1640 msgid "" -"Inserts <literal>replace(expression, \"from\", \"to\")</literal> to replace " -"literal text strings in the key. You need to edit the placeholder strings " -"\"from\" and \"to\" to specify what text to search for and what to replace " -"it with. Example: <literal>replace(Name, \".backup\", \"\")</literal> " -"removes \".backup\" from filenames." +"Inserts <literal>replace(expression, \"from\", \"to\")</literal> to replace literal text strings in the key. You need to edit the placeholder " +"strings \"from\" and \"to\" to specify what text to search for and what to replace it with. Example: <literal>replace(Name, \".backup\", \"\")</" +"literal> removes \".backup\" from filenames." msgstr "" -"Inserisce <literal>replace(expression, \"from\", \"to\")</literal> per " -"sostituire le stringhe di testo letterale nella chiave.È necessario " -"modificare le stringhe segnaposto \"da\" e \"a\" per specificare quale testo " -"cercare e con cosa sostituirlo.Esempio: <literal>replace(Name, \".backup\", " -"\"\")</literal> rimuove \".backup\" dai nomi dei file." +"Inserisce <literal>replace(expression, \"from\", \"to\")</literal> per sostituire le stringhe di testo letterale nella chiave.È necessario modificare " +"le stringhe segnaposto \"da\" e \"a\" per specificare quale testo cercare e con cosa sostituirlo.Esempio: <literal>replace(Name, \".backup\", \"\")</" +"literal> rimuove \".backup\" dai nomi dei file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1648 @@ -10684,18 +8043,13 @@ msgstr "Inserisci la funzione regexReplace()" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1651 msgid "" -"Inserts <literal>regexReplace(expression, \"pattern\", \"replacement\")</" -"literal> to replace text using regular expressions. Supports backreferences " -"($1, $2, etc.) in the replacement string. Example: " -"<literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", \"$2\")</literal> removes a " -"leading number and underscore from filenames." +"Inserts <literal>regexReplace(expression, \"pattern\", \"replacement\")</literal> to replace text using regular expressions. Supports backreferences " +"($1, $2, etc.) in the replacement string. Example: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", \"$2\")</literal> removes a leading number and " +"underscore from filenames." msgstr "" -"Inserisce <literal>regexReplace(expression, \"pattern\", \"replacement\")</" -"literal> per sostituire il testo utilizzando le espressioni regolari." -"Supporta i riferimenti all'indietro ($1, $2, ecc.) nella stringa di " -"sostituzione.Esempio: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", " -"\"$2\")</literal> rimuove un numero iniziale e un carattere di " -"sottolineatura dai nomi dei file." +"Inserisce <literal>regexReplace(expression, \"pattern\", \"replacement\")</literal> per sostituire il testo utilizzando le espressioni " +"regolari.Supporta i riferimenti all'indietro ($1, $2, ecc.) nella stringa di sostituzione.Esempio: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", " +"\"$2\")</literal> rimuove un numero iniziale e un carattere di sottolineatura dai nomi dei file." #. type: Content of: <article><section><section><section><title> #: English/Configuration.xml:1661 @@ -10704,12 +8058,8 @@ msgstr "Sostituisci elenchi" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1663 -msgid "" -"The Replace Lists submenu provides access to batch string replacement " -"functionality using external files:" -msgstr "" -"Il sottomenu Sostituisci elenchi fornisce l'accesso alla funzionalità di " -"sostituzione delle stringhe batch utilizzando file esterni:" +msgid "The Replace Lists submenu provides access to batch string replacement functionality using external files:" +msgstr "Il sottomenu Sostituisci elenchi fornisce l'accesso alla funzionalità di sostituzione delle stringhe batch utilizzando file esterni:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1668 @@ -10719,31 +8069,21 @@ msgstr "Crea stringa Sostituisci elenco e inserisci..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1671 msgid "" -"Creates a new tab-separated values (TSV) file with a template for string " -"replacements. The file is stored in <filename>%APPDATA%" -"\\WinMerge\\ReplaceLists</filename> (or " -"<filename>Documents\\WinMerge\\ReplaceLists</filename> depending on your " -"settings). After creation, the file opens in your default text editor and " -"the function <literal>replaceWithList(expression, \"filepath\")</literal> is " -"inserted." -msgstr "" -"Crea un nuovo file di valori separati da tabulazioni (TSV) con un modello " -"per le sostituzioni di stringhe.Il file è archiviato in <filename>%APPDATA%" -"\\WinMerge\\ReplaceLists</filename> (o " -"<filename>Documents\\WinMerge\\ReplaceLists</filename> a seconda delle " -"impostazioni).Dopo la creazione, il file si apre nell'editor di testo " -"predefinito e viene inserita la funzione " -"<literal>replaceWithList(expression, \"filepath\")</literal>." +"Creates a new tab-separated values (TSV) file with a template for string replacements. The file is stored in <filename>%APPDATA%" +"\\WinMerge\\ReplaceLists</filename> (or <filename>Documents\\WinMerge\\ReplaceLists</filename> depending on your settings). After creation, the file " +"opens in your default text editor and the function <literal>replaceWithList(expression, \"filepath\")</literal> is inserted." +msgstr "" +"Crea un nuovo file di valori separati da tabulazioni (TSV) con un modello per le sostituzioni di stringhe.Il file è archiviato in <filename>%APPDATA%" +"\\WinMerge\\ReplaceLists</filename> (o <filename>Documents\\WinMerge\\ReplaceLists</filename> a seconda delle impostazioni).Dopo la creazione, il " +"file si apre nell'editor di testo predefinito e viene inserita la funzione <literal>replaceWithList(expression, \"filepath\")</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1676 msgid "" -"The file format is one replacement per line: <literal>search_string<" -"TAB>replacement_string</literal>. Lines starting with <literal>#</" -"literal> are comments." +"The file format is one replacement per line: <literal>search_string<TAB>replacement_string</literal>. Lines starting with <literal>#</literal> " +"are comments." msgstr "" -"Il formato del file è una sostituzione per riga: <literal>search_string<" -"TAB>replacement_string</literal>.Le righe che iniziano con <literal>#</" +"Il formato del file è una sostituzione per riga: <literal>search_string<TAB>replacement_string</literal>.Le righe che iniziano con <literal>#</" "literal> sono commenti." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para><screen> @@ -10771,26 +8111,18 @@ msgstr "Crea elenco di sostituzione Regex e inserisci..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1692 msgid "" -"Similar to Create String Replace List, but for regular expression " -"replacements. Creates a template file in <filename>%APPDATA%" -"\\WinMerge\\RegexReplaceLists</filename> (or " -"<filename>Documents\\WinMerge\\RegexReplaceLists</filename>). Inserts " +"Similar to Create String Replace List, but for regular expression replacements. Creates a template file in <filename>%APPDATA%" +"\\WinMerge\\RegexReplaceLists</filename> (or <filename>Documents\\WinMerge\\RegexReplaceLists</filename>). Inserts " "<literal>regexReplaceWithList(expression, \"filepath\")</literal>." msgstr "" -"Simile a Crea elenco di sostituzione stringhe, ma per la sostituzione di " -"espressioni regolari.Crea un file modello in <filename>%APPDATA%" -"\\WinMerge\\RegexReplaceLists</filename> (o " -"<filename>Documents\\WinMerge\\RegexReplaceLists</filename>).Inserisce " +"Simile a Crea elenco di sostituzione stringhe, ma per la sostituzione di espressioni regolari.Crea un file modello in <filename>%APPDATA%" +"\\WinMerge\\RegexReplaceLists</filename> (o <filename>Documents\\WinMerge\\RegexReplaceLists</filename>).Inserisce " "<literal>regexReplaceWithList(expression, \"filepath\")</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1697 -msgid "" -"The file format is: <literal>regex_pattern<TAB>replacement</literal> " -"with support for backreferences." -msgstr "" -"Il formato del file è: <literal>regex_pattern<TAB>sostituzione</" -"literal> con supporto per backreference." +msgid "The file format is: <literal>regex_pattern<TAB>replacement</literal> with support for backreferences." +msgstr "Il formato del file è: <literal>regex_pattern<TAB>sostituzione</literal> con supporto per backreference." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para><screen> #: English/Configuration.xml:1701 @@ -10812,36 +8144,26 @@ msgstr "Elenchi di sostituzione stringhe/Elenchi di sostituzione regex" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1712 msgid "" -"These submenus list all TSV files found in the respective ReplaceLists " -"folders. Selecting a file from the list inserts the corresponding " -"<literal>replaceWithList()</literal> or <literal>regexReplaceWithList()</" -"literal> function with the file's path. This allows you to quickly reuse " +"These submenus list all TSV files found in the respective ReplaceLists folders. Selecting a file from the list inserts the corresponding " +"<literal>replaceWithList()</literal> or <literal>regexReplaceWithList()</literal> function with the file's path. This allows you to quickly reuse " "previously created replacement lists." msgstr "" -"Questi sottomenu elencano tutti i file TSV trovati nelle rispettive cartelle " -"replacelists.Selezionando un file dall'elenco si inserisce la corrispondente " -"funzione <literal>replaceWithList()</literal> o " -"<literal>regexReplaceWithList()</literal> con il percorso del file.Ciò " -"consente di riutilizzare rapidamente gli elenchi di sostituzione creati in " -"precedenza." +"Questi sottomenu elencano tutti i file TSV trovati nelle rispettive cartelle replacelists.Selezionando un file dall'elenco si inserisce la " +"corrispondente funzione <literal>replaceWithList()</literal> o <literal>regexReplaceWithList()</literal> con il percorso del file.Ciò consente di " +"riutilizzare rapidamente gli elenchi di sostituzione creati in precedenza." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1721 -msgid "" -"Open String Replace Lists Folder... / Open Regex Replace Lists Folder..." -msgstr "" -"Apri stringa Sostituisci cartella elenchi... / Apri Regex Sostituisci " -"cartella elenchi..." +msgid "Open String Replace Lists Folder... / Open Regex Replace Lists Folder..." +msgstr "Apri stringa Sostituisci cartella elenchi... / Apri Regex Sostituisci cartella elenchi..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1724 msgid "" -"Opens Windows Explorer at the folder where replacement list files are " -"stored, allowing you to manage (edit, delete, organize) your replacement " -"list files directly." +"Opens Windows Explorer at the folder where replacement list files are stored, allowing you to manage (edit, delete, organize) your replacement list " +"files directly." msgstr "" -"Apre Esplora risorse nella cartella in cui sono archiviati i file " -"dell'elenco di sostituzione, consentendo di gestire (modificare, eliminare, " +"Apre Esplora risorse nella cartella in cui sono archiviati i file dell'elenco di sostituzione, consentendo di gestire (modificare, eliminare, " "organizzare) direttamente i file dell'elenco di sostituzione." #. type: Content of: <article><section><section><section><title> @@ -10851,12 +8173,8 @@ msgstr "Normalizzazione del testo" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1735 -msgid "" -"The Text Normalization submenu provides functions to normalize text for more " -"flexible matching:" -msgstr "" -"Il sottomenu Normalizzazione testo fornisce funzioni per normalizzare il " -"testo per una corrispondenza più flessibile:" +msgid "The Text Normalization submenu provides functions to normalize text for more flexible matching:" +msgstr "Il sottomenu Normalizzazione testo fornisce funzioni per normalizzare il testo per una corrispondenza più flessibile:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1740 @@ -10866,17 +8184,12 @@ msgstr "Minuscolo/Maiuscolo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1743 msgid "" -"Inserts <literal>toLower(expression)</literal> or " -"<literal>toUpper(expression)</literal> to convert all characters to " -"lowercase or uppercase. Useful for case-insensitive matching. Example: " -"<literal>toLower(Name)</literal> matches \"File.txt\", \"FILE.TXT\", and " -"\"file.txt\" as identical." +"Inserts <literal>toLower(expression)</literal> or <literal>toUpper(expression)</literal> to convert all characters to lowercase or uppercase. Useful " +"for case-insensitive matching. Example: <literal>toLower(Name)</literal> matches \"File.txt\", \"FILE.TXT\", and \"file.txt\" as identical." msgstr "" -"Inserisce <literal>toLower(expression)</literal> o " -"<literal>toUpper(expression)</literal> per convertire tutti i caratteri in " -"minuscolo o maiuscolo.Utile per la corrispondenza senza distinzione tra " -"maiuscole e minuscole.Esempio: <literal>toLower(Name)</literal> corrisponde " -"a \"File.txt\", \"FILE.TXT\" e \"file.txt\" come identici." +"Inserisce <literal>toLower(expression)</literal> o <literal>toUpper(expression)</literal> per convertire tutti i caratteri in minuscolo o " +"maiuscolo.Utile per la corrispondenza senza distinzione tra maiuscole e minuscole.Esempio: <literal>toLower(Name)</literal> corrisponde a " +"\"File.txt\", \"FILE.TXT\" e \"file.txt\" come identici." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1751 @@ -10886,17 +8199,13 @@ msgstr "Metà larghezza/larghezza intera" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1754 msgid "" -"Inserts <literal>toHalfWidth(expression)</literal> or " -"<literal>toFullWidth(expression)</literal>. Converts between half-width and " -"full-width characters (primarily for Japanese text). Example: " -"<literal>toHalfWidth(Name)</literal> converts \"ファイル\" (full-width " -"katakana) to \"ﾌｧｲﾙ\" (half-width)." +"Inserts <literal>toHalfWidth(expression)</literal> or <literal>toFullWidth(expression)</literal>. Converts between half-width and full-width " +"characters (primarily for Japanese text). Example: <literal>toHalfWidth(Name)</literal> converts \"ファイル\" (full-width katakana) to \"ﾌｧｲﾙ\" " +"(half-width)." msgstr "" -"Inserisce <literal>toHalfWidth(expression)</literal> o " -"<literal>toFullWidth(expression)</literal>.Converte tra caratteri a mezza " -"larghezza e a larghezza intera (principalmente per il testo giapponese)." -"Esempio: <literal>toHalfWidth(Name)</literal> converte \"ファイル" -"\" (katakana a larghezza intera) in \"ﾌｧｲﾙ\" (mezza larghezza)." +"Inserisce <literal>toHalfWidth(expression)</literal> o <literal>toFullWidth(expression)</literal>.Converte tra caratteri a mezza larghezza e a " +"larghezza intera (principalmente per il testo giapponese).Esempio: <literal>toHalfWidth(Name)</literal> converte \"ファイル\" (katakana a larghezza " +"intera) in \"ﾌｧｲﾙ\" (mezza larghezza)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1762 @@ -10906,15 +8215,11 @@ msgstr "Conversione cinese" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1765 msgid "" -"Provides <literal>toSimplifiedChinese(expression)</literal> and " -"<literal>toTraditionalChinese(expression)</literal> functions. Converts " -"between Simplified and Traditional Chinese characters. Useful for matching " -"files with names in different Chinese character sets." +"Provides <literal>toSimplifiedChinese(expression)</literal> and <literal>toTraditionalChinese(expression)</literal> functions. Converts between " +"Simplified and Traditional Chinese characters. Useful for matching files with names in different Chinese character sets." msgstr "" -"Fornisce le funzioni <literal>toSimplifiedChinese(expression)</literal> e " -"<literal>toTraditionalChinese(expression)</literal>.Converte tra caratteri " -"cinesi semplificati e tradizionali.Utile per abbinare file con nomi in " -"diversi set di caratteri cinesi." +"Fornisce le funzioni <literal>toSimplifiedChinese(expression)</literal> e <literal>toTraditionalChinese(expression)</literal>.Converte tra caratteri " +"cinesi semplificati e tradizionali.Utile per abbinare file con nomi in diversi set di caratteri cinesi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1773 @@ -10924,13 +8229,11 @@ msgstr "Conversione giapponese" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1776 msgid "" -"Provides <literal>toHiragana(expression)</literal> and " -"<literal>toKatakana(expression)</literal> functions. Converts between " -"Hiragana and Katakana Japanese characters." +"Provides <literal>toHiragana(expression)</literal> and <literal>toKatakana(expression)</literal> functions. Converts between Hiragana and Katakana " +"Japanese characters." msgstr "" -"Fornisce le funzioni <literal>toHiragana(espressione)</literal> e " -"<literal>toKatakana(espressione)</literal>.Converte tra i caratteri " -"giapponesi Hiragana e Katakana." +"Fornisce le funzioni <literal>toHiragana(espressione)</literal> e <literal>toKatakana(espressione)</literal>.Converte tra i caratteri giapponesi " +"Hiragana e Katakana." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1783 @@ -10940,42 +8243,32 @@ msgstr "Normalizza Unicode" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1786 msgid "" -"Inserts <literal>normalizeUnicode(expression)</literal> which normalizes " -"Unicode text to NFC (Normalization Form Canonical Composition) form. This " -"is useful for matching files whose names may use different Unicode encodings " -"for the same characters (e.g., a single é character vs. e + combining acute " -"accent)." +"Inserts <literal>normalizeUnicode(expression)</literal> which normalizes Unicode text to NFC (Normalization Form Canonical Composition) form. This " +"is useful for matching files whose names may use different Unicode encodings for the same characters (e.g., a single é character vs. e + combining " +"acute accent)." msgstr "" -"Inserisce <literal>normalizeUnicode(expression)</literal> che normalizza il " -"testo Unicode nel formato NFC (Normalization Form Canonical Composition).Ciò " -"è utile per abbinare file i cui nomi possono utilizzare codifiche Unicode " -"diverse per gli stessi caratteri (ad esempio, un singolo carattere é contro " -"e + che combina l'accento acuto)." +"Inserisce <literal>normalizeUnicode(expression)</literal> che normalizza il testo Unicode nel formato NFC (Normalization Form Canonical " +"Composition).Ciò è utile per abbinare file i cui nomi possono utilizzare codifiche Unicode diverse per gli stessi caratteri (ad esempio, un singolo " +"carattere é contro e + che combina l'accento acuto)." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1796 msgid "" -"You can combine multiple keys using the <literal>+</literal> operator with a " -"separator. For example, <literal>Name + \"|\" + Size</literal> will create " -"a composite key combining both filename and size." +"You can combine multiple keys using the <literal>+</literal> operator with a separator. For example, <literal>Name + \"|\" + Size</literal> will " +"create a composite key combining both filename and size." msgstr "" -"Puoi combinare più chiavi utilizzando l'operatore <literal>+</literal> con " -"un separatore.Ad esempio, <literal>Nome + \"|\"+ Size</literal> creerà una " +"Puoi combinare più chiavi utilizzando l'operatore <literal>+</literal> con un separatore.Ad esempio, <literal>Nome + \"|\"+ Size</literal> creerà una " "chiave composita che combina nome file e dimensione." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:1802 msgid "" -"The detection key expression is evaluated for each side of a file/folder " -"comparison to produce a key. Items are grouped when their keys match. For " -"example, with the key <literal>Size</literal>, a file of 1024 bytes on the " -"left and a file of 1024 bytes on the right (even with different names) will " -"be grouped together." +"The detection key expression is evaluated for each side of a file/folder comparison to produce a key. Items are grouped when their keys match. For " +"example, with the key <literal>Size</literal>, a file of 1024 bytes on the left and a file of 1024 bytes on the right (even with different names) " +"will be grouped together." msgstr "" -"L'espressione della chiave di rilevamento viene valutata per ciascun lato di " -"un confronto file/cartella per produrre una chiave.Gli elementi vengono " -"raggruppati quando le relative chiavi corrispondono.Ad esempio, con il tasto " -"<literal>Size</literal>, verranno raggruppati un file di 1024 byte a " +"L'espressione della chiave di rilevamento viene valutata per ciascun lato di un confronto file/cartella per produrre una chiave.Gli elementi vengono " +"raggruppati quando le relative chiavi corrispondono.Ad esempio, con il tasto <literal>Size</literal>, verranno raggruppati un file di 1024 byte a " "sinistra e un file di 1024 byte a destra (anche con nomi diversi)." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -10990,78 +8283,56 @@ msgstr "unire gli elementi spostati" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1811 -msgid "" -"Merge renames and moves<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Unisci rinominazioni e spostamenti<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Merge renames and moves<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Unisci rinominazioni e spostamenti<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1819 msgid "" -"Specifies how renamed and moved items detected by the rename/move detection " -"feature should be merged into single entries in the folder comparison tree." +"Specifies how renamed and moved items detected by the rename/move detection feature should be merged into single entries in the folder comparison " +"tree." msgstr "" -"Specifica il modo in cui gli elementi rinominati e spostati rilevati dalla " -"funzionalità di rilevamento di ridenominazione/spostamento devono essere " +"Specifica il modo in cui gli elementi rinominati e spostati rilevati dalla funzionalità di rilevamento di ridenominazione/spostamento devono essere " "uniti in singole voci nell'albero di confronto delle cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1825 msgid "" -"<option>Disabled</option> (default): Renamed/moved items remain as separate " -"entries in the folder comparison tree. The items are grouped together " -"(indicated by a common group ID), but each side's file/folder is shown " -"separately." +"<option>Disabled</option> (default): Renamed/moved items remain as separate entries in the folder comparison tree. The items are grouped together " +"(indicated by a common group ID), but each side's file/folder is shown separately." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): gli elementi " -"rinominati/spostati rimangono come voci separate nell'albero di confronto " -"delle cartelle.Gli elementi sono raggruppati insieme (indicati da un ID di " -"gruppo comune), ma il file/la cartella di ciascun lato viene visualizzato " +"<option>Disabilitato</option> (impostazione predefinita): gli elementi rinominati/spostati rimangono come voci separate nell'albero di confronto " +"delle cartelle.Gli elementi sono raggruppati insieme (indicati da un ID di gruppo comune), ma il file/la cartella di ciascun lato viene visualizzato " "separatamente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1832 msgid "" -"<option>Merge renames</option>: Items that have been detected as renamed but " -"are in the same directory are merged into a single entry. This simplifies " -"the comparison tree by showing a single item that exists on multiple sides " -"with different names. Items in different directories (moved items) are not " -"merged." +"<option>Merge renames</option>: Items that have been detected as renamed but are in the same directory are merged into a single entry. This " +"simplifies the comparison tree by showing a single item that exists on multiple sides with different names. Items in different directories (moved " +"items) are not merged." msgstr "" -"<option>Unisci rinomina</option>: gli elementi che sono stati rilevati come " -"rinominati ma che si trovano nella stessa cartella vengono uniti in un'unica " -"voce.Ciò semplifica l'albero di confronto mostrando un singolo elemento che " -"esiste su più lati con nomi diversi.Gli elementi in cartella diverse " -"(elementi spostati) non vengono uniti." +"<option>Unisci rinomina</option>: gli elementi che sono stati rilevati come rinominati ma che si trovano nella stessa cartella vengono uniti in " +"un'unica voce.Ciò semplifica l'albero di confronto mostrando un singolo elemento che esiste su più lati con nomi diversi.Gli elementi in cartella " +"diverse (elementi spostati) non vengono uniti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1840 msgid "" -"<option>Merge renames and moves</option>: Both renamed items (same " -"directory, different names) and moved items (different directories) are " -"merged into single entries when detected. This provides the most compact " -"view of renamed and relocated files/folders." +"<option>Merge renames and moves</option>: Both renamed items (same directory, different names) and moved items (different directories) are merged " +"into single entries when detected. This provides the most compact view of renamed and relocated files/folders." msgstr "" -"<option>Unisci rinominazioni e spostamenti</option>: sia gli elementi " -"rinominati (stessa cartella, nomi diversi) che gli elementi spostati " -"(cartella diverse) vengono uniti in singole voci quando rilevati.Ciò " -"fornisce la visualizzazione più compatta di file/cartelle rinominati e " -"riposizionati." +"<option>Unisci rinominazioni e spostamenti</option>: sia gli elementi rinominati (stessa cartella, nomi diversi) che gli elementi spostati (cartella " +"diverse) vengono uniti in singole voci quando rilevati.Ciò fornisce la visualizzazione più compatta di file/cartelle rinominati e riposizionati." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:1848 msgid "" -"Merging only occurs when each side has at most one item in the group and the " -"items satisfy the merge criteria (same directory for renames, or any " -"directory for moves). If multiple files match on one side (ambiguous case), " -"they are not merged." +"Merging only occurs when each side has at most one item in the group and the items satisfy the merge criteria (same directory for renames, or any " +"directory for moves). If multiple files match on one side (ambiguous case), they are not merged." msgstr "" -"L'unione avviene solo quando ciascuna parte ha al massimo un elemento nel " -"gruppo e gli elementi soddisfano i criteri di unione (stessa cartella per le " -"ridenominazioni o qualsiasi cartella per gli spostamenti). Se più file " -"corrispondono su un lato (caso ambiguo), non vengono uniti." +"L'unione avviene solo quando ciascuna parte ha al massimo un elemento nel gruppo e gli elementi soddisfano i criteri di unione (stessa cartella per " +"le ridenominazioni o qualsiasi cartella per gli spostamenti). Se più file corrispondono su un lato (caso ambiguo), non vengono uniti." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:1858 @@ -11071,8 +8342,7 @@ msgstr "file di tabella" #. type: Content of: <article><section><title> #: English/Configuration.xml:1857 msgid "Compare > Table page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronta >Pagina della tabella<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronta >Pagina della tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1862 @@ -11082,15 +8352,11 @@ msgstr "Modelli di file CSV" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1864 msgid "" -"Specifies file name pattern for comma-separated values files to open in " -"table format. To specify multiple items, separate them with a semicolon. " -"By default, *.csv is specified. If you do not want to open the files with " -"the extension .csv in table format. Delete the *.csv." +"Specifies file name pattern for comma-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By " +"default, *.csv is specified. If you do not want to open the files with the extension .csv in table format. Delete the *.csv." msgstr "" -"Specifica il modello del nome file per i file con valori separati da virgole " -"da aprire in formato tabella.Per specificare più elementi, separarli con un " -"punto e virgola.Per impostazione predefinita, è specificato *.csv.Se non " -"desideri aprire i file con estensione .csv in formato tabella.Elimina il " +"Specifica il modello del nome file per i file con valori separati da virgole da aprire in formato tabella.Per specificare più elementi, separarli con " +"un punto e virgola.Per impostazione predefinita, è specificato *.csv.Se non desideri aprire i file con estensione .csv in formato tabella.Elimina il " "file *.csv." #. type: Content of: <article><section><section><title> @@ -11101,16 +8367,12 @@ msgstr "Modelli di file TSV" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1873 msgid "" -"Specifies file name pattern for tab-separated values files to open in table " -"format. To specify multiple items, separate them with a semicolon. By " -"default, *.tsv is specified. If you do not want to open the files with the " -"extension .tsv in table format. Delete the *.tsv." +"Specifies file name pattern for tab-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By " +"default, *.tsv is specified. If you do not want to open the files with the extension .tsv in table format. Delete the *.tsv." msgstr "" -"Specifica il modello del nome file per i file con valori separati da " -"tabulazioni da aprire in formato tabella.Per specificare più elementi, " -"separarli con un punto e virgola.Per impostazione predefinita, è specificato " -"*.tsv.Se non desideri aprire i file con estensione .tsv in formato tabella." -"Eliminare il file *.tsv." +"Specifica il modello del nome file per i file con valori separati da tabulazioni da aprire in formato tabella.Per specificare più elementi, separarli " +"con un punto e virgola.Per impostazione predefinita, è specificato *.tsv.Se non desideri aprire i file con estensione .tsv in formato " +"tabella.Eliminare il file *.tsv." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1880 @@ -11120,13 +8382,11 @@ msgstr "Valori personalizzati separati da delimitatori" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1882 msgid "" -"If you want to open text files, with values separated by characters other " -"than commas or tabs, in tabular format, specify the file name pattern and " +"If you want to open text files, with values separated by characters other than commas or tabs, in tabular format, specify the file name pattern and " "delimiter." msgstr "" -"Se si desidera aprire file di testo, con valori separati da caratteri " -"diversi da virgole o tabulazioni, in formato tabellare, specificare il " -"modello e il delimitatore del nome file." +"Se si desidera aprire file di testo, con valori separati da caratteri diversi da virgole o tabulazioni, in formato tabellare, specificare il modello " +"e il delimitatore del nome file." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1888 @@ -11136,25 +8396,17 @@ msgstr "Consenti i ritorni a capo tra virgolette" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1892 msgid "" -"<option>Enabled</option> (default): If there is a newline character between " -"the quote character and the next quote character, the newline character is " -"treated as part of a value. Enable this option if you want to process CSV/" -"TSV files that contain multiple lines in one field." +"<option>Enabled</option> (default): If there is a newline character between the quote character and the next quote character, the newline character " +"is treated as part of a value. Enable this option if you want to process CSV/TSV files that contain multiple lines in one field." msgstr "" -"<option>Abilitato</option> (predefinito): se c'è un carattere di nuova riga " -"tra il carattere di virgoletta e il carattere di virgoletta successivo, il " -"carattere di nuova riga viene trattato come parte di un valore.Abilita " -"questa opzione se desideri elaborare file CSV/TSV che contengono più righe " +"<option>Abilitato</option> (predefinito): se c'è un carattere di nuova riga tra il carattere di virgoletta e il carattere di virgoletta successivo, " +"il carattere di nuova riga viene trattato come parte di un valore.Abilita questa opzione se desideri elaborare file CSV/TSV che contengono più righe " "in un campo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1901 -msgid "" -"<option>Disabled</option>: Disable the above. Disable this option when " -"opening files with incorrect quotes." -msgstr "" -"<option>Disabilitato</option>: disabilita quanto sopra.Disabilitare questa " -"opzione quando si aprono file con virgolette errate." +msgid "<option>Disabled</option>: Disable the above. Disable this option when opening files with incorrect quotes." +msgstr "<option>Disabilitato</option>: disabilita quanto sopra.Disabilitare questa opzione quando si aprono file con virgolette errate." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1910 @@ -11164,16 +8416,12 @@ msgstr "Carattere di citazione" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1912 msgid "" -"Specifies the character that is treated as quotation marks. Delimiters " -"within the text range enclosed by the characters specified here are treated " -"as part of a value. This field can be empty. To open files in which the " -"quotation marks are mere values, leave it empty or specify a character that " +"Specifies the character that is treated as quotation marks. Delimiters within the text range enclosed by the characters specified here are treated " +"as part of a value. This field can be empty. To open files in which the quotation marks are mere values, leave it empty or specify a character that " "does not exist in the file." msgstr "" -"Specifica il carattere da considerare come virgolette.I delimitatori " -"all'interno dell'intervallo di testo racchiuso dai caratteri qui specificati " -"vengono trattati come parte di un valore.Questo campo può essere vuoto.Per " -"aprire file in cui le virgolette sono semplici valori, lasciarlo vuoto o " +"Specifica il carattere da considerare come virgolette.I delimitatori all'interno dell'intervallo di testo racchiuso dai caratteri qui specificati " +"vengono trattati come parte di un valore.Questo campo può essere vuoto.Per aprire file in cui le virgolette sono semplici valori, lasciarlo vuoto o " "specificare un carattere che non esiste nel file." #. type: Content of: <article><section><title> @@ -11194,16 +8442,12 @@ msgstr "Modelli di file binari<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1930 msgid "" -"Specifies file name patterns for binary files to be opened in the binary " -"compare window. To specify multiple items, separate them with a semicolon. " -"By default, *.bin is specified. If you do not want files with the .bin " -"extension to be opened in the binary compare window, remove *.bin from the " +"Specifies file name patterns for binary files to be opened in the binary compare window. To specify multiple items, separate them with a semicolon. " +"By default, *.bin is specified. If you do not want files with the .bin extension to be opened in the binary compare window, remove *.bin from the " "list." msgstr "" -"Specifica i modelli di nome file per i file binari da aprire nella finestra " -"di confronto binario.Per specificare più elementi, separarli con un punto e " -"virgola.Per impostazione predefinita, è specificato *.bin.Se non desideri " -"che i file con estensione .bin vengano aperti nella finestra di confronto " +"Specifica i modelli di nome file per i file binari da aprire nella finestra di confronto binario.Per specificare più elementi, separarli con un punto " +"e virgola.Per impostazione predefinita, è specificato *.bin.Se non desideri che i file con estensione .bin vengano aperti nella finestra di confronto " "binario, rimuovi *.bin dall'elenco." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -11228,67 +8472,47 @@ msgstr "Qui puoi scegliere:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1949 -msgid "" -"The number of bytes to display per line of hexdump (only applies if "" -"Automatically adjust number of bytes per line" is disabled)" -msgstr "" -"Il numero di byte da visualizzare per riga di hexdump (si applica solo se " -"\"Regola automaticamente il numero di byte per riga\" è disabilitato)" +msgid "The number of bytes to display per line of hexdump (only applies if "Automatically adjust number of bytes per line" is disabled)" +msgstr "Il numero di byte da visualizzare per riga di hexdump (si applica solo se \"Regola automaticamente il numero di byte per riga\" è disabilitato)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1954 msgid "" -"If the "Automatically adjust number of bytes per line"- checkbox " -"is checked, then the number of bytes displayed per hexdump line is adjusted " -"in such a way that the whole window width is used at all times." +"If the "Automatically adjust number of bytes per line"- checkbox is checked, then the number of bytes displayed per hexdump line is " +"adjusted in such a way that the whole window width is used at all times." msgstr "" -"Se la casella \"Regola automaticamente il numero di byte per riga\" - è " -"selezionata, il numero di byte visualizzati per riga esadecimale viene " +"Se la casella \"Regola automaticamente il numero di byte per riga\" - è selezionata, il numero di byte visualizzati per riga esadecimale viene " "regolato in modo tale da utilizzare sempre l'intera larghezza della finestra." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1960 -msgid "" -"The number of digits for the offset length (only applies if "Adjust " -"offset length" is disabled)" -msgstr "" -"Il numero di cifre per la lunghezza dell'offset (si applica solo se \"Regola " -"lunghezza dell'offset\" è disabilitato)" +msgid "The number of digits for the offset length (only applies if "Adjust offset length" is disabled)" +msgstr "Il numero di cifre per la lunghezza dell'offset (si applica solo se \"Regola lunghezza dell'offset\" è disabilitato)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1964 -msgid "" -"If the offset length should be automatically adjusted to that of the maximum " -"offset (enabled) or right-padded with spaces (disabled)" +msgid "If the offset length should be automatically adjusted to that of the maximum offset (enabled) or right-padded with spaces (disabled)" msgstr "" -"Se la lunghezza dell'offset deve essere regolata automaticamente su quella " -"dell'offset massimo (abilitato) o riempita a destra con spazi (disabilitata)" +"Se la lunghezza dell'offset deve essere regolata automaticamente su quella dell'offset massimo (abilitato) o riempita a destra con spazi " +"(disabilitata)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1969 -msgid "" -"How to display the values at the caret position, either as signed or as " -"unsigned integer values" -msgstr "" -"Come visualizzare i valori nella posizione del cursore, come valori interi " -"con segno o senza segno" +msgid "How to display the values at the caret position, either as signed or as unsigned integer values" +msgstr "Come visualizzare i valori nella posizione del cursore, come valori interi con segno o senza segno" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1973 msgid "If read-only mode should be automatically set after opening files." -msgstr "" -"Se la modalità di sola lettura deve essere impostata automaticamente dopo " -"l'apertura dei file." +msgstr "Se la modalità di sola lettura deve essere impostata automaticamente dopo l'apertura dei file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1977 msgid "" -"The name of the text editor that will be called by the " -"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Open in text editor </" -"guimenuitem></menuchoice> command." +"The name of the text editor that will be called by the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Open in text editor </guimenuitem></" +"menuchoice> command." msgstr "" -"Il nome dell'editor di testo che verrà richiamato dal comando <menuchoice " -"><guimenu >Modifica</guimenu ><guimenuitem >Apri nell'editor di testo </" +"Il nome dell'editor di testo che verrà richiamato dal comando <menuchoice ><guimenu >Modifica</guimenu ><guimenuitem >Apri nell'editor di testo </" "guimenuitem ></menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -11299,15 +8523,11 @@ msgstr "Modalità binaria..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1989 msgid "" -"What kind of byte order to use: Either Little-endian, as used in Intel-" -"computers or Big-endian, used for example in computers with a Motorola " -"processor. The difference between these modes is thus: Consider a longword, " -"which is 4 bytes (named A to D) long." +"What kind of byte order to use: Either Little-endian, as used in Intel-computers or Big-endian, used for example in computers with a Motorola " +"processor. The difference between these modes is thus: Consider a longword, which is 4 bytes (named A to D) long." msgstr "" -"Che tipo di ordine dei byte utilizzare: Little-endian, come utilizzato nei " -"computer Intel o Big-endian, utilizzato ad esempio nei computer con " -"processore Motorola.La differenza tra queste modalità è quindi: Considera " -"una parola lunga, che è lunga 4 byte (dai nomi da A a D)." +"Che tipo di ordine dei byte utilizzare: Little-endian, come utilizzato nei computer Intel o Big-endian, utilizzato ad esempio nei computer con " +"processore Motorola.La differenza tra queste modalità è quindi: Considera una parola lunga, che è lunga 4 byte (dai nomi da A a D)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Configuration.xml:1994 @@ -11318,15 +8538,12 @@ msgstr "Parola lunga nel registro del processore = ABCD." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1996 msgid "" -"The least significant bit, which has the value 1, is found in byte \"D\". In " -"a processor register the longword is ordered in this way. If this value is " -"written to a position in memory, then by Intel convention the longword is " -"written in this way, with the growing offsets to the right:" +"The least significant bit, which has the value 1, is found in byte \"D\". In a processor register the longword is ordered in this way. If this value " +"is written to a position in memory, then by Intel convention the longword is written in this way, with the growing offsets to the right:" msgstr "" -"Il bit meno significativo, che ha il valore 1, si trova nel byte \"D\".In un " -"registro del processore la longword è ordinata in questo modo.Se questo " -"valore viene scritto in una posizione in memoria, per convenzione Intel la " -"parola lunga viene scritta in questo modo, con gli offset crescenti a destra:" +"Il bit meno significativo, che ha il valore 1, si trova nel byte \"D\".In un registro del processore la longword è ordinata in questo modo.Se questo " +"valore viene scritto in una posizione in memoria, per convenzione Intel la parola lunga viene scritta in questo modo, con gli offset crescenti a " +"destra:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Configuration.xml:2002 @@ -11336,22 +8553,16 @@ msgstr "Parola lunga in memoria = DCBA." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2004 -msgid "" -"That is, the bytes making up the longword are written in reverse order as " -"they are found in a processor register." -msgstr "" -"Cioè, i byte che compongono la longword vengono scritti in ordine inverso " -"rispetto a come si trovano in un registro del processore." +msgid "That is, the bytes making up the longword are written in reverse order as they are found in a processor register." +msgstr "Cioè, i byte che compongono la longword vengono scritti in ordine inverso rispetto a come si trovano in un registro del processore." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2007 msgid "" -"This means that a file written by a Big-endian machine will contain wrong " -"longword and word values if read by a Little-endian machine without " +"This means that a file written by a Big-endian machine will contain wrong longword and word values if read by a Little-endian machine without " "conversion." msgstr "" -"Ciò significa che un file scritto da una macchina Big-endian conterrà valori " -"longword e parole errati se letto da una macchina Little-endian senza " +"Ciò significa che un file scritto da una macchina Big-endian conterrà valori longword e parole errati se letto da una macchina Little-endian senza " "conversione." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -11362,13 +8573,11 @@ msgstr "Set di caratteri..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2017 msgid "" -"Here you can choose the character set for displaying and writing characters, " -"either ANSI (the Windows character set) or OEM (the DOS character set). The " -"font size in points can also be chosen." +"Here you can choose the character set for displaying and writing characters, either ANSI (the Windows character set) or OEM (the DOS character set). " +"The font size in points can also be chosen." msgstr "" -"Qui puoi scegliere il set di caratteri per visualizzare e scrivere i " -"caratteri, ANSI (il set di caratteri di Windows) o OEM (il set di caratteri " -"di DOS).È possibile scegliere anche la dimensione del carattere in punti." +"Qui puoi scegliere il set di caratteri per visualizzare e scrivere i caratteri, ANSI (il set di caratteri di Windows) o OEM (il set di caratteri di " +"DOS).È possibile scegliere anche la dimensione del carattere in punti." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2029 @@ -11378,8 +8587,7 @@ msgstr "file di immagini" #. type: Content of: <article><section><title> #: English/Configuration.xml:2028 msgid "Compare > Image page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronta >Pagina immagine<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronta >Pagina immagine<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2033 @@ -11389,18 +8597,13 @@ msgstr "Modelli di file di immagine" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2035 msgid "" -"Specifies file name patterns for image files to be opened in the image " -"compare window. To specify multiple items, separate them with a semicolon. " -"By default, the .pdf, .svg, .wmf, and .emf extensions are not in the list. " -"Add them if you want files with these extensions to be displayed in the " +"Specifies file name patterns for image files to be opened in the image compare window. To specify multiple items, separate them with a semicolon. " +"By default, the .pdf, .svg, .wmf, and .emf extensions are not in the list. Add them if you want files with these extensions to be displayed in the " "image compare window." msgstr "" -"Specifica i modelli di nome file per i file di immagine da aprire nella " -"finestra di confronto delle immagini.Per specificare più elementi, separarli " -"con un punto e virgola.Per impostazione predefinita, le estensioni .pdf, ." -"svg, .wmf e .emf non sono nell'elenco.Aggiungili se desideri che i file con " -"queste estensioni vengano visualizzati nella finestra di confronto delle " -"immagini." +"Specifica i modelli di nome file per i file di immagine da aprire nella finestra di confronto delle immagini.Per specificare più elementi, separarli " +"con un punto e virgola.Per impostazione predefinita, le estensioni .pdf, .svg, .wmf e .emf non sono nell'elenco.Aggiungili se desideri che i file con " +"queste estensioni vengano visualizzati nella finestra di confronto delle immagini." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2043 @@ -11410,15 +8613,11 @@ msgstr "Abilita il confronto delle immagini nel confronto delle cartelle" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2045 msgid "" -"When this option is enabled, folder comparisons will compare files that " -"match the specified patterns as images. Metadata differences will be " -"ignored, and a color distance threshold will be applied to determine visual " -"differences between images." +"When this option is enabled, folder comparisons will compare files that match the specified patterns as images. Metadata differences will be " +"ignored, and a color distance threshold will be applied to determine visual differences between images." msgstr "" -"Quando questa opzione è abilitata, i confronti delle cartelle confronteranno " -"i file che corrispondono ai modelli specificati come immagini.Le differenze " -"nei metadati verranno ignorate e verrà applicata una soglia di distanza del " -"colore per determinare le differenze visive tra le immagini." +"Quando questa opzione è abilitata, i confronti delle cartelle confronteranno i file che corrispondono ai modelli specificati come immagini.Le " +"differenze nei metadati verranno ignorate e verrà applicata una soglia di distanza del colore per determinare le differenze visive tra le immagini." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2051 @@ -11427,30 +8626,19 @@ msgstr "Risultato dell'OCR" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2055 -msgid "" -"<option>Text only</option> (default): Shows only the text recognized from " -"the image." -msgstr "" -"<option>Solo testo</option> (impostazione predefinita): mostra solo il testo " -"riconosciuto dall'immagine." +msgid "<option>Text only</option> (default): Shows only the text recognized from the image." +msgstr "<option>Solo testo</option> (impostazione predefinita): mostra solo il testo riconosciuto dall'immagine." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2062 -msgid "" -"<option>Line-by-line position and text</option>: Shows the recognized text " -"line by line with its position in the original image." -msgstr "" -"<option>Posizione e testo riga per riga</option>: mostra il testo " -"riconosciuto riga per riga con la sua posizione nell'immagine originale." +msgid "<option>Line-by-line position and text</option>: Shows the recognized text line by line with its position in the original image." +msgstr "<option>Posizione e testo riga per riga</option>: mostra il testo riconosciuto riga per riga con la sua posizione nell'immagine originale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2069 -msgid "" -"<option>Word-by-word position and text</option>: Shows the recognized text " -"word by word with its position in the original image." +msgid "<option>Word-by-word position and text</option>: Shows the recognized text word by word with its position in the original image." msgstr "" -"<option>Posizione e testo parola per parola</option>: mostra il testo " -"riconosciuto parola per parola con la sua posizione nell'immagine originale." +"<option>Posizione e testo parola per parola</option>: mostra il testo riconosciuto parola per parola con la sua posizione nell'immagine originale." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2080 @@ -11460,102 +8648,68 @@ msgstr "pagine web" #. type: Content of: <article><section><title> #: English/Configuration.xml:2079 msgid "Compare > Webpage page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronta >Pagina della pagina web<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Confronta >Pagina della pagina web<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2086 -msgid "" -"URL pattern to include (Regular expression)<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Pattern URL da includere (espressione regolare)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "URL pattern to include (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Pattern URL da includere (espressione regolare)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2090 msgid "" -"Enter a regular expression in this field to specify the file paths or URLs " -"that should be opened in the webpage compare window. For example, if you " -"enter the regular expression <code>.*\\.html?|https?://.*</code>, files with " -"the .html or .htm extension and URLs starting with http:// or https:// will " -"be opened in the webpage compare window." +"Enter a regular expression in this field to specify the file paths or URLs that should be opened in the webpage compare window. For example, if you " +"enter the regular expression <code>.*\\.html?|https?://.*</code>, files with the .html or .htm extension and URLs starting with http:// or https:// " +"will be opened in the webpage compare window." msgstr "" -"Inserisci un'espressione regolare in questo campo per specificare i percorsi " -"dei file o gli URL che devono essere aperti nella finestra di confronto " -"delle pagine web.Ad esempio, se inserisci l'espressione regolare <code>.*\\." -"html?|https?://.*</code>, i file con estensione .html o .htm e gli URL che " -"iniziano con http:// o https:// verranno aperti nella finestra di confronto " -"delle pagine web." +"Inserisci un'espressione regolare in questo campo per specificare i percorsi dei file o gli URL che devono essere aperti nella finestra di confronto " +"delle pagine web.Ad esempio, se inserisci l'espressione regolare <code>.*\\.html?|https?://.*</code>, i file con estensione .html o .htm e gli URL " +"che iniziano con http:// o https:// verranno aperti nella finestra di confronto delle pagine web." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2098 -msgid "" -"URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Pattern URL da escludere (espressione regolare)<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Pattern URL da escludere (espressione regolare)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2102 msgid "" -"Enter a regular expression to exclude certain file paths or URLs from the " -"Webpage Comparison window. This applies to items that match the \"URL " -"pattern to include\" field. Use this to exclude specific patterns you don't " -"want to include." +"Enter a regular expression to exclude certain file paths or URLs from the Webpage Comparison window. This applies to items that match the \"URL " +"pattern to include\" field. Use this to exclude specific patterns you don't want to include." msgstr "" -"Inserisci un'espressione regolare per escludere determinati percorsi di file " -"o URL dalla finestra Confronto pagine web.Questo vale per gli elementi che " -"corrispondono al campo \"Pattern URL da includere\".Utilizzalo per escludere " -"modelli specifici che non desideri includere." +"Inserisci un'espressione regolare per escludere determinati percorsi di file o URL dalla finestra Confronto pagine web.Questo vale per gli elementi " +"che corrispondono al campo \"Pattern URL da includere\".Utilizzalo per escludere modelli specifici che non desideri includere." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2110 msgid "User data folder location<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Posizione della cartella dei dati utente<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Posizione della cartella dei dati utente<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2116 -msgid "" -"<option>AppData folder</option> (default): Stores cookies, browsing history, " -"and cache data in the %APPDATA%\\WinMerge\\WinWebDiff folder." +msgid "<option>AppData folder</option> (default): Stores cookies, browsing history, and cache data in the %APPDATA%\\WinMerge\\WinWebDiff folder." msgstr "" -"<option>Cartella AppData</option> (impostazione predefinita): archivia " -"cookie, cronologia di navigazione e dati della cache nella cartella %APPDATA%" +"<option>Cartella AppData</option> (impostazione predefinita): archivia cookie, cronologia di navigazione e dati della cache nella cartella %APPDATA%" "\\WinMerge\\WinWebDiff." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2122 msgid "" -"<option>Install folder</option>: Saves data in the WinMerge installation " -"directory, which usually requires administrator permissions to write. This " +"<option>Install folder</option>: Saves data in the WinMerge installation directory, which usually requires administrator permissions to write. This " "is generally not recommended." msgstr "" -"<option>Cartella di installazione</option>: salva i dati nella cartella di " -"installazione di WinMerge, che in genere richiede autorizzazioni di " +"<option>Cartella di installazione</option>: salva i dati nella cartella di installazione di WinMerge, che in genere richiede autorizzazioni di " "amministratore per la scrittura.Questo generalmente non è raccomandato." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2130 -msgid "" -"Separate user data folders for each pane<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Cartelle dei dati utente separate per ciascun riquadro<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Separate user data folders for each pane<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Cartelle dei dati utente separate per ciascun riquadro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2133 -msgid "" -"Creates distinct data folders for each pane, preventing data overlap between " -"them." -msgstr "" -"Crea cartelle di dati distinte per ciascun riquadro, impedendo la " -"sovrapposizione dei dati tra di loro." +msgid "Creates distinct data folders for each pane, preventing data overlap between them." +msgstr "Crea cartelle di dati distinte per ciascun riquadro, impedendo la sovrapposizione dei dati tra di loro." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2140 @@ -11575,43 +8729,32 @@ msgstr "Reset" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2148 msgid "" -"WinMerge allows you to suppress some common message boxes. For example, when " -"two identical files are opened, the message box titled, <guilabel>The files " -"are identical</guilabel>, is normally opened. If you don't want this box to " -"display any more, you can enable (check) the option in that message box to " -"not show the message again." +"WinMerge allows you to suppress some common message boxes. For example, when two identical files are opened, the message box titled, <guilabel>The " +"files are identical</guilabel>, is normally opened. If you don't want this box to display any more, you can enable (check) the option in that message " +"box to not show the message again." msgstr "" -"WinMerge consente di eliminare alcune finestre di messaggio comuni.Ad " -"esempio, quando vengono aperti due file identici, viene normalmente aperta " -"la finestra di messaggio intitolata <guilabel >I file sono identici</" -"guilabel >.Se non vuoi che questa casella venga più visualizzata, puoi " -"abilitare (selezionare) l'opzione in quella finestra di messaggio per non " -"mostrare più il messaggio." +"WinMerge consente di eliminare alcune finestre di messaggio comuni.Ad esempio, quando vengono aperti due file identici, viene normalmente aperta la " +"finestra di messaggio intitolata <guilabel >I file sono identici</guilabel >.Se non vuoi che questa casella venga più visualizzata, puoi abilitare " +"(selezionare) l'opzione in quella finestra di messaggio per non mostrare più il messaggio." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2156 msgid "" -"Later, you might decide that you want to see those messages again. If so, " -"click the <guibutton>Reset</guibutton> button to make the message boxes " +"Later, you might decide that you want to see those messages again. If so, click the <guibutton>Reset</guibutton> button to make the message boxes " "display again." msgstr "" -"Successivamente, potresti decidere di voler rivedere quei messaggi.In tal " -"caso, fai clic sul pulsante <guibutton >Ripristina</guibutton > per " +"Successivamente, potresti decidere di voler rivedere quei messaggi.In tal caso, fai clic sul pulsante <guibutton >Ripristina</guibutton > per " "visualizzare nuovamente le finestre di messaggio." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:2163 msgid "" -"We recommend that you not suppress messages when updating WinMerge to a " -"newer version. The installer enables their display automatically, but if you " -"don't use the installer, then remember to enable message display by using " -"the <guibutton>Reset</guibutton> button." +"We recommend that you not suppress messages when updating WinMerge to a newer version. The installer enables their display automatically, but if you " +"don't use the installer, then remember to enable message display by using the <guibutton>Reset</guibutton> button." msgstr "" -"Ti consigliamo di non eliminare i messaggi durante l'aggiornamento di " -"WinMerge a una versione più recente.Il programma di installazione ne abilita " -"la visualizzazione automaticamente, ma se non usi il programma di " -"installazione, ricordati di abilitare la visualizzazione dei messaggi " -"utilizzando il pulsante <guibutton >Ripristina</guibutton >." +"Ti consigliamo di non eliminare i messaggi durante l'aggiornamento di WinMerge a una versione più recente.Il programma di installazione ne abilita la " +"visualizzazione automaticamente, ma se non usi il programma di installazione, ricordati di abilitare la visualizzazione dei messaggi utilizzando il " +"pulsante <guibutton >Ripristina</guibutton >." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Configuration.xml:2177 English/Configuration.xml:2348 @@ -11641,26 +8784,20 @@ msgstr "Evidenzia la sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2193 msgid "" -"<option>Enabled</option> (default): WinMerge can syntax highlight many " -"programming language and web formats. To see the formats that are supported " -"by default, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Syntax " -"Highlight</guimenuitem> </menuchoice>." +"<option>Enabled</option> (default): WinMerge can syntax highlight many programming language and web formats. To see the formats that are supported by " +"default, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Syntax Highlight</guimenuitem> </menuchoice>." msgstr "" -"<option>Abilitato</option> (predefinito): WinMerge può evidenziare la " -"sintassi di molti linguaggi di programmazione e formati web.Per vedere i " -"formati supportati per impostazione predefinita, fai clic su <menuchoice> " -"<guimenu >Visualizza</guimenu > <guimenuitem >Evidenziazione sintassi</" +"<option>Abilitato</option> (predefinito): WinMerge può evidenziare la sintassi di molti linguaggi di programmazione e formati web.Per vedere i " +"formati supportati per impostazione predefinita, fai clic su <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Evidenziazione sintassi</" "guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2205 msgid "" -"<option>Disabled</option>: Syntax highlighting consumes some processing " -"power, so if WinMerge screen updating seems to be slow, turning off this " +"<option>Disabled</option>: Syntax highlighting consumes some processing power, so if WinMerge screen updating seems to be slow, turning off this " "option might help." msgstr "" -"<option>Disabilitato</option>: l'evidenziazione della sintassi consuma una " -"certa potenza di elaborazione, quindi se l'aggiornamento dello schermo di " +"<option>Disabilitato</option>: l'evidenziazione della sintassi consuma una certa potenza di elaborazione, quindi se l'aggiornamento dello schermo di " "WinMerge sembra lento, disattivare questa opzione potrebbe essere d'aiuto." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -11670,68 +8807,48 @@ msgstr "fine della riga" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2215 -msgid "" -"Preserve original EOL<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Conserva l'EOL originale<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Preserve original EOL<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Conserva l'EOL originale<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2229 msgid "" -"<option>Disabled</option> (default): Assumes that files are meant to be " -"Windows files. If a file does not use the standard Windows line ending, " -"WinMerge considers this to be an error. It silently changes the line endings " -"to the Windows style instead of detecting them as differences. Thus, the " -"File Compare window status bar shows the EOL style as <guilabel>Win</" -"guilabel>." +"<option>Disabled</option> (default): Assumes that files are meant to be Windows files. If a file does not use the standard Windows line ending, " +"WinMerge considers this to be an error. It silently changes the line endings to the Windows style instead of detecting them as differences. Thus, the " +"File Compare window status bar shows the EOL style as <guilabel>Win</guilabel>." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): presuppone che i " -"file debbano essere file Windows.Se un file non utilizza la fine riga " -"standard di Windows, WinMerge lo considera un errore.Cambia silenziosamente " -"le terminazioni di riga nello stile Windows invece di rilevarle come " -"differenze.Pertanto, la barra di stato della finestra Confronta file mostra " -"lo stile EOL come <guilabel >Win</guilabel >." +"<option>Disabilitato</option> (impostazione predefinita): presuppone che i file debbano essere file Windows.Se un file non utilizza la fine riga " +"standard di Windows, WinMerge lo considera un errore.Cambia silenziosamente le terminazioni di riga nello stile Windows invece di rilevarle come " +"differenze.Pertanto, la barra di stato della finestra Confronta file mostra lo stile EOL come <guilabel >Win</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2238 msgid "" -"For most situations you should leave this option disabled: the default " -"behavior works even when comparing two files that have different line ending " +"For most situations you should leave this option disabled: the default behavior works even when comparing two files that have different line ending " "styles." msgstr "" -"Nella maggior parte dei casi dovresti lasciare questa opzione disabilitata: " -"il comportamento predefinito funziona anche quando si confrontano due file " -"che hanno stili di fine riga diversi." +"Nella maggior parte dei casi dovresti lasciare questa opzione disabilitata: il comportamento predefinito funziona anche quando si confrontano due " +"file che hanno stili di fine riga diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2246 msgid "" -"<option>Enabled</option>: Prevents WinMerge from automatically changing line " -"endings, so that it detects different EOL styles for every line. This might " -"be useful for handling files from systems with different EOL styles (for " -"example, Windows and Unix)." +"<option>Enabled</option>: Prevents WinMerge from automatically changing line endings, so that it detects different EOL styles for every line. This " +"might be useful for handling files from systems with different EOL styles (for example, Windows and Unix)." msgstr "" -"<option>Abilitato</option>: impedisce a WinMerge di modificare " -"automaticamente le terminazioni di riga, in modo che rilevi diversi stili " -"EOL per ogni riga.Ciò potrebbe essere utile per gestire file da sistemi con " -"stili EOL diversi (ad esempio, Windows e Unix)." +"<option>Abilitato</option>: impedisce a WinMerge di modificare automaticamente le terminazioni di riga, in modo che rilevi diversi stili EOL per ogni " +"riga.Ciò potrebbe essere utile per gestire file da sistemi con stili EOL diversi (ad esempio, Windows e Unix)." #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> #: English/Configuration.xml:2254 msgid "" -"This is an advanced option for users who are familiar with EOL bytes and who " -"want to compare files with different EOL styles inside <emphasis>one</" -"emphasis> file. We recommend that you not enable this option unless you need " -"this advanced functionality. Remember, this option is not required to " +"This is an advanced option for users who are familiar with EOL bytes and who want to compare files with different EOL styles inside <emphasis>one</" +"emphasis> file. We recommend that you not enable this option unless you need this advanced functionality. Remember, this option is not required to " "compare two files with different EOL styles." msgstr "" -"Questa è un'opzione avanzata per gli utenti che hanno familiarità con i byte " -"EOL e che desiderano confrontare file con stili EOL diversi all'interno di " -"<emphasis>un</emphasis> file.Ti consigliamo di non abilitare questa opzione " -"a meno che non ti serva questa funzionalità avanzata.Ricorda, questa opzione " -"non è necessaria per confrontare due file con stili EOL diversi." +"Questa è un'opzione avanzata per gli utenti che hanno familiarità con i byte EOL e che desiderano confrontare file con stili EOL diversi all'interno " +"di <emphasis>un</emphasis> file.Ti consigliamo di non abilitare questa opzione a meno che non ti serva questa funzionalità avanzata.Ricorda, questa " +"opzione non è necessaria per confrontare due file con stili EOL diversi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2271 @@ -11751,14 +8868,11 @@ msgstr "Dimensioni della scheda" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2281 msgid "" -"Width of a tab space. Specify a value <replaceable>n</replaceable>: the " -"resulting width is equivalent to that of <replaceable>n</replaceable> " +"Width of a tab space. Specify a value <replaceable>n</replaceable>: the resulting width is equivalent to that of <replaceable>n</replaceable> " "characters. Default: 4. The maximum value is 64." msgstr "" -"Larghezza di uno spazio di tabulazione.Specificare un valore <replaceable>n</" -"replaceable>: la larghezza risultante è equivalente a quella di " -"<replaceable>n</replaceable> caratteri.Impostazione predefinita: 4. Il " -"valore massimo è 64." +"Larghezza di uno spazio di tabulazione.Specificare un valore <replaceable>n</replaceable>: la larghezza risultante è equivalente a quella di " +"<replaceable>n</replaceable> caratteri.Impostazione predefinita: 4. Il valore massimo è 64." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:2290 @@ -11767,32 +8881,22 @@ msgstr "Opzioni di inserimento schede" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2294 -msgid "" -"Determines what kind of character is used when you insert a tab in text. " -"Only one of these options can be enabled:" -msgstr "" -"Determina il tipo di carattere utilizzato quando si inserisce una " -"tabulazione nel testo.È possibile abilitare solo una di queste opzioni:" +msgid "Determines what kind of character is used when you insert a tab in text. Only one of these options can be enabled:" +msgstr "Determina il tipo di carattere utilizzato quando si inserisce una tabulazione nel testo.È possibile abilitare solo una di queste opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2301 -msgid "" -"<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." -msgstr "" -"<guilabel >Inserisci tabulazioni</guilabel> (predefinito): utilizza un " -"singolo carattere di tabulazione." +msgid "<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." +msgstr "<guilabel >Inserisci tabulazioni</guilabel> (predefinito): utilizza un singolo carattere di tabulazione." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2308 msgid "" -"<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by " -"the <option>Tab size</option>) instead of a tab character. For example, with " -"the default tab size, four spaces are inserted." +"<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by the <option>Tab size</option>) instead of a tab character. For example, " +"with the default tab size, four spaces are inserted." msgstr "" -"<guilabel >Inserisci spazi</guilabel >: utilizza uno o più spazi " -"(determinati dalla <option >dimensione della tabulazione</option >) invece " -"del carattere di tabulazione.Ad esempio, con la dimensione di tabulazione " -"predefinita, vengono inseriti quattro spazi." +"<guilabel >Inserisci spazi</guilabel >: utilizza uno o più spazi (determinati dalla <option >dimensione della tabulazione</option >) invece del " +"carattere di tabulazione.Ad esempio, con la dimensione di tabulazione predefinita, vengono inseriti quattro spazi." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2323 @@ -11806,37 +8910,25 @@ msgstr "Modalità di rendering<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2330 -msgid "" -"<option>GDI</option> (default): Renders text using the Graphics Device " -"Interface (GDI)." -msgstr "" -"<option>GDI</option> (predefinito): esegue il rendering del testo " -"utilizzando la Graphics Device Interface (GDI)." +msgid "<option>GDI</option> (default): Renders text using the Graphics Device Interface (GDI)." +msgstr "<option>GDI</option> (predefinito): esegue il rendering del testo utilizzando la Graphics Device Interface (GDI)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2336 msgid "" -"<option>DirectWrite Modes</option>: Renders text using various DirectWrite " -"rendering modes, including support for colored emojis on Windows 8.1 and " -"later. Available only in the 64-bit version of WinMerge. See <ulink " -"url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-" -"dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for " -"details." +"<option>DirectWrite Modes</option>: Renders text using various DirectWrite rendering modes, including support for colored emojis on Windows 8.1 and " +"later. Available only in the 64-bit version of WinMerge. See <ulink url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-" +"dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for details." msgstr "" -"<option>Modalità DirectWrite</option>: esegue il rendering del testo " -"utilizzando varie modalità di rendering DirectWrite, incluso il supporto per " -"emoji colorati su Windows 8.1 e versioni successive.Disponibile solo nella " -"versione a 64 bit di WinMerge.Vedi <ulink url=\"https://learn.microsoft.com/" -"en-us/windows/win32/api/dwrite/ne-dwrite-" -"dwrite_rendering_mode#constants\">Modalità di rendering DirectWrite</ulink> " -"per i dettagli." +"<option>Modalità DirectWrite</option>: esegue il rendering del testo utilizzando varie modalità di rendering DirectWrite, incluso il supporto per " +"emoji colorati su Windows 8.1 e versioni successive.Disponibile solo nella versione a 64 bit di WinMerge.Vedi <ulink url=\"https://" +"learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-dwrite_rendering_mode#constants\">Modalità di rendering DirectWrite</ulink> per i " +"dettagli." #. type: Content of: <article><section><title> #: English/Configuration.xml:2345 -msgid "" -"Editor > Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Editore >Confronta/Unisci pagina<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Editor > Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Editore >Confronta/Unisci pagina<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2357 @@ -11851,35 +8943,25 @@ msgstr "Nuova scansione automatica<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2364 msgid "" -"<option>Disabled</option> (default): WinMerge rescans automatically when you " -"merge a difference, or if you manually rescan (for example, click the " +"<option>Disabled</option> (default): WinMerge rescans automatically when you merge a difference, or if you manually rescan (for example, click the " "<guibutton>Rescan</guibutton> button)." msgstr "" -"<option >Disabilitato</option> (predefinito): WinMerge esegue nuovamente la " -"scansione automaticamente quando unisci una differenza o se esegui " -"nuovamente la scansione manualmente (ad esempio, facendo clic sul pulsante " -"<guibutton >Ripeti scansione</guibutton >)." +"<option >Disabilitato</option> (predefinito): WinMerge esegue nuovamente la scansione automaticamente quando unisci una differenza o se esegui " +"nuovamente la scansione manualmente (ad esempio, facendo clic sul pulsante <guibutton >Ripeti scansione</guibutton >)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2372 -msgid "" -"<option>Enabled</option>: Forces WinMerge to rescan after every edit event " -"(a change to files, like typing)." -msgstr "" -"<option>Abilitato</option>: forza WinMerge a ripetere la scansione dopo ogni " -"evento di modifica (una modifica ai file, come la digitazione)." +msgid "<option>Enabled</option>: Forces WinMerge to rescan after every edit event (a change to files, like typing)." +msgstr "<option>Abilitato</option>: forza WinMerge a ripetere la scansione dopo ogni evento di modifica (una modifica ai file, come la digitazione)." #. type: Content of: <article><section><section><itemizedlist><listitem><note><para> #: English/Configuration.xml:2378 msgid "" -"To avoid slowing down your editing, WinMerge delays automatic rescanning a " -"little: it waits one second after each edit event. Because each new edit " +"To avoid slowing down your editing, WinMerge delays automatic rescanning a little: it waits one second after each edit event. Because each new edit " "event resets the timer, no rescans occur until you pause or stop editing." msgstr "" -"Per evitare di rallentare la modifica, WinMerge ritarda leggermente la " -"scansione automatica: attende un secondo dopo ogni evento di modifica.Poiché " -"ogni nuovo evento di modifica reimposta il timer, non vengono eseguite nuove " -"scansioni finché non si mette in pausa o si interrompe la modifica." +"Per evitare di rallentare la modifica, WinMerge ritarda leggermente la scansione automatica: attende un secondo dopo ogni evento di modifica.Poiché " +"ogni nuovo evento di modifica reimposta il timer, non vengono eseguite nuove scansioni finché non si mette in pausa o si interrompe la modifica." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2391 @@ -11888,55 +8970,37 @@ msgstr "granularità della copia" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2390 -msgid "" -"Copy granularity for selected differences<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Granularità della copia per le differenze selezionate<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Copy granularity for selected differences<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Granularità della copia per le differenze selezionate<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2396 msgid "" -"Specifies the copy granularity when copying to another pane by clicking the " -"<guimenuitem>Copy to right</guimenuitem> menu item etc. with text selected." +"Specifies the copy granularity when copying to another pane by clicking the <guimenuitem>Copy to right</guimenuitem> menu item etc. with text " +"selected." msgstr "" -"Specifica la granularità della copia quando si copia in un altro pannello " -"facendo clic sulla voce del menu <guimenuitem >Copia a destra</guimenuitem > " -"ecc. con il testo selezionato." +"Specifica la granularità della copia quando si copia in un altro pannello facendo clic sulla voce del menu <guimenuitem >Copia a destra</guimenuitem " +"> ecc. con il testo selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2404 msgid "<option>Diff hunk</option>: Copies diff hunks within the selected text." -msgstr "" -"<option>Diff hunk</option>: copia i diff hunk all'interno del testo " -"selezionato." +msgstr "<option>Diff hunk</option>: copia i diff hunk all'interno del testo selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2411 -msgid "" -"<option>Inline diff</option>: Copies inline diffs within the selected text." -msgstr "" -"<option>DIFF in linea</option>: copia le differenze in linea all'interno del " -"testo selezionato." +msgid "<option>Inline diff</option>: Copies inline diffs within the selected text." +msgstr "<option>DIFF in linea</option>: copia le differenze in linea all'interno del testo selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2418 -msgid "" -"<option>Line</option>: Copies the differences within the selected text line " -"by line." -msgstr "" -"<option>Line</option>: copia le differenze all'interno del testo selezionato " -"riga per riga." +msgid "<option>Line</option>: Copies the differences within the selected text line by line." +msgstr "<option>Line</option>: copia le differenze all'interno del testo selezionato riga per riga." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2425 -msgid "" -"<option>Character</option> (default): Copies the differences within the " -"selected text character by character." -msgstr "" -"<option>Carattere</option> (predefinito): copia le differenze all'interno " -"del testo selezionato carattere per carattere." +msgid "<option>Character</option> (default): Copies the differences within the selected text character by character." +msgstr "<option>Carattere</option> (predefinito): copia le differenze all'interno del testo selezionato carattere per carattere." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2438 @@ -11950,12 +9014,9 @@ msgstr "Colorazione differenza linea<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2443 -msgid "" -"These settings enable and configure the detection of <glossterm> line " -"differences </glossterm> (changes within the lines of difference blocks):" +msgid "These settings enable and configure the detection of <glossterm> line differences </glossterm> (changes within the lines of difference blocks):" msgstr "" -"Queste impostazioni abilitano e configurano il rilevamento delle <glossterm> " -"differenze di riga </glossterm> (modifiche all'interno delle righe dei " +"Queste impostazioni abilitano e configurano il rilevamento delle <glossterm> differenze di riga </glossterm> (modifiche all'interno delle righe dei " "blocchi di differenza):" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -11966,14 +9027,11 @@ msgstr "Visualizza le differenze di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2458 msgid "" -"<option>Enabled</option> (default): WinMerge highlights differences within " -"lines. Also enables the <menuchoice> <guimenu>View</guimenu> " +"<option>Enabled</option> (default): WinMerge highlights differences within lines. Also enables the <menuchoice> <guimenu>View</guimenu> " "<guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." msgstr "" -"<option>Abilitato</option> (predefinito): WinMerge evidenzia le differenze " -"all'interno delle righe.Abilita anche la voce di menu <menuchoice> <guimenu " -">Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</" -"guimenuitem > </menuchoice >." +"<option>Abilitato</option> (predefinito): WinMerge evidenzia le differenze all'interno delle righe.Abilita anche la voce di menu <menuchoice> " +"<guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2466 @@ -11983,61 +9041,44 @@ msgstr "Scegli una di queste opzioni secondarie:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2471 msgid "" -"<guilabel>Character level</guilabel>: Highlights individual characters that " -"are different. This option can be useful if you are looking for changes " +"<guilabel>Character level</guilabel>: Highlights individual characters that are different. This option can be useful if you are looking for changes " "within words, or for file formats that do not have clear word breaks." msgstr "" -"<guilabel >Livello carattere</guilabel >: evidenzia i singoli caratteri che " -"sono diversi.Questa opzione può essere utile se stai cercando modifiche " -"all'interno delle parole o per formati di file che non presentano " -"interruzioni di parola chiare." +"<guilabel >Livello carattere</guilabel >: evidenzia i singoli caratteri che sono diversi.Questa opzione può essere utile se stai cercando modifiche " +"all'interno delle parole o per formati di file che non presentano interruzioni di parola chiare." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2480 -msgid "" -"<guilabel>Word-level</guilabel> (default): Highlights entire words that are " -"different." -msgstr "" -"<guilabel >A livello di parola</guilabel > (predefinito): evidenzia intere " -"parole che sono diverse." +msgid "<guilabel>Word-level</guilabel> (default): Highlights entire words that are different." +msgstr "<guilabel >A livello di parola</guilabel > (predefinito): evidenzia intere parole che sono diverse." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2487 msgid "" -"<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be " -"separated by whitespace characters. This usually works for typical text " +"<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be separated by whitespace characters. This usually works for typical text " "files." msgstr "" -"<guilabel >Interrompi nello spazio</guilabel> (predefinito): si presuppone " -"che le parole siano separate da caratteri di spazio.Questo di solito " +"<guilabel >Interrompi nello spazio</guilabel> (predefinito): si presuppone che le parole siano separate da caratteri di spazio.Questo di solito " "funziona per i tipici file di testo." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2495 msgid "" -"<guilabel>Break at whitespace or punctuation</guilabel>: Considers both " -"whitespace and punctuation characters to be word breaks. This can useful for " -"handling lists that are separated with punctuation (like comma-separated " -"lists)." +"<guilabel>Break at whitespace or punctuation</guilabel>: Considers both whitespace and punctuation characters to be word breaks. This can useful for " +"handling lists that are separated with punctuation (like comma-separated lists)." msgstr "" -"<guilabel >Interruzione negli spazi bianchi o nella punteggiatura</guilabel " -">: considera sia gli spazi bianchi che i caratteri di punteggiatura come " -"interruzioni di parola.Ciò può essere utile per gestire elenchi separati da " -"punteggiatura (come elenchi separati da virgole)." +"<guilabel >Interruzione negli spazi bianchi o nella punteggiatura</guilabel >: considera sia gli spazi bianchi che i caratteri di punteggiatura come " +"interruzioni di parola.Ciò può essere utile per gestire elenchi separati da punteggiatura (come elenchi separati da virgole)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2509 msgid "" -"<option>Disabled</option>: WinMerge does not highlight line differences, and " -"all settings for the level and whitespace options are ignored. Also disables " -"the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</" -"guimenuitem> </menuchoice> menu item." +"<option>Disabled</option>: WinMerge does not highlight line differences, and all settings for the level and whitespace options are ignored. Also " +"disables the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." msgstr "" -"<option>Disabilitato</option>: WinMerge non evidenzia le differenze di linea " -"e tutte le impostazioni per le opzioni di livello e spazio bianco vengono " -"ignorate.Disabilita anche la voce di menu <menuchoice> <guimenu >Visualizza</" -"guimenu> <guimenuitem >Visualizza differenze di riga</guimenuitem > </" -"menuchoice >." +"<option>Disabilitato</option>: WinMerge non evidenzia le differenze di linea e tutte le impostazioni per le opzioni di livello e spazio bianco " +"vengono ignorate.Disabilita anche la voce di menu <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:2525 @@ -12047,11 +9088,9 @@ msgstr "Caratteri di interruzione di parola" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2528 msgid "" -"Specifies the symbols that are treated as non-whitespace word separators " -"when <guilabel>Break at whitespace or punctuation</guilabel> is selected." +"Specifies the symbols that are treated as non-whitespace word separators when <guilabel>Break at whitespace or punctuation</guilabel> is selected." msgstr "" -"Specifica i simboli che vengono trattati come separatori di parole non spazi " -"bianchi quando è selezionato <guilabel >Interrompi in corrispondenza di " +"Specifica i simboli che vengono trattati come separatori di parole non spazi bianchi quando è selezionato <guilabel >Interrompi in corrispondenza di " "spazi bianchi o punteggiatura</guilabel>." #. type: Content of: <article><section><section><note><title> @@ -12061,18 +9100,13 @@ msgstr "Argomento correlato" #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:2540 -msgid "" -"<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail " -"how WinMerge detects and marks line differences." -msgstr "" -"<xref linkend=\"CompareFiles_linediff-highlight\" /> spiega in modo più " -"dettagliato come WinMerge rileva e contrassegna le differenze di linea." +msgid "<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail how WinMerge detects and marks line differences." +msgstr "<xref linkend=\"CompareFiles_linediff-highlight\" /> spiega in modo più dettagliato come WinMerge rileva e contrassegna le differenze di linea." #. type: Content of: <article><section><title> #: English/Configuration.xml:2550 msgid "Editor > Syntax page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Editore >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Editore >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2565 @@ -12081,24 +9115,17 @@ msgstr "combinazioni di colori" #. type: Content of: <article><section><title> #: English/Configuration.xml:2564 -msgid "" -"Colors > Color Schemes page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Colori >Pagina Combinazioni di colori<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Colors > Color Schemes page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Colori >Pagina Combinazioni di colori<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2572 msgid "" -"The Color Schemes page allows you to customize the overall color appearance " -"of WinMerge, including support for light and dark modes. You can select and " -"manage color schemes for each mode, and save or delete your own custom " -"schemes." +"The Color Schemes page allows you to customize the overall color appearance of WinMerge, including support for light and dark modes. You can select " +"and manage color schemes for each mode, and save or delete your own custom schemes." msgstr "" -"La pagina Combinazioni colori consente di personalizzare l'aspetto cromatico " -"generale di WinMerge, incluso il supporto per le modalità chiaro e scuro." -"Puoi selezionare e gestire combinazioni di colori per ciascuna modalità e " -"salvare o eliminare le tue combinazioni personalizzate." +"La pagina Combinazioni colori consente di personalizzare l'aspetto cromatico generale di WinMerge, incluso il supporto per le modalità chiaro e " +"scuro.Puoi selezionare e gestire combinazioni di colori per ciascuna modalità e salvare o eliminare le tue combinazioni personalizzate." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2577 @@ -12113,35 +9140,26 @@ msgstr "Seleziona la modalità colore per l'applicazione.Scegli tra:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2585 msgid "" -"<option>Light</option> (default): Uses the color scheme specified for light " -"mode. When selected, the appearance of dialog windows, menus, and other UI " -"elements will be shown in a light style." +"<option>Light</option> (default): Uses the color scheme specified for light mode. When selected, the appearance of dialog windows, menus, and other " +"UI elements will be shown in a light style." msgstr "" -"<option>Luce</option> (predefinito): utilizza lo schema di colori " -"specificato per la modalità luce.Quando selezionato, l'aspetto delle " -"finestre di dialogo, dei menu e degli altri elementi dell'interfaccia utente " -"verrà mostrato in uno stile chiaro." +"<option>Luce</option> (predefinito): utilizza lo schema di colori specificato per la modalità luce.Quando selezionato, l'aspetto delle finestre di " +"dialogo, dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in uno stile chiaro." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2590 msgid "" -"<option>Dark</option>: Uses the color scheme specified for dark mode. When " -"selected, the appearance of dialog windows, menus, and other UI elements " +"<option>Dark</option>: Uses the color scheme specified for dark mode. When selected, the appearance of dialog windows, menus, and other UI elements " "will be shown in a dark style." msgstr "" -"<option>Scuro</option>: utilizza la combinazione di colori specificata per " -"la modalità oscura.Quando selezionato, l'aspetto delle finestre di dialogo, " -"dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in " -"uno stile scuro." +"<option>Scuro</option>: utilizza la combinazione di colori specificata per la modalità oscura.Quando selezionato, l'aspetto delle finestre di " +"dialogo, dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in uno stile scuro." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2595 -msgid "" -"<option>Follow system</option>: Automatically switches between light and " -"dark mode based on your operating system's setting." +msgid "<option>Follow system</option>: Automatically switches between light and dark mode based on your operating system's setting." msgstr "" -"<option>Segui il sistema</option>: passa automaticamente dalla modalità " -"chiara a quella scura in base alle impostazioni del tuo sistema operativo." +"<option>Segui il sistema</option>: passa automaticamente dalla modalità chiara a quella scura in base alle impostazioni del tuo sistema operativo." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2603 @@ -12151,14 +9169,11 @@ msgstr "Schema della modalità luce" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2606 msgid "" -"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set " -"to Light. Available schemes include <option>Default</option> (default), " +"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set to Light. Available schemes include <option>Default</option> (default), " "<option>Modern</option>, and any user-defined schemes you have saved." msgstr "" -"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità " -"colore</guilabel > è impostata su Luce.Gli schemi disponibili includono " -"<option>Default</option> (predefinito), <option>Modern</option> e qualsiasi " -"schema definito dall'utente che hai salvato." +"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità colore</guilabel > è impostata su Luce.Gli schemi disponibili includono " +"<option>Default</option> (predefinito), <option>Modern</option> e qualsiasi schema definito dall'utente che hai salvato." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2612 @@ -12168,14 +9183,11 @@ msgstr "Schema della modalità oscura" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2615 msgid "" -"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set " -"to Dark. Available schemes include <option>VS Dark</option> (default), " +"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set to Dark. Available schemes include <option>VS Dark</option> (default), " "<option>Solarized Dark</option>, and any user-defined schemes you have saved." msgstr "" -"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità " -"colore</guilabel > è impostata su Scuro.Gli schemi disponibili includono " -"<option>VS Dark</option> (predefinito), <option>Solarized Dark</option> e " -"qualsiasi schema definito dall'utente che hai salvato." +"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità colore</guilabel > è impostata su Scuro.Gli schemi disponibili includono " +"<option>VS Dark</option> (predefinito), <option>Solarized Dark</option> e qualsiasi schema definito dall'utente che hai salvato." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2621 @@ -12185,16 +9197,12 @@ msgstr "Salva lo schema corrente" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2624 msgid "" -"Saves the current color settings as a new scheme. The scheme is saved as an " -"INI file. <emphasis> Only schemes saved in the <filename>Documents/WinMerge/" -"ColorSchemes</filename> folder will appear in the <guilabel>Light mode " -"scheme</guilabel> and <guilabel>Dark mode scheme</guilabel> lists. </" +"Saves the current color settings as a new scheme. The scheme is saved as an INI file. <emphasis> Only schemes saved in the <filename>Documents/" +"WinMerge/ColorSchemes</filename> folder will appear in the <guilabel>Light mode scheme</guilabel> and <guilabel>Dark mode scheme</guilabel> lists. </" "emphasis>" msgstr "" -"Salva le impostazioni colore correnti come nuovo schema.Lo schema viene " -"salvato come file INI.<emphasis>Solo gli schemi salvati nella cartella " -"<filename>Documents/WinMerge/ColorSchemes</filename> appariranno negli " -"elenchi <guilabel >Schema modalità luce</guilabel > e <guilabel >Schema " +"Salva le impostazioni colore correnti come nuovo schema.Lo schema viene salvato come file INI.<emphasis>Solo gli schemi salvati nella cartella " +"<filename>Documents/WinMerge/ColorSchemes</filename> appariranno negli elenchi <guilabel >Schema modalità luce</guilabel > e <guilabel >Schema " "modalità scura</guilabel >.</emphasis>" #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -12205,62 +9213,46 @@ msgstr "Elimina lo schema corrente" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2635 msgid "" -"Deletes the currently selected color scheme. This button is only enabled for " -"user-defined schemes (not for built-in schemes like Default or VS Dark)." +"Deletes the currently selected color scheme. This button is only enabled for user-defined schemes (not for built-in schemes like Default or VS Dark)." msgstr "" -"Elimina la combinazione di colori attualmente selezionata.Questo pulsante è " -"abilitato solo per gli schemi definiti dall'utente (non per gli schemi " +"Elimina la combinazione di colori attualmente selezionata.Questo pulsante è abilitato solo per gli schemi definiti dall'utente (non per gli schemi " "integrati come Predefinito o VS Scuro)." #. type: Content of: <article><section><para> #: English/Configuration.xml:2642 msgid "" -"Use these options to tailor the WinMerge interface to your preferences or to " -"match your system theme. Custom color schemes make it easy to share or reuse " -"your preferred color settings." +"Use these options to tailor the WinMerge interface to your preferences or to match your system theme. Custom color schemes make it easy to share or " +"reuse your preferred color settings." msgstr "" -"Utilizza queste opzioni per personalizzare l'interfaccia WinMerge in base " -"alle tue preferenze o per adattarla al tema del tuo sistema.Le combinazioni " -"di colori personalizzate semplificano la condivisione o il riutilizzo delle " -"impostazioni di colore preferite." +"Utilizza queste opzioni per personalizzare l'interfaccia WinMerge in base alle tue preferenze o per adattarla al tema del tuo sistema.Le combinazioni " +"di colori personalizzate semplificano la condivisione o il riutilizzo delle impostazioni di colore preferite." #. type: Content of: <article><section><title> #: English/Configuration.xml:2648 msgid "Colors > Differences page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Colori >Pagina delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Colori >Pagina delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2656 msgid "" -"Use this page if you want to change any of the difference colors used in the " -"File Compare window. You can set the background, deleted, and text color." +"Use this page if you want to change any of the difference colors used in the File Compare window. You can set the background, deleted, and text color." msgstr "" -"Utilizza questa pagina se desideri modificare uno qualsiasi dei colori " -"diversi utilizzati nella finestra Confronto file.È possibile impostare lo " +"Utilizza questa pagina se desideri modificare uno qualsiasi dei colori diversi utilizzati nella finestra Confronto file.È possibile impostare lo " "sfondo, l'eliminazione e il colore del testo." #. type: Content of: <article><section><para> #: English/Configuration.xml:2662 English/Configuration.xml:2743 msgid "" -"To change a color, click in its box to open a standard Color chooser dialog. " -"Choose one of the predefined colors or define your own custom color, then " -"click <guibutton>OK</guibutton> to load the new color in the box." +"To change a color, click in its box to open a standard Color chooser dialog. Choose one of the predefined colors or define your own custom color, " +"then click <guibutton>OK</guibutton> to load the new color in the box." msgstr "" -"Per cambiare un colore, fare clic nella sua casella per aprire una finestra " -"di dialogo standard per la scelta del colore.Scegli uno dei colori " -"predefiniti o definisci il tuo colore personalizzato, quindi fai clic su " -"<guibutton >OK</guibutton > per caricare il nuovo colore nella casella." +"Per cambiare un colore, fare clic nella sua casella per aprire una finestra di dialogo standard per la scelta del colore.Scegli uno dei colori " +"predefiniti o definisci il tuo colore personalizzato, quindi fai clic su <guibutton >OK</guibutton > per caricare il nuovo colore nella casella." #. type: Content of: <article><section><para> -#: English/Configuration.xml:2669 English/Configuration.xml:2692 -#: English/Configuration.xml:2750 -msgid "" -"To revert to the default colors of a scheme, choose a different scheme and " -"return to the modified scheme." -msgstr "" -"Per ripristinare i colori predefiniti di uno schema, scegli uno schema " -"diverso e torna allo schema modificato." +#: English/Configuration.xml:2669 English/Configuration.xml:2692 English/Configuration.xml:2750 +msgid "To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme." +msgstr "Per ripristinare i colori predefiniti di uno schema, scegli uno schema diverso e torna allo schema modificato." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Configuration.xml:2679 @@ -12275,17 +9267,13 @@ msgstr "Colori >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2684 msgid "" -"By default, the WinMerge File Compare window marks the syntax of certain " -"kinds of source code, as described in <xref " -"linkend=\"Configuration_syntaxhighlight\" />. This page lists the syntax " -"elements that are recognized, and enables you to change their text color and " +"By default, the WinMerge File Compare window marks the syntax of certain kinds of source code, as described in <xref " +"linkend=\"Configuration_syntaxhighlight\" />. This page lists the syntax elements that are recognized, and enables you to change their text color and " "weight." msgstr "" -"Per impostazione predefinita, la finestra Confronto file WinMerge " -"contrassegna la sintassi di determinati tipi di codice sorgente, come " -"descritto in <xref linkend=\"Configuration_syntaxhighlight\" />.Questa " -"pagina elenca gli elementi di sintassi riconosciuti e consente di modificare " -"il colore e lo spessore del testo." +"Per impostazione predefinita, la finestra Confronto file WinMerge contrassegna la sintassi di determinati tipi di codice sorgente, come descritto in " +"<xref linkend=\"Configuration_syntaxhighlight\" />.Questa pagina elenca gli elementi di sintassi riconosciuti e consente di modificare il colore e lo " +"spessore del testo." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2700 @@ -12300,18 +9288,13 @@ msgstr "Colori >Pagina di testo<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2707 msgid "" -"Use this page to change the colors used for text. First, check the option, " -"<guilabel>Use customized text colors</guilabel>. This activates the text " -"options. There is an option for three kinds of text: whitespace, regular " -"text, and selected text. For each kind of text , you can choose a color for " +"Use this page to change the colors used for text. First, check the option, <guilabel>Use customized text colors</guilabel>. This activates the text " +"options. There is an option for three kinds of text: whitespace, regular text, and selected text. For each kind of text , you can choose a color for " "the background and the text." msgstr "" -"Utilizza questa pagina per modificare i colori utilizzati per il testo." -"Innanzitutto, seleziona l'opzione <guilabel >Utilizza colori testo " -"personalizzati</guilabel >.Questo attiva le opzioni di testo.È disponibile " -"un'opzione per tre tipi di testo: spazio bianco, testo normale e testo " -"selezionato.Per ogni tipo di testo puoi scegliere un colore per lo sfondo e " -"il testo." +"Utilizza questa pagina per modificare i colori utilizzati per il testo.Innanzitutto, seleziona l'opzione <guilabel >Utilizza colori testo " +"personalizzati</guilabel >.Questo attiva le opzioni di testo.È disponibile un'opzione per tre tipi di testo: spazio bianco, testo normale e testo " +"selezionato.Per ogni tipo di testo puoi scegliere un colore per lo sfondo e il testo." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2718 @@ -12330,21 +9313,16 @@ msgstr "cartella confronta i colori" #. type: Content of: <article><section><title> #: English/Configuration.xml:2729 -msgid "" -"Colors > Folder Compare page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Colori >Pagina di confronto delle cartelle<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Colors > Folder Compare page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Colori >Pagina di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2737 msgid "" -"By default, the WinMerge Folder Compare window use background colors to show " -"the status from a item (equal, different, not exists on all sides or " +"By default, the WinMerge Folder Compare window use background colors to show the status from a item (equal, different, not exists on all sides or " "filtered)." msgstr "" -"Per impostazione predefinita, la finestra Confronto cartelle di WinMerge " -"utilizza i colori di sfondo per mostrare lo stato di un elemento (uguale, " +"Per impostazione predefinita, la finestra Confronto cartelle di WinMerge utilizza i colori di sfondo per mostrare lo stato di un elemento (uguale, " "diverso, non esiste su tutti i lati o filtrato)." #. type: Content of: <article><section><title><indexterm><secondary> @@ -12355,15 +9333,12 @@ msgstr "configurazione del supporto dopo l'installazione" #. type: Content of: <article><section><title> #: English/Configuration.xml:2757 msgid "Archive Support page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Archivia la pagina di supporto<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Archivia la pagina di supporto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2765 msgid "This page contains options for configuring archive support using 7-Zip." -msgstr "" -"Questa pagina contiene le opzioni per configurare il supporto dell'archivio " -"utilizzando 7-Zip." +msgstr "Questa pagina contiene le opzioni per configurare il supporto dell'archivio utilizzando 7-Zip." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2772 English/Open_paths.xml:60 @@ -12378,31 +9353,22 @@ msgstr "abilitare e disabilitare l'integrazione" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2771 msgid "Enable archive file support<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Abilita il supporto dei file di archivio<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Abilita il supporto dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2779 -msgid "" -"This option controls how WinMerge handles archive files (based on 7-Zip " -"integration)." -msgstr "" -"Questa opzione controlla il modo in cui WinMerge gestisce i file di archivio " -"(basato sull'integrazione 7-Zip)." +msgid "This option controls how WinMerge handles archive files (based on 7-Zip integration)." +msgstr "Questa opzione controlla il modo in cui WinMerge gestisce i file di archivio (basato sull'integrazione 7-Zip)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2786 msgid "<option>Enabled</option> (default): WinMerge recognizes 7-Zip archives." -msgstr "" -"<option>Abilitato</option> (impostazione predefinita): WinMerge riconosce " -"gli archivi 7-Zip." +msgstr "<option>Abilitato</option> (impostazione predefinita): WinMerge riconosce gli archivi 7-Zip." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2793 msgid "<option>Disabled</option>: Turns off 7-Zip archive integration." -msgstr "" -"<option>Disabilitato</option>: disattiva l'integrazione dell'archivio 7-Zip." +msgstr "<option>Disabilitato</option>: disattiva l'integrazione dell'archivio 7-Zip." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2803 @@ -12411,46 +9377,34 @@ msgstr "rilevamento dei tipi di archivio" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2802 -msgid "" -"Detect archive type from file signature<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Rileva il tipo di archivio dalla firma del file<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Detect archive type from file signature<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Rileva il tipo di archivio dalla firma del file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2810 msgid "" -"<option>Disabled</option> (default): WinMerge recognizes only archives whose " -"file extension is known on your system (for example, in the registry or " +"<option>Disabled</option> (default): WinMerge recognizes only archives whose file extension is known on your system (for example, in the registry or " "through a file association)." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): WinMerge riconosce " -"solo gli archivi la cui estensione di file è nota sul tuo sistema (ad " +"<option>Disabilitato</option> (impostazione predefinita): WinMerge riconosce solo gli archivi la cui estensione di file è nota sul tuo sistema (ad " "esempio, nel registro o tramite un'associazione di file)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2818 msgid "" -"<option>Enabled</option>: WinMerge can recognize archive files even if their " -"file extension is not known. To recognize an archive, WinMerge searches the " -"beginning of the file for the archive signature bytes." +"<option>Enabled</option>: WinMerge can recognize archive files even if their file extension is not known. To recognize an archive, WinMerge searches " +"the beginning of the file for the archive signature bytes." msgstr "" -"<option>Abilitato</option>: WinMerge può riconoscere i file di archivio " -"anche se la loro estensione non è nota.Per riconoscere un archivio, WinMerge " +"<option>Abilitato</option>: WinMerge può riconoscere i file di archivio anche se la loro estensione non è nota.Per riconoscere un archivio, WinMerge " "cerca all'inizio del file i byte della firma dell'archivio." #. type: Content of: <article><section><section><itemizedlist><listitem><para><tip><para> #: English/Configuration.xml:2823 -msgid "" -"You can use this option to enable WinMerge to recognize Open Office files." -msgstr "" -"È possibile utilizzare questa opzione per consentire a WinMerge di " -"riconoscere i file Open Office." +msgid "You can use this option to enable WinMerge to recognize Open Office files." +msgstr "È possibile utilizzare questa opzione per consentire a WinMerge di riconoscere i file Open Office." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:2836 English/Open_paths.xml:367 -#: English/Quick_start.xml:203 +#: English/Configuration.xml:2836 English/Open_paths.xml:367 English/Quick_start.xml:203 msgid "project files" msgstr "file di progetto" @@ -12466,38 +9420,26 @@ msgstr "Pagina di sistema" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2852 -msgid "" -"Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Invia i file eliminati al Cestino<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Invia i file eliminati al Cestino<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2862 msgid "" -"<option>Enabled</option> (default): Files and folders that you delete in a " -"Folder Compare window are moved to the Recycle Bin, if it is available." +"<option>Enabled</option> (default): Files and folders that you delete in a Folder Compare window are moved to the Recycle Bin, if it is available." msgstr "" -"<option>Abilitato</option> (impostazione predefinita): i file e le cartelle " -"eliminati in una finestra Confronto cartelle vengono spostati nel Cestino, " -"se disponibile." +"<option>Abilitato</option> (impostazione predefinita): i file e le cartelle eliminati in una finestra Confronto cartelle vengono spostati nel " +"Cestino, se disponibile." #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> #: English/Configuration.xml:2869 -msgid "" -"Remember: if the Recycle Bin on your system has been deactivated, this " -"option does not work, and deleted files are lost!" -msgstr "" -"Ricorda: se il Cestino del tuo sistema è stato disattivato, questa opzione " -"non funziona e i file cancellati andranno persi!" +msgid "Remember: if the Recycle Bin on your system has been deactivated, this option does not work, and deleted files are lost!" +msgstr "Ricorda: se il Cestino del tuo sistema è stato disattivato, questa opzione non funziona e i file cancellati andranno persi!" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2879 -msgid "" -"<option>Disabled</option>: Files and folders deleted in a directory compare " -"actually deleted." -msgstr "" -"<option>Disabilitato</option>: i file e le cartelle eliminati in una " -"cartella vengono confrontati con quelli effettivamente eliminati." +msgid "<option>Disabled</option>: Files and folders deleted in a directory compare actually deleted." +msgstr "<option>Disabilitato</option>: i file e le cartelle eliminati in una cartella vengono confrontati con quelli effettivamente eliminati." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2889 @@ -12517,55 +9459,41 @@ msgstr "Editor esterno<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2896 msgid "" -"The WinMerge File Compare window provides common editing functions. If you " -"prefer using your favorite, full-featured editor, you can configure WinMerge " -"to open an external editor from the Folder Compare context menu." +"The WinMerge File Compare window provides common editing functions. If you prefer using your favorite, full-featured editor, you can configure " +"WinMerge to open an external editor from the Folder Compare context menu." msgstr "" -"La finestra Confronta file WinMerge fornisce funzioni di modifica comuni.Se " -"preferisci utilizzare il tuo editor preferito e completo, puoi configurare " -"WinMerge per aprire un editor esterno dal menu contestuale Confronto " -"cartelle." +"La finestra Confronta file WinMerge fornisce funzioni di modifica comuni.Se preferisci utilizzare il tuo editor preferito e completo, puoi " +"configurare WinMerge per aprire un editor esterno dal menu contestuale Confronto cartelle." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2903 msgid "" -"Installation configures Notepad as the default external editor, because it " -"is found on all Windows systems. To configure a different external editor, " +"Installation configures Notepad as the default external editor, because it is found on all Windows systems. To configure a different external editor, " "enter the full path to its executable file." msgstr "" -"L'installazione configura Blocco note come editor esterno predefinito, " -"perché si trova su tutti i sistemi Windows.Per configurare un diverso editor " +"L'installazione configura Blocco note come editor esterno predefinito, perché si trova su tutti i sistemi Windows.Per configurare un diverso editor " "esterno, inserisci il percorso completo del suo file eseguibile." #. type: Content of: <article><section><section><tip><para> #: English/Configuration.xml:2910 msgid "" -"Along with the path, you can include any command line parameters supported " -"by the external tool, in this format: <command> <replaceable>path to " -"executable</replaceable> </command> <option>-option1</option> <option>-" -"option2</option> <option> <replaceable>...</replaceable> </option>" +"Along with the path, you can include any command line parameters supported by the external tool, in this format: <command> <replaceable>path to " +"executable</replaceable> </command> <option>-option1</option> <option>-option2</option> <option> <replaceable>...</replaceable> </option>" msgstr "" -"Insieme al percorso, puoi includere qualsiasi parametro della riga di " -"comando supportato dallo strumento esterno, in questo formato: <command> " -"<replaceable>percorso dell'eseguibile</replaceable> </command> <option>-" -"option1</option> <option>-option2</option> <option> <replaceable>...</" +"Insieme al percorso, puoi includere qualsiasi parametro della riga di comando supportato dallo strumento esterno, in questo formato: <command> " +"<replaceable>percorso dell'eseguibile</replaceable> </command> <option>-option1</option> <option>-option2</option> <option> <replaceable>...</" "replaceable> </option>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2923 msgid "" -"To use the configured external editor, right-click a file in the Folder " -"Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> " -"<guimenuitem>With External Editor</guimenuitem> </menuchoice> or " -"<menuchoice> <guimenuitem>Open Right</guimenuitem> <guimenuitem>With " -"External Editor</guimenuitem> </menuchoice>." -msgstr "" -"Per usare l'editor esterno configurato, fai clic con il pulsante destro del " -"mouse su un file nella finestra Confronta cartelle e scegli <menuchoice> " -"<guimenuitem >Apri a sinistra</guimenuitem > <guimenuitem >Con editor " -"esterno</guimenuitem > </menuchoice > o <menuchoice> <guimenuitem >Apri a " -"destra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </" -"menuchoice >." +"To use the configured external editor, right-click a file in the Folder Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> " +"<guimenuitem>With External Editor</guimenuitem> </menuchoice> or <menuchoice> <guimenuitem>Open Right</guimenuitem> <guimenuitem>With External " +"Editor</guimenuitem> </menuchoice>." +msgstr "" +"Per usare l'editor esterno configurato, fai clic con il pulsante destro del mouse su un file nella finestra Confronta cartelle e scegli <menuchoice> " +"<guimenuitem >Apri a sinistra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </menuchoice > o <menuchoice> <guimenuitem >Apri a " +"destra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2939 @@ -12584,31 +9512,21 @@ msgstr "Archivia i dati utente in<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2945 -msgid "" -"Specifies where WinMerge stores user data such as filters, plugins, color " -"schemes, and configuration logs." -msgstr "" -"Specifica dove WinMerge archivia i dati utente come filtri, plug-in, " -"combinazioni di colori e registri di configurazione." +msgid "Specifies where WinMerge stores user data such as filters, plugins, color schemes, and configuration logs." +msgstr "Specifica dove WinMerge archivia i dati utente come filtri, plug-in, combinazioni di colori e registri di configurazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2952 -msgid "" -"<guilabel>AppData (Roaming) folder</guilabel> (default): Stores user data in " -"the roaming application data folder of your user profile." +msgid "<guilabel>AppData (Roaming) folder</guilabel> (default): Stores user data in the roaming application data folder of your user profile." msgstr "" -"<guilabel >Cartella AppData (Roaming)</guilabel > (predefinita): memorizza i " -"dati dell'utente nella cartella dei dati dell'applicazione in roaming del " -"tuo profilo utente." +"<guilabel >Cartella AppData (Roaming)</guilabel > (predefinita): memorizza i dati dell'utente nella cartella dei dati dell'applicazione in roaming " +"del tuo profilo utente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2959 -msgid "" -"<guilabel>Documents folder</guilabel>: Stores user data in the " -"<filename>WinMerge</filename> subfolder of your Documents directory." +msgid "<guilabel>Documents folder</guilabel>: Stores user data in the <filename>WinMerge</filename> subfolder of your Documents directory." msgstr "" -"<guilabel >Cartella Documenti</guilabel >: memorizza i dati dell'utente " -"nella sottocartella <filename >WinMerge</filename > della cartella Documenti." +"<guilabel >Cartella Documenti</guilabel >: memorizza i dati dell'utente nella sottocartella <filename >WinMerge</filename > della cartella Documenti." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2966 @@ -12633,15 +9551,11 @@ msgstr "Cartella filtro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2980 msgid "" -"Use this field to specify your own private folder for file filters. By " -"default this folder is your user profile directory (for example, " -"<filename>Documents</filename> on Windows 10). When you create a file " -"filter, it is automatically added to this folder." +"Use this field to specify your own private folder for file filters. By default this folder is your user profile directory (for example, " +"<filename>Documents</filename> on Windows 10). When you create a file filter, it is automatically added to this folder." msgstr "" -"Utilizza questo campo per specificare la tua cartella privata per i filtri " -"di file. Per impostazione predefinita, questa cartella è la cartella del " -"profilo utente (ad esempio, <filename>Documents</filename> su Windows 10). " -"Quando crei un filtro file, questo viene automaticamente aggiunto a questa " +"Utilizza questo campo per specificare la tua cartella privata per i filtri di file. Per impostazione predefinita, questa cartella è la cartella del " +"profilo utente (ad esempio, <filename>Documents</filename> su Windows 10). Quando crei un filtro file, questo viene automaticamente aggiunto a questa " "cartella." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -12656,31 +9570,21 @@ msgstr "Cartella dei file temporanei<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2995 -msgid "" -"Specify the folder where WinMerge stores temporary files. Either one of " -"these options is available:" -msgstr "" -"Specificare la cartella in cui WinMerge memorizza i file temporanei.È " -"disponibile una di queste opzioni:" +msgid "Specify the folder where WinMerge stores temporary files. Either one of these options is available:" +msgstr "Specificare la cartella in cui WinMerge memorizza i file temporanei.È disponibile una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3002 -msgid "" -"<guilabel>System's temp folder</guilabel> (default): For example, this might " -"be <filename>C:\\Windows\\Temp</filename> on your system." +msgid "<guilabel>System's temp folder</guilabel> (default): For example, this might be <filename>C:\\Windows\\Temp</filename> on your system." msgstr "" -"<guilabel >Cartella temporanea del sistema</guilabel> (predefinita): ad " -"esempio, potrebbe essere <filename>C:\\Windows\\Temp</filename> sul tuo " +"<guilabel >Cartella temporanea del sistema</guilabel> (predefinita): ad esempio, potrebbe essere <filename>C:\\Windows\\Temp</filename> sul tuo " "sistema." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3009 -msgid "" -"<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and " -"select a different folder where you have write access." +msgid "<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and select a different folder where you have write access." msgstr "" -"<guilabel >Cartella personalizzata</guilabel >: fai clic su <guibutton " -">Sfoglia</guibutton > e seleziona una cartella diversa dove hai accesso in " +"<guilabel >Cartella personalizzata</guilabel >: fai clic su <guibutton >Sfoglia</guibutton > e seleziona una cartella diversa dove hai accesso in " "scrittura." #. type: Content of: <article><section><title><indexterm><primary> @@ -12696,9 +9600,7 @@ msgstr "Pagina File di backup<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:3025 msgid "This page allows you to control how WinMerge creates backup files." -msgstr "" -"Questa pagina consente di controllare il modo in cui WinMerge crea i file di " -"backup." +msgstr "Questa pagina consente di controllare il modo in cui WinMerge crea i file di backup." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3030 @@ -12707,32 +9609,21 @@ msgstr "Crea file di backup per" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3033 -msgid "" -"Specify when WinMerge should create backup files. You can enable or disable " -"each of these options independently:" -msgstr "" -"Specificare quando WinMerge deve creare i file di backup.Puoi abilitare o " -"disabilitare ciascuna di queste opzioni in modo indipendente:" +msgid "Specify when WinMerge should create backup files. You can enable or disable each of these options independently:" +msgstr "Specificare quando WinMerge deve creare i file di backup.Puoi abilitare o disabilitare ciascuna di queste opzioni in modo indipendente:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3040 -msgid "" -"<guilabel>Folder compare</guilabel> (disabled by default): Backup files are " -"create whenever files are overwritten (copied)." +msgid "<guilabel>Folder compare</guilabel> (disabled by default): Backup files are create whenever files are overwritten (copied)." msgstr "" -"<guilabel >Confronto cartelle</guilabel > (disabilitato per impostazione " -"predefinita): i file di backup vengono creati ogni volta che i file vengono " +"<guilabel >Confronto cartelle</guilabel > (disabilitato per impostazione predefinita): i file di backup vengono creati ogni volta che i file vengono " "sovrascritti (copiati)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3048 -msgid "" -"<guilabel>File compare</guilabel> (enabled by default): Backup files are " -"created whenever files are saved." +msgid "<guilabel>File compare</guilabel> (enabled by default): Backup files are created whenever files are saved." msgstr "" -"<guilabel >Confronto file</guilabel > (abilitato per impostazione " -"predefinita): i file di backup vengono creati ogni volta che i file vengono " -"salvati." +"<guilabel >Confronto file</guilabel > (abilitato per impostazione predefinita): i file di backup vengono creati ogni volta che i file vengono salvati." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3056 @@ -12741,39 +9632,27 @@ msgstr "Crea file di backup in" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3059 -msgid "" -"Specify where backup files are created. Only one of these options can be " -"enabled:" -msgstr "" -"Specificare dove vengono creati i file di backup.È possibile abilitare solo " -"una di queste opzioni:" +msgid "Specify where backup files are created. Only one of these options can be enabled:" +msgstr "Specificare dove vengono creati i file di backup.È possibile abilitare solo una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3066 msgid "" -"<guilabel>Original file's folder</guilabel> (enabled by default): Backup " -"files are created in the same folder as the source file. This is usually a " -"good choice. The down side is that cleaning up backup files in big folders " -"can take a lot of work." +"<guilabel>Original file's folder</guilabel> (enabled by default): Backup files are created in the same folder as the source file. This is usually a " +"good choice. The down side is that cleaning up backup files in big folders can take a lot of work." msgstr "" -"<guilabel >Cartella del file originale</guilabel > (abilitata per " -"impostazione predefinita): i file di backup vengono creati nella stessa " -"cartella del file sorgente.Di solito questa è una buona scelta.Lo svantaggio " -"è che la pulizia dei file di backup in cartelle di grandi dimensioni può " +"<guilabel >Cartella del file originale</guilabel > (abilitata per impostazione predefinita): i file di backup vengono creati nella stessa cartella " +"del file sorgente.Di solito questa è una buona scelta.Lo svantaggio è che la pulizia dei file di backup in cartelle di grandi dimensioni può " "richiedere molto lavoro." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3075 msgid "" -"<guilabel>Global backup folder</guilabel> (disabled by default): All backup " -"files are created in one global folder. This makes them easy to clean up. " -"But, if there are multiple source files with same file name, then the most " -"recent backup file overwrites the previous one of the same name." +"<guilabel>Global backup folder</guilabel> (disabled by default): All backup files are created in one global folder. This makes them easy to clean up. " +"But, if there are multiple source files with same file name, then the most recent backup file overwrites the previous one of the same name." msgstr "" -"<guilabel >Cartella di backup globale</guilabel > (disabilitata per " -"impostazione predefinita): tutti i file di backup vengono creati in una " -"cartella globale.Questo li rende facili da pulire.Tuttavia, se sono presenti " -"più file di origine con lo stesso nome file, il file di backup più recente " +"<guilabel >Cartella di backup globale</guilabel > (disabilitata per impostazione predefinita): tutti i file di backup vengono creati in una cartella " +"globale.Questo li rende facili da pulire.Tuttavia, se sono presenti più file di origine con lo stesso nome file, il file di backup più recente " "sovrascrive quello precedente con lo stesso nome." #. type: Content of: <article><section><section><title> @@ -12783,46 +9662,36 @@ msgstr "Nome del file di backup" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3089 -msgid "" -"When WinMerge creates a backup file, it appends an extension to the source " -"file name. You can choose either or both of these extension schemes:" +msgid "When WinMerge creates a backup file, it appends an extension to the source file name. You can choose either or both of these extension schemes:" msgstr "" -"Quando WinMerge crea un file di backup, aggiunge un'estensione al nome del " -"file di origine.Puoi scegliere uno o entrambi questi schemi di estensione:" +"Quando WinMerge crea un file di backup, aggiunge un'estensione al nome del file di origine.Puoi scegliere uno o entrambi questi schemi di estensione:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3097 msgid "" -"<guilabel>Append .bak extension</guilabel> (enabled by default): For " -"example, the <filename>file.txt</filename> is backed up to <filename>file." -"txt.bak</filename>." +"<guilabel>Append .bak extension</guilabel> (enabled by default): For example, the <filename>file.txt</filename> is backed up to " +"<filename>file.txt.bak</filename>." msgstr "" -"<guilabel >Aggiungi estensione .bak</guilabel> (abilitato per impostazione " -"predefinita): ad esempio, viene eseguito il backup di <filename>file.txt</" +"<guilabel >Aggiungi estensione .bak</guilabel> (abilitato per impostazione predefinita): ad esempio, viene eseguito il backup di <filename>file.txt</" "filename> in <filename>file.txt.bak</filename>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3105 msgid "" -"<guilabel>Append timestamp</guilabel> (enabled by default): Timestamps are " -"almost always unique, so this option usually avoids duplicating backup file " -"names when the source files have the same names." +"<guilabel>Append timestamp</guilabel> (enabled by default): Timestamps are almost always unique, so this option usually avoids duplicating backup " +"file names when the source files have the same names." msgstr "" -"<guilabel >Aggiungi timestamp</guilabel > (abilitato per impostazione " -"predefinita): i timestamp sono quasi sempre univoci, quindi questa opzione " -"solitamente evita di duplicare i nomi dei file di backup quando i file di " -"origine hanno gli stessi nomi." +"<guilabel >Aggiungi timestamp</guilabel > (abilitato per impostazione predefinita): i timestamp sono quasi sempre univoci, quindi questa opzione " +"solitamente evita di duplicare i nomi dei file di backup quando i file di origine hanno gli stessi nomi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3112 msgid "" -"Also, storing a copy of a file each time you save it provides a way to track " -"changes to the file. However, you should consider that this option can " +"Also, storing a copy of a file each time you save it provides a way to track changes to the file. However, you should consider that this option can " "create a lot of files." msgstr "" -"Inoltre, la memorizzazione di una copia di un file ogni volta che lo salvi " -"fornisce un modo per tenere traccia delle modifiche apportate al file." -"Tuttavia, dovresti considerare che questa opzione può creare molti file." +"Inoltre, la memorizzazione di una copia di un file ogni volta che lo salvi fornisce un modo per tenere traccia delle modifiche apportate al " +"file.Tuttavia, dovresti considerare che questa opzione può creare molti file." #. type: Content of: <article><section><title> #: English/Configuration.xml:3123 @@ -12832,48 +9701,38 @@ msgstr "Pagina della tabella codici<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:3131 msgid "" -"WinMerge detects handles file encoding transparently, and in most cases you " -"should not need to change the default settings.This page allows you to " +"WinMerge detects handles file encoding transparently, and in most cases you should not need to change the default settings.This page allows you to " "specify the codepages of certain file formats, should you need to." msgstr "" -"WinMerge rileva la codifica dei file in modo trasparente e nella maggior " -"parte dei casi non dovrebbe essere necessario modificare le impostazioni " -"predefinite. Questa pagina consente di specificare le codepage di " -"determinati formati di file, se necessario." +"WinMerge rileva la codifica dei file in modo trasparente e nella maggior parte dei casi non dovrebbe essere necessario modificare le impostazioni " +"predefinite. Questa pagina consente di specificare le codepage di determinati formati di file, se necessario." #. type: Content of: <article><section><note><para> #: English/Configuration.xml:3138 msgid "" -"A full explanation of text encoding and Windows codepages is beyond the " -"scope of WinMerge documentation. Fortunately, there is lots of information " +"A full explanation of text encoding and Windows codepages is beyond the scope of WinMerge documentation. Fortunately, there is lots of information " "about them on the Internet. For example, here are some places to start:" msgstr "" -"Una spiegazione completa della codifica del testo e delle codepage di " -"Windows va oltre lo scopo della documentazione di WinMerge.Fortunatamente, " -"su Internet si trovano molte informazioni su di loro.Ad esempio, ecco alcuni " -"punti da cui iniziare:" +"Una spiegazione completa della codifica del testo e delle codepage di Windows va oltre lo scopo della documentazione di WinMerge.Fortunatamente, su " +"Internet si trovano molte informazioni su di loro.Ad esempio, ecco alcuni punti da cui iniziare:" #. type: Content of: <article><section><note><itemizedlist><listitem><para> #: English/Configuration.xml:3147 msgid "" -"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code " -"pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" +"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" "Character_encoding\"> Character encoding </ulink>" msgstr "" -"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: pagine " -"di codici </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" +"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: pagine di codici </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" "Character_encoding\"> Codifica dei caratteri </ulink>" #. type: Content of: <article><section><note><itemizedlist><listitem><para> #: English/Configuration.xml:3160 msgid "" -"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-" -"ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages " +"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages " "Supported by Windows </ulink>" msgstr "" -"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-" -"ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: pagine codici " -"supportate da Windows </ulink>" +"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: pagine " +"codici supportate da Windows </ulink>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3170 @@ -12882,142 +9741,103 @@ msgstr "Tabella codici predefinita" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3173 -msgid "" -"Choose one of these radio buttons to set the default codepage that WinMerge " -"uses when handling ANSI files:" -msgstr "" -"Scegli uno di questi pulsanti di opzione per impostare la codepage " -"predefinita utilizzata da WinMerge durante la gestione dei file ANSI:" +msgid "Choose one of these radio buttons to set the default codepage that WinMerge uses when handling ANSI files:" +msgstr "Scegli uno di questi pulsanti di opzione per impostare la codepage predefinita utilizzata da WinMerge durante la gestione dei file ANSI:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3180 msgid "" -"<guilabel>System codepage</guilabel> (default):The codepage used by your " -"Windows system. This default is usually the best choice. However if you " -"know that you are comparing files that do not use the system codepage, " -"consider one of the other options." +"<guilabel>System codepage</guilabel> (default):The codepage used by your Windows system. This default is usually the best choice. However if you " +"know that you are comparing files that do not use the system codepage, consider one of the other options." msgstr "" -"<guilabel >Codice di sistema</guilabel> (predefinito): il codice utilizzato " -"dal tuo sistema Windows.Questa impostazione predefinita è solitamente la " -"scelta migliore.Tuttavia, se sai che stai confrontando file che non " -"utilizzano la codepage di sistema, considera una delle altre opzioni." +"<guilabel >Codice di sistema</guilabel> (predefinito): il codice utilizzato dal tuo sistema Windows.Questa impostazione predefinita è solitamente la " +"scelta migliore.Tuttavia, se sai che stai confrontando file che non utilizzano la codepage di sistema, considera una delle altre opzioni." #. This is just a guess - don't find any info on this option. #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3189 -msgid "" -"<guilabel>According to WinMerge User Interface</guilabel>: The encoding used " -"by your installation of WinMerge." -msgstr "" -"<guilabel >Secondo l'interfaccia utente di WinMerge</guilabel >: la codifica " -"utilizzata dalla tua installazione di WinMerge." +msgid "<guilabel>According to WinMerge User Interface</guilabel>: The encoding used by your installation of WinMerge." +msgstr "<guilabel >Secondo l'interfaccia utente di WinMerge</guilabel >: la codifica utilizzata dalla tua installazione di WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3196 msgid "" -"<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. " -"For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</" +"<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</" "userinput>." msgstr "" -"<guilabel >Codice personalizzato</guilabel >: inserisci esplicitamente il " -"numero della tabella codici.Ad esempio, <userinput>UTF-8</userinput> o " +"<guilabel >Codice personalizzato</guilabel >: inserisci esplicitamente il numero della tabella codici.Ad esempio, <userinput>UTF-8</userinput> o " "<userinput>ISO-8851-1</userinput>." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3205 msgid "Detect codepage info for these files: .html, .rc, .xml" -msgstr "" -"Rileva informazioni sulla tabella codici per questi file: .html, .rc, .xml" +msgstr "Rileva informazioni sulla tabella codici per questi file: .html, .rc, .xml" -#. What option? The one in the Options page? If it should always be unchecked, +#. What option? The one in the Options page? If it should always be unchecked, #. why is the option there? Also, should we mention WinMergeU.exe when we mention WinMerge.exe, #. or is this understood? #. type: Content of: <article><section><section><important><para> #: English/Configuration.xml:3209 msgid "" -"Uncheck this option in <filename>WinMerge.exe</filename>. Characters " -"conversions can result in lossy conversions and the risk is very high. " -"<filename>WinMerge.exe</filename> can display files only with your current " -"codepage." +"Uncheck this option in <filename>WinMerge.exe</filename>. Characters conversions can result in lossy conversions and the risk is very high. " +"<filename>WinMerge.exe</filename> can display files only with your current codepage." msgstr "" -"Deseleziona questa opzione in <filename>WinMerge.exe</filename>.Le " -"conversioni dei caratteri possono comportare conversioni con perdita e il " -"rischio è molto alto.<filename>WinMerge.exe</filename> può visualizzare solo " -"file con la codepage corrente." +"Deseleziona questa opzione in <filename>WinMerge.exe</filename>.Le conversioni dei caratteri possono comportare conversioni con perdita e il rischio " +"è molto alto.<filename>WinMerge.exe</filename> può visualizzare solo file con la codepage corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3221 msgid "" -"<option>Disabled</option> (default): WinMerge does not read codepage " -"information from the source files. It uses the default codepage setting " -"instead." +"<option>Disabled</option> (default): WinMerge does not read codepage information from the source files. It uses the default codepage setting instead." msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge non legge le " -"informazioni sulla tabella codici dai file sorgente.Utilizza invece " -"l'impostazione della tabella codici predefinita." +"<option>Disabilitato</option> (predefinito): WinMerge non legge le informazioni sulla tabella codici dai file sorgente.Utilizza invece l'impostazione " +"della tabella codici predefinita." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3229 msgid "" -"<option>Enabled</option>: WinMerge detects the codepage for these " -"extensions: <filename class=\"extension\">html</filename>, <filename " -"class=\"extension\">rc</filename> (resource files for VC++) and <filename " -"class=\"extension\">xml</filename>. The detected codepage overrides the " +"<option>Enabled</option>: WinMerge detects the codepage for these extensions: <filename class=\"extension\">html</filename>, <filename " +"class=\"extension\">rc</filename> (resource files for VC++) and <filename class=\"extension\">xml</filename>. The detected codepage overrides the " "setting for the default codepage option." msgstr "" -"<option>Abilitato</option>: WinMerge rileva la codepage per queste " -"estensioni: <filename class=\"extension\">html</filename>, <filename " -"class=\"extension\">rc</filename> (file di risorse per VC++) e <filename " -"class=\"extension\">xml</filename>.La codepage rilevata sovrascrive " +"<option>Abilitato</option>: WinMerge rileva la codepage per queste estensioni: <filename class=\"extension\">html</filename>, <filename " +"class=\"extension\">rc</filename> (file di risorse per VC++) e <filename class=\"extension\">xml</filename>.La codepage rilevata sovrascrive " "l'impostazione dell'opzione codepage predefinita." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3237 -msgid "" -"This option is of interest when your documents use a codepage that is " -"different from the codepage of your Windows configuration." +msgid "This option is of interest when your documents use a codepage that is different from the codepage of your Windows configuration." msgstr "" -"Questa opzione è interessante quando i tuoi documenti utilizzano una tabella " -"codici diversa dalla tabella codici della configurazione di Windows." +"Questa opzione è interessante quando i tuoi documenti utilizzano una tabella codici diversa dalla tabella codici della configurazione di Windows." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3243 msgid "" -"For example, you might merge two Slovak or two Japanese files in an English " -"environment. With this option enabled (and with the required fonts), your " -"Slovak, or Japanese, the files are displayed using Slovak, or Japanese, " -"characters." +"For example, you might merge two Slovak or two Japanese files in an English environment. With this option enabled (and with the required fonts), your " +"Slovak, or Japanese, the files are displayed using Slovak, or Japanese, characters." msgstr "" -"Ad esempio, potresti unire due file slovacchi o due giapponesi in un " -"ambiente inglese.Con questa opzione abilitata (e con i caratteri richiesti), " -"il tuo slovacco o giapponese, i file vengono visualizzati utilizzando i " -"caratteri slovacchi o giapponesi." +"Ad esempio, potresti unire due file slovacchi o due giapponesi in un ambiente inglese.Con questa opzione abilitata (e con i caratteri richiesti), il " +"tuo slovacco o giapponese, i file vengono visualizzati utilizzando i caratteri slovacchi o giapponesi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3250 msgid "" -"WinMerge also detects a codepage difference between the left/right files. To " -"avoid lossy conversions when you merge, copy, or paste, we suggest that you " -"ignore the codepage information." +"WinMerge also detects a codepage difference between the left/right files. To avoid lossy conversions when you merge, copy, or paste, we suggest that " +"you ignore the codepage information." msgstr "" -"WinMerge rileva anche una differenza di codepage tra i file sinistro/destro." -"Per evitare conversioni con perdita di dati quando unisci, copi o incolli, " -"ti suggeriamo di ignorare le informazioni sulla tabella codici." +"WinMerge rileva anche una differenza di codepage tra i file sinistro/destro.Per evitare conversioni con perdita di dati quando unisci, copi o " +"incolli, ti suggeriamo di ignorare le informazioni sulla tabella codici." #. type: Content of: <article><section><section><itemizedlist><listitem><caution><para> #: English/Configuration.xml:3257 msgid "" -"When you copy or paste text to an external application, the external " -"application must use the same codepage as WinMerge does. Refer to the " -"documentation for your external editor. For copying to WinMerge, Internet " -"Explorer offers codepage selection. If your external editor does not support " -"custom codepages, disable this option." +"When you copy or paste text to an external application, the external application must use the same codepage as WinMerge does. Refer to the " +"documentation for your external editor. For copying to WinMerge, Internet Explorer offers codepage selection. If your external editor does not " +"support custom codepages, disable this option." msgstr "" -"Quando copi o incolli testo su un'applicazione esterna, l'applicazione " -"esterna deve utilizzare la stessa tabella codici di WinMerge.Fare " -"riferimento alla documentazione dell'editor esterno.Per copiare su WinMerge, " -"Internet Explorer offre la selezione della tabella codici.Se il tuo editor " -"esterno non supporta le codepage personalizzate, disabilita questa opzione." +"Quando copi o incolli testo su un'applicazione esterna, l'applicazione esterna deve utilizzare la stessa tabella codici di WinMerge.Fare riferimento " +"alla documentazione dell'editor esterno.Per copiare su WinMerge, Internet Explorer offre la selezione della tabella codici.Se il tuo editor esterno " +"non supporta le codepage personalizzate, disabilita questa opzione." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3270 @@ -13030,15 +9850,13 @@ msgid "Shell Integration page" msgstr "Pagina Integrazione shell" #. type: Content of: <article><title><indexterm><primary> -#: English/Configuration.xml:3283 English/Faq.xml:95 English/Install.xml:174 -#: English/Install.xml:189 English/Install.xml:352 +#: English/Configuration.xml:3283 English/Faq.xml:95 English/Install.xml:174 English/Install.xml:189 English/Install.xml:352 #: English/Version_control.xml:4 msgid "integration" msgstr "integrazione" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:3285 English/Install.xml:191 -#: English/Install.xml:354 +#: English/Configuration.xml:3285 English/Install.xml:191 English/Install.xml:354 msgid "with Windows shell" msgstr "con la shell di Windows" @@ -13050,16 +9868,12 @@ msgstr "Esplora<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3290 msgid "" -"The <option>Add to context menu</option> option enables you to launch " -"WinMerge directly from Windows Explorer, comparing items that you have " -"selected there. It is enabled or disabled by default during WinMerge " -"installation. If enabled, you can also enable one or both of these options:" +"The <option>Add to context menu</option> option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected " +"there. It is enabled or disabled by default during WinMerge installation. If enabled, you can also enable one or both of these options:" msgstr "" -"L'opzione <option>Aggiungi al menu contestuale</option> ti consente di " -"avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi " -"che hai selezionato lì.È abilitato o disabilitato per impostazione " -"predefinita durante l'installazione di WinMerge.Se abilitato, puoi anche " -"abilitare una o entrambe queste opzioni:" +"L'opzione <option>Aggiungi al menu contestuale</option> ti consente di avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi " +"che hai selezionato lì.È abilitato o disabilitato per impostazione predefinita durante l'installazione di WinMerge.Se abilitato, puoi anche abilitare " +"una o entrambe queste opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:3299 @@ -13068,23 +9882,18 @@ msgstr "Abilita il menu avanzato" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3305 -msgid "" -"<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</" -"guimenuitem> shortcut is included in the Windows Explorer context menu." +msgid "<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</guimenuitem> shortcut is included in the Windows Explorer context menu." msgstr "" -"<option >Disabilitato</option> (predefinito): solo la scorciatoia " -"<guimenuitem >WinMerge</guimenuitem > è inclusa nel menu contestuale di " -"Esplora risorse." +"<option >Disabilitato</option> (predefinito): solo la scorciatoia <guimenuitem >WinMerge</guimenuitem > è inclusa nel menu contestuale di Esplora " +"risorse." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3313 msgid "" -"<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> " -"shortcut in the Explorer context menu with <guimenuitem>Compare</" +"<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> shortcut in the Explorer context menu with <guimenuitem>Compare</" "guimenuitem> shortcuts." msgstr "" -"<option >Abilitato</option >: sostituisce la scorciatoia <guimenuitem " -">WinMerge</guimenuitem > nel menu contestuale di Explorer con le scorciatoie " +"<option >Abilitato</option >: sostituisce la scorciatoia <guimenuitem >WinMerge</guimenuitem > nel menu contestuale di Explorer con le scorciatoie " "<guimenuitem >Confronta</guimenuitem >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -13094,30 +9903,19 @@ msgstr "Abilita il menu Confronta come" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3332 -msgid "" -"<option>Disabled</option> (default): Removes <guimenuitem>Compare As</" -"guimenuitem> menu item from Explorer context menu." +msgid "<option>Disabled</option> (default): Removes <guimenuitem>Compare As</guimenuitem> menu item from Explorer context menu." msgstr "" -"<option >Disabilitato</option> (predefinito): rimuove la voce di menu " -"<guimenuitem >Confronta come</guimenuitem > dal menu contestuale di Explorer." +"<option >Disabilitato</option> (predefinito): rimuove la voce di menu <guimenuitem >Confronta come</guimenuitem > dal menu contestuale di Explorer." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3340 -msgid "" -"<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu " -"item to Explorer context menu." -msgstr "" -"<option >Abilitato</option >: aggiunge la voce di menu <guimenuitem " -">Confronta come</guimenuitem > al menu contestuale di Explorer." +msgid "<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu item to Explorer context menu." +msgstr "<option >Abilitato</option >: aggiunge la voce di menu <guimenuitem >Confronta come</guimenuitem > al menu contestuale di Explorer." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3351 -msgid "" -"<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge " -"and Compare shortcuts." -msgstr "" -"<xref linkend=\"OpenPaths_shell-integ\" /> descrive come utilizzare le " -"scorciatoie WinMerge e Confronta." +msgid "<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge and Compare shortcuts." +msgstr "<xref linkend=\"OpenPaths_shell-integ\" /> descrive come utilizzare le scorciatoie WinMerge e Confronta." #. type: Content of: <article><title> #: English/Faq.xml:3 @@ -13157,83 +9955,58 @@ msgstr "ANSI" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:14 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>Beginning with Version " -"2.14, WinMerge ended support for older 32-bit Windows systems, including " -"Windows 9x, ME, and NT4. In addition, WinMerge version 2.16 does not " +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>Beginning with Version " +"2.14, WinMerge ended support for older 32-bit Windows systems, including Windows 9x, ME, and NT4. In addition, WinMerge version 2.16 does not " "support Windows 2000." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>A partire dalla versione " -"2.14, WinMerge ha interrotto il supporto per i vecchi sistemi Windows a 32 " -"bit, inclusi Windows 9x, ME e NT4.Inoltre, WinMerge versione 2.16 non " -"supporta Windows 2000." +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>A partire dalla " +"versione 2.14, WinMerge ha interrotto il supporto per i vecchi sistemi Windows a 32 bit, inclusi Windows 9x, ME e NT4.Inoltre, WinMerge versione 2.16 " +"non supporta Windows 2000." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:25 msgid "" -"Previously, WinMerge provided an ANSI (8-bit) executable, <filename>WinMerge." -"exe</filename>, that was designed around the old Windows codepages. " -"<filename>WinMerge.exe</filename> internally stored only the ANSI characters " -"supported by the Windows codepage. This executable had severe limitations " -"for working with Unicode: if you opened a Unicode file, the characters were " -"converted to the Windows ANSI codepage. Because there are over 100,000 " -"Unicode characters, and only 256 can be represented in the ANSI character " -"set, data loss could occur. Conversion might be approximate (for example, " -"accents are lost) or impossible: characters were replaced by question marks " -"( <literal>?</literal> )." -msgstr "" -"In precedenza, WinMerge forniva un eseguibile ANSI (8 bit), " -"<filename>WinMerge.exe</filename>, progettato attorno alle vecchie codepage " -"di Windows.<filename>WinMerge.exe</filename> memorizzava internamente solo i " -"caratteri ANSI supportati dalla codepage di Windows.Questo eseguibile " -"presentava gravi limitazioni per lavorare con Unicode: se si apriva un file " -"Unicode, i caratteri venivano convertiti nella codepage ANSI di Windows." -"Poiché sono presenti oltre 100.000 caratteri Unicode e solo 256 possono " -"essere rappresentati nel set di caratteri ANSI, potrebbe verificarsi una " -"perdita di dati.La conversione potrebbe essere approssimativa (ad esempio, " -"gli accenti vengono persi) o impossibile: i caratteri sono stati sostituiti " -"da punti interrogativi ( <literal>?</literal> )." +"Previously, WinMerge provided an ANSI (8-bit) executable, <filename>WinMerge.exe</filename>, that was designed around the old Windows codepages. " +"<filename>WinMerge.exe</filename> internally stored only the ANSI characters supported by the Windows codepage. This executable had severe " +"limitations for working with Unicode: if you opened a Unicode file, the characters were converted to the Windows ANSI codepage. Because there are " +"over 100,000 Unicode characters, and only 256 can be represented in the ANSI character set, data loss could occur. Conversion might be approximate " +"(for example, accents are lost) or impossible: characters were replaced by question marks ( <literal>?</literal> )." +msgstr "" +"In precedenza, WinMerge forniva un eseguibile ANSI (8 bit), <filename>WinMerge.exe</filename>, progettato attorno alle vecchie codepage di Windows." +"<filename>WinMerge.exe</filename> memorizzava internamente solo i caratteri ANSI supportati dalla codepage di Windows.Questo eseguibile presentava " +"gravi limitazioni per lavorare con Unicode: se si apriva un file Unicode, i caratteri venivano convertiti nella codepage ANSI di Windows.Poiché sono " +"presenti oltre 100.000 caratteri Unicode e solo 256 possono essere rappresentati nel set di caratteri ANSI, potrebbe verificarsi una perdita di " +"dati.La conversione potrebbe essere approssimativa (ad esempio, gli accenti vengono persi) o impossibile: i caratteri sono stati sostituiti da punti " +"interrogativi ( <literal>?</literal> )." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:36 msgid "" -"<filename>WinMerge.exe</filename> also could not open files with names " -"outside the current ANSI codepage. For example, on an English system, " +"<filename>WinMerge.exe</filename> also could not open files with names outside the current ANSI codepage. For example, on an English system, " "<filename>WinMerge.exe</filename> could not open a file with a Hebrew name." msgstr "" -"Inoltre, <filename>WinMerge.exe</filename> non è in grado di aprire file con " -"nomi esterni alla codepage ANSI corrente.Ad esempio, su un sistema inglese, " -"<filename>WinMerge.exe</filename> non è riuscito ad aprire un file con un " -"nome ebraico." +"Inoltre, <filename>WinMerge.exe</filename> non è in grado di aprire file con nomi esterni alla codepage ANSI corrente.Ad esempio, su un sistema " +"inglese, <filename>WinMerge.exe</filename> non è riuscito ad aprire un file con un nome ebraico." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:40 msgid "" -"WinMerge developed the Unicode-enabled <filename>WinMergeU.exe</filename> " -"executable to work with newer, Unicode-based Windows systems. " -"<filename>WinMergeU.exe</filename> has none of the limitations of the ANSI " -"executable." +"WinMerge developed the Unicode-enabled <filename>WinMergeU.exe</filename> executable to work with newer, Unicode-based Windows systems. " +"<filename>WinMergeU.exe</filename> has none of the limitations of the ANSI executable." msgstr "" -"WinMerge ha sviluppato l'eseguibile <filename>WinMergeU.exe</filename> " -"abilitato per Unicode per funzionare con i nuovi sistemi Windows basati su " -"Unicode.<filename>WinMergeU.exe</filename> non presenta nessuna delle " -"limitazioni dell'eseguibile ANSI." +"WinMerge ha sviluppato l'eseguibile <filename>WinMergeU.exe</filename> abilitato per Unicode per funzionare con i nuovi sistemi Windows basati su " +"Unicode.<filename>WinMergeU.exe</filename> non presenta nessuna delle limitazioni dell'eseguibile ANSI." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:44 msgid "" -"<filename>WinMergeU.exe</filename> has been installed by default for some " -"time, and since few ANSI-based Windows systems remain, the value of " -"maintaining <filename>WinMerge.exe</filename> is minimal. As of Version " -"2.14, WinMerge no longer includes <filename>WinMerge.exe</filename> in the " +"<filename>WinMergeU.exe</filename> has been installed by default for some time, and since few ANSI-based Windows systems remain, the value of " +"maintaining <filename>WinMerge.exe</filename> is minimal. As of Version 2.14, WinMerge no longer includes <filename>WinMerge.exe</filename> in the " "installer." msgstr "" -"<filename>WinMergeU.exe</filename> è stato installato per impostazione " -"predefinita da qualche tempo e poiché rimangono pochi sistemi Windows basati " -"su ANSI, l'utilità di mantenere <filename>WinMerge.exe</filename> è minima.A " -"partire dalla versione 2.14, WinMerge non include più <filename>WinMerge." -"exe</filename> nel programma di installazione." +"<filename>WinMergeU.exe</filename> è stato installato per impostazione predefinita da qualche tempo e poiché rimangono pochi sistemi Windows basati " +"su ANSI, l'utilità di mantenere <filename>WinMerge.exe</filename> è minima.A partire dalla versione 2.14, WinMerge non include più " +"<filename>WinMerge.exe</filename> nel programma di installazione." #. type: Content of: <article><para><indexterm><secondary> #: English/Faq.xml:58 English/Open_paths.xml:11 English/Open_paths.xml:15 @@ -13242,51 +10015,37 @@ msgstr "selezionando nella finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:54 -msgid "" -"I want to compare folders, but I cannot select a folder in the Browse dialog." -"<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "I want to compare folders, but I cannot select a folder in the Browse dialog.<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Desidero confrontare le cartelle, ma non riesco a selezionare una cartella " -"nella finestra di dialogo Sfoglia.<placeholder type=\"indexterm\" id=\"0\"/>" +"Desidero confrontare le cartelle, ma non riesco a selezionare una cartella nella finestra di dialogo Sfoglia.<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:63 msgid "" -"Browse in the folder contents to the folder you want to compare. Do not " -"select any of the files or subfolders, just click <guibutton>Open</" -"guibutton> when <literal>Folder Selection</literal> is displayed in the " -"<guilabel>File name</guilabel> field. If you already selected a files or " -"subfolders, just type a random string in the <guilabel>File name</guilabel> " -"field and click <guibutton>Open</guibutton>. If the file name you enter is " -"not found, WinMerge opens the folder." -msgstr "" -"Sfoglia il contenuto della cartella fino alla cartella che desideri " -"confrontare.Non selezionare nessun file o sottocartella, fai semplicemente " -"clic su <guibutton >Apri</guibutton > quando <literal >Selezione cartella</" -"literal > è visualizzato nel campo <guilabel >Nome file</guilabel >.Se hai " -"già selezionato un file o una sottocartella, digita semplicemente una " -"stringa casuale nel campo <guilabel >Nome file</guilabel > e fai clic su " -"<guibutton >Apri</guibutton >.Se il nome file immesso non viene trovato, " -"WinMerge apre la cartella." +"Browse in the folder contents to the folder you want to compare. Do not select any of the files or subfolders, just click <guibutton>Open</" +"guibutton> when <literal>Folder Selection</literal> is displayed in the <guilabel>File name</guilabel> field. If you already selected a files or " +"subfolders, just type a random string in the <guilabel>File name</guilabel> field and click <guibutton>Open</guibutton>. If the file name you enter " +"is not found, WinMerge opens the folder." +msgstr "" +"Sfoglia il contenuto della cartella fino alla cartella che desideri confrontare.Non selezionare nessun file o sottocartella, fai semplicemente clic " +"su <guibutton >Apri</guibutton > quando <literal >Selezione cartella</literal > è visualizzato nel campo <guilabel >Nome file</guilabel >.Se hai già " +"selezionato un file o una sottocartella, digita semplicemente una stringa casuale nel campo <guilabel >Nome file</guilabel > e fai clic su <guibutton " +">Apri</guibutton >.Se il nome file immesso non viene trovato, WinMerge apre la cartella." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:76 -msgid "" -"Do you have any plans to support other operating systems besides Windows?" +msgid "Do you have any plans to support other operating systems besides Windows?" msgstr "Prevedi di supportare altri sistemi operativi oltre a Windows?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:81 msgid "" -"There are currently no plans for cross-platform support but you can try the " -"unofficial version <ulink url=\"https://github.com/datadiode/winmerge2011\"> " -"WinMerge 2011</ulink> by Jochen Neubeck. This version should work with Wine " -"also under Linux." +"There are currently no plans for cross-platform support but you can try the unofficial version <ulink url=\"https://github.com/datadiode/" +"winmerge2011\"> WinMerge 2011</ulink> by Jochen Neubeck. This version should work with Wine also under Linux." msgstr "" -"Al momento non è previsto il supporto multipiattaforma, ma puoi provare la " -"versione non ufficiale <ulink url=\"https://github.com/datadiode/" -"winmerge2011\"> WinMerge 2011</ulink> di Jochen Neubeck.Questa versione " -"dovrebbe funzionare con Wine anche sotto Linux." +"Al momento non è previsto il supporto multipiattaforma, ma puoi provare la versione non ufficiale <ulink url=\"https://github.com/datadiode/" +"winmerge2011\"> WinMerge 2011</ulink> di Jochen Neubeck.Questa versione dovrebbe funzionare con Wine anche sotto Linux." #. type: Content of: <article><section><title><indexterm><primary> #: English/Faq.xml:91 English/Install.xml:180 English/Version_control.xml:53 @@ -13305,27 +10064,19 @@ msgstr "con sistemi di controllo della versione" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:90 -msgid "" -"Why is there no CVS integration?<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Perché non è disponibile alcuna integrazione CVS?<placeholder " -"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Why is there no CVS integration?<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Perché non è disponibile alcuna integrazione CVS?<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:102 msgid "" -"Providing an integration with CVS is of questionable value because there " -"already are so many good CVS clients. However, WinMerge does provide an " -"integration with the diff function of one of those clients, TortoiseCVS (as " -"described in <xref linkend=\"Version_control\" />). Also, WinMerge can " +"Providing an integration with CVS is of questionable value because there already are so many good CVS clients. However, WinMerge does provide an " +"integration with the diff function of one of those clients, TortoiseCVS (as described in <xref linkend=\"Version_control\" />). Also, WinMerge can " "resolve conflict files (see <xref linkend=\"ResolveConflictFiles\" />)." msgstr "" -"Fornire un'integrazione con CVS ha un valore discutibile perché esistono già " -"tanti buoni client CVS.Tuttavia, WinMerge fornisce un'integrazione con la " -"funzione diff di uno di questi client, TortoiseCVS (come descritto in <xref " -"linkend=\"Version_control\" />).Inoltre, WinMerge può risolvere i file in " -"conflitto (vedi <xref linkend=\"ResolveConflictFiles\" />)." +"Fornire un'integrazione con CVS ha un valore discutibile perché esistono già tanti buoni client CVS.Tuttavia, WinMerge fornisce un'integrazione con " +"la funzione diff di uno di questi client, TortoiseCVS (come descritto in <xref linkend=\"Version_control\" />).Inoltre, WinMerge può risolvere i file " +"in conflitto (vedi <xref linkend=\"ResolveConflictFiles\" />)." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:113 @@ -13335,14 +10086,11 @@ msgstr "Cos'è un elenco MRU?<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:119 msgid "" -"MRU is an abbreviation for <quote>Most Recently Used</quote>, and refers to " -"the history lists in the Select Files or Folders dialog. The list contains " -"the last twenty paths used on each side." +"MRU is an abbreviation for <quote>Most Recently Used</quote>, and refers to the history lists in the Select Files or Folders dialog. The list " +"contains the last twenty paths used on each side." msgstr "" -"MRU è un'abbreviazione di <quote>Utilizzato più recentemente</quote> e si " -"riferisce agli elenchi della cronologia nella finestra di dialogo Seleziona " -"file o cartelle.L'elenco contiene gli ultimi venti percorsi utilizzati su " -"ciascun lato." +"MRU è un'abbreviazione di <quote>Utilizzato più recentemente</quote> e si riferisce agli elenchi della cronologia nella finestra di dialogo Seleziona " +"file o cartelle.L'elenco contiene gli ultimi venti percorsi utilizzati su ciascun lato." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> #: English/Faq.xml:128 @@ -13351,59 +10099,40 @@ msgstr "OpenOffice, apertura di file in WinMerge" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:127 -msgid "" -"Can WinMerge open OpenOffice files?<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"WinMerge può aprire file OpenOffice?<placeholder type=\"indexterm\" id=\"0\"/" -">" +msgid "Can WinMerge open OpenOffice files?<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "WinMerge può aprire file OpenOffice?<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:133 -msgid "" -"OpenOffice files are archives. To be able to open them in WinMerge, you have " -"to configure archive support:" -msgstr "" -"I file OpenOffice sono archivi.Per poterli aprire in WinMerge, devi " -"configurare il supporto dell'archivio:" +msgid "OpenOffice files are archives. To be able to open them in WinMerge, you have to configure archive support:" +msgstr "I file OpenOffice sono archivi.Per poterli aprire in WinMerge, devi configurare il supporto dell'archivio:" #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:138 msgid "" -"In WinMerge, click the <guibutton>Options</guibutton> button (or click " -"<menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" -"menuchoice>). In the Archive Support page, enable the <guilabel>Detect " -"archive type from file signature</guilabel> option" +"In WinMerge, click the <guibutton>Options</guibutton> button (or click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" +"menuchoice>). In the Archive Support page, enable the <guilabel>Detect archive type from file signature</guilabel> option" msgstr "" -"In WinMerge, fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai " -"clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" -"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita " -"l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >" +"In WinMerge, fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" +"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:153 -msgid "" -"Why do large files sometimes show up as different in the Folder Compare " -"window, but identical in the File Compare window?" +msgid "Why do large files sometimes show up as different in the Folder Compare window, but identical in the File Compare window?" msgstr "" -"Perché i file di grandi dimensioni a volte vengono visualizzati come diversi " -"nella finestra Confronto cartelle, ma identici nella finestra Confronto file?" +"Perché i file di grandi dimensioni a volte vengono visualizzati come diversi nella finestra Confronto cartelle, ma identici nella finestra Confronto " +"file?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:158 msgid "" -"This is because WinMerge always uses the <guilabel>Quick Contents</guilabel> " -"file compare method for large files. This method enables WinMerge to compare " -"large files more efficiently. To test if this is causing the behavior you're " -"seeing, you can try raising the <guilabel>Quick Contents</guilabel> " -"threshold for large files. See the discussion of this method in <xref " -"linkend=\"Compare_dirs_starting\" /> to learn how." -msgstr "" -"Questo perché WinMerge usa sempre il metodo di confronto file <guilabel " -">Contenuti rapidi</guilabel > per file di grandi dimensioni.Questo metodo " -"consente a WinMerge di confrontare file di grandi dimensioni in modo più " -"efficiente.Per verificare se questo è la causa del comportamento che stai " -"riscontrando, puoi provare ad aumentare la soglia dei <guilabel >Contenuti " -"rapidi</guilabel > per i file di grandi dimensioni.Vedi la discussione di " +"This is because WinMerge always uses the <guilabel>Quick Contents</guilabel> file compare method for large files. This method enables WinMerge to " +"compare large files more efficiently. To test if this is causing the behavior you're seeing, you can try raising the <guilabel>Quick Contents</" +"guilabel> threshold for large files. See the discussion of this method in <xref linkend=\"Compare_dirs_starting\" /> to learn how." +msgstr "" +"Questo perché WinMerge usa sempre il metodo di confronto file <guilabel >Contenuti rapidi</guilabel > per file di grandi dimensioni.Questo metodo " +"consente a WinMerge di confrontare file di grandi dimensioni in modo più efficiente.Per verificare se questo è la causa del comportamento che stai " +"riscontrando, puoi provare ad aumentare la soglia dei <guilabel >Contenuti rapidi</guilabel > per i file di grandi dimensioni.Vedi la discussione di " "questo metodo in <xref linkend=\"Compare_dirs_starting\" /> per sapere come." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> @@ -13419,42 +10148,31 @@ msgstr "ordine di selezione dei file" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:170 msgid "" -"When comparing multiple files from Windows Explorer, how can I control which " -"file appears on the left side?<placeholder type=\"indexterm\" id=\"0\"/>" +"When comparing multiple files from Windows Explorer, how can I control which file appears on the left side?<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Quando si confrontano più file da Esplora risorse, come posso controllare " -"quale file viene visualizzato sul lato sinistro?<placeholder " +"Quando si confrontano più file da Esplora risorse, come posso controllare quale file viene visualizzato sul lato sinistro?<placeholder " "type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:177 msgid "" -"When multiple files are selected in Windows Explorer, the file you right-" -"click becomes the first (primary) item. The remaining items follow in the " -"order they were selected. Therefore, to make a file appear on the left side " -"in WinMerge, select multiple files and right-click the one you want to " +"When multiple files are selected in Windows Explorer, the file you right-click becomes the first (primary) item. The remaining items follow in the " +"order they were selected. Therefore, to make a file appear on the left side in WinMerge, select multiple files and right-click the one you want to " "compare on the left." msgstr "" -"Quando vengono selezionati più file in Esplora risorse, il file su cui si fa " -"clic con il pulsante destro del mouse diventa il primo elemento (primario)." -"Gli elementi rimanenti seguono nell'ordine in cui sono stati selezionati." -"Pertanto, per far apparire un file sul lato sinistro in WinMerge, seleziona " -"più file e fai clic con il pulsante destro del mouse su quello che desideri " -"confrontare a sinistra." +"Quando vengono selezionati più file in Esplora risorse, il file su cui si fa clic con il pulsante destro del mouse diventa il primo elemento " +"(primario).Gli elementi rimanenti seguono nell'ordine in cui sono stati selezionati.Pertanto, per far apparire un file sul lato sinistro in WinMerge, " +"seleziona più file e fai clic con il pulsante destro del mouse su quello che desideri confrontare a sinistra." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:178 msgid "" -"For more information about this Windows shell behavior, see: <ulink " -"url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?p=102406\">The " -"Old New Thing: How does Explorer determine which program to use to open a " -"file if an explicit command is not provided?</ulink>." +"For more information about this Windows shell behavior, see: <ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?p=102406\">The Old " +"New Thing: How does Explorer determine which program to use to open a file if an explicit command is not provided?</ulink>." msgstr "" -"Per ulteriori informazioni sul comportamento della shell di Windows, vedi: " -"<ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?" -"p=102406\">The Old New Thing: in che modo Explorer determina quale programma " -"utilizzare per aprire un file se non viene fornito un comando esplicito?</" -"ulink>." +"Per ulteriori informazioni sul comportamento della shell di Windows, vedi: <ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?" +"p=102406\">The Old New Thing: in che modo Explorer determina quale programma utilizzare per aprire un file se non viene fornito un comando esplicito?" +"</ulink>." #. type: Content of: <article><section><title> #: English/Faq.xml:186 @@ -13463,28 +10181,19 @@ msgstr "Confronto di file" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:191 -msgid "" -"Why do my files have all lines marked as different (colored), even though I " -"know all the lines are not different?" -msgstr "" -"Perché i miei file hanno tutte le linee contrassegnate come diverse " -"(colorate), anche se so che non tutte le linee sono diverse?" +msgid "Why do my files have all lines marked as different (colored), even though I know all the lines are not different?" +msgstr "Perché i miei file hanno tutte le linee contrassegnate come diverse (colorate), anche se so che non tutte le linee sono diverse?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:196 msgid "" -"Maybe your files have different line ending styles (for example, Windows and " -"Unix). By default, WinMerge compares line ending styles. To disable it, " -"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" -"guimenuitem> </menuchoice>. In the Compare page, enable (check) the option, " +"Maybe your files have different line ending styles (for example, Windows and Unix). By default, WinMerge compares line ending styles. To disable it, " +"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice>. In the Compare page, enable (check) the option, " "<guilabel>Ignore carriage return differences</guilabel>." msgstr "" -"Forse i tuoi file hanno stili di fine riga diversi (ad esempio, Windows e " -"Unix).Per impostazione predefinita, WinMerge confronta gli stili di fine " -"riga.Per disabilitarlo, fai clic su <menuchoice> <guimenu >Modifica</guimenu " -"> <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Nella pagina " -"Confronta, abilita (seleziona) l'opzione <guilabel >Ignora differenze di " -"ritorno a capo</guilabel >." +"Forse i tuoi file hanno stili di fine riga diversi (ad esempio, Windows e Unix).Per impostazione predefinita, WinMerge confronta gli stili di fine " +"riga.Per disabilitarlo, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Nella pagina " +"Confronta, abilita (seleziona) l'opzione <guilabel >Ignora differenze di ritorno a capo</guilabel >." #. type: Content of: <article><section><title> #: English/Faq.xml:210 @@ -13499,24 +10208,18 @@ msgstr "Vedo punti interrogativi invece di lettere nei file." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:219 msgid "This is what we call a <glossterm>lossy conversion</glossterm>." -msgstr "" -"Questo è ciò che chiamiamo <glossterm>conversione con perdita</glossterm>." +msgstr "Questo è ciò che chiamiamo <glossterm>conversione con perdita</glossterm>." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:223 msgid "" -"For ANSI files, this is probably due to code-page problems. To troubleshoot, " -"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" -"guimenuitem> </menuchoice>. Then in the Codepages page, see if the option " -"<guilabel>Detect codepage info</guilabel> is checked. If it is, deselect the " -"option, click <guibutton>OK</guibutton>, and see if that helps." +"For ANSI files, this is probably due to code-page problems. To troubleshoot, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" +"guimenuitem> </menuchoice>. Then in the Codepages page, see if the option <guilabel>Detect codepage info</guilabel> is checked. If it is, deselect " +"the option, click <guibutton>OK</guibutton>, and see if that helps." msgstr "" -"Per i file ANSI, ciò è probabilmente dovuto a problemi di tabella codici.Per " -"risolvere il problema, fai clic su <menuchoice> <guimenu >Modifica</guimenu " -"> <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Quindi, nella pagina " -"Codepages, verifica se l'opzione <guilabel >Rileva informazioni codepage</" -"guilabel > è selezionata.Se lo è, deseleziona l'opzione, fai clic su " -"<guibutton >OK</guibutton > e vedi se aiuta." +"Per i file ANSI, ciò è probabilmente dovuto a problemi di tabella codici.Per risolvere il problema, fai clic su <menuchoice> <guimenu >Modifica</" +"guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Quindi, nella pagina Codepages, verifica se l'opzione <guilabel >Rileva informazioni " +"codepage</guilabel > è selezionata.Se lo è, deseleziona l'opzione, fai clic su <guibutton >OK</guibutton > e vedi se aiuta." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:237 @@ -13530,29 +10233,20 @@ msgstr "Sfortunatamente, WinMerge supporta solo caratteri non proporzionali." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:248 -msgid "" -"What is <glossterm>delay of automatic rescan</glossterm>? Why it is needed?" -msgstr "" -"Cos'è il <glossterm>ritardo della nuova scansione automatica</glossterm>?" -"Perché è necessario?" +msgid "What is <glossterm>delay of automatic rescan</glossterm>? Why it is needed?" +msgstr "Cos'è il <glossterm>ritardo della nuova scansione automatica</glossterm>?Perché è necessario?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:253 msgid "" -"When <guilabel>Automatic Rescan</guilabel> is enabled (in the Editor page of " -"Options), WinMerge delays rescanning while you edit files. That is, no " -"rescanning occurs until shortly after you stop typing. Without this delay, " -"WinMerge would rescan after every typed character, making the editing " -"process too slow. The delay especially improves editing bigger files, which " -"can take several seconds to rescan." -msgstr "" -"Quando è abilitata la <guilabel >Riscansione automatica</guilabel > (nella " -"pagina Editor delle Opzioni), WinMerge ritarda la nuova scansione mentre " -"modifichi i file.Cioè, non viene eseguita alcuna nuova scansione fino a poco " -"dopo aver smesso di digitare.Senza questo ritardo, WinMerge eseguirebbe " -"nuovamente la scansione dopo ogni carattere digitato, rendendo il processo " -"di modifica troppo lento.Il ritardo migliora soprattutto la modifica di file " -"più grandi, la cui nuova scansione può richiedere diversi secondi." +"When <guilabel>Automatic Rescan</guilabel> is enabled (in the Editor page of Options), WinMerge delays rescanning while you edit files. That is, no " +"rescanning occurs until shortly after you stop typing. Without this delay, WinMerge would rescan after every typed character, making the editing " +"process too slow. The delay especially improves editing bigger files, which can take several seconds to rescan." +msgstr "" +"Quando è abilitata la <guilabel >Riscansione automatica</guilabel > (nella pagina Editor delle Opzioni), WinMerge ritarda la nuova scansione mentre " +"modifichi i file.Cioè, non viene eseguita alcuna nuova scansione fino a poco dopo aver smesso di digitare.Senza questo ritardo, WinMerge eseguirebbe " +"nuovamente la scansione dopo ogni carattere digitato, rendendo il processo di modifica troppo lento.Il ritardo migliora soprattutto la modifica di " +"file più grandi, la cui nuova scansione può richiedere diversi secondi." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:265 @@ -13561,31 +10255,22 @@ msgstr "Posso stampare file dai riquadri File nella finestra Confronta file?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:270 -msgid "" -"Yes, there is basic printing support: click <menuchoice> <guimenu>File</" -"guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>." +msgid "Yes, there is basic printing support: click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>." msgstr "" -"Sì, esiste un supporto di stampa di base: fai clic su <menuchoice> <guimenu " -">File</guimenu > <guimenuitem >Stampa</guimenuitem > </menuchoice >." +"Sì, esiste un supporto di stampa di base: fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Stampa</guimenuitem > </menuchoice >." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:280 -msgid "" -"Can I hide similar lines in a file comparison, so that only different lines " -"are visible?" -msgstr "" -"Posso nascondere righe simili in un confronto di file, in modo che siano " -"visibili solo righe diverse?" +msgid "Can I hide similar lines in a file comparison, so that only different lines are visible?" +msgstr "Posso nascondere righe simili in un confronto di file, in modo che siano visibili solo righe diverse?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:285 msgid "" -"Yes, you can show only different lines by clicking <menuchoice> " -"<guimenu>View</guimenu><guimenuitem>Diff Context</guimenuitem> " -"<guimenuitem>0 lines</guimenuitem> </menuchoice>." +"Yes, you can show only different lines by clicking <menuchoice> <guimenu>View</guimenu><guimenuitem>Diff Context</guimenuitem> <guimenuitem>0 lines</" +"guimenuitem> </menuchoice>." msgstr "" -"Sì, puoi mostrare solo righe diverse facendo clic su <menuchoice> <guimenu " -">Visualizza</guimenu ><guimenuitem >Contesto differenze</guimenuitem > " +"Sì, puoi mostrare solo righe diverse facendo clic su <menuchoice> <guimenu >Visualizza</guimenu ><guimenuitem >Contesto differenze</guimenuitem > " "<guimenuitem >0 righe</guimenuitem > </menuchoice >." #. type: Content of: <article><section><title> @@ -13595,29 +10280,18 @@ msgstr "WinMerge come strumento di confronto o diff esterno" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:300 -msgid "" -"I want WinMerge to close with a single <keycap>Esc</keycap> press after I'm " -"done?" -msgstr "" -"Voglio che WinMerge si chiuda con una singola pressione di <keycap>Esc</" -"keycap> dopo aver finito?" +msgid "I want WinMerge to close with a single <keycap>Esc</keycap> press after I'm done?" +msgstr "Voglio che WinMerge si chiuda con una singola pressione di <keycap>Esc</keycap> dopo aver finito?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:305 -msgid "" -"Open WinMerge from the command line, and include the <option>-e</option> " -"switch." -msgstr "" -"Apri WinMerge dalla riga di comando e includi l'opzione <option>-e</option>." +msgid "Open WinMerge from the command line, and include the <option>-e</option> switch." +msgstr "Apri WinMerge dalla riga di comando e includi l'opzione <option>-e</option>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:312 -msgid "" -"I don't want to see the <guilabel>Files Are Identical</guilabel> message " -"when I compare identical files, I just want WinMerge to quit." -msgstr "" -"Non voglio vedere il messaggio <guilabel >I file sono identici</guilabel > " -"quando confronto file identici, voglio solo che WinMerge esca." +msgid "I don't want to see the <guilabel>Files Are Identical</guilabel> message when I compare identical files, I just want WinMerge to quit." +msgstr "Non voglio vedere il messaggio <guilabel >I file sono identici</guilabel > quando confronto file identici, voglio solo che WinMerge esca." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:318 @@ -13626,28 +10300,18 @@ msgstr "Utilizza l'opzione della riga di comando <option>-x</option>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:324 -msgid "" -"How can I avoid filling the Select Files or Folders dialog history lists " -"with temporary paths?" -msgstr "" -"Come posso evitare di riempire gli elenchi della cronologia della finestra " -"di dialogo Seleziona file o cartelle con percorsi temporanei?" +msgid "How can I avoid filling the Select Files or Folders dialog history lists with temporary paths?" +msgstr "Come posso evitare di riempire gli elenchi della cronologia della finestra di dialogo Seleziona file o cartelle con percorsi temporanei?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:329 -msgid "" -"Have your external program invoke WinMerge with the <option>/ub</option> " -"option, which tells WinMerge to not add the files to the MRU." -msgstr "" -"Chiedi al tuo programma esterno di invocare WinMerge con l'opzione <option>/" -"ub</option>, che dice a WinMerge di non aggiungere i file alla MRU." +msgid "Have your external program invoke WinMerge with the <option>/ub</option> option, which tells WinMerge to not add the files to the MRU." +msgstr "Chiedi al tuo programma esterno di invocare WinMerge con l'opzione <option>/ub</option>, che dice a WinMerge di non aggiungere i file alla MRU." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:337 msgid "But the program I'm using doesn't allow command line parameters!" -msgstr "" -"Ma il programma che sto utilizzando non consente i parametri della riga di " -"comando!" +msgstr "Ma il programma che sto utilizzando non consente i parametri della riga di comando!" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:342 @@ -13683,52 +10347,35 @@ msgstr "file patch, in stile Perry" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:367 -msgid "" -"How can I open the Perry-style patch files that WinMerge developers use when " -"submitting patches?<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "How can I open the Perry-style patch files that WinMerge developers use when submitting patches?<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Come posso aprire i file patch in stile Perry che gli sviluppatori WinMerge " -"utilizzano quando inviano le patch?<placeholder type=\"indexterm\" id=\"0\"/>" +"Come posso aprire i file patch in stile Perry che gli sviluppatori WinMerge utilizzano quando inviano le patch?<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:374 msgid "" -"Perry-style patches are zip files containing original and changed files in " -"different directories. WinMerge has internal support (surprise!) for " -"handling these files: just launch a compare operation, selecting the zip " -"file for both the left and right sides. WinMerge opens the contents of the " -"zip file in a Folder Compare window, comparing the original and changed " -"files." +"Perry-style patches are zip files containing original and changed files in different directories. WinMerge has internal support (surprise!) for " +"handling these files: just launch a compare operation, selecting the zip file for both the left and right sides. WinMerge opens the contents of the " +"zip file in a Folder Compare window, comparing the original and changed files." msgstr "" -"Le patch in stile Perry sono file zip contenenti file originali e modificati " -"in cartella diverse. WinMerge ha un supporto interno (sorpresa!) per la " -"gestione di questi file: basta avviare un'operazione di confronto, " -"selezionando il file zip sia per il lato sinistro che per quello destro. " -"WinMerge apre il contenuto del file zip in una finestra Confronto cartelle, " -"confrontando i file originali e modificati." +"Le patch in stile Perry sono file zip contenenti file originali e modificati in cartella diverse. WinMerge ha un supporto interno (sorpresa!) per la " +"gestione di questi file: basta avviare un'operazione di confronto, selezionando il file zip sia per il lato sinistro che per quello destro. WinMerge " +"apre il contenuto del file zip in una finestra Confronto cartelle, confrontando i file originali e modificati." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:385 -msgid "" -"Can WinMerge open archive files with non-standard file-extensions? (For " -"example .jar files as zip-files)" -msgstr "" -"WinMerge può aprire file di archivio con estensioni di file non standard?(Ad " -"esempio file .jar come file zip)" +msgid "Can WinMerge open archive files with non-standard file-extensions? (For example .jar files as zip-files)" +msgstr "WinMerge può aprire file di archivio con estensioni di file non standard?(Ad esempio file .jar come file zip)" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:390 msgid "" -"Yes: click the <guibutton>Options</guibutton> button (or click <menuchoice> " -"<guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice>). " -"In the Archive Support page, enable the <guilabel>Detect archive type from " -"file signature</guilabel> option." +"Yes: click the <guibutton>Options</guibutton> button (or click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" +"menuchoice>). In the Archive Support page, enable the <guilabel>Detect archive type from file signature</guilabel> option." msgstr "" -"Sì: fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su " -"<menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" -"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita " -"l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel " -">." +"Sì: fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" +"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Faq.xml:407 @@ -13738,72 +10385,52 @@ msgstr "rilevamento nei file utilizzando Blocco note" #. type: Content of: <article><section><title> #: English/Faq.xml:404 msgid "Text encoding (codepages)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Codifica del testo (codepage)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Codifica del testo (codepage)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:413 msgid "How do I tell if my file is coded in the local Windows (ANSI) codepage?" -msgstr "" -"Come faccio a sapere se il mio file è codificato nella codepage locale di " -"Windows (ANSI)?" +msgstr "Come faccio a sapere se il mio file è codificato nella codepage locale di Windows (ANSI)?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:418 msgid "" -"Open the file in Windows Notepad (for example, click <menuchoice> " -"<guimenu>Start</guimenu> <guisubmenu>(All) Programs</guisubmenu> " -"<guisubmenu>Accessories</guisubmenu> <guimenuitem>Notepad</guimenuitem> </" -"menuchoice>). Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save " -"As</guimenuitem> </menuchoice>, and in the Save As dialog, scroll to the " -"<guilabel>Encoding</guilabel> item at the dropdown list. The possible values " +"Open the file in Windows Notepad (for example, click <menuchoice> <guimenu>Start</guimenu> <guisubmenu>(All) Programs</guisubmenu> " +"<guisubmenu>Accessories</guisubmenu> <guimenuitem>Notepad</guimenuitem> </menuchoice>). Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save " +"As</guimenuitem> </menuchoice>, and in the Save As dialog, scroll to the <guilabel>Encoding</guilabel> item at the dropdown list. The possible values " "include:" msgstr "" -"Apri il file nel Blocco note di Windows (ad esempio, fai clic su " -"<menuchoice> <guimenu >Start</guimenu > <guisubmenu >Programmi (tutti)</" -"guisubmenu > <guisubmenu >Accessori</guisubmenu > <guimenuitem >Blocco note</" -"guimenuitem > </menuchoice >).Fai clic su <menuchoice> <guimenu >File</" -"guimenu > <guimenuitem >Salva con nome</guimenuitem > </menuchoice > e, " -"nella finestra di dialogo Salva con nome, scorri fino alla voce <guilabel " -">Codifica</guilabel > nell'elenco a discesa.I possibili valori includono:" +"Apri il file nel Blocco note di Windows (ad esempio, fai clic su <menuchoice> <guimenu >Start</guimenu > <guisubmenu >Programmi (tutti)</guisubmenu > " +"<guisubmenu >Accessori</guisubmenu > <guimenuitem >Blocco note</guimenuitem > </menuchoice >).Fai clic su <menuchoice> <guimenu >File</guimenu > " +"<guimenuitem >Salva con nome</guimenuitem > </menuchoice > e, nella finestra di dialogo Salva con nome, scorri fino alla voce <guilabel >Codifica</" +"guilabel > nell'elenco a discesa.I possibili valori includono:" #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:436 msgid "" -"<guilabel>ANSI</guilabel>: The file is apparently in the local Windows " -"codepage. If the file is entirely in English and normal punctuation, then " -"the file is also in ASCII." +"<guilabel>ANSI</guilabel>: The file is apparently in the local Windows codepage. If the file is entirely in English and normal punctuation, then the " +"file is also in ASCII." msgstr "" -"<guilabel >ANSI</guilabel >: apparentemente il file si trova nella codepage " -"locale di Windows.Se il file è interamente in inglese e con punteggiatura " +"<guilabel >ANSI</guilabel >: apparentemente il file si trova nella codepage locale di Windows.Se il file è interamente in inglese e con punteggiatura " "normale, anche il file è in ASCII." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:442 -msgid "" -"<guilabel>Unicode</guilabel>: The file is probably in the default Windows " -"Unicode encoding, UCS-2LE." -msgstr "" -"<guilabel >Unicode</guilabel >: il file probabilmente ha la codifica Unicode " -"predefinita di Windows, UCS-2LE." +msgid "<guilabel>Unicode</guilabel>: The file is probably in the default Windows Unicode encoding, UCS-2LE." +msgstr "<guilabel >Unicode</guilabel >: il file probabilmente ha la codifica Unicode predefinita di Windows, UCS-2LE." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:447 -msgid "" -"<guilabel>UTF-8</guilabel>: The file is in the cross-platform Unicode " -"encoding, UTF-8." -msgstr "" -"<guilabel >UTF-8</guilabel >: il file è nella codifica Unicode " -"multipiattaforma, UTF-8." +msgid "<guilabel>UTF-8</guilabel>: The file is in the cross-platform Unicode encoding, UTF-8." +msgstr "<guilabel >UTF-8</guilabel >: il file è nella codifica Unicode multipiattaforma, UTF-8." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:452 msgid "" -"<guilabel>Unicode big endian</guilabel>: The file is in a different Unicode " -"encoding that is little used or supported in Windows, probably UCS-2BE." +"<guilabel>Unicode big endian</guilabel>: The file is in a different Unicode encoding that is little used or supported in Windows, probably UCS-2BE." msgstr "" -"<guilabel >Unicode big endian</guilabel >: il file ha una codifica Unicode " -"diversa che è poco utilizzata o supportata in Windows, probabilmente UCS-2BE." +"<guilabel >Unicode big endian</guilabel >: il file ha una codifica Unicode diversa che è poco utilizzata o supportata in Windows, probabilmente " +"UCS-2BE." #. type: Content of: <article><section><title><indexterm><primary> #: English/Faq.xml:464 @@ -13827,12 +10454,8 @@ msgstr "Patch WinMerge compatibili con" #. type: Content of: <article><section><title> #: English/Faq.xml:463 -msgid "" -"Patch files<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"File di patch<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>" +msgid "Patch files<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "File di patch<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:476 @@ -13842,19 +10465,13 @@ msgstr "C'è un modo per creare file patch dalla riga di comando?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:480 msgid "" -"No. It might be added in later versions. Until then, you can use the Win32 " -"port of <filename>diffutils</filename>. The latest version of " -"<filename>diffutils</filename> (and patch) can be downloaded from " -"<application>the SourceForge GnuWin32</application> project page: <ulink " -"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/" -"projects/gnuwin32</ulink>." +"No. It might be added in later versions. Until then, you can use the Win32 port of <filename>diffutils</filename>. The latest version of " +"<filename>diffutils</filename> (and patch) can be downloaded from <application>the SourceForge GnuWin32</application> project page: <ulink " +"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/projects/gnuwin32</ulink>." msgstr "" -"No. Potrebbe essere aggiunto nelle versioni successive.Fino ad allora, puoi " -"usare il port Win32 di <filename>diffutils</filename>.L'ultima versione di " -"<filename>diffutils</filename> (e patch) può essere scaricata dalla pagina " -"del progetto <application>SourceForge GnuWin32</application>: <ulink " -"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/" -"projects/gnuwin32</ulink>." +"No. Potrebbe essere aggiunto nelle versioni successive.Fino ad allora, puoi usare il port Win32 di <filename>diffutils</filename>.L'ultima versione " +"di <filename>diffutils</filename> (e patch) può essere scaricata dalla pagina del progetto <application>SourceForge GnuWin32</application>: <ulink " +"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/projects/gnuwin32</ulink>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:491 @@ -13863,23 +10480,17 @@ msgstr "È possibile applicare le patch utilizzando WinMerge?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:495 -msgid "" -"You can apply patches using the experimental plugin ApplyPatch.sct. The " -"extensions of patches supported by the plugin are .diff or .patch." -msgstr "" -"Puoi applicare le patch utilizzando il plugin sperimentale ApplyPatch.sct.Le " -"estensioni delle patch supportate dal plugin sono .diff o .patch." +msgid "You can apply patches using the experimental plugin ApplyPatch.sct. The extensions of patches supported by the plugin are .diff or .patch." +msgstr "Puoi applicare le patch utilizzando il plugin sperimentale ApplyPatch.sct.Le estensioni delle patch supportate dal plugin sono .diff o .patch." #. type: Content of: <article><section><section><section><title><indexterm><primary> -#: English/Filters.xml:6 English/Filters.xml:1299 English/Filters.xml:1312 -#: English/Filters.xml:1329 English/Filters.xml:1373 English/Filters.xml:1459 +#: English/Filters.xml:6 English/Filters.xml:1299 English/Filters.xml:1312 English/Filters.xml:1329 English/Filters.xml:1373 English/Filters.xml:1459 #: English/Filters.xml:1939 English/Filters.xml:2138 msgid "file filters" msgstr "filtri di file" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Filters.xml:8 English/Filters.xml:85 English/Filters.xml:89 -#: English/Filters.xml:131 English/Filters.xml:135 +#: English/Filters.xml:8 English/Filters.xml:85 English/Filters.xml:89 English/Filters.xml:131 English/Filters.xml:135 msgid "file masks" msgstr "maschere di file" @@ -13899,8 +10510,7 @@ msgid "Using Filters<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "Utilizzo dei filtri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Filters.xml:20 English/Filters.xml:28 English/Filters.xml:137 -#: English/Filters.xml:1551 English/Filters.xml:1555 English/Filters.xml:1739 +#: English/Filters.xml:20 English/Filters.xml:28 English/Filters.xml:137 English/Filters.xml:1551 English/Filters.xml:1555 English/Filters.xml:1739 #: English/Filters.xml:2325 msgid "regular expressions" msgstr "espressioni regolari" @@ -13923,45 +10533,31 @@ msgstr "espressione regolare" #. type: Content of: <article><para> #: English/Filters.xml:15 msgid "" -"When you compare files or folders, you can use filters to narrow the scope " -"of the comparison. This can be useful when you want to simplify the " -"comparison result by eliminating differences that you are not interested " -"in. Filters are rules based on regular expressions. WinMerge uses the " -"popular PCRE (Perl Compatible Regular Expressions) regular expression engine." -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" -msgstr "" -"Quando confronti file o cartelle, puoi utilizzare i filtri per restringere " -"l'ambito del confronto.Ciò può essere utile quando desideri semplificare il " -"risultato del confronto eliminando le differenze che non ti interessano. I " -"filtri sono regole basate su espressioni regolari.WinMerge utilizza il " -"popolare motore di espressioni regolari PCRE (Perl Compatibile Regular " -"Expressions).<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"When you compare files or folders, you can use filters to narrow the scope of the comparison. This can be useful when you want to simplify the " +"comparison result by eliminating differences that you are not interested in. Filters are rules based on regular expressions. WinMerge uses the " +"popular PCRE (Perl Compatible Regular Expressions) regular expression engine.<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgstr "" +"Quando confronti file o cartelle, puoi utilizzare i filtri per restringere l'ambito del confronto.Ciò può essere utile quando desideri semplificare " +"il risultato del confronto eliminando le differenze che non ti interessano. I filtri sono regole basate su espressioni regolari.WinMerge utilizza il " +"popolare motore di espressioni regolari PCRE (Perl Compatibile Regular Expressions).<placeholder type=\"indexterm\" id=\"0\"/><placeholder " "type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><para> #: English/Filters.xml:31 msgid "" -"The basic function of filtering is simple: evaluate each item that would " -"normally be compared (a folder, file, or line within a file), and if the " -"filter expression matches the target item, apply the filter. Depending on " -"the type of filter, the item is either included or excluded in the " +"The basic function of filtering is simple: evaluate each item that would normally be compared (a folder, file, or line within a file), and if the " +"filter expression matches the target item, apply the filter. Depending on the type of filter, the item is either included or excluded in the " "comparison." msgstr "" -"La funzione di base del filtro è semplice: valuta ogni elemento che verrebbe " -"normalmente confrontato (una cartella, un file o una riga all'interno di un " -"file) e, se l'espressione del filtro corrisponde all'elemento di " -"destinazione, applica il filtro.A seconda del tipo di filtro, l'elemento " -"viene incluso o escluso dal confronto." +"La funzione di base del filtro è semplice: valuta ogni elemento che verrebbe normalmente confrontato (una cartella, un file o una riga all'interno di " +"un file) e, se l'espressione del filtro corrisponde all'elemento di destinazione, applica il filtro.A seconda del tipo di filtro, l'elemento viene " +"incluso o escluso dal confronto." #. type: Content of: <article><para> #: English/Filters.xml:37 -msgid "" -"There are different WinMerge filters for folder compare and file compare " -"operations:" -msgstr "" -"Esistono diversi filtri WinMerge per le operazioni di confronto di cartelle " -"e file:" +msgid "There are different WinMerge filters for folder compare and file compare operations:" +msgstr "Esistono diversi filtri WinMerge per le operazioni di confronto di cartelle e file:" #. type: Content of: <article><variablelist><varlistentry><term><indexterm><secondary> #: English/Filters.xml:45 English/Filters.xml:68 @@ -13970,72 +10566,48 @@ msgstr "filtraggio" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Filters.xml:42 -msgid "" -"Folder comparison: File masks and file filters<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronto cartelle: maschere di file e filtri di file<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Folder comparison: File masks and file filters<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronto cartelle: maschere di file e filtri di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:49 msgid "" -"You can specify files to include in a folder comparison by using simple file " -"masks, or, for more complex filtering, by applying multiple rules specified " -"in a file filter." +"You can specify files to include in a folder comparison by using simple file masks, or, for more complex filtering, by applying multiple rules " +"specified in a file filter." msgstr "" -"È possibile specificare i file da includere in un confronto di cartelle " -"utilizzando semplici maschere di file o, per filtri più complessi, " -"applicando più regole specificate in un filtro di file." +"È possibile specificare i file da includere in un confronto di cartelle utilizzando semplici maschere di file o, per filtri più complessi, applicando " +"più regole specificate in un filtro di file." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:53 msgid "" -"Files and folders that are filtered are hidden in the result by default, " -"which is typically what you want. You can click <menuchoice> <guimenu>View</" -"guimenu> <guimenuitem>Show Skipped Items</guimenuitem> </menuchoice> to " -"unhide filtered items, but the Folder Compare window shows only minimal " -"information about them. For example, you cannot tell whether a skipped file " -"is a text file or binary." -msgstr "" -"I file e le cartelle filtrati vengono nascosti nel risultato per " -"impostazione predefinita, che in genere è ciò che desideri.Puoi fare clic su " -"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza " -"elementi saltati</guimenuitem > </menuchoice > per mostrare gli elementi " -"filtrati, ma la finestra Confronta cartelle mostra solo informazioni minime " -"su di essi.Ad esempio, non è possibile stabilire se un file ignorato è un " +"Files and folders that are filtered are hidden in the result by default, which is typically what you want. You can click <menuchoice> <guimenu>View</" +"guimenu> <guimenuitem>Show Skipped Items</guimenuitem> </menuchoice> to unhide filtered items, but the Folder Compare window shows only minimal " +"information about them. For example, you cannot tell whether a skipped file is a text file or binary." +msgstr "" +"I file e le cartelle filtrati vengono nascosti nel risultato per impostazione predefinita, che in genere è ciò che desideri.Puoi fare clic su " +"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza elementi saltati</guimenuitem > </menuchoice > per mostrare gli elementi " +"filtrati, ma la finestra Confronta cartelle mostra solo informazioni minime su di essi.Ad esempio, non è possibile stabilire se un file ignorato è un " "file di testo o binario." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Filters.xml:65 -msgid "" -"File comparisons: Line filters and substitution filters<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Confronti di file: filtri di riga e filtri di sostituzione<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "File comparisons: Line filters and substitution filters<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Confronti di file: filtri di riga e filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:72 -msgid "" -"Line filters are applied only to file compare operations. They let you " -"ignore single line differences." -msgstr "" -"I filtri di riga vengono applicati solo alle operazioni di confronto dei " -"file.Ti consentono di ignorare le differenze su una singola riga." +msgid "Line filters are applied only to file compare operations. They let you ignore single line differences." +msgstr "I filtri di riga vengono applicati solo alle operazioni di confronto dei file.Ti consentono di ignorare le differenze su una singola riga." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:74 msgid "" -"Substitution filters are applied only to file compare operations. They " -"replace the strings in the diff block with the specified strings, compare " -"them, and ignore the diff block if the replacement results match. They are " -"useful for ignoring large numbers of uninteresting changes." +"Substitution filters are applied only to file compare operations. They replace the strings in the diff block with the specified strings, compare " +"them, and ignore the diff block if the replacement results match. They are useful for ignoring large numbers of uninteresting changes." msgstr "" -"I filtri di sostituzione vengono applicati solo alle operazioni di confronto " -"dei file.Sostituiscono le stringhe nel blocco diff con le stringhe " -"specificate, le confrontano e ignorano il blocco diff se i risultati della " -"sostituzione corrispondono.Sono utili per ignorare un gran numero di " +"I filtri di sostituzione vengono applicati solo alle operazioni di confronto dei file.Sostituiscono le stringhe nel blocco diff con le stringhe " +"specificate, le confrontano e ignorano il blocco diff se i risultati della sostituzione corrispondono.Sono utili per ignorare un gran numero di " "modifiche poco interessanti." #. type: Content of: <article><section><title><indexterm><secondary> @@ -14045,24 +10617,19 @@ msgstr "nei confronti delle cartelle" #. type: Content of: <article><section><title> #: English/Filters.xml:84 -msgid "" -"Using file masks<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "Using file masks<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Utilizzo delle maschere dei file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " +"Utilizzo delle maschere dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " "id=\"2\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:96 msgid "" -"You can use one or more <glossterm>file masks</glossterm> that specify file " -"extensions to include in a folder comparison. All other files are omitted " +"You can use one or more <glossterm>file masks</glossterm> that specify file extensions to include in a folder comparison. All other files are omitted " "from your selection." msgstr "" -"È possibile utilizzare una o più <glossterm>maschere file</glossterm> che " -"specificano le estensioni dei file da includere in un confronto di cartelle." -"Tutti gli altri file vengono omessi dalla selezione." +"È possibile utilizzare una o più <glossterm>maschere file</glossterm> che specificano le estensioni dei file da includere in un confronto di " +"cartelle.Tutti gli altri file vengono omessi dalla selezione." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:104 @@ -14071,43 +10638,29 @@ msgstr "applicare maschere di file" #. type: Content of: <article><section><section><title> #: English/Filters.xml:101 -msgid "" -"Defining and applying file masks<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Definizione e applicazione di maschere di file<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Defining and applying file masks<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Definizione e applicazione di maschere di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:107 -msgid "" -"Define and apply a file mask at the time you launch your folder compare " -"operation:" -msgstr "" -"Definisci e applica una maschera file nel momento in cui avvii l'operazione " -"di confronto delle cartelle:" +msgid "Define and apply a file mask at the time you launch your folder compare operation:" +msgstr "Definisci e applica una maschera file nel momento in cui avvii l'operazione di confronto delle cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:112 msgid "" -"If you are using the Select Files or Folders dialog, after choosing the " -"<guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, enter one or " -"more file masks in the <guilabel>Filter</guilabel> field. The masks are " -"applied when you start the folder compare operation." +"If you are using the Select Files or Folders dialog, after choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, enter one or " +"more file masks in the <guilabel>Filter</guilabel> field. The masks are applied when you start the folder compare operation." msgstr "" -"Se stai usando la finestra di dialogo Seleziona file o cartelle, dopo aver " -"scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, " -"inserisci una o più maschere di file nel campo <guilabel >Filtro</guilabel >." -"Le maschere vengono applicate quando si avvia l'operazione di confronto " +"Se stai usando la finestra di dialogo Seleziona file o cartelle, dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, " +"inserisci una o più maschere di file nel campo <guilabel >Filtro</guilabel >.Le maschere vengono applicate quando si avvia l'operazione di confronto " "delle cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:120 -msgid "" -"If you are using the WinMerge command line, use the <option>-f</option> flag " -"to specify file masks (see the example in the next section)." +msgid "If you are using the WinMerge command line, use the <option>-f</option> flag to specify file masks (see the example in the next section)." msgstr "" -"Se stai usando la riga di comando di WinMerge, usa il flag <option>-f</" -"option> per specificare le maschere dei file (vedi l'esempio nella prossima " +"Se stai usando la riga di comando di WinMerge, usa il flag <option>-f</option> per specificare le maschere dei file (vedi l'esempio nella prossima " "sezione)." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -14123,19 +10676,16 @@ msgstr "nelle maschere dei file" #. type: Content of: <article><section><section><title> #: English/Filters.xml:128 msgid "" -"File mask syntax and example<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " +"File mask syntax and example<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " "id=\"2\"/>" msgstr "" -"Sintassi ed esempio della maschera file<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder " +"Sintassi ed esempio della maschera file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder " "type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:142 msgid "You can specify file masks and extended filters using this format:" -msgstr "" -"Puoi specificare maschere file e filtri estesi utilizzando questo formato:" +msgstr "Puoi specificare maschere file e filtri estesi utilizzando questo formato:" #. type: Content of: <article><section><section><synopsis> #: English/Filters.xml:145 @@ -14149,42 +10699,27 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:149 -msgid "" -"The <filename>|</filename> character separates filter groups and acts as a " -"logical AND." -msgstr "" -"Il carattere <filename>|</filename> separa i gruppi di filtri e funge da AND " -"logico." +msgid "The <filename>|</filename> character separates filter groups and acts as a logical AND." +msgstr "Il carattere <filename>|</filename> separa i gruppi di filtri e funge da AND logico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:150 -msgid "" -"Filters within the same group are separated by <filename>;</filename> and " -"are interpreted with a logical OR." -msgstr "" -"I filtri all'interno dello stesso gruppo sono separati da <filename>;</" -"filename> e vengono interpretati con un OR logico." +msgid "Filters within the same group are separated by <filename>;</filename> and are interpreted with a logical OR." +msgstr "I filtri all'interno dello stesso gruppo sono separati da <filename>;</filename> e vengono interpretati con un OR logico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:151 -msgid "" -"A file is included only if it matches at least one filter in each group." -msgstr "" -"Un file viene incluso solo se corrisponde ad almeno un filtro in ciascun " -"gruppo." +msgid "A file is included only if it matches at least one filter in each group." +msgstr "Un file viene incluso solo se corrisponde ad almeno un filtro in ciascun gruppo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:153 msgid "" -"To include a literal <filename>|</filename> (pipe) character in a regular " -"expression that is not enclosed in double quotes (such as in <filename>f:</" -"filename> or <filename>f!:</filename> filters), use <filename>||</filename> " -"instead." +"To include a literal <filename>|</filename> (pipe) character in a regular expression that is not enclosed in double quotes (such as in <filename>f:</" +"filename> or <filename>f!:</filename> filters), use <filename>||</filename> instead." msgstr "" -"Per includere un carattere letterale <filename>|</filename> (pipe) in " -"un'espressione regolare che non è racchiusa tra virgolette doppie (come nei " -"filtri <filename>f:</filename> o <filename>f!:</filename>), utilizzare " -"invece <filename>||</filename>." +"Per includere un carattere letterale <filename>|</filename> (pipe) in un'espressione regolare che non è racchiusa tra virgolette doppie (come nei " +"filtri <filename>f:</filename> o <filename>f!:</filename>), utilizzare invece <filename>||</filename>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:154 @@ -14194,9 +10729,7 @@ msgstr "Esempio: <userinput>f:(abc||def)\\.txt$</userinput>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:157 msgid "Each filter (e.g., Filter1, Filter2) can be one of the following types:" -msgstr "" -"Ciascun filtro (ad esempio, Filtro1, Filtro2) può essere uno dei seguenti " -"tipi:" +msgstr "Ciascun filtro (ad esempio, Filtro1, Filtro2) può essere uno dei seguenti tipi:" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:159 @@ -14226,9 +10759,7 @@ msgstr "!<replaceable>*.ext</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:161 msgid "Exclude files matching the extension (Available since 2.16.19)" -msgstr "" -"Escludi file corrispondenti all'estensione (disponibile dalla versione " -"2.16.19)" +msgstr "Escludi file corrispondenti all'estensione (disponibile dalla versione 2.16.19)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:162 @@ -14238,8 +10769,7 @@ msgstr "<replaceable>cartella</replaceable>\\" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:162 msgid "Target folders (must end with \\) (Available since 2.16.19)" -msgstr "" -"Cartelle di destinazione (devono terminare con \\) (disponibile dal 16.2.19)" +msgstr "Cartelle di destinazione (devono terminare con \\) (disponibile dal 16.2.19)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:163 @@ -14259,9 +10789,7 @@ msgstr "f: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:164 msgid "Match file names using regular expressions (Available since 2.16.49)" -msgstr "" -"Abbina i nomi dei file utilizzando le espressioni regolari (disponibile " -"dalla versione 2.16.49)" +msgstr "Abbina i nomi dei file utilizzando le espressioni regolari (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:165 English/Filters.xml:1538 @@ -14271,8 +10799,7 @@ msgstr "f!: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:165 msgid "Exclude files matching regex (Available since 2.16.49)" -msgstr "" -"Escludi file corrispondenti a regex (disponibile dalla versione 2.16.49)" +msgstr "Escludi file corrispondenti a regex (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:166 English/Filters.xml:1539 @@ -14282,9 +10809,7 @@ msgstr "d: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:166 msgid "Match folder names using regex (Available since 2.16.49)" -msgstr "" -"Abbina i nomi delle cartelle utilizzando regex (disponibile dalla versione " -"2.16.49)" +msgstr "Abbina i nomi delle cartelle utilizzando regex (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:167 English/Filters.xml:1540 @@ -14303,11 +10828,8 @@ msgstr "fe: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:168 English/Filters.xml:1541 -msgid "" -"Filter expression for files (e.g. fe:Size < 1KB) (Available since 2.16.49)" -msgstr "" -"Espressione di filtro per file (ad esempio fe:Size < 1KB) (disponibile " -"dal 16.2.49)" +msgid "Filter expression for files (e.g. fe:Size < 1KB) (Available since 2.16.49)" +msgstr "Espressione di filtro per file (ad esempio fe:Size < 1KB) (disponibile dal 16.2.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:169 English/Filters.xml:1542 @@ -14317,8 +10839,7 @@ msgstr "fe!: <replaceable>expr</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:169 English/Filters.xml:1542 msgid "Filter expression to exclude files (Available since 2.16.49)" -msgstr "" -"Espressione di filtro per escludere file (disponibile dalla versione 2.16.49)" +msgstr "Espressione di filtro per escludere file (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:170 English/Filters.xml:1543 @@ -14328,8 +10849,7 @@ msgstr "de: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:170 English/Filters.xml:1543 msgid "Filter expression for folders (Available since 2.16.49)" -msgstr "" -"Espressione di filtro per cartelle (disponibile dalla versione 2.16.49)" +msgstr "Espressione di filtro per cartelle (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:171 English/Filters.xml:1544 @@ -14339,9 +10859,7 @@ msgstr "de!: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:171 English/Filters.xml:1544 msgid "Filter expression to exclude folders (Available since 2.16.49)" -msgstr "" -"Espressione di filtro per escludere cartelle (disponibile dalla versione " -"2.16.49)" +msgstr "Espressione di filtro per escludere cartelle (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:172 @@ -14361,20 +10879,16 @@ msgstr "Maschera di archivio" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:180 msgid "" -"In this command-line example, the folder compare operation includes only " -"files with <filename>xml</filename> or <filename>txt</filename> extensions. " +"In this command-line example, the folder compare operation includes only files with <filename>xml</filename> or <filename>txt</filename> extensions. " "All other files are omitted:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle " -"cartelle include solo file con estensioni <filename>xml</filename> o " +"In questo esempio da riga di comando, l'operazione di confronto delle cartelle include solo file con estensioni <filename>xml</filename> o " "<filename>txt</filename>.Tutti gli altri file vengono omessi:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:184 -msgid "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" -msgstr "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" +msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" +msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:189 @@ -14383,20 +10897,15 @@ msgstr "Escluse le cartelle (dalla versione 2.16.19)" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:191 -msgid "" -"In this command-line example, the folder compare operation excludes " -"<filename>.git</filename> and <filename>.vs</filename> folders:" +msgid "In this command-line example, the folder compare operation excludes <filename>.git</filename> and <filename>.vs</filename> folders:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle " -"cartelle esclude le cartelle <filename>.git</filename> e <filename>.vs</" +"In questo esempio da riga di comando, l'operazione di confronto delle cartelle esclude le cartelle <filename>.git</filename> e <filename>.vs</" "filename>:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:195 -msgid "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" -msgstr "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" +msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" +msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:200 @@ -14406,22 +10915,16 @@ msgstr "Espressione filtro (dalla versione 2.16.49)" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:202 msgid "" -"In this command-line example, the folder compare operation includes only " -"files with <filename>cpp</filename> or <filename>h</filename> extensions and " +"In this command-line example, the folder compare operation includes only files with <filename>cpp</filename> or <filename>h</filename> extensions and " "a file size less than 1KB:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle " -"cartelle include solo file con estensioni <filename>cpp</filename> o " +"In questo esempio da riga di comando, l'operazione di confronto delle cartelle include solo file con estensioni <filename>cpp</filename> o " "<filename>h</filename> e una dimensione di file inferiore a 1 KB:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:206 -msgid "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Size < " -"1KB\"</userinput>" -msgstr "" -"<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Dimensione " -"< 1KB\"</userinput>" +msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Size < 1KB\"</userinput>" +msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Dimensione < 1KB\"</userinput>" #. type: Content of: <article><section><section><title> #: English/Filters.xml:212 @@ -14431,14 +10934,11 @@ msgstr "Sintassi dell'espressione di filtro" #. type: Content of: <article><section><section><para> #: English/Filters.xml:215 msgid "" -"WinMerge allows powerful filtering using expressions that operate on file " -"metadata, contents, and comparison context. This section describes the " +"WinMerge allows powerful filtering using expressions that operate on file metadata, contents, and comparison context. This section describes the " "supported attributes, operators, functions, data types, and evaluation rules." msgstr "" -"WinMerge consente un potente filtraggio utilizzando espressioni che operano " -"sui metadati dei file, sui contenuti e sul contesto di confronto.Questa " -"sezione descrive gli attributi, gli operatori, le funzioni, i tipi di dati e " -"le regole di valutazione supportati." +"WinMerge consente un potente filtraggio utilizzando espressioni che operano sui metadati dei file, sui contenuti e sul contesto di confronto.Questa " +"sezione descrive gli attributi, gli operatori, le funzioni, i tipi di dati e le regole di valutazione supportati." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:221 @@ -14452,52 +10952,38 @@ msgstr "I tipi letterali supportati includono:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:225 -msgid "" -"<emphasis>Boolean</emphasis>: <literal>true</literal>, <literal>false</" -"literal>" -msgstr "" -"<emphasis>Booleano</emphasis>: <literal>vero</literal>, <literal>falso</" -"literal>" +msgid "<emphasis>Boolean</emphasis>: <literal>true</literal>, <literal>false</literal>" +msgstr "<emphasis>Booleano</emphasis>: <literal>vero</literal>, <literal>falso</literal>" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:226 msgid "" -"<emphasis>Integer</emphasis>: 64-bit signed integers (e.g., <literal>1024</" -"literal>, or with units like <literal>100KB</literal>, <literal>7days</" +"<emphasis>Integer</emphasis>: 64-bit signed integers (e.g., <literal>1024</literal>, or with units like <literal>100KB</literal>, <literal>7days</" "literal>)" msgstr "" -"<emphasis>Intero</emphasis>: interi con segno a 64 bit (ad esempio, " -"<literal>1024</literal> o con unità come <literal>100KB</literal>, " -"<literal>7 giorni</literal>)" +"<emphasis>Intero</emphasis>: interi con segno a 64 bit (ad esempio, <literal>1024</literal> o con unità come <literal>100KB</literal>, <literal>7 " +"giorni</literal>)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:227 msgid "" -"<emphasis>Real (Double)</emphasis>: Floating-point numbers with optional " -"decimal or exponent (e.g., <literal>3.14</literal>, <literal>.5</literal>, " +"<emphasis>Real (Double)</emphasis>: Floating-point numbers with optional decimal or exponent (e.g., <literal>3.14</literal>, <literal>.5</literal>, " "<literal>1e6</literal>)" msgstr "" -"<emphasis>Reale (doppio)</emphasis>: numeri in virgola mobile con decimale o " -"esponente opzionale (ad esempio, <literal>3.14</literal>, <literal>.5</" +"<emphasis>Reale (doppio)</emphasis>: numeri in virgola mobile con decimale o esponente opzionale (ad esempio, <literal>3.14</literal>, <literal>.5</" "literal>, <literal>1e6</literal>)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:228 -msgid "" -"<emphasis>String</emphasis>: Enclosed in double quotes (e.g., " -"<literal>\"example\"</literal>)" -msgstr "" -"<emphasis>Stringa</emphasis>: racchiusa tra virgolette doppie (ad esempio, " -"<literal>\"esempio\"</literal>)" +msgid "<emphasis>String</emphasis>: Enclosed in double quotes (e.g., <literal>\"example\"</literal>)" +msgstr "<emphasis>Stringa</emphasis>: racchiusa tra virgolette doppie (ad esempio, <literal>\"esempio\"</literal>)" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:232 msgid "" -"Internally, values may be of the following types: Boolean, Integer, Real, " -"Timestamp, String, File Content, Array, or <literal>undefined</literal>." +"Internally, values may be of the following types: Boolean, Integer, Real, Timestamp, String, File Content, Array, or <literal>undefined</literal>." msgstr "" -"Internamente, i valori possono essere dei seguenti tipi: Booleano, Intero, " -"Reale, Timestamp, Stringa, Contenuto file, Array o <literal>non definito</" +"Internamente, i valori possono essere dei seguenti tipi: Booleano, Intero, Reale, Timestamp, Stringa, Contenuto file, Array o <literal>non definito</" "literal>." #. type: Content of: <article><section><section><section><title> @@ -14508,15 +10994,11 @@ msgstr "Direttive" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:241 msgid "" -"Filter expressions support directives that control how the expression is " -"evaluated. Directives are specified at the beginning of the expression, " -"prefixed with <literal>@</literal>, and separated from the expression by " -"whitespace." +"Filter expressions support directives that control how the expression is evaluated. Directives are specified at the beginning of the expression, " +"prefixed with <literal>@</literal>, and separated from the expression by whitespace." msgstr "" -"Le espressioni di filtro supportano direttive che controllano il modo in cui " -"viene valutata l'espressione.Le direttive sono specificate all'inizio " -"dell'espressione, precedute da <literal>@</literal> e separate " -"dall'espressione da spazi bianchi." +"Le espressioni di filtro supportano direttive che controllano il modo in cui viene valutata l'espressione.Le direttive sono specificate all'inizio " +"dell'espressione, precedute da <literal>@</literal> e separate dall'espressione da spazi bianchi." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:247 @@ -14526,20 +11008,14 @@ msgstr "Direttive sulla distinzione tra maiuscole e minuscole" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:250 msgid "" -"By default, all string comparison operators (<literal>=</literal>, <literal>!" -"=</literal>, <literal><</literal>, <literal><=</literal>, <literal>>" -"</literal>, <literal>>=</literal>, <literal>contains</literal>, " -"<literal>recontains</literal>, <literal>like</literal>, <literal>matches</" -"literal>) are case-insensitive. You can control this behavior using the " -"following directives:" -msgstr "" -"Per impostazione predefinita, tutti gli operatori di confronto di stringhe " -"(<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " -"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, " -"<literal>contains</literal>, <literal>recontains</literal>, <literal>like</" -"literal>,<literal>corrispondenze</literal>) non fanno distinzione tra " -"maiuscole e minuscole.Puoi controllare questo comportamento utilizzando le " -"seguenti direttive:" +"By default, all string comparison operators (<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " +"<literal>></literal>, <literal>>=</literal>, <literal>contains</literal>, <literal>recontains</literal>, <literal>like</literal>, " +"<literal>matches</literal>) are case-insensitive. You can control this behavior using the following directives:" +msgstr "" +"Per impostazione predefinita, tutti gli operatori di confronto di stringhe (<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " +"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, <literal>contains</literal>, <literal>recontains</literal>, " +"<literal>like</literal>,<literal>corrispondenze</literal>) non fanno distinzione tra maiuscole e minuscole.Puoi controllare questo comportamento " +"utilizzando le seguenti direttive:" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:258 @@ -14548,12 +11024,9 @@ msgstr "<literal>@cs</literal>, <literal>@casesensitive</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:261 -msgid "" -"Enable case-sensitive comparison. With these directives, <literal>\"ABC\"</" -"literal> and <literal>\"abc\"</literal> are considered different." +msgid "Enable case-sensitive comparison. With these directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are considered different." msgstr "" -"Abilita il confronto con distinzione tra maiuscole e minuscole.Con queste " -"direttive, <literal>\"ABC\"</literal> e <literal>\"abc\"</literal> sono " +"Abilita il confronto con distinzione tra maiuscole e minuscole.Con queste direttive, <literal>\"ABC\"</literal> e <literal>\"abc\"</literal> sono " "considerati diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -14564,13 +11037,11 @@ msgstr "<literal>@ci</literal>, <literal>@caseinsensitive</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:270 msgid "" -"Enable case-insensitive comparison (default behavior). With these " -"directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are " +"Enable case-insensitive comparison (default behavior). With these directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are " "considered identical." msgstr "" -"Abilita il confronto senza distinzione tra maiuscole e minuscole " -"(comportamento predefinito).Con queste direttive, <literal>\"ABC\"</literal> " -"e <literal>\"abc\"</literal> sono considerati identici." +"Abilita il confronto senza distinzione tra maiuscole e minuscole (comportamento predefinito).Con queste direttive, <literal>\"ABC\"</literal> e " +"<literal>\"abc\"</literal> sono considerati identici." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:277 @@ -14592,8 +11063,7 @@ msgstr "" "@caseinsensitive Il contenuto contiene \"errore\" ## Non distingue tra maiuscole e minuscole: corrisponde a \"Errore\", \"ERRORE\", \"errore\", ecc." #. type: Content of: <article><section><section><section><section><section><example> -#: English/Filters.xml:278 English/Filters.xml:315 English/Filters.xml:347 -#: English/Filters.xml:738 +#: English/Filters.xml:278 English/Filters.xml:315 English/Filters.xml:347 English/Filters.xml:738 msgid "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "<placeholder type=\"programlisting\" id=\"0\"/>" @@ -14604,13 +11074,10 @@ msgstr "Direttive di ottimizzazione" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:289 -msgid "" -"By default, filter expressions are optimized to improve performance. You can " -"control this behavior using the following directives:" +msgid "By default, filter expressions are optimized to improve performance. You can control this behavior using the following directives:" msgstr "" -"Per impostazione predefinita, le espressioni di filtro sono ottimizzate per " -"migliorare le prestazioni.Puoi controllare questo comportamento utilizzando " -"le seguenti direttive:" +"Per impostazione predefinita, le espressioni di filtro sono ottimizzate per migliorare le prestazioni.Puoi controllare questo comportamento " +"utilizzando le seguenti direttive:" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:295 @@ -14619,13 +11086,9 @@ msgstr "<literal>@ottimizzare</literal>, <literal>@opt</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:298 -msgid "" -"Enable filter expression optimization (default behavior). This may improve " -"performance for complex expressions." +msgid "Enable filter expression optimization (default behavior). This may improve performance for complex expressions." msgstr "" -"Abilita l'ottimizzazione dell'espressione del filtro (comportamento " -"predefinito).Ciò potrebbe migliorare le prestazioni per le espressioni " -"complesse." +"Abilita l'ottimizzazione dell'espressione del filtro (comportamento predefinito).Ciò potrebbe migliorare le prestazioni per le espressioni complesse." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:304 @@ -14634,12 +11097,8 @@ msgstr "<literal>@nooptimize</literal>, <literal>@noopt</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:307 -msgid "" -"Disable filter expression optimization. This is useful for debugging or when " -"optimization causes unexpected results." -msgstr "" -"Disabilita l'ottimizzazione dell'espressione del filtro.Ciò è utile per il " -"debug o quando l'ottimizzazione provoca risultati imprevisti." +msgid "Disable filter expression optimization. This is useful for debugging or when optimization causes unexpected results." +msgstr "Disabilita l'ottimizzazione dell'espressione del filtro.Ciò è utile per il debug o quando l'ottimizzazione provoca risultati imprevisti." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:314 @@ -14666,44 +11125,34 @@ msgstr "Direttiva sui nomi" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:325 msgid "" -"The <literal>@name</literal> directive allows you to assign a descriptive " -"name to a filter expression. This name is intended for use in error " +"The <literal>@name</literal> directive allows you to assign a descriptive name to a filter expression. This name is intended for use in error " "messages and logs to help identify which filter expression caused an issue." msgstr "" -"La direttiva <literal>@name</literal> consente di assegnare un nome " -"descrittivo a un'espressione di filtro.Questo nome è destinato all'uso nei " -"messaggi di errore e nei log per identificare quale espressione di filtro ha " -"causato un problema." +"La direttiva <literal>@name</literal> consente di assegnare un nome descrittivo a un'espressione di filtro.Questo nome è destinato all'uso nei " +"messaggi di errore e nei log per identificare quale espressione di filtro ha causato un problema." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:331 -msgid "" -"<literal>@name=\"Filter Name\"</literal>, <literal>@name=FilterName</literal>" -msgstr "" -"<literal>@name=\"Nome filtro\"</literal>, <literal>@name=Nome filtro</" -"literal>" +msgid "<literal>@name=\"Filter Name\"</literal>, <literal>@name=FilterName</literal>" +msgstr "<literal>@name=\"Nome filtro\"</literal>, <literal>@name=Nome filtro</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:334 msgid "" -"Assigns a name to the filter expression. If the name contains spaces or " -"special characters, it must be enclosed in double quotes. Names without " +"Assigns a name to the filter expression. If the name contains spaces or special characters, it must be enclosed in double quotes. Names without " "spaces can be specified without quotes." msgstr "" -"Assegna un nome all'espressione di filtro.Se il nome contiene spazi o " -"caratteri speciali, deve essere racchiuso tra virgolette doppie.I nomi senza " +"Assegna un nome all'espressione di filtro.Se il nome contiene spazi o caratteri speciali, deve essere racchiuso tra virgolette doppie.I nomi senza " "spazi possono essere specificati senza virgolette." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:338 msgid "" -"The specified name will be used in error messages and diagnostic output to " -"identify the filter. This is particularly useful when working with multiple " -"complex filter expressions." +"The specified name will be used in error messages and diagnostic output to identify the filter. This is particularly useful when working with " +"multiple complex filter expressions." msgstr "" -"Il nome specificato verrà utilizzato nei messaggi di errore e nell'output " -"diagnostico per identificare il filtro.Ciò è particolarmente utile quando si " -"lavora con più espressioni di filtro complesse." +"Il nome specificato verrà utilizzato nei messaggi di errore e nell'output diagnostico per identificare il filtro.Ciò è particolarmente utile quando " +"si lavora con più espressioni di filtro complesse." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:346 @@ -14727,12 +11176,10 @@ msgstr "" #. type: Content of: <article><section><section><section><section><note><para> #: English/Filters.xml:355 msgid "" -"The <literal>@name</literal> directive can be combined with other " -"directives. When multiple directives are used, they should all appear at " -"the beginning of the expression, separated by whitespace." +"The <literal>@name</literal> directive can be combined with other directives. When multiple directives are used, they should all appear at the " +"beginning of the expression, separated by whitespace." msgstr "" -"La direttiva <literal>@name</literal> può essere combinata con altre " -"direttive.Quando vengono utilizzate più direttive, dovrebbero apparire tutte " +"La direttiva <literal>@name</literal> può essere combinata con altre direttive.Quando vengono utilizzate più direttive, dovrebbero apparire tutte " "all'inizio dell'espressione, separate da spazi bianchi." #. type: Content of: <article><section><section><section><title> @@ -14743,15 +11190,11 @@ msgstr "Attributi" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:367 msgid "" -"Filter expressions support a variety of attributes referring to file " -"metadata and content. Attribute names are case-insensitive. You can " -"optionally specify which side of the comparison (Left, Right, or Middle) an " -"attribute applies to by using a prefix." +"Filter expressions support a variety of attributes referring to file metadata and content. Attribute names are case-insensitive. You can optionally " +"specify which side of the comparison (Left, Right, or Middle) an attribute applies to by using a prefix." msgstr "" -"Le espressioni di filtro supportano una varietà di attributi che fanno " -"riferimento ai metadati e al contenuto dei file.I nomi degli attributi non " -"fanno distinzione tra maiuscole e minuscole.Facoltativamente, è possibile " -"specificare a quale lato del confronto (Sinistra, Destra o Centro) si " +"Le espressioni di filtro supportano una varietà di attributi che fanno riferimento ai metadati e al contenuto dei file.I nomi degli attributi non " +"fanno distinzione tra maiuscole e minuscole.Facoltativamente, è possibile specificare a quale lato del confronto (Sinistra, Destra o Centro) si " "applica un attributo utilizzando un prefisso." #. type: Content of: <article><section><section><section><section><title> @@ -14766,12 +11209,8 @@ msgstr "<varname>Exists</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:377 -msgid "" -"Returns <literal>true</literal> if the file exists, <literal>false</literal> " -"otherwise" -msgstr "" -"Restituisce <literal>true</literal> se il file esiste, <literal>false</" -"literal> altrimenti" +msgid "Returns <literal>true</literal> if the file exists, <literal>false</literal> otherwise" +msgstr "Restituisce <literal>true</literal> se il file esiste, <literal>false</literal> altrimenti" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:380 @@ -14790,12 +11229,8 @@ msgstr "<varname>BaseName</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:385 -msgid "" -"Returns the filename without extension. For example, \"document.txt\" " -"returns \"document\"." -msgstr "" -"Restituisce il nome del file senza estensione.Ad esempio, \"document.txt\" " -"restituisce \"documento\"." +msgid "Returns the filename without extension. For example, \"document.txt\" returns \"document\"." +msgstr "Restituisce il nome del file senza estensione.Ad esempio, \"document.txt\" restituisce \"documento\"." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:388 @@ -14815,8 +11250,7 @@ msgstr "<varname>IsFolder</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:393 msgid "Returns true if the item is a folder/directory, false if it's a file." -msgstr "" -"Restituisce vero se l'elemento è una cartella/cartella, falso se è un file." +msgstr "Restituisce vero se l'elemento è una cartella/cartella, falso se è un file." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:396 @@ -14826,9 +11260,7 @@ msgstr "<varname>Folder</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:397 msgid "Returns the relative path excluding the file name and base folder" -msgstr "" -"Restituisce il percorso relativo escludendo il nome del file e la cartella " -"di base" +msgstr "Restituisce il percorso relativo escludendo il nome del file e la cartella di base" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:400 @@ -14838,14 +11270,11 @@ msgstr "<varname>RelPath</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:401 msgid "" -"Returns the relative path from the comparison root directory, including both " -"folder path and filename. For example, if comparing \"C:\\Project\" and the " -"file is at \"C:\\Project\\src\\main.cpp\", RelPath returns \"src\\main.cpp\"." +"Returns the relative path from the comparison root directory, including both folder path and filename. For example, if comparing \"C:\\Project\" and " +"the file is at \"C:\\Project\\src\\main.cpp\", RelPath returns \"src\\main.cpp\"." msgstr "" -"Restituisce il percorso relativo dalla cartella principale di confronto, " -"inclusi sia il percorso della cartella che il nome del file. Ad esempio, se " -"si confronta \"C:\\Project\" e il file si trova in \"C:\\Project\\src\\main." -"cpp\", RelPath restituisce \"src\\main.cpp\"." +"Restituisce il percorso relativo dalla cartella principale di confronto, inclusi sia il percorso della cartella che il nome del file. Ad esempio, se " +"si confronta \"C:\\Project\" e il file si trova in \"C:\\Project\\src\\main.cpp\", RelPath restituisce \"src\\main.cpp\"." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:404 @@ -14885,9 +11314,7 @@ msgstr "<varname>DateStr</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:417 msgid "Last modified date string in <literal>yyyy-MM-dd</literal> format" -msgstr "" -"Stringa della data dell'ultima modifica nel formato <literal>aaaa-MM-gg</" -"literal>" +msgstr "Stringa della data dell'ultima modifica nel formato <literal>aaaa-MM-gg</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:420 @@ -14917,14 +11344,11 @@ msgstr "<varname>AttrStr</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:430 msgid "" -"Returns file attribute string. Examples: <literal>\"R\"</literal> for Read-" -"only, <literal>\"H\"</literal> for Hidden, <literal>\"A\"</literal> for " +"Returns file attribute string. Examples: <literal>\"R\"</literal> for Read-only, <literal>\"H\"</literal> for Hidden, <literal>\"A\"</literal> for " "Archive, <literal>\"S\"</literal> for System file." msgstr "" -"Restituisce la stringa dell'attributo del file.Esempi: <literal>\"R\"</" -"literal> per sola lettura, <literal>\"H\"</literal> per nascosto, " -"<literal>\"A\"</literal> per archivio, <literal>\"S\"</literal> per file di " -"sistema." +"Restituisce la stringa dell'attributo del file.Esempi: <literal>\"R\"</literal> per sola lettura, <literal>\"H\"</literal> per nascosto, " +"<literal>\"A\"</literal> per archivio, <literal>\"S\"</literal> per file di sistema." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:442 @@ -14933,12 +11357,9 @@ msgstr "Attributi solo file" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:444 -msgid "" -"The following attributes are available only for file comparison items. When " -"used with folder items, the behavior is undefined." +msgid "The following attributes are available only for file comparison items. When used with folder items, the behavior is undefined." msgstr "" -"I seguenti attributi sono disponibili solo per gli elementi di confronto " -"file.Se utilizzato con elementi di cartelle, il comportamento non è definito." +"I seguenti attributi sono disponibili solo per gli elementi di confronto file.Se utilizzato con elementi di cartelle, il comportamento non è definito." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:450 @@ -14948,12 +11369,9 @@ msgstr "<varname>Content</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:451 msgid "" -"Content of the file. Returns a FileContent-type value. Only " -"<literal>contains</literal> and <literal>recontains</literal> can be used " -"with this type." +"Content of the file. Returns a FileContent-type value. Only <literal>contains</literal> and <literal>recontains</literal> can be used with this type." msgstr "" -"Contenuto del file.Restituisce un valore di tipo FileContent.Con questo tipo " -"è possibile utilizzare solo <literal>contains</literal> e " +"Contenuto del file.Restituisce un valore di tipo FileContent.Con questo tipo è possibile utilizzare solo <literal>contains</literal> e " "<literal>recontains</literal>." #. type: Content of: <article><section><section><section><section><title> @@ -14963,12 +11381,9 @@ msgstr "Attributi solo cartella" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:459 -msgid "" -"The following attributes are available only for folder comparison items. " -"When used with file items, the behavior is undefined." +msgid "The following attributes are available only for folder comparison items. When used with file items, the behavior is undefined." msgstr "" -"I seguenti attributi sono disponibili solo per gli elementi di confronto " -"delle cartelle.Se utilizzato con elementi file, il comportamento non è " +"I seguenti attributi sono disponibili solo per gli elementi di confronto delle cartelle.Se utilizzato con elementi file, il comportamento non è " "definito." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -14989,8 +11404,7 @@ msgstr "<varname>RecursiveFiles</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:470 msgid "Number of files contained in the folder, including all subfolders." -msgstr "" -"Numero di file contenuti nella cartella, incluse tutte le sottocartelle." +msgstr "Numero di file contenuti nella cartella, incluse tutte le sottocartelle." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:473 @@ -14999,11 +11413,8 @@ msgstr "<varname>Items</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:474 -msgid "" -"Number of items (files and subfolders) directly contained in the folder." -msgstr "" -"Numero di elementi (file e sottocartelle) contenuti direttamente nella " -"cartella." +msgid "Number of items (files and subfolders) directly contained in the folder." +msgstr "Numero di elementi (file e sottocartelle) contenuti direttamente nella cartella." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:477 @@ -15012,12 +11423,8 @@ msgstr "<varname>RecursiveItems</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:478 -msgid "" -"Number of items (files and subfolders) contained in the folder, including " -"all subfolders." -msgstr "" -"Numero di elementi (file e sottocartelle) contenuti nella cartella, incluse " -"tutte le sottocartelle." +msgid "Number of items (files and subfolders) contained in the folder, including all subfolders." +msgstr "Numero di elementi (file e sottocartelle) contenuti nella cartella, incluse tutte le sottocartelle." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:481 @@ -15027,9 +11434,7 @@ msgstr "<varname>TotalSize</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:482 msgid "Total size of all files directly contained in the folder, in bytes." -msgstr "" -"Dimensione totale di tutti i file direttamente contenuti nella cartella, in " -"byte." +msgstr "Dimensione totale di tutti i file direttamente contenuti nella cartella, in byte." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:485 @@ -15038,12 +11443,8 @@ msgstr "<varname>RecursiveTotalSize</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:486 -msgid "" -"Total size of all files contained in the folder, including all subfolders, " -"in bytes." -msgstr "" -"Dimensione totale di tutti i file contenuti nella cartella, incluse tutte le " -"sottocartelle, in byte." +msgid "Total size of all files contained in the folder, including all subfolders, in bytes." +msgstr "Dimensione totale di tutti i file contenuti nella cartella, incluse tutte le sottocartelle, in byte." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:492 @@ -15057,40 +11458,25 @@ msgstr "È possibile aggiungere prefissi per specificare il lato di confronto:" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:497 -msgid "" -"<emphasis>Left</emphasis>: Applies to the file on the left side (e.g., " -"<literal>LeftSize</literal>)" -msgstr "" -"<emphasis>Sinistra</emphasis>: si applica al file sul lato sinistro (ad " -"esempio, <literal>LeftSize</literal>)" +msgid "<emphasis>Left</emphasis>: Applies to the file on the left side (e.g., <literal>LeftSize</literal>)" +msgstr "<emphasis>Sinistra</emphasis>: si applica al file sul lato sinistro (ad esempio, <literal>LeftSize</literal>)" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:498 -msgid "" -"<emphasis>Right</emphasis>: Applies to the file on the right side (e.g., " -"<literal>RightDate</literal>)" -msgstr "" -"<emphasis>Destra</emphasis>: si applica al file sul lato destro (ad esempio, " -"<literal>RightDate</literal>)" +msgid "<emphasis>Right</emphasis>: Applies to the file on the right side (e.g., <literal>RightDate</literal>)" +msgstr "<emphasis>Destra</emphasis>: si applica al file sul lato destro (ad esempio, <literal>RightDate</literal>)" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:499 -msgid "" -"<emphasis>Middle</emphasis>: Applies to the middle file in 3-way comparison " -"(e.g., <literal>MiddleName</literal>)" -msgstr "" -"<emphasis>Medio</emphasis>: si applica al file centrale nel confronto a 3 " -"vie (ad esempio, <literal>MiddleName</literal>)" +msgid "<emphasis>Middle</emphasis>: Applies to the middle file in 3-way comparison (e.g., <literal>MiddleName</literal>)" +msgstr "<emphasis>Medio</emphasis>: si applica al file centrale nel confronto a 3 vie (ad esempio, <literal>MiddleName</literal>)" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:503 -msgid "" -"Attributes without a prefix (e.g., <literal>Size</literal>) return an array " -"of values from all available sides (Left, Middle, Right)." +msgid "Attributes without a prefix (e.g., <literal>Size</literal>) return an array of values from all available sides (Left, Middle, Right)." msgstr "" -"Gli attributi senza prefisso (ad esempio, <literal>Size</literal>) " -"restituiscono un array di valori da tutti i lati disponibili (Sinistra, " -"Centro, Destra)." +"Gli attributi senza prefisso (ad esempio, <literal>Size</literal>) restituiscono un array di valori da tutti i lati disponibili (Sinistra, Centro, " +"Destra)." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:508 @@ -15100,15 +11486,11 @@ msgstr "Attributi delle proprietà di Windows" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:510 msgid "" -"These attributes provide access to Windows Property System values, such as " -"metadata defined by the Windows Property System schema (e.g., " -"<literal>System.Title</literal>, <literal>System.FileOwner</literal>, " -"<literal>System.Image.HorizontalResolution</literal>)." +"These attributes provide access to Windows Property System values, such as metadata defined by the Windows Property System schema (e.g., " +"<literal>System.Title</literal>, <literal>System.FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." msgstr "" -"Questi attributi forniscono l'accesso ai valori del sistema di proprietà di " -"Windows, come i metadati definiti dallo schema del sistema di proprietà di " -"Windows (ad esempio, <literal>System.Title</literal>, <literal>System." -"FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." +"Questi attributi forniscono l'accesso ai valori del sistema di proprietà di Windows, come i metadati definiti dallo schema del sistema di proprietà " +"di Windows (ad esempio, <literal>System.Title</literal>, <literal>System.FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:518 @@ -15118,11 +11500,10 @@ msgstr "<varname>Prop</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:521 msgid "" -"Returns an array of property values (Left, Middle, Right) for the specified " -"canonical property name. Example: <literal>prop(\"System.Title\")</literal>" +"Returns an array of property values (Left, Middle, Right) for the specified canonical property name. Example: <literal>prop(\"System.Title\")</" +"literal>" msgstr "" -"Restituisce una matrice di valori di proprietà (Sinistra, Centro, Destra) " -"per il nome della proprietà canonica specificata.Esempio: " +"Restituisce una matrice di valori di proprietà (Sinistra, Centro, Destra) per il nome della proprietà canonica specificata.Esempio: " "<literal>prop(\"System.Title\")</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -15132,12 +11513,8 @@ msgstr "<varname>LeftProp</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:531 -msgid "" -"Property value of the left-side file. Example: <literal>leftprop(\"System." -"FileOwner\")</literal>" -msgstr "" -"Valore della proprietà del file sul lato sinistro.Esempio: " -"<literal>leftprop(\"System.FileOwner\")</literal>" +msgid "Property value of the left-side file. Example: <literal>leftprop(\"System.FileOwner\")</literal>" +msgstr "Valore della proprietà del file sul lato sinistro.Esempio: <literal>leftprop(\"System.FileOwner\")</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:537 @@ -15167,22 +11544,15 @@ msgstr "Display Filters Only Attributes" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:555 msgid "" -"The following attributes are designed for use in <emphasis " -"role=\"bold\">Display filters only</emphasis> (specified via <guilabel>e:</" -"guilabel>, <guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:" -"</guilabel>, <guilabel>de:</guilabel>, or <guilabel>de!:</guilabel> prefixes " -"in the Filter field). They should not be used in file filter (<filename>." -"flt</filename>) include/exclude rules, as they require the comparison to be " +"The following attributes are designed for use in <emphasis role=\"bold\">Display filters only</emphasis> (specified via <guilabel>e:</guilabel>, " +"<guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</guilabel>, or <guilabel>de!:</guilabel> prefixes in the " +"Filter field). They should not be used in file filter (<filename>.flt</filename>) include/exclude rules, as they require the comparison to be " "completed first and may lead to unexpected behavior." msgstr "" -"I seguenti attributi sono progettati per essere usati solo nei filtri " -"<emphasis role=\"bold\">Display fileters only</emphasis> (specificati " -"tramite i prefissi <guilabel>e:</guilabel>, <guilabel>e!:</guilabel>, " -"<guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</" -"guilabel> o <guilabel>de!:</guilabel> in il campo Filtro). Non devono essere " -"uszati nelle regole di inclusione/esclusione del filtro file (<nomefile>." -"flt</nomefile>), poiché richiedono che il confronto venga prima completato e " -"potrebbero causare comportamenti imprevisti." +"I seguenti attributi sono progettati per essere usati solo nei filtri <emphasis role=\"bold\">Display fileters only</emphasis> (specificati tramite i " +"prefissi <guilabel>e:</guilabel>, <guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</guilabel> o " +"<guilabel>de!:</guilabel> in il campo Filtro). Non devono essere uszati nelle regole di inclusione/esclusione del filtro file (<nomefile>.flt</" +"nomefile>), poiché richiedono che il confronto venga prima completato e potrebbero causare comportamenti imprevisti." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:564 @@ -15192,15 +11562,12 @@ msgstr "<varname>Identical</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:567 msgid "" -"Returns <literal>true</literal> if the comparison result indicates the items " -"are identical, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: " -"<literal>Identical</literal> to show only identical files." +"Returns <literal>true</literal> if the comparison result indicates the items are identical, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: <literal>Identical</literal> to show only identical files." msgstr "" -"Restituisce <literal>true</literal> se il risultato del confronto indica che " -"gli elementi sono identici, <literal>false</literal> se non sono identici. " -"Questo è un attributo globale (non supporta prefissi specifici del lato). " -"Esempio: <literal>Identical</literal> visualizzare solo file identici." +"Restituisce <literal>true</literal> se il risultato del confronto indica che gli elementi sono identici, <literal>false</literal> se non sono " +"identici. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Identical</literal> visualizzare solo file " +"identici." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:575 @@ -15210,15 +11577,11 @@ msgstr "<varname>Different</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:578 msgid "" -"Returns <literal>true</literal> if the comparison result indicates the items " -"are different, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: " -"<literal>Different</literal> to show only different files." +"Returns <literal>true</literal> if the comparison result indicates the items are different, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: <literal>Different</literal> to show only different files." msgstr "" -"Restituisce <literal>true</literal> se il risultato del confronto indica che " -"gli elementi sono diversi, <literal>false</literal>se non sono diversi. " -"Questo è un attributo globale (non supporta prefissi specifici del lato). " -"Esempio: <literal>Different</literal> per visualizzare solo file diversi." +"Restituisce <literal>true</literal> se il risultato del confronto indica che gli elementi sono diversi, <literal>false</literal>se non sono diversi. " +"Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Different</literal> per visualizzare solo file diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:586 @@ -15228,16 +11591,12 @@ msgstr "<varname>Skipped</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:589 msgid "" -"Returns <literal>true</literal> if the comparison was skipped due to an " -"error or filter rule, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: " -"<literal>Skipped</literal> to show only skipped items." +"Returns <literal>true</literal> if the comparison was skipped due to an error or filter rule, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: <literal>Skipped</literal> to show only skipped items." msgstr "" -"Restituisce <literal>true</literal> se il confronto è stato saltato a causa " -"di un errore o di una regola di filtro, <literal>false</literal> se non è " -"stato saltato. Questo è un attributo globale (non supporta prefissi " -"specifici del lato). Esempio: <literal>Skipped</literal> per visualizzare " -"solo gli elementi saltati." +"Restituisce <literal>true</literal> se il confronto è stato saltato a causa di un errore o di una regola di filtro, <literal>false</literal> se non è " +"stato saltato. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Skipped</literal> per visualizzare solo " +"gli elementi saltati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:597 @@ -15247,19 +11606,13 @@ msgstr "<varname>Binary</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:600 msgid "" -"Returns <literal>true</literal> if the file is detected as binary, " -"<literal>false</literal> if it's text, or <literal>undefined</literal> if " -"the file doesn't exist. This attribute supports side-specific prefixes (e." -"g., <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " -"Example: <literal>allof(Binary)</literal> to show files that are binary on " -"all sides." +"Returns <literal>true</literal> if the file is detected as binary, <literal>false</literal> if it's text, or <literal>undefined</literal> if the file " +"doesn't exist. This attribute supports side-specific prefixes (e.g., <literal>LeftBinary</literal>, <literal>RightBinary</literal>). Example: " +"<literal>allof(Binary)</literal> to show files that are binary on all sides." msgstr "" -"Restituisce <literal>true</literal> se il file viene rilevato come binario, " -"<literal>false</literal> se è testo o <literal>unfine</literal> se il file " -"non esiste. Questo attributo supporta prefissi specifici del lato (ad " -"esempio, <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " -"Esempio: <literal>allof(Binary)</literal> per visualizzare i file binari su " -"tutti i lati." +"Restituisce <literal>true</literal> se il file viene rilevato come binario, <literal>false</literal> se è testo o <literal>unfine</literal> se il " +"file non esiste. Questo attributo supporta prefissi specifici del lato (ad esempio, <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " +"Esempio: <literal>allof(Binary)</literal> per visualizzare i file binari su tutti i lati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:608 @@ -15269,19 +11622,13 @@ msgstr "<varname>DifferentLeftMiddle</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:611 msgid "" -"Returns <literal>true</literal> if the left and middle files are different " -"in a 3-way comparison, <literal>false</literal> otherwise. Returns " -"<literal>undefined</literal> in 2-way comparisons. This is a global " -"attribute (does not support side-specific prefixes). Example: " -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> to find " -"files where only left differs from middle." +"Returns <literal>true</literal> if the left and middle files are different in a 3-way comparison, <literal>false</literal> otherwise. Returns " +"<literal>undefined</literal> in 2-way comparisons. This is a global attribute (does not support side-specific prefixes). Example: " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> to find files where only left differs from middle." msgstr "" -"Restituisce <literal>true</literal> se in un confronto a 3 vie i file di " -"sinistra e centrale sono diversi, <literal>false</literal> se non sono " -"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. " -"Questo è un attributo globale (non supporta prefissi specifici del lato). " -"Esempio: <literal>DifferentLeftMiddle e non DifferentMiddleRight</literal> " -"per trovare file in cui solo la sinistra differisce da quello al centro." +"Restituisce <literal>true</literal> se in un confronto a 3 vie i file di sinistra e centrale sono diversi, <literal>false</literal> se non sono " +"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. Questo è un attributo globale (non supporta prefissi specifici del lato). " +"Esempio: <literal>DifferentLeftMiddle e non DifferentMiddleRight</literal> per trovare file in cui solo la sinistra differisce da quello al centro." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:620 @@ -15291,19 +11638,13 @@ msgstr "<varname>DifferentMiddleRight</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:623 msgid "" -"Returns <literal>true</literal> if the middle and right files are different " -"in a 3-way comparison, <literal>false</literal> otherwise. Returns " -"<literal>undefined</literal> in 2-way comparisons. This is a global " -"attribute (does not support side-specific prefixes). Example: " -"<literal>DifferentMiddleRight</literal> to show files where middle and right " -"differ." +"Returns <literal>true</literal> if the middle and right files are different in a 3-way comparison, <literal>false</literal> otherwise. Returns " +"<literal>undefined</literal> in 2-way comparisons. This is a global attribute (does not support side-specific prefixes). Example: " +"<literal>DifferentMiddleRight</literal> to show files where middle and right differ." msgstr "" -"Restituisce <literal>true</literal> se in un confronto a 3 vie i file " -"centrale e destro sono diversi, <literal>false</literal> o se non sono " -"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. " -"Questo è un attributo globale (non supporta prefissi specifici del lato). " -"Esempio: <literal>DifferentMiddleRight</literal> per visualizzare i file in " -"cui iquello centrale e quello a destra sono diversi." +"Restituisce <literal>true</literal> se in un confronto a 3 vie i file centrale e destro sono diversi, <literal>false</literal> o se non sono diversi. " +"Nei confronti a due vie restituisce <literal>undefined</literal>. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: " +"<literal>DifferentMiddleRight</literal> per visualizzare i file in cui iquello centrale e quello a destra sono diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:632 @@ -15313,19 +11654,13 @@ msgstr "<varname>DifferentLeftRight</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:635 msgid "" -"In 3-way comparisons, returns <literal>true</literal> if the left and right " -"files are different, <literal>false</literal> otherwise. In 2-way " -"comparisons, returns <literal>true</literal> if both files exist and are " -"different. This is a global attribute (does not support side-specific " -"prefixes). Example: <literal>DifferentLeftRight</literal> to show files " -"where left and right differ." +"In 3-way comparisons, returns <literal>true</literal> if the left and right files are different, <literal>false</literal> otherwise. In 2-way " +"comparisons, returns <literal>true</literal> if both files exist and are different. This is a global attribute (does not support side-specific " +"prefixes). Example: <literal>DifferentLeftRight</literal> to show files where left and right differ." msgstr "" -"Nei confronti a 3 vie restituisce <literal>true</literal> se i file sinistro " -"e destro sono diversi, <literal>false</literal> se non sono diversi. Nei " -"confronti a due vie restituisce <literal>true</literal> se entrambi i file " -"esistono e sono diversi. Questo è un attributo globale (non supporta " -"prefissi specifici del lato). Esempio: <literal>DifferentLeftRight</" -"literal> per visualizzare i file in cui la sinistra e la destra differiscono." +"Nei confronti a 3 vie restituisce <literal>true</literal> se i file sinistro e destro sono diversi, <literal>false</literal> se non sono diversi. Nei " +"confronti a due vie restituisce <literal>true</literal> se entrambi i file esistono e sono diversi. Questo è un attributo globale (non supporta " +"prefissi specifici del lato). Esempio: <literal>DifferentLeftRight</literal> per visualizzare i file in cui la sinistra e la destra differiscono." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:644 @@ -15335,19 +11670,13 @@ msgstr "<varname>Differences</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:647 msgid "" -"Returns the number of text differences in the file comparison. This " -"attribute is only meaningful for text files that have been compared. This " -"is a global attribute (does not support side-specific prefixes). Example: " -"<literal>Differences > 0</literal> to show files with differences, or " -"<literal>Differences > 10</literal> to show files with more than 10 " -"differences." +"Returns the number of text differences in the file comparison. This attribute is only meaningful for text files that have been compared. This is a " +"global attribute (does not support side-specific prefixes). Example: <literal>Differences > 0</literal> to show files with differences, or " +"<literal>Differences > 10</literal> to show files with more than 10 differences." msgstr "" -"Restituisce il numero di differenze di testo nel confronto dei file. Questo " -"attributo è significativo solo per i file di testo che sono stati " -"confrontati. Questo è un attributo globale (non supporta prefissi specifici " -"del lato). Esempio: <literal>Differences > 0</literal> per visualizzare file " -"con differenze, o <literal>Differences > 10</literal> per visualizzare file " -"con più di 10 differenze." +"Restituisce il numero di differenze di testo nel confronto dei file. Questo attributo è significativo solo per i file di testo che sono stati " +"confrontati. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Differences > 0</literal> per visualizzare " +"file con differenze, o <literal>Differences > 10</literal> per visualizzare file con più di 10 differenze." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:657 @@ -15357,22 +11686,15 @@ msgstr "<varname>IgnoredDiffs</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:660 msgid "" -"Returns the number of ignored differences in the file comparison " -"(differences filtered by line filters or whitespace settings). This " -"attribute is only meaningful for text files that have been compared. This " -"is a global attribute (does not support side-specific prefixes). Example: " -"<literal>IgnoredDiffs > 0</literal> to show files with ignored " -"differences, or <literal>Differences = 0 and IgnoredDiffs > 0</literal> " -"to show files that are identical except for ignored differences." -msgstr "" -"Restituisce il numero di differenze ignorate nel confronto dei file " -"(differenze filtrate dai filtri di linea o dalle impostazioni degli spazi " -"bianchi). Questo attributo è significativo solo per i file di testo che sono " -"stati confrontati. Questo è un attributo globale (non supporta prefissi " -"specifici del lato). Esempio: <literal>IgnoredDiffs > 0</literal> per " -"visualizzare file con differenze ignorate, o <literal>Differences = 0 e " -"IgnoredDiffs > 0</literal> per visualizzare file identici tranne che per le " -"differenze ignorate." +"Returns the number of ignored differences in the file comparison (differences filtered by line filters or whitespace settings). This attribute is " +"only meaningful for text files that have been compared. This is a global attribute (does not support side-specific prefixes). Example: " +"<literal>IgnoredDiffs > 0</literal> to show files with ignored differences, or <literal>Differences = 0 and IgnoredDiffs > 0</literal> to show " +"files that are identical except for ignored differences." +msgstr "" +"Restituisce il numero di differenze ignorate nel confronto dei file (differenze filtrate dai filtri di linea o dalle impostazioni degli spazi " +"bianchi). Questo attributo è significativo solo per i file di testo che sono stati confrontati. Questo è un attributo globale (non supporta prefissi " +"specifici del lato). Esempio: <literal>IgnoredDiffs > 0</literal> per visualizzare file con differenze ignorate, o <literal>Differences = 0 e " +"IgnoredDiffs > 0</literal> per visualizzare file identici tranne che per le differenze ignorate." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:670 @@ -15382,19 +11704,13 @@ msgstr "<varname>Unpacker</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:673 msgid "" -"Returns the name of the unpacker plugin used for the file comparison, or an " -"empty string if no unpacker was used. This is a global attribute (does not " -"support side-specific prefixes). Example: <literal>Unpacker = " -"\"CompareMSExcelFiles\"</literal> to show files compared using the Excel " -"unpacker, or <literal>Unpacker != \"\"</literal> to show all files where an " -"unpacker was used." -msgstr "" -"Restituisce il nome del plugin di decompressione usato per il confronto dei " -"file o una stringa vuota se non è stato usato alcun programma di " -"decompressione. Questo è un attributo globale (non supporta prefissi " -"specifici del lato). Esempio: <literal>Unpacker = \"CompareMSExcelFiles\"</" -"literal> per visualizzare i file confrontati usando il decompressore di " -"Excel o <literal>Unpacker != \"\"</literal> per visualizzare tutti i file in " +"Returns the name of the unpacker plugin used for the file comparison, or an empty string if no unpacker was used. This is a global attribute (does " +"not support side-specific prefixes). Example: <literal>Unpacker = \"CompareMSExcelFiles\"</literal> to show files compared using the Excel unpacker, " +"or <literal>Unpacker != \"\"</literal> to show all files where an unpacker was used." +msgstr "" +"Restituisce il nome del plugin di decompressione usato per il confronto dei file o una stringa vuota se non è stato usato alcun programma di " +"decompressione. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Unpacker = \"CompareMSExcelFiles\"</" +"literal> per visualizzare i file confrontati usando il decompressore di Excel o <literal>Unpacker != \"\"</literal> per visualizzare tutti i file in " "cui è stato usato un decompressore." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -15405,19 +11721,13 @@ msgstr "<varname>Prediffer</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:685 msgid "" -"Returns the name of the prediffer plugin used for the file comparison, or an " -"empty string if no prediffer was used. This is a global attribute (does not " -"support side-specific prefixes). Example: <literal>Prediffer = " -"\"IgnoreColumns\"</literal> to show files compared using the IgnoreColumns " -"prediffer, or <literal>Prediffer != \"\"</literal> to show all files where a " -"prediffer was used." +"Returns the name of the prediffer plugin used for the file comparison, or an empty string if no prediffer was used. This is a global attribute (does " +"not support side-specific prefixes). Example: <literal>Prediffer = \"IgnoreColumns\"</literal> to show files compared using the IgnoreColumns " +"prediffer, or <literal>Prediffer != \"\"</literal> to show all files where a prediffer was used." msgstr "" -"Restituisce il nome del plugin prediffer usato per il confronto dei file o " -"una stringa vuota se non è stato utilizzato alcun prediffer. Questo è un " -"attributo globale (non supporta prefissi specifici del lato). Esempio: " -"<literal>Prediffer = \"IgnoreColumns\"</literal> per visualizzare i file " -"confrontati usando il prediffer IgnoreColumns, o <literal>Prediffer != \"\"</" -"literal> per visualizzare tutti i file in cui è stato usato prediffer." +"Restituisce il nome del plugin prediffer usato per il confronto dei file o una stringa vuota se non è stato utilizzato alcun prediffer. Questo è un " +"attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Prediffer = \"IgnoreColumns\"</literal> per visualizzare i file " +"confrontati usando il prediffer IgnoreColumns, o <literal>Prediffer != \"\"</literal> per visualizzare tutti i file in cui è stato usato prediffer." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:694 @@ -15427,18 +11737,13 @@ msgstr "<varname>Codepage</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:697 msgid "" -"Returns the file's codepage (character encoding) as an integer value. This " -"attribute supports side-specific prefixes (e.g., <literal>LeftCodepage</" -"literal>, <literal>RightCodepage</literal>). Example: <literal>Codepage = " -"65001</literal> to show UTF-8 files, or <literal>allof(Codepage = 65001)</" +"Returns the file's codepage (character encoding) as an integer value. This attribute supports side-specific prefixes (e.g., <literal>LeftCodepage</" +"literal>, <literal>RightCodepage</literal>). Example: <literal>Codepage = 65001</literal> to show UTF-8 files, or <literal>allof(Codepage = 65001)</" "literal> to show files that are UTF-8 on all sides." msgstr "" -"Restituisce la pagina codici del file (codifica dei caratteri) come valore " -"intero. Questo attributo supporta prefissi specifici del lato (ad esempio, " -"<literal>LeftCodepage</literal>, <literal>RightCodepage</literal>). Esempio: " -"<literal>Codepage = 65001</literal> per visualizzare file UTF-8 o " -"<literal>allof(Codepage = 65001)</literal> per visualizzare file UTF-8 in " -"tutti i lati." +"Restituisce la pagina codici del file (codifica dei caratteri) come valore intero. Questo attributo supporta prefissi specifici del lato (ad esempio, " +"<literal>LeftCodepage</literal>, <literal>RightCodepage</literal>). Esempio: <literal>Codepage = 65001</literal> per visualizzare file UTF-8 o " +"<literal>allof(Codepage = 65001)</literal> per visualizzare file UTF-8 in tutti i lati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:706 @@ -15448,18 +11753,13 @@ msgstr "<varname>HasBOM</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:709 msgid "" -"Returns <literal>true</literal> if the file has a Byte Order Mark (BOM), " -"<literal>false</literal> otherwise. This attribute supports side-specific " -"prefixes (e.g., <literal>LeftHasBOM</literal>, <literal>RightHasBOM</" -"literal>). Example: <literal>HasBOM</literal> to show files with BOM, or " +"Returns <literal>true</literal> if the file has a Byte Order Mark (BOM), <literal>false</literal> otherwise. This attribute supports side-specific " +"prefixes (e.g., <literal>LeftHasBOM</literal>, <literal>RightHasBOM</literal>). Example: <literal>HasBOM</literal> to show files with BOM, or " "<literal>not HasBOM</literal> to show files without BOM." msgstr "" -"Restituisce <literal>true</literal> se il file ha un Byte Order Mark (BOM), " -"<literal>false</literal> altrimenti. Questo attributo supporta prefissi " -"specifici del lato (ad esempio, <literal>LeftHasBOM</literal>, " -"<literal>RightHasBOM</literal>). Esempio: <literal>HasBOM</literal> per " -"visualizzare file con BOM, o <literal>not HasBOM</literal> per visualizzare " -"file senza BOM." +"Restituisce <literal>true</literal> se il file ha un Byte Order Mark (BOM), <literal>false</literal> altrimenti. Questo attributo supporta prefissi " +"specifici del lato (ad esempio, <literal>LeftHasBOM</literal>, <literal>RightHasBOM</literal>). Esempio: <literal>HasBOM</literal> per visualizzare " +"file con BOM, o <literal>not HasBOM</literal> per visualizzare file senza BOM." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:721 @@ -15469,16 +11769,12 @@ msgstr "Valutazione della matrice" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:724 msgid "" -"Attributes without a side prefix (e.g., <literal>Size</literal>) return an " -"array of values from all available sides (Left, Middle, Right). When " -"applying an operator to such arrays, behavior differs depending on whether " -"the comparison is with a scalar or another array." +"Attributes without a side prefix (e.g., <literal>Size</literal>) return an array of values from all available sides (Left, Middle, Right). When " +"applying an operator to such arrays, behavior differs depending on whether the comparison is with a scalar or another array." msgstr "" -"Gli attributi senza prefisso laterale (ad esempio, <literal>Size</literal>) " -"restituiscono un array di valori da tutti i lati disponibili (Sinistra, " -"Centro, Destra).Quando si applica un operatore a tali array, il " -"comportamento varia a seconda che il confronto avvenga con un array scalare " -"o con un altro." +"Gli attributi senza prefisso laterale (ad esempio, <literal>Size</literal>) restituiscono un array di valori da tutti i lati disponibili (Sinistra, " +"Centro, Destra).Quando si applica un operatore a tali array, il comportamento varia a seconda che il confronto avvenga con un array scalare o con un " +"altro." #. type: Content of: <article><section><section><section><section><section><title> #: English/Filters.xml:730 @@ -15488,17 +11784,13 @@ msgstr "Array vs scalare" #. type: Content of: <article><section><section><section><section><section><para> #: English/Filters.xml:732 msgid "" -"When comparing an array to a scalar, the operation is applied to each array " -"element individually. This results in a boolean array. If any element in " -"this boolean array is <literal>true</literal>, the overall expression " -"evaluates to <literal>true</literal>. Otherwise, it evaluates to " +"When comparing an array to a scalar, the operation is applied to each array element individually. This results in a boolean array. If any element in " +"this boolean array is <literal>true</literal>, the overall expression evaluates to <literal>true</literal>. Otherwise, it evaluates to " "<literal>false</literal>." msgstr "" -"Quando si confronta un array con uno scalare, l'operazione viene applicata " -"individualmente a ciascun elemento dell'array.Ciò si traduce in un array " -"booleano.Se qualsiasi elemento in questo array booleano è <literal>true</" -"literal>, l'espressione complessiva restituisce <literal>true</literal>." -"Altrimenti, restituisce <literal>false</literal>." +"Quando si confronta un array con uno scalare, l'operazione viene applicata individualmente a ciascun elemento dell'array.Ciò si traduce in un array " +"booleano.Se qualsiasi elemento in questo array booleano è <literal>true</literal>, l'espressione complessiva restituisce <literal>true</" +"literal>.Altrimenti, restituisce <literal>false</literal>." #. type: Content of: <article><section><section><section><section><section><example><programlisting> #: English/Filters.xml:738 @@ -15514,39 +11806,29 @@ msgstr "Array contro array" #. type: Content of: <article><section><section><section><section><section><para> #: English/Filters.xml:745 msgid "When comparing two arrays, the behavior depends on the operator:" -msgstr "" -"Quando si confrontano due array, il comportamento dipende dall'operatore:" +msgstr "Quando si confrontano due array, il comportamento dipende dall'operatore:" #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:750 msgid "" -"For <literal>=</literal> and <literal>!=</literal>: The arrays must have the " -"same length. The result is a single boolean value, not an array. " -"<literal>=</literal> returns <literal>true</literal> only if all elements " -"are equal. <literal>!=</literal> returns <literal>true</literal> if any " +"For <literal>=</literal> and <literal>!=</literal>: The arrays must have the same length. The result is a single boolean value, not an array. " +"<literal>=</literal> returns <literal>true</literal> only if all elements are equal. <literal>!=</literal> returns <literal>true</literal> if any " "element differs." msgstr "" -"Per <literal>=</literal> e <literal>!=</literal>: gli array devono avere la " -"stessa lunghezza.Il risultato è un singolo valore booleano, non un array." -"<literal>=</literal> restituisce <literal>true</literal> solo se tutti gli " -"elementi sono uguali.<literal>!=</literal> restituisce <literal>true</" +"Per <literal>=</literal> e <literal>!=</literal>: gli array devono avere la stessa lunghezza.Il risultato è un singolo valore booleano, non un array." +"<literal>=</literal> restituisce <literal>true</literal> solo se tutti gli elementi sono uguali.<literal>!=</literal> restituisce <literal>true</" "literal> se qualche elemento è diverso." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:759 msgid "" -"For all other operators (e.g., <literal>></literal>, <literal><</" -"literal>): the operation is applied element-wise, producing a boolean " -"array. The final result of the expression is <literal>true</literal> if any " -"element in the boolean array is <literal>true</literal>, and <literal>false</" +"For all other operators (e.g., <literal>></literal>, <literal><</literal>): the operation is applied element-wise, producing a boolean array. " +"The final result of the expression is <literal>true</literal> if any element in the boolean array is <literal>true</literal>, and <literal>false</" "literal> if all elements are <literal>false</literal>." msgstr "" -"Per tutti gli altri operatori (ad esempio, <literal>></literal>, " -"<literal><</literal>): l'operazione viene applicata per elemento, " -"producendo un array booleano.Il risultato finale dell'espressione è " -"<literal>true</literal> se qualsiasi elemento nell'array booleano è " -"<literal>true</literal> e <literal>false</literal> se tutti gli elementi " -"sono <literal>false</literal>." +"Per tutti gli altri operatori (ad esempio, <literal>></literal>, <literal><</literal>): l'operazione viene applicata per elemento, producendo " +"un array booleano.Il risultato finale dell'espressione è <literal>true</literal> se qualsiasi elemento nell'array booleano è <literal>true</literal> " +"e <literal>false</literal> se tutti gli elementi sono <literal>false</literal>." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:768 English/Filters.xml:1266 @@ -15581,14 +11863,8 @@ msgstr "" #. type: Content of: <article><section><section><section><section><section><example> #: English/Filters.xml:769 -msgid "" -"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder " -"type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" " -"id=\"2\"/>" -msgstr "" -"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder " -"type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" " -"id=\"2\"/>" +msgid "<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" id=\"2\"/>" +msgstr "<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" id=\"2\"/>" #. type: Content of: <article><section><section><section><section><section><title> #: English/Filters.xml:779 @@ -15598,31 +11874,23 @@ msgstr "Riepilogo" #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:783 msgid "" -"Array vs scalar comparisons produce a boolean array. The overall expression " -"result is <literal>true</literal> if at least one element is <literal>true</" -"literal>." +"Array vs scalar comparisons produce a boolean array. The overall expression result is <literal>true</literal> if at least one element is " +"<literal>true</literal>." msgstr "" -"I confronti tra array e scalari producono un array booleano.Il risultato " -"complessivo dell'espressione è <literal>true</literal> se almeno un elemento " +"I confronti tra array e scalari producono un array booleano.Il risultato complessivo dell'espressione è <literal>true</literal> se almeno un elemento " "è <literal>true</literal>." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:789 -msgid "" -"Array vs array with <literal>=</literal> or <literal>!=</literal> returns a " -"single boolean value." -msgstr "" -"Array vs array con <literal>=</literal> o <literal>!=</literal> restituisce " -"un singolo valore booleano." +msgid "Array vs array with <literal>=</literal> or <literal>!=</literal> returns a single boolean value." +msgstr "Array vs array con <literal>=</literal> o <literal>!=</literal> restituisce un singolo valore booleano." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:794 msgid "" -"Array vs array with other operators produces a boolean array. The final " -"result is <literal>true</literal> if any element is <literal>true</literal>." +"Array vs array with other operators produces a boolean array. The final result is <literal>true</literal> if any element is <literal>true</literal>." msgstr "" -"Array vs array con altri operatori produce un array booleano.Il risultato " -"finale è <literal>true</literal> se qualsiasi elemento è <literal>true</" +"Array vs array con altri operatori produce un array booleano.Il risultato finale è <literal>true</literal> se qualsiasi elemento è <literal>true</" "literal>." #. type: Content of: <article><section><section><section><title> @@ -15633,30 +11901,20 @@ msgstr "Operatori" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:807 msgid "" -"By default, all string comparison operators (such as <literal>=</literal>, " -"<literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " -"<literal>></literal>, <literal>>=</literal>, <literal>like</literal>, " -"<literal>matches</literal>, <literal>contains</literal>, and " -"<literal>recontains</literal>) are case-insensitive. You can control this " -"behavior using directives (see <xref " +"By default, all string comparison operators (such as <literal>=</literal>, <literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " +"<literal>></literal>, <literal>>=</literal>, <literal>like</literal>, <literal>matches</literal>, <literal>contains</literal>, and " +"<literal>recontains</literal>) are case-insensitive. You can control this behavior using directives (see <xref " "linkend=\"FilterExpression_CaseSensitivity\" />)." msgstr "" -"Per impostazione predefinita, tutti gli operatori di confronto di stringhe " -"(come <literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " -"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, " -"<literal>like</literal>, <literal>match</literal>, <literal>contains</" -"literal> e<literal>recontains</literal>) non fanno distinzione tra maiuscole " -"e minuscole.Puoi controllare questo comportamento utilizzando le direttive " -"(vedi <xref linkend=\"FilterExpression_CaseSensitivity\" />)." +"Per impostazione predefinita, tutti gli operatori di confronto di stringhe (come <literal>=</literal>, <literal>!=</literal>, <literal><</" +"literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>, <literal>like</literal>, <literal>match</literal>, " +"<literal>contains</literal> e<literal>recontains</literal>) non fanno distinzione tra maiuscole e minuscole.Puoi controllare questo comportamento " +"utilizzando le direttive (vedi <xref linkend=\"FilterExpression_CaseSensitivity\" />)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:815 -msgid "" -"<literal><</literal>, <literal><=</literal>, <literal>></literal>, " -"<literal>>=</literal>" -msgstr "" -"<literal><</literal>, <literal><=</literal>, <literal>></literal>, " -"<literal>>=</literal>" +msgid "<literal><</literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>" +msgstr "<literal><</literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:816 @@ -15685,25 +11943,17 @@ msgstr "Confronto delle disuguaglianze" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:827 -msgid "" -"<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/" -"</literal>, <literal>%</literal>" -msgstr "" -"<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/" -"</literal>, <literal>%</literal>" +msgid "<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/</literal>, <literal>%</literal>" +msgstr "<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/</literal>, <literal>%</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:830 msgid "" -"Arithmetic operators. <literal>+</literal> and <literal>-</literal> perform " -"addition and subtraction. <literal>*</literal> and <literal>/</literal> " -"perform multiplication and division. <literal>%</literal> is the modulo " -"operator (remainder)." +"Arithmetic operators. <literal>+</literal> and <literal>-</literal> perform addition and subtraction. <literal>*</literal> and <literal>/</literal> " +"perform multiplication and division. <literal>%</literal> is the modulo operator (remainder)." msgstr "" -"Operatori aritmetici.<literal>+</literal> e <literal>-</literal> eseguono " -"addizioni e sottrazioni.<literal>*</literal> e <literal>/</literal> eseguono " -"moltiplicazioni e divisioni.<literal>%</literal> è l'operatore modulo " -"(resto)." +"Operatori aritmetici.<literal>+</literal> e <literal>-</literal> eseguono addizioni e sottrazioni.<literal>*</literal> e <literal>/</literal> " +"eseguono moltiplicazioni e divisioni.<literal>%</literal> è l'operatore modulo (resto)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:835 @@ -15727,11 +11977,8 @@ msgstr "Corrispondenza di stringhe di caratteri jolly" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:842 -msgid "" -"You can also use <literal>not like</literal> to perform the inverse match." -msgstr "" -"Puoi anche usare <literal>not like</literal> per eseguire la corrispondenza " -"inversa." +msgid "You can also use <literal>not like</literal> to perform the inverse match." +msgstr "Puoi anche usare <literal>not like</literal> per eseguire la corrispondenza inversa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:846 @@ -15745,11 +11992,8 @@ msgstr "Corrisponde alle espressioni regolari" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:849 -msgid "" -"You can also use <literal>not matches</literal> to perform the inverse match." -msgstr "" -"Puoi anche usare <literal>notmatch</literal> per eseguire la corrispondenza " -"inversa." +msgid "You can also use <literal>not matches</literal> to perform the inverse match." +msgstr "Puoi anche usare <literal>notmatch</literal> per eseguire la corrispondenza inversa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:853 @@ -15763,12 +12007,8 @@ msgstr "Controlla se una stringa contiene una sottostringa" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:856 -msgid "" -"You can also use <literal>not contains</literal> to check for absence of the " -"substring." -msgstr "" -"Puoi anche usare <literal>not contiene</literal> per verificare l'assenza " -"della sottostringa." +msgid "You can also use <literal>not contains</literal> to check for absence of the substring." +msgstr "Puoi anche usare <literal>not contiene</literal> per verificare l'assenza della sottostringa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:860 @@ -15778,16 +12018,12 @@ msgstr "<literal>contiene</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:862 msgid "Checks if any substring matches a regular expression" -msgstr "" -"Controlla se qualche sottostringa corrisponde a un'espressione regolare" +msgstr "Controlla se qualche sottostringa corrisponde a un'espressione regolare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:863 -msgid "" -"You can also use <literal>not recontains</literal> to ensure no match exists." -msgstr "" -"Puoi anche usare <literal>not recontains</literal> per assicurarti che non " -"esista alcuna corrispondenza." +msgid "You can also use <literal>not recontains</literal> to ensure no match exists." +msgstr "Puoi anche usare <literal>not recontains</literal> per assicurarti che non esista alcuna corrispondenza." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:870 @@ -15802,37 +12038,25 @@ msgstr "<function>lineCount<function>(<replaceable>contenuto</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:875 msgid "" -"Returns the number of lines in the file content or file content array as an " -"<literal>Integer</literal>. If <replaceable>content</replaceable> is an " -"array, the result is an integer array. Example: <literal>lineCount(Content)</" -"literal>" +"Returns the number of lines in the file content or file content array as an <literal>Integer</literal>. If <replaceable>content</replaceable> is an " +"array, the result is an integer array. Example: <literal>lineCount(Content)</literal>" msgstr "" -"Restituisce il numero di righe nel contenuto del file o nell'array del " -"contenuto del file come <literal>Intero</literal>.Se <replaceable>content</" -"replaceable> è un array, il risultato è un array di numeri interi.Esempio: " -"<literal>lineCount(Content)</literal>" +"Restituisce il numero di righe nel contenuto del file o nell'array del contenuto del file come <literal>Intero</literal>.Se <replaceable>content</" +"replaceable> è un array, il risultato è un array di numeri interi.Esempio: <literal>lineCount(Content)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:878 -msgid "" -"<function>sublines</function>(<replaceable>content</replaceable>, " -"<replaceable>start</replaceable>, <replaceable>count</replaceable>)" -msgstr "" -"<function>sublines</function>(<replaceable>contenuto</replaceable>, " -"<replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" +msgid "<function>sublines</function>(<replaceable>content</replaceable>, <replaceable>start</replaceable>, <replaceable>count</replaceable>)" +msgstr "<function>sublines</function>(<replaceable>contenuto</replaceable>, <replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:881 msgid "" -"Extracts the specified number of lines starting from the given line index in " -"the file content or file content array, and returns them as a single " -"concatenated string. If <replaceable>content</replaceable> is an array, the " -"result is an array of strings." +"Extracts the specified number of lines starting from the given line index in the file content or file content array, and returns them as a single " +"concatenated string. If <replaceable>content</replaceable> is an array, the result is an array of strings." msgstr "" -"Estrae il numero specificato di righe a partire dall'indice di riga " -"specificato nel contenuto del file o nell'array del contenuto del file e li " -"restituisce come un'unica stringa concatenata.Se <replaceable>content</" -"replaceable> è un array, il risultato è un array di stringhe." +"Estrae il numero specificato di righe a partire dall'indice di riga specificato nel contenuto del file o nell'array del contenuto del file e li " +"restituisce come un'unica stringa concatenata.Se <replaceable>content</replaceable> è un array, il risultato è un array di stringhe." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:887 @@ -15842,35 +12066,25 @@ msgstr "<function>strlen</function>(<replaceable>fonte</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:888 msgid "" -"Returns the length of the string as an <literal>Integer</literal>. If " -"<replaceable>source</replaceable> is a string array, the result is an " -"integer array. Example: <literal>strlen(Name)</literal>" +"Returns the length of the string as an <literal>Integer</literal>. If <replaceable>source</replaceable> is a string array, the result is an integer " +"array. Example: <literal>strlen(Name)</literal>" msgstr "" -"Restituisce la lunghezza della stringa come <literal>Intero</literal>.Se " -"<replaceable>source</replaceable> è un array di stringhe, il risultato è un " +"Restituisce la lunghezza della stringa come <literal>Intero</literal>.Se <replaceable>source</replaceable> è un array di stringhe, il risultato è un " "array di numeri interi.Esempio: <literal>strlen(Nome)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:891 -msgid "" -"<function>substr</function>(<replaceable>source</replaceable>, " -"<replaceable>start</replaceable>, <replaceable>count</replaceable>)" -msgstr "" -"<function>substr</function>(<replaceable>sorgente</replaceable>, " -"<replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" +msgid "<function>substr</function>(<replaceable>source</replaceable>, <replaceable>start</replaceable>, <replaceable>count</replaceable>)" +msgstr "<function>substr</function>(<replaceable>sorgente</replaceable>, <replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:892 msgid "" -"Returns a specific range of text from the <emphasis>string or string array</" -"emphasis> as a <literal>String</literal>. If <replaceable>source</" -"replaceable> is a string array, the result is a string array. Example: " -"<literal>substr(Name, 0, 3)</literal>" +"Returns a specific range of text from the <emphasis>string or string array</emphasis> as a <literal>String</literal>. If <replaceable>source</" +"replaceable> is a string array, the result is a string array. Example: <literal>substr(Name, 0, 3)</literal>" msgstr "" -"Restituisce un intervallo specifico di testo dalla <emphasis>stringa o " -"dall'array di stringhe</emphasis> come <literal>Stringa</literal>.Se " -"<replaceable>source</replaceable> è un array di stringhe, il risultato è un " -"array di stringhe.Esempio: <literal>substr(Nome, 0, 3)</literal>" +"Restituisce un intervallo specifico di testo dalla <emphasis>stringa o dall'array di stringhe</emphasis> come <literal>Stringa</literal>.Se " +"<replaceable>source</replaceable> è un array di stringhe, il risultato è un array di stringhe.Esempio: <literal>substr(Nome, 0, 3)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:895 @@ -15880,16 +12094,11 @@ msgstr "<function>replace</function> (da, a, in)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:898 msgid "" -"Replaces all occurrences of the string <replaceable>from</replaceable> with " -"<replaceable>to</replaceable>. If <replaceable>str</replaceable> is an " -"array, the result is an array of strings with replacements applied. " -"Example: <literal>replace(name, \".bak\", \".txt\")</literal>" +"Replaces all occurrences of the string <replaceable>from</replaceable> with <replaceable>to</replaceable>. If <replaceable>str</replaceable> is an " +"array, the result is an array of strings with replacements applied. Example: <literal>replace(name, \".bak\", \".txt\")</literal>" msgstr "" -"Sostituisce tutte le occorrenze della stringa <replaceable>from</" -"replaceable> con <replaceable>to</replaceable>.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe a cui sono " -"applicate le sostituzioni.Esempio: <literal>sostituisci(nome, \".bak\", \"." -"txt\")</literal>" +"Sostituisce tutte le occorrenze della stringa <replaceable>from</replaceable> con <replaceable>to</replaceable>.Se <replaceable>str</replaceable> è " +"un array, il risultato è un array di stringhe a cui sono applicate le sostituzioni.Esempio: <literal>sostituisci(nome, \".bak\", \".txt\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:905 @@ -15899,19 +12108,14 @@ msgstr "<function>regexReplace</function>(str, modello, sostituzione)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:908 msgid "" -"Replaces all matches of the regular expression pattern with the replacement " -"string. Supports backreferences ($1, $2, etc.) in the replacement string. " -"If <replaceable>str</replaceable> is an array, the result is an array of " -"strings with replacements applied. Example: <literal>regexReplace(name, " -"\"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> swaps words separated by " -"underscore." +"Replaces all matches of the regular expression pattern with the replacement string. Supports backreferences ($1, $2, etc.) in the replacement " +"string. If <replaceable>str</replaceable> is an array, the result is an array of strings with replacements applied. Example: " +"<literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> swaps words separated by underscore." msgstr "" -"Sostituisce tutte le corrispondenze del modello di espressione regolare con " -"la stringa sostitutiva.Supporta i riferimenti all'indietro ($1, $2, ecc.) " -"nella stringa di sostituzione.Se <replaceable>str</replaceable> è un array, " -"il risultato è un array di stringhe a cui sono applicate le sostituzioni." -"Esempio: <literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</" -"literal> scambia le parole separate da un carattere di sottolineatura." +"Sostituisce tutte le corrispondenze del modello di espressione regolare con la stringa sostitutiva.Supporta i riferimenti all'indietro ($1, $2, ecc.) " +"nella stringa di sostituzione.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe a cui sono applicate le " +"sostituzioni.Esempio: <literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> scambia le parole separate da un carattere di " +"sottolineatura." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:916 @@ -15921,22 +12125,15 @@ msgstr "<function>replaceWithList</function>(str, percorsofile)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:919 msgid "" -"Replaces multiple strings in <replaceable>str</replaceable> using " -"replacement rules loaded from a tab-separated file. The file format is one " -"replacement rule per line: <literal>search_string<TAB>" -"replacement_string</literal>. Lines starting with <literal>#</literal> are " -"treated as comments and ignored. Empty lines are also ignored. If " -"<replaceable>str</replaceable> is an array, the result is an array of " -"strings with replacements applied." -msgstr "" -"Sostituisce più stringhe in <replaceable>str</replaceable> utilizzando le " -"regole di sostituzione caricate da un file separato da tabulazioni.Il " -"formato del file è una regola di sostituzione per riga: " -"<literal>search_string<TAB>replacement_string</literal>.Le righe che " -"iniziano con <literal>#</literal> vengono trattate come commenti e ignorate." -"Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un " -"array, il risultato è un array di stringhe a cui sono applicate le " -"sostituzioni." +"Replaces multiple strings in <replaceable>str</replaceable> using replacement rules loaded from a tab-separated file. The file format is one " +"replacement rule per line: <literal>search_string<TAB>replacement_string</literal>. Lines starting with <literal>#</literal> are treated as " +"comments and ignored. Empty lines are also ignored. If <replaceable>str</replaceable> is an array, the result is an array of strings with " +"replacements applied." +msgstr "" +"Sostituisce più stringhe in <replaceable>str</replaceable> utilizzando le regole di sostituzione caricate da un file separato da tabulazioni.Il " +"formato del file è una regola di sostituzione per riga: <literal>search_string<TAB>replacement_string</literal>.Le righe che iniziano con " +"<literal>#</literal> vengono trattate come commenti e ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un array, il " +"risultato è un array di stringhe a cui sono applicate le sostituzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:925 English/Filters.xml:947 @@ -15958,20 +12155,15 @@ msgstr "" "vecchio nuovo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> -#: English/Filters.xml:930 English/Filters.xml:951 English/Filters.xml:1109 -#: English/Filters.xml:1126 English/Filters.xml:1158 English/Filters.xml:1176 +#: English/Filters.xml:930 English/Filters.xml:951 English/Filters.xml:1109 English/Filters.xml:1126 English/Filters.xml:1158 English/Filters.xml:1176 #: English/Filters.xml:1192 English/Filters.xml:1208 English/Filters.xml:1232 msgid "Examples:" msgstr "Esempi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:932 -msgid "" -"<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> " -"- applies replacements from file to file name" -msgstr "" -"<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> " -"- applica le sostituzioni dal file al nome del file" +msgid "<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> - applies replacements from file to file name" +msgstr "<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> - applica le sostituzioni dal file al nome del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:937 @@ -15981,24 +12173,16 @@ msgstr "<function>regexReplaceWithList</function>(str, percorsofile)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:940 msgid "" -"Replaces strings in <replaceable>str</replaceable> using regular expression " -"patterns loaded from a tab-separated file. The file format is one pattern " -"per line: <literal>regex_pattern<TAB>replacement_string</literal>. " -"The replacement string can include backreferences ($1, $2, etc.) to captured " -"groups. Lines starting with <literal>#</literal> are treated as comments " -"and ignored. Empty lines are also ignored. If <replaceable>str</" -"replaceable> is an array, the result is an array of strings with " -"replacements applied." +"Replaces strings in <replaceable>str</replaceable> using regular expression patterns loaded from a tab-separated file. The file format is one " +"pattern per line: <literal>regex_pattern<TAB>replacement_string</literal>. The replacement string can include backreferences ($1, $2, etc.) to " +"captured groups. Lines starting with <literal>#</literal> are treated as comments and ignored. Empty lines are also ignored. If <replaceable>str</" +"replaceable> is an array, the result is an array of strings with replacements applied." msgstr "" -"Sostituisce le stringhe in <replaceable>str</replaceable> utilizzando " -"modelli di espressioni regolari caricati da un file separato da tabulazioni." -"Il formato del file è un modello per riga: <literal>regex_pattern<TAB>" -"replacement_string</literal>.La stringa di sostituzione può includere " -"riferimenti all'indietro ($1, $2 e così via) ai gruppi acquisiti.Le righe " -"che iniziano con <literal>#</literal> vengono trattate come commenti e " -"ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe a cui sono " -"applicate le sostituzioni." +"Sostituisce le stringhe in <replaceable>str</replaceable> utilizzando modelli di espressioni regolari caricati da un file separato da tabulazioni.Il " +"formato del file è un modello per riga: <literal>regex_pattern<TAB>replacement_string</literal>.La stringa di sostituzione può includere " +"riferimenti all'indietro ($1, $2 e così via) ai gruppi acquisiti.Le righe che iniziano con <literal>#</literal> vengono trattate come commenti e " +"ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe a cui sono applicate " +"le sostituzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><screen> #: English/Filters.xml:948 @@ -16014,12 +12198,8 @@ msgstr "" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:953 -msgid "" -"<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements." -"txt\")</literal> - applies regex replacements to file name" -msgstr "" -"<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements." -"txt\")</literal> - applica sostituzioni regex al nome del file" +msgid "<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements.txt\")</literal> - applies regex replacements to file name" +msgstr "<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements.txt\")</literal> - applica sostituzioni regex al nome del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:958 @@ -16029,19 +12209,13 @@ msgstr "<function>normalizeUnicode</function>(str[, modulo])" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:961 msgid "" -"Normalizes Unicode string. The optional form parameter specifies the " -"normalization form: \"NFC\" or \"C\" (default), \"NFD\" or \"D\", \"NFKC\" " -"or \"KC\", \"NFKD\" or \"KD\". Can also use numeric forms: 1=NFC, 2=NFD, " -"5=NFKC, 6=NFKD. If <replaceable>str</replaceable> is an array, the result " -"is an array of normalized strings. Example: <literal>normalizeUnicode(name, " -"\"NFC\")</literal>" +"Normalizes Unicode string. The optional form parameter specifies the normalization form: \"NFC\" or \"C\" (default), \"NFD\" or \"D\", \"NFKC\" or " +"\"KC\", \"NFKD\" or \"KD\". Can also use numeric forms: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD. If <replaceable>str</replaceable> is an array, the result is " +"an array of normalized strings. Example: <literal>normalizeUnicode(name, \"NFC\")</literal>" msgstr "" -"Normalizza la stringa Unicode.Il parametro facoltativo del modulo specifica " -"il modulo di normalizzazione: \"NFC\" o \"C\" (predefinito), \"NFD\" o " -"\"D\", \"NFKC\" o \"KC\", \"NFKD\" o \"KD\".È possibile utilizzare anche " -"forme numeriche: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe normalizzate." -"Esempio: <literal>normalizeUnicode(name, \"NFC\")</literal>" +"Normalizza la stringa Unicode.Il parametro facoltativo del modulo specifica il modulo di normalizzazione: \"NFC\" o \"C\" (predefinito), \"NFD\" o " +"\"D\", \"NFKC\" o \"KC\", \"NFKD\" o \"KD\".È possibile utilizzare anche forme numeriche: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe normalizzate.Esempio: <literal>normalizeUnicode(name, \"NFC\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:971 @@ -16051,15 +12225,11 @@ msgstr "<function>toLower</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:975 msgid "" -"Converts all characters in the string to lowercase. If <replaceable>str</" -"replaceable> is an array, the result is an array of lowercase strings. " -"Example: <literal>toLower(\"Hello World\")</literal> returns " -"<literal>\"hello world\"</literal>" +"Converts all characters in the string to lowercase. If <replaceable>str</replaceable> is an array, the result is an array of lowercase strings. " +"Example: <literal>toLower(\"Hello World\")</literal> returns <literal>\"hello world\"</literal>" msgstr "" -"Converte tutti i caratteri della stringa in minuscolo.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe minuscole." -"Esempio: <literal>toLower(\"Hello World\")</literal> restituisce " -"<literal>\"hello world\"</literal>" +"Converte tutti i caratteri della stringa in minuscolo.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe " +"minuscole.Esempio: <literal>toLower(\"Hello World\")</literal> restituisce <literal>\"hello world\"</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:983 @@ -16069,15 +12239,11 @@ msgstr "<function>toUpper</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:987 msgid "" -"Converts all characters in the string to uppercase. If <replaceable>str</" -"replaceable> is an array, the result is an array of uppercase strings. " -"Example: <literal>toUpper(\"Hello World\")</literal> returns " -"<literal>\"HELLO WORLD\"</literal>" +"Converts all characters in the string to uppercase. If <replaceable>str</replaceable> is an array, the result is an array of uppercase strings. " +"Example: <literal>toUpper(\"Hello World\")</literal> returns <literal>\"HELLO WORLD\"</literal>" msgstr "" -"Converte tutti i caratteri della stringa in maiuscolo.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe maiuscole." -"Esempio: <literal>toUpper(\"Hello World\")</literal> restituisce " -"<literal>\"HELLO WORLD\"</literal>" +"Converte tutti i caratteri della stringa in maiuscolo.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe " +"maiuscole.Esempio: <literal>toUpper(\"Hello World\")</literal> restituisce <literal>\"HELLO WORLD\"</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:995 @@ -16087,15 +12253,11 @@ msgstr "<function>toHalfWidth</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:999 msgid "" -"Converts full-width characters to half-width characters. Primarily used for " -"converting full-width alphanumeric and katakana characters to half-width. " -"If <replaceable>str</replaceable> is an array, the result is an array of " -"converted strings." +"Converts full-width characters to half-width characters. Primarily used for converting full-width alphanumeric and katakana characters to half-" +"width. If <replaceable>str</replaceable> is an array, the result is an array of converted strings." msgstr "" -"Converte i caratteri a larghezza intera in caratteri a metà larghezza." -"Utilizzato principalmente per convertire caratteri alfanumerici e katakana a " -"larghezza intera in caratteri a metà larghezza.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe convertite." +"Converte i caratteri a larghezza intera in caratteri a metà larghezza.Utilizzato principalmente per convertire caratteri alfanumerici e katakana a " +"larghezza intera in caratteri a metà larghezza.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1007 @@ -16105,15 +12267,11 @@ msgstr "<function>toFullWidth</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1011 msgid "" -"Converts half-width characters to full-width characters. Primarily used for " -"converting half-width alphanumeric and katakana characters to full-width. " -"If <replaceable>str</replaceable> is an array, the result is an array of " -"converted strings." +"Converts half-width characters to full-width characters. Primarily used for converting half-width alphanumeric and katakana characters to full-" +"width. If <replaceable>str</replaceable> is an array, the result is an array of converted strings." msgstr "" -"Converte i caratteri a mezza larghezza in caratteri a larghezza intera." -"Utilizzato principalmente per convertire caratteri alfanumerici e katakana " -"da metà larghezza a larghezza intera.Se <replaceable>str</replaceable> è un " -"array, il risultato è un array di stringhe convertite." +"Converte i caratteri a mezza larghezza in caratteri a larghezza intera.Utilizzato principalmente per convertire caratteri alfanumerici e katakana da " +"metà larghezza a larghezza intera.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1019 @@ -16123,13 +12281,11 @@ msgstr "<function>toKatakana</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1023 msgid "" -"Converts hiragana characters to katakana. Non-hiragana characters remain " -"unchanged. If <replaceable>str</replaceable> is an array, the result is an " +"Converts hiragana characters to katakana. Non-hiragana characters remain unchanged. If <replaceable>str</replaceable> is an array, the result is an " "array of converted strings." msgstr "" -"Converte i caratteri hiragana in katakana.I caratteri non hiragana rimangono " -"invariati.Se <replaceable>str</replaceable> è un array, il risultato è un " -"array di stringhe convertite." +"Converte i caratteri hiragana in katakana.I caratteri non hiragana rimangono invariati.Se <replaceable>str</replaceable> è un array, il risultato è " +"un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1031 @@ -16139,53 +12295,39 @@ msgstr "<function>toHiragana</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1035 msgid "" -"Converts katakana characters to hiragana. Non-katakana characters remain " -"unchanged. If <replaceable>str</replaceable> is an array, the result is an " +"Converts katakana characters to hiragana. Non-katakana characters remain unchanged. If <replaceable>str</replaceable> is an array, the result is an " "array of converted strings." msgstr "" -"Converte i caratteri katakana in hiragana.I caratteri non katakana rimangono " -"invariati.Se <replaceable>str</replaceable> è un array, il risultato è un " -"array di stringhe convertite." +"Converte i caratteri katakana in hiragana.I caratteri non katakana rimangono invariati.Se <replaceable>str</replaceable> è un array, il risultato è " +"un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1043 -msgid "" -"<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" -msgstr "" -"<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" +msgid "<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" +msgstr "<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1047 msgid "" -"Converts traditional Chinese characters to simplified Chinese characters. " -"Characters that don't have a simplified form remain unchanged. If " -"<replaceable>str</replaceable> is an array, the result is an array of " -"converted strings." +"Converts traditional Chinese characters to simplified Chinese characters. Characters that don't have a simplified form remain unchanged. If " +"<replaceable>str</replaceable> is an array, the result is an array of converted strings." msgstr "" -"Converte i caratteri cinesi tradizionali in caratteri cinesi semplificati.I " -"caratteri che non hanno una forma semplificata rimangono invariati.Se " -"<replaceable>str</replaceable> è un array, il risultato è un array di " -"stringhe convertite." +"Converte i caratteri cinesi tradizionali in caratteri cinesi semplificati.I caratteri che non hanno una forma semplificata rimangono invariati.Se " +"<replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1055 -msgid "" -"<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" -msgstr "" -"<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" +msgid "<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" +msgstr "<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1059 msgid "" -"Converts simplified Chinese characters to traditional Chinese characters. " -"Characters that don't have a traditional form remain unchanged. If " -"<replaceable>str</replaceable> is an array, the result is an array of " -"converted strings." +"Converts simplified Chinese characters to traditional Chinese characters. Characters that don't have a traditional form remain unchanged. If " +"<replaceable>str</replaceable> is an array, the result is an array of converted strings." msgstr "" -"Converte i caratteri cinesi semplificati in caratteri cinesi tradizionali.I " -"personaggi che non hanno una forma tradizionale rimangono invariati.Se " -"<replaceable>str</replaceable> è un array, il risultato è un array di " -"stringhe convertite." +"Converte i caratteri cinesi semplificati in caratteri cinesi tradizionali.I personaggi che non hanno una forma tradizionale rimangono invariati.Se " +"<replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1066 @@ -16194,11 +12336,8 @@ msgstr "<function>now</function>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1067 -msgid "" -"Returns the current date and time as a <literal>Timestamp</literal> value." -msgstr "" -"Restituisce la data e l'ora correnti come valore <literal>Timestamp</" -"literal>." +msgid "Returns the current date and time as a <literal>Timestamp</literal> value." +msgstr "Restituisce la data e l'ora correnti come valore <literal>Timestamp</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1070 @@ -16207,12 +12346,8 @@ msgstr "<function>today</function>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1071 -msgid "" -"Returns today's date as a <literal>Timestamp</literal> value representing " -"<literal>00:00:00.000</literal> at the start of the day." -msgstr "" -"Restituisce la data odierna come valore <literal>Timestamp</literal> che " -"rappresenta <literal>00:00:00.000</literal> all'inizio della giornata." +msgid "Returns today's date as a <literal>Timestamp</literal> value representing <literal>00:00:00.000</literal> at the start of the day." +msgstr "Restituisce la data odierna come valore <literal>Timestamp</literal> che rappresenta <literal>00:00:00.000</literal> all'inizio della giornata." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1074 @@ -16221,18 +12356,13 @@ msgstr "<function>startOfWeek</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1075 -msgid "" -"Returns the first day of the week, which is always Sunday regardless of " -"locale." -msgstr "" -"Restituisce il primo giorno della settimana, che è sempre domenica, " -"indipendentemente dalle impostazioni locali." +msgid "Returns the first day of the week, which is always Sunday regardless of locale." +msgstr "Restituisce il primo giorno della settimana, che è sempre domenica, indipendentemente dalle impostazioni locali." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1078 msgid "<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" -msgstr "" -"<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" +msgstr "<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1079 @@ -16257,13 +12387,11 @@ msgstr "<function>toDateStr</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1087 msgid "" -"Converts the given timestamp to a date string in <literal>yyyy-MM-dd</" -"literal> format. If <replaceable>timestamp</replaceable> is a timestamp " -"array, the result is a string array." +"Converts the given timestamp to a date string in <literal>yyyy-MM-dd</literal> format. If <replaceable>timestamp</replaceable> is a timestamp array, " +"the result is a string array." msgstr "" -"Converte il timestamp specificato in una stringa di data nel formato " -"<literal>aaaa-MM-gg</literal>.Se <replaceable>timestamp</replaceable> è un " -"array di timestamp, il risultato è un array di stringhe." +"Converte il timestamp specificato in una stringa di data nel formato <literal>aaaa-MM-gg</literal>.Se <replaceable>timestamp</replaceable> è un array " +"di timestamp, il risultato è un array di stringhe." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1090 @@ -16273,13 +12401,11 @@ msgstr "<function>abs</function>(<replaceable>valore</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1091 msgid "" -"Returns the absolute value of the <emphasis>integer or integer array</" -"emphasis>. If <replaceable>value</replaceable> is an integer array, the " -"result is an integer array." +"Returns the absolute value of the <emphasis>integer or integer array</emphasis>. If <replaceable>value</replaceable> is an integer array, the result " +"is an integer array." msgstr "" -"Restituisce il valore assoluto dell'<emphasis>intero o dell'array di interi</" -"emphasis>.Se <replaceable>value</replaceable> è un array di numeri interi, " -"il risultato è un array di numeri interi." +"Restituisce il valore assoluto dell'<emphasis>intero o dell'array di interi</emphasis>.Se <replaceable>value</replaceable> è un array di numeri " +"interi, il risultato è un array di numeri interi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1094 @@ -16288,12 +12414,8 @@ msgstr "<function>allof</function>(<replaceable>booleani</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1095 -msgid "" -"Returns <literal>true</literal> if all elements in the <emphasis>boolean " -"array</emphasis> satisfy the condition." -msgstr "" -"Restituisce <literal>true</literal> se tutti gli elementi " -"nell'<emphasis>array booleano</emphasis> soddisfano la condizione." +msgid "Returns <literal>true</literal> if all elements in the <emphasis>boolean array</emphasis> satisfy the condition." +msgstr "Restituisce <literal>true</literal> se tutti gli elementi nell'<emphasis>array booleano</emphasis> soddisfano la condizione." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1098 @@ -16303,151 +12425,98 @@ msgstr "<function>allequal</function>(<replaceable>array</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1099 msgid "Returns <literal>true</literal> if all values in the array are equal." -msgstr "" -"Restituisce <literal>true</literal> se tutti i valori nell'array sono uguali." +msgstr "Restituisce <literal>true</literal> se tutti i valori nell'array sono uguali." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1102 -msgid "" -"<function>isWithin</function>(<replaceable>value</replaceable>, " -"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" -msgstr "" -"<function>isWithin</function>(<replaceable>valore</replaceable>, " -"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgid "<function>isWithin</function>(<replaceable>value</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgstr "<function>isWithin</function>(<replaceable>valore</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1105 msgid "" -"Returns <literal>true</literal> if <replaceable>value</replaceable> is " -"within the range <literal>[min, max]</literal> (inclusive on both ends). " -"Supports integers, floating-point numbers, timestamps, and strings (case-" -"insensitive comparison). If <replaceable>value</replaceable> is an array, " +"Returns <literal>true</literal> if <replaceable>value</replaceable> is within the range <literal>[min, max]</literal> (inclusive on both ends). " +"Supports integers, floating-point numbers, timestamps, and strings (case-insensitive comparison). If <replaceable>value</replaceable> is an array, " "the result is a boolean array with each element checked individually." msgstr "" -"Restituisce <literal>true</literal> se <replaceable>valore</replaceable> è " -"compreso nell'intervallo <literal>[min, max]</literal> (incluso su entrambe " -"le estremità).Supporta numeri interi, numeri a virgola mobile, timestamp e " -"stringhe (confronto senza distinzione tra maiuscole e minuscole).Se " -"<replaceable>value</replaceable> è un array, il risultato è un array " -"booleano con ogni elemento controllato individualmente." +"Restituisce <literal>true</literal> se <replaceable>valore</replaceable> è compreso nell'intervallo <literal>[min, max]</literal> (incluso su " +"entrambe le estremità).Supporta numeri interi, numeri a virgola mobile, timestamp e stringhe (confronto senza distinzione tra maiuscole e " +"minuscole).Se <replaceable>value</replaceable> è un array, il risultato è un array booleano con ogni elemento controllato individualmente." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1111 msgid "<literal>isWithin(5, 1, 10)</literal> returns <literal>true</literal>" -msgstr "" -"<literal>isWithin(5, 1, 10)</literal> restituisce <literal>true</literal>" +msgstr "<literal>isWithin(5, 1, 10)</literal> restituisce <literal>true</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1112 -msgid "" -"<literal>isWithin(Size, 1KB, 10MB)</literal> checks if any file size is " -"between 1KB and 10MB" -msgstr "" -"<literal>isWithin(Size, 1KB, 10MB)</literal> controlla se la dimensione del " -"file è compresa tra 1KB e 10MB" +msgid "<literal>isWithin(Size, 1KB, 10MB)</literal> checks if any file size is between 1KB and 10MB" +msgstr "<literal>isWithin(Size, 1KB, 10MB)</literal> controlla se la dimensione del file è compresa tra 1KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1113 -msgid "" -"<literal>isWithin(Date, today() - 7days, today())</literal> checks if file " -"was modified within the last week" -msgstr "" -"<literal>isWithin(Date, today() - 7days, today())</literal> controlla se il " -"file è stato modificato nell'ultima settimana" +msgid "<literal>isWithin(Date, today() - 7days, today())</literal> checks if file was modified within the last week" +msgstr "<literal>isWithin(Date, today() - 7days, today())</literal> controlla se il file è stato modificato nell'ultima settimana" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1114 -msgid "" -"<literal>allof(isWithin(Size, 1KB, 10MB))</literal> checks if all file sizes " -"are between 1KB and 10MB" -msgstr "" -"<literal>allof(isWithin(Size, 1KB, 10MB))</literal> controlla se tutte le " -"dimensioni dei file sono comprese tra 1KB e 10MB" +msgid "<literal>allof(isWithin(Size, 1KB, 10MB))</literal> checks if all file sizes are between 1KB and 10MB" +msgstr "<literal>allof(isWithin(Size, 1KB, 10MB))</literal> controlla se tutte le dimensioni dei file sono comprese tra 1KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1119 -msgid "" -"<function>inRange</function>(<replaceable>value</replaceable>, " -"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" -msgstr "" -"<function>inRange</function>(<replaceable>valore</replaceable>, " -"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgid "<function>inRange</function>(<replaceable>value</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgstr "<function>inRange</function>(<replaceable>valore</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1122 msgid "" -"Returns <literal>true</literal> if <replaceable>value</replaceable> is " -"within the range <literal>[min, max)</literal> (inclusive on the lower " -"bound, exclusive on the upper bound). Supports integers, floating-point " -"numbers, timestamps, and strings (case-insensitive comparison). If " -"<replaceable>value</replaceable> is an array, the result is a boolean array " -"with each element checked individually." +"Returns <literal>true</literal> if <replaceable>value</replaceable> is within the range <literal>[min, max)</literal> (inclusive on the lower bound, " +"exclusive on the upper bound). Supports integers, floating-point numbers, timestamps, and strings (case-insensitive comparison). If " +"<replaceable>value</replaceable> is an array, the result is a boolean array with each element checked individually." msgstr "" -"Restituisce <literal>true</literal> se <replaceable>value</replaceable> è " -"compreso nell'intervallo <literal>[min, max)</literal> (incluso nel limite " -"inferiore, escluso nel limite superiore).Supporta numeri interi, numeri a " -"virgola mobile, timestamp e stringhe (confronto senza distinzione tra " -"maiuscole e minuscole).Se <replaceable>value</replaceable> è un array, il " -"risultato è un array booleano con ogni elemento controllato individualmente." +"Restituisce <literal>true</literal> se <replaceable>value</replaceable> è compreso nell'intervallo <literal>[min, max)</literal> (incluso nel limite " +"inferiore, escluso nel limite superiore).Supporta numeri interi, numeri a virgola mobile, timestamp e stringhe (confronto senza distinzione tra " +"maiuscole e minuscole).Se <replaceable>value</replaceable> è un array, il risultato è un array booleano con ogni elemento controllato individualmente." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1128 msgid "<literal>inRange(5, 1, 10)</literal> returns <literal>true</literal>" -msgstr "" -"<literal>inRange(5, 1, 10)</literal> restituisce <literal>true</literal>" +msgstr "<literal>inRange(5, 1, 10)</literal> restituisce <literal>true</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1129 msgid "<literal>inRange(10, 1, 10)</literal> returns <literal>false</literal>" -msgstr "" -"<literal>inRange(10, 1, 10)</literal> restituisce <literal>false</literal>" +msgstr "<literal>inRange(10, 1, 10)</literal> restituisce <literal>false</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1130 -msgid "" -"<literal>inRange(Size, 0, 1MB)</literal> checks if any file size is less " -"than 1MB" -msgstr "" -"<literal>inRange(Size, 0, 1MB)</literal> controlla se la dimensione del file " -"è inferiore a 1 MB" +msgid "<literal>inRange(Size, 0, 1MB)</literal> checks if any file size is less than 1MB" +msgstr "<literal>inRange(Size, 0, 1MB)</literal> controlla se la dimensione del file è inferiore a 1 MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1131 -msgid "" -"<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> " -"checks if any file was modified this month (excluding today)" -msgstr "" -"<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> " -"controlla se qualche file è stato modificato questo mese (escluso oggi)" +msgid "<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> checks if any file was modified this month (excluding today)" +msgstr "<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> controlla se qualche file è stato modificato questo mese (escluso oggi)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1136 msgid "" -"<function>logError</function>(<replaceable>value1</replaceable>, " -"<replaceable>value2</replaceable>, ...), <function>logWarn</" -"function>(<replaceable>value1</replaceable>, <replaceable>value2</" -"replaceable>, ...), <function>logInfo</function>(<replaceable>value1</" -"replaceable>, <replaceable>value2</replaceable>, ...)" +"<function>logError</function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...), <function>logWarn</" +"function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...), <function>logInfo</function>(<replaceable>value1</replaceable>, " +"<replaceable>value2</replaceable>, ...)" msgstr "" -"<function>logError<function>(<replaceable>valore1</replaceable>, " -"<replaceable>value2</replaceable>, ...), logWarn(<replaceable>value1</" -"replaceable>, <replaceable>value2</replaceable>, ...), " -"logInfo(<replaceable>value1</replaceable>, <replaceable>value2</" -"replaceable>, ...)" +"<function>logError<function>(<replaceable>valore1</replaceable>, <replaceable>value2</replaceable>, ...), logWarn(<replaceable>value1</replaceable>, " +"<replaceable>value2</replaceable>, ...), logInfo(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1139 msgid "" -"Outputs the concatenated string representation of all arguments to the log " -"(at error, warning, or information level respectively), separated by spaces, " -"and returns the last argument value. These functions are useful for " -"debugging filter expressions." +"Outputs the concatenated string representation of all arguments to the log (at error, warning, or information level respectively), separated by " +"spaces, and returns the last argument value. These functions are useful for debugging filter expressions." msgstr "" -"Restituisce la rappresentazione di stringa concatenata di tutti gli " -"argomenti nel log (rispettivamente a livello di errore, avviso o " -"informazione), separati da spazi, e restituisce il valore dell'ultimo " -"argomento.Queste funzioni sono utili per il debug delle espressioni di " -"filtro." +"Restituisce la rappresentazione di stringa concatenata di tutti gli argomenti nel log (rispettivamente a livello di errore, avviso o informazione), " +"separati da spazi, e restituisce il valore dell'ultimo argomento.Queste funzioni sono utili per il debug delle espressioni di filtro." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1143 @@ -16456,260 +12525,165 @@ msgstr "Esempi (utilizzando il valore restituito):" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1145 -msgid "" -"<literal>logInfo(\"File size:\", Size) > 1MB</literal> - logs the file " -"size(s) and checks if greater than 1MB" -msgstr "" -"<literal>logInfo(\"File size:\", Size) > 1MB</literal> - registra le " -"dimensioni del file e controlla se maggiore di 1MB" +msgid "<literal>logInfo(\"File size:\", Size) > 1MB</literal> - logs the file size(s) and checks if greater than 1MB" +msgstr "<literal>logInfo(\"File size:\", Size) > 1MB</literal> - registra le dimensioni del file e controlla se maggiore di 1MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1146 -msgid "" -"<literal>logWarn(\"Processing:\", Name) like \"*.tmp\"</literal> - logs the " -"file name(s) and checks if it's a temporary file" -msgstr "" -"<literal>logWarn(\"Processing:\", Name) come \"*.tmp\"</literal> - registra " -"i nomi dei file e controlla se si tratta di un file temporaneo" +msgid "<literal>logWarn(\"Processing:\", Name) like \"*.tmp\"</literal> - logs the file name(s) and checks if it's a temporary file" +msgstr "<literal>logWarn(\"Processing:\", Name) come \"*.tmp\"</literal> - registra i nomi dei file e controlla se si tratta di un file temporaneo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1147 -msgid "" -"<literal>Size > 1KB and logInfo(\"Large file:\", Name) contains \"test\"</" -"literal> - logs only when size condition is true, then checks name" +msgid "<literal>Size > 1KB and logInfo(\"Large file:\", Name) contains \"test\"</literal> - logs only when size condition is true, then checks name" msgstr "" -"<literal>Dimensione > 1KB e logInfo(\"Large file:\", Name) contiene " -"\"test\"</literal> - registra solo quando la condizione della dimensione è " -"vera, quindi controlla il nome" +"<literal>Dimensione > 1KB e logInfo(\"Large file:\", Name) contiene \"test\"</literal> - registra solo quando la condizione della dimensione è vera, " +"quindi controlla il nome" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1152 -msgid "" -"<function>if</function>(<replaceable>condition</replaceable>, " -"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" -msgstr "" -"<function>if</function>(<replaceable>condizione</replaceable>, " -"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +msgid "<function>if</function>(<replaceable>condition</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +msgstr "<function>if</function>(<replaceable>condizione</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1155 msgid "" -"Returns <replaceable>trueValue</replaceable> if <replaceable>condition</" -"replaceable> evaluates to true, otherwise returns <replaceable>falseValue</" -"replaceable>. This function performs short-circuit evaluation (it only " -"evaluates the branch that will be returned)." +"Returns <replaceable>trueValue</replaceable> if <replaceable>condition</replaceable> evaluates to true, otherwise returns <replaceable>falseValue</" +"replaceable>. This function performs short-circuit evaluation (it only evaluates the branch that will be returned)." msgstr "" -"Restituisce <replaceable>trueValue</replaceable> se <replaceable>condizione</" -"replaceable> restituisce true, altrimenti restituisce " -"<replaceable>falseValue</replaceable>.Questa funzione esegue la valutazione " -"del cortocircuito (valuta solo il ramo che verrà restituito)." +"Restituisce <replaceable>trueValue</replaceable> se <replaceable>condizione</replaceable> restituisce true, altrimenti restituisce " +"<replaceable>falseValue</replaceable>.Questa funzione esegue la valutazione del cortocircuito (valuta solo il ramo che verrà restituito)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1160 -msgid "" -"<literal>if(Size > 1MB, \"large\", \"small\")</literal> - returns \"large\" " -"or \"small\" based on file size" -msgstr "" -"<literal>if(Size > 1MB, \"large\", \"small\")</literal> - restituisce " -"\"large\" o \"small\" in base alla dimensione del file" +msgid "<literal>if(Size > 1MB, \"large\", \"small\")</literal> - returns \"large\" or \"small\" based on file size" +msgstr "<literal>if(Size > 1MB, \"large\", \"small\")</literal> - restituisce \"large\" o \"small\" in base alla dimensione del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1161 -msgid "" -"<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - " -"classifies files by extension" -msgstr "" -"<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - " -"classifica i file per estensione" +msgid "<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - classifies files by extension" +msgstr "<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - classifica i file per estensione" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1162 -msgid "" -"<literal>if(Exists, Size, 0)</literal> - returns file size or 0 if file " -"doesn't exist" -msgstr "" -"<literal>if(Exists, Size, 0)</literal> - restituisce la dimensione del file " -"o 0 se il file non esiste" +msgid "<literal>if(Exists, Size, 0)</literal> - returns file size or 0 if file doesn't exist" +msgstr "<literal>if(Exists, Size, 0)</literal> - restituisce la dimensione del file o 0 se il file non esiste" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1167 msgid "" -"<function>ifEach</function>(<replaceable>conditionArray</replaceable>, " -"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +"<function>ifEach</function>(<replaceable>conditionArray</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" msgstr "" -"<function>ifEach<function>(<replaceable>conditionArray</replaceable>, " -"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +"<function>ifEach<function>(<replaceable>conditionArray</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1170 msgid "" -"Element-wise conditional selection. For each element in " -"<replaceable>conditionArray</replaceable>, returns the corresponding element " -"from <replaceable>trueValue</replaceable> if the condition is true, " -"otherwise returns the corresponding element from <replaceable>falseValue</" -"replaceable>. If <replaceable>trueValue</replaceable> or " -"<replaceable>falseValue</replaceable> is a scalar, it is broadcast to all " -"elements." -msgstr "" -"Selezione condizionale per elemento.Per ogni elemento in " -"<replaceable>conditionArray</replaceable>, restituisce l'elemento " -"corrispondente da <replaceable>trueValue</replaceable> se la condizione è " -"vera, altrimenti restituisce l'elemento corrispondente da " -"<replaceable>falseValue</replaceable>.Se <replaceable>trueValue</" -"replaceable> o <replaceable>falseValue</replaceable> è uno scalare, viene " -"trasmesso a tutti gli elementi." +"Element-wise conditional selection. For each element in <replaceable>conditionArray</replaceable>, returns the corresponding element from " +"<replaceable>trueValue</replaceable> if the condition is true, otherwise returns the corresponding element from <replaceable>falseValue</" +"replaceable>. If <replaceable>trueValue</replaceable> or <replaceable>falseValue</replaceable> is a scalar, it is broadcast to all elements." +msgstr "" +"Selezione condizionale per elemento.Per ogni elemento in <replaceable>conditionArray</replaceable>, restituisce l'elemento corrispondente da " +"<replaceable>trueValue</replaceable> se la condizione è vera, altrimenti restituisce l'elemento corrispondente da <replaceable>falseValue</" +"replaceable>.Se <replaceable>trueValue</replaceable> o <replaceable>falseValue</replaceable> è uno scalare, viene trasmesso a tutti gli elementi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1178 -msgid "" -"<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - returns " -"array of \"large\"/\"small\" labels for each file" -msgstr "" -"<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - restituisce " -"un array di etichette \"grande\"/\"piccolo\" per ogni file" +msgid "<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - returns array of \"large\"/\"small\" labels for each file" +msgstr "<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - restituisce un array di etichette \"grande\"/\"piccolo\" per ogni file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1179 msgid "" -"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), " -"array(\"x\", \"y\", \"z\"))</literal> - returns <literal>array(\"a\", \"y\", " +"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), array(\"x\", \"y\", \"z\"))</literal> - returns <literal>array(\"a\", \"y\", " "\"c\")</literal>" msgstr "" -"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), " -"array(\"x\", \"y\", \"z\"))</literal> - restituisce <literal>array(\"a\", " +"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), array(\"x\", \"y\", \"z\"))</literal> - restituisce <literal>array(\"a\", " "\"y\", \"c\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1180 -msgid "" -"<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - " -"checks if any file is between 100KB and 10MB" -msgstr "" -"<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - " -"controlla se qualche file è compreso tra 100KB e 10MB" +msgid "<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - checks if any file is between 100KB and 10MB" +msgstr "<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - controlla se qualche file è compreso tra 100KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1185 -msgid "" -"<function>choose</function>(<replaceable>index</replaceable>, " -"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" -msgstr "" -"<function>choose</function>(<replaceable>indice</replaceable>, " -"<replaceable>valore0</replaceable>, <replaceable>valore1</replaceable>, ...)" +msgid "<function>choose</function>(<replaceable>index</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +msgstr "<function>choose</function>(<replaceable>indice</replaceable>, <replaceable>valore0</replaceable>, <replaceable>valore1</replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1188 msgid "" -"Selects a value from the arguments based on <replaceable>index</" -"replaceable>. If <replaceable>index</replaceable> is 0, returns " -"<replaceable>value0</replaceable>; if 1, returns <replaceable>value1</" -"replaceable>, etc. Negative indices are clamped to 0. Indices beyond the " -"last value return the last value." +"Selects a value from the arguments based on <replaceable>index</replaceable>. If <replaceable>index</replaceable> is 0, returns <replaceable>value0</" +"replaceable>; if 1, returns <replaceable>value1</replaceable>, etc. Negative indices are clamped to 0. Indices beyond the last value return the last " +"value." msgstr "" -"Seleziona un valore dagli argomenti in base a <replaceable>index</" -"replaceable>.Se <replaceable>index</replaceable> è 0, restituisce " -"<replaceable>value0</replaceable>;se 1, restituisce <replaceable>value1</" -"replaceable>, ecc. Gli indici negativi sono limitati a 0. Gli indici oltre " +"Seleziona un valore dagli argomenti in base a <replaceable>index</replaceable>.Se <replaceable>index</replaceable> è 0, restituisce " +"<replaceable>value0</replaceable>;se 1, restituisce <replaceable>value1</replaceable>, ecc. Gli indici negativi sono limitati a 0. Gli indici oltre " "l'ultimo valore restituiscono l'ultimo valore." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1194 -msgid "" -"<literal>choose(0, \"first\", \"second\", \"third\")</literal> - returns " -"\"first\"" -msgstr "" -"<literal>scegli(0, \"primo\", \"secondo\", \"terzo\")</literal> - " -"restituisce \"primo\"" +msgid "<literal>choose(0, \"first\", \"second\", \"third\")</literal> - returns \"first\"" +msgstr "<literal>scegli(0, \"primo\", \"secondo\", \"terzo\")</literal> - restituisce \"primo\"" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1195 -msgid "" -"<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</" -"literal> - maps diff codes to labels" -msgstr "" -"<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</" -"literal> - mappa i codici diff sulle etichette" +msgid "<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</literal> - maps diff codes to labels" +msgstr "<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</literal> - mappa i codici diff sulle etichette" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1196 -msgid "" -"<literal>choose(5, \"a\", \"b\", \"c\")</literal> - returns \"c\" (out of " -"bounds, returns last value)" -msgstr "" -"<literal>scegli(5, \"a\", \"b\", \"c\")</literal> - restituisce \"c\" (fuori " -"dai limiti, restituisce l'ultimo valore)" +msgid "<literal>choose(5, \"a\", \"b\", \"c\")</literal> - returns \"c\" (out of bounds, returns last value)" +msgstr "<literal>scegli(5, \"a\", \"b\", \"c\")</literal> - restituisce \"c\" (fuori dai limiti, restituisce l'ultimo valore)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1201 msgid "" -"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, " -"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" msgstr "" -"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, " -"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1204 msgid "" -"Element-wise value selection. For each index in <replaceable>indexArray</" -"replaceable>, selects the corresponding value from the remaining arguments. " -"If <replaceable>indexArray</replaceable> is a scalar, behaves like " -"<literal>choose</literal>." +"Element-wise value selection. For each index in <replaceable>indexArray</replaceable>, selects the corresponding value from the remaining arguments. " +"If <replaceable>indexArray</replaceable> is a scalar, behaves like <literal>choose</literal>." msgstr "" -"Selezione del valore in base agli elementi.Per ogni indice in " -"<replaceable>indexArray</replaceable>, seleziona il valore corrispondente " -"dagli argomenti rimanenti.Se <replaceable>indexArray</replaceable> è uno " -"scalare, si comporta come <literal>choose</literal>." +"Selezione del valore in base agli elementi.Per ogni indice in <replaceable>indexArray</replaceable>, seleziona il valore corrispondente dagli " +"argomenti rimanenti.Se <replaceable>indexArray</replaceable> è uno scalare, si comporta come <literal>choose</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1210 -msgid "" -"<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - returns " -"<literal>array(\"a\", \"b\", \"c\")</literal>" -msgstr "" -"<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - " -"restituisce <literal>array(\"a\", \"b\", \"c\")</literal>" +msgid "<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - returns <literal>array(\"a\", \"b\", \"c\")</literal>" +msgstr "<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - restituisce <literal>array(\"a\", \"b\", \"c\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1211 -msgid "" -"<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - returns " -"<literal>array(\"x\", \"x\", \"y\")</literal>" -msgstr "" -"<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - restituisce " -"<literal>array(\"x\", \"x\", \"y\")</literal>" +msgid "<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - returns <literal>array(\"x\", \"x\", \"y\")</literal>" +msgstr "<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - restituisce <literal>array(\"x\", \"x\", \"y\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1212 msgid "" -"<literal>chooseEach(array(2, 0, 1), \"first\", \"second\", \"third\")</" -"literal> - returns <literal>array(\"third\", \"first\", \"second\")</literal>" +"<literal>chooseEach(array(2, 0, 1), \"first\", \"second\", \"third\")</literal> - returns <literal>array(\"third\", \"first\", \"second\")</literal>" msgstr "" -"<literal>chooseEach(array(2, 0, 1), \"primo\", \"secondo\", \"terzo\")</" -"literal> - restituisce <literal>array(\"terzo\", \"primo\", \"secondo\")</" +"<literal>chooseEach(array(2, 0, 1), \"primo\", \"secondo\", \"terzo\")</literal> - restituisce <literal>array(\"terzo\", \"primo\", \"secondo\")</" "literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1217 msgid "" -"<function>andEach</function>(<replaceable>value1</replaceable>, " -"<replaceable>value2</replaceable>), <function>orEach</" -"function>(<replaceable>value1</replaceable>, <replaceable>value2</" -"replaceable>), <function>notEach</function>(<replaceable>value</replaceable>)" +"<function>andEach</function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>), <function>orEach</function>(<replaceable>value1</" +"replaceable>, <replaceable>value2</replaceable>), <function>notEach</function>(<replaceable>value</replaceable>)" msgstr "" -"<function>andEach</function>(<replaceable>valore1</replaceable>, " -"<replaceable>valore2</replaceable>), orEach(<replaceable>valore1</" -"replaceable>, <replaceable>valore2</replaceable>), " -"notEach(<replaceable>valore</replaceable>)" +"<function>andEach</function>(<replaceable>valore1</replaceable>, <replaceable>valore2</replaceable>), orEach(<replaceable>valore1</replaceable>, " +"<replaceable>valore2</replaceable>), notEach(<replaceable>valore</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1220 -msgid "" -"Element-wise logical operations. These functions operate on booleans, " -"boolean arrays, or a combination of both:" -msgstr "" -"Operazioni logiche per elementi.Queste funzioni operano su booleani, array " -"booleani o una combinazione di entrambi:" +msgid "Element-wise logical operations. These functions operate on booleans, boolean arrays, or a combination of both:" +msgstr "Operazioni logiche per elementi.Queste funzioni operano su booleani, array booleani o una combinazione di entrambi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1223 @@ -16729,32 +12703,21 @@ msgstr "<literal>notEach</literal> - Operazione logica NOT (argomento singolo)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1228 msgid "" -"When arguments are scalars, returns a scalar boolean result. When one " -"argument is an array and the other is a scalar, the scalar is broadcast to " -"all elements. When both arguments are arrays, performs element-wise " -"operation." +"When arguments are scalars, returns a scalar boolean result. When one argument is an array and the other is a scalar, the scalar is broadcast to all " +"elements. When both arguments are arrays, performs element-wise operation." msgstr "" -"Quando gli argomenti sono scalari, restituisce un risultato booleano scalare." -"Quando un argomento è un array e l'altro è uno scalare, lo scalare viene " -"trasmesso a tutti gli elementi.Quando entrambi gli argomenti sono array, " -"esegue l'operazione a livello di elemento." +"Quando gli argomenti sono scalari, restituisce un risultato booleano scalare.Quando un argomento è un array e l'altro è uno scalare, lo scalare viene " +"trasmesso a tutti gli elementi.Quando entrambi gli argomenti sono array, esegue l'operazione a livello di elemento." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1234 -msgid "" -"<literal>andEach(Size > 1KB, Size < 1MB)</literal> - files between 1KB " -"and 1MB" -msgstr "" -"<literal>andEach(Size > 1KB, Size < 1MB)</literal> - file tra 1KB e 1MB" +msgid "<literal>andEach(Size > 1KB, Size < 1MB)</literal> - files between 1KB and 1MB" +msgstr "<literal>andEach(Size > 1KB, Size < 1MB)</literal> - file tra 1KB e 1MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1235 -msgid "" -"<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - txt or " -"log files" -msgstr "" -"<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - file " -"txt o di registro" +msgid "<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - txt or log files" +msgstr "<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - file txt o di registro" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1236 @@ -16763,20 +12726,13 @@ msgstr "<literal>notEach(Exists)</literal> - file che non esistono" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1237 -msgid "" -"<literal>allof(andEach(Exists, Size > 0))</literal> - all files exist " -"with non-zero size" -msgstr "" -"<literal>allof(andEach(Exists, Size > 0))</literal> - tutti i file " -"esistono con dimensione diversa da zero" +msgid "<literal>allof(andEach(Exists, Size > 0))</literal> - all files exist with non-zero size" +msgstr "<literal>allof(andEach(Exists, Size > 0))</literal> - tutti i file esistono con dimensione diversa da zero" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Filters.xml:1238 -msgid "" -"<literal>anyof(notEach(Size > 1MB))</literal> - any file 1MB or smaller" -msgstr "" -"<literal>anyof(notEach(Size > 1MB))</literal> - qualsiasi file di 1 MB o " -"inferiore" +#: English/Filters.xml:1238 +msgid "<literal>anyof(notEach(Size > 1MB))</literal> - any file 1MB or smaller" +msgstr "<literal>anyof(notEach(Size > 1MB))</literal> - qualsiasi file di 1 MB o inferiore" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1246 @@ -16926,74 +12882,47 @@ msgstr "ms" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1268 msgid "<literal>Size < 10KB</literal> - Any side's size is less than 10KB" -msgstr "" -"<literal>Dimensione <10KB</literal>: la dimensione di qualsiasi lato è " -"inferiore a 10KB" +msgstr "<literal>Dimensione <10KB</literal>: la dimensione di qualsiasi lato è inferiore a 10KB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1269 -msgid "" -"<literal>LeftSize >= 10MB</literal> - Left side file is at least 10MB" -msgstr "" -"<literal>LeftSize >= 10MB</literal> - Il file del lato sinistro è di " -"almeno 10MB" +msgid "<literal>LeftSize >= 10MB</literal> - Left side file is at least 10MB" +msgstr "<literal>LeftSize >= 10MB</literal> - Il file del lato sinistro è di almeno 10MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1270 msgid "<literal>allof(Size < 1MB)</literal> - All sides are under 1MB" -msgstr "" -"<literal>allof(Size < 1MB)</literal> - Tutti i lati sono inferiori a 1 MB" +msgstr "<literal>allof(Size < 1MB)</literal> - Tutti i lati sono inferiori a 1 MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1271 -msgid "" -"<literal>abs(LeftSize - RightSize) < 1KB</literal> - Size difference is " -"small" -msgstr "" -"<literal>abs(LeftSize - RightSize) <1KB</literal> - La differenza di " -"dimensioni è piccola" +msgid "<literal>abs(LeftSize - RightSize) < 1KB</literal> - Size difference is small" +msgstr "<literal>abs(LeftSize - RightSize) <1KB</literal> - La differenza di dimensioni è piccola" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1272 -msgid "" -"<literal>DateStr = \"2025-07-20\"</literal> - File was last modified on that " -"date" -msgstr "" -"<literal>DateStr = \"2025-07-20\"</literal> - Il file è stato modificato " -"l'ultima volta in quella data" +msgid "<literal>DateStr = \"2025-07-20\"</literal> - File was last modified on that date" +msgstr "<literal>DateStr = \"2025-07-20\"</literal> - Il file è stato modificato l'ultima volta in quella data" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1273 msgid "<literal>Date >= today()</literal> - Modified today or later" -msgstr "" -"<literal>Data >= today()</literal> - Modificato oggi o successivamente" +msgstr "<literal>Data >= today()</literal> - Modificato oggi o successivamente" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1274 -msgid "" -"<literal>isWithin(Date, today() - 7days, today())</literal> - File modified " -"within the last week" -msgstr "" -"<literal>is Within(Date, today() - 7 days, today())</literal> - File " -"modificato nell'ultima settimana" +msgid "<literal>isWithin(Date, today() - 7days, today())</literal> - File modified within the last week" +msgstr "<literal>is Within(Date, today() - 7 days, today())</literal> - File modificato nell'ultima settimana" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1275 -msgid "" -"<literal>inRange(Size, 1KB, 10MB)</literal> - File size is between 1KB " -"(inclusive) and 10MB (exclusive)" -msgstr "" -"<literal>inRange(Size, 1KB, 10MB)</literal>: la dimensione del file è " -"compresa tra 1 KB (incluso) e 10 MB (escluso)" +msgid "<literal>inRange(Size, 1KB, 10MB)</literal> - File size is between 1KB (inclusive) and 10MB (exclusive)" +msgstr "<literal>inRange(Size, 1KB, 10MB)</literal>: la dimensione del file è compresa tra 1 KB (incluso) e 10 MB (escluso)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1276 -msgid "" -"<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - All file sizes are " -"between 100KB and 1MB" -msgstr "" -"<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - Tutte le dimensioni " -"dei file sono comprese tra 100KB e 1MB" +msgid "<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - All file sizes are between 100KB and 1MB" +msgstr "<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - Tutte le dimensioni dei file sono comprese tra 100KB e 1MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1277 @@ -17003,132 +12932,82 @@ msgstr "<literal>AttrStr contiene \"R\"</literal> - Il file è di sola lettura" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1278 msgid "<literal>Name matches \"file[0-9]\\.txt\"</literal> - Regex on filename" -msgstr "" -"<literal>Il nome corrisponde a \"file[0-9]\\.txt\"</literal> - Regex sul " -"nome file" +msgstr "<literal>Il nome corrisponde a \"file[0-9]\\.txt\"</literal> - Regex sul nome file" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1279 -msgid "" -"<literal>Content contains \"Test\"</literal> - File content includes keyword" -msgstr "" -"<literal>Il contenuto contiene \"Test\"</literal> - Il contenuto del file " -"include la parola chiave" +msgid "<literal>Content contains \"Test\"</literal> - File content includes keyword" +msgstr "<literal>Il contenuto contiene \"Test\"</literal> - Il contenuto del file include la parola chiave" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1280 -msgid "" -"<literal>sublines(Content, 0, 1) contains \"XML\"</literal> - First line " -"contains \"XML\"" -msgstr "" -"<literal>sublines(Content, 0, 1) contiene \"XML\"</literal> - La prima riga " -"contiene \"XML\"" +msgid "<literal>sublines(Content, 0, 1) contains \"XML\"</literal> - First line contains \"XML\"" +msgstr "<literal>sublines(Content, 0, 1) contiene \"XML\"</literal> - La prima riga contiene \"XML\"" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1281 -msgid "" -"<literal>(Extension = \"log\" and Size > 10MB) or (Date < today() - " -"7days)</literal> - Large log files or files older than a week" +msgid "<literal>(Extension = \"log\" and Size > 10MB) or (Date < today() - 7days)</literal> - Large log files or files older than a week" msgstr "" -"<literal>(Estensione = \"log\" e dimensione > 10 MB) o (Data < oggi() - 7 " -"giorni)</literal> - File di registro di grandi dimensioni o file più vecchi " -"di una settimana" +"<literal>(Estensione = \"log\" e dimensione > 10 MB) o (Data < oggi() - 7 giorni)</literal> - File di registro di grandi dimensioni o file più " +"vecchi di una settimana" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1282 -msgid "" -"<literal>AttrStr not contains \"H\" and Name like \"*.tmp\"</literal> - Non-" -"hidden temporary files" -msgstr "" -"<literal>AttrStr non contiene \"H\" e nome come \"*.tmp\"</literal> - File " -"temporanei non nascosti" +msgid "<literal>AttrStr not contains \"H\" and Name like \"*.tmp\"</literal> - Non-hidden temporary files" +msgstr "<literal>AttrStr non contiene \"H\" e nome come \"*.tmp\"</literal> - File temporanei non nascosti" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1283 -msgid "" -"<literal>isWithin(Extension, \"a\", \"m\") and inRange(Size, 0, 1MB)</" -"literal> - Files with extensions from 'a' to 'm' and size less than 1MB" -msgstr "" -"<literal>isWithin(Extension, \"a\", \"m\") e inRange(Size, 0, 1MB)</literal> " -"- File con estensioni da 'a' a 'm' e dimensioni inferiori a 1 MB" +msgid "<literal>isWithin(Extension, \"a\", \"m\") and inRange(Size, 0, 1MB)</literal> - Files with extensions from 'a' to 'm' and size less than 1MB" +msgstr "<literal>isWithin(Extension, \"a\", \"m\") e inRange(Size, 0, 1MB)</literal> - File con estensioni da 'a' a 'm' e dimensioni inferiori a 1 MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1284 -msgid "" -"<literal>toLower(Name) = \"readme.txt\"</literal> - Case-insensitive " -"filename matching" -msgstr "" -"<literal>toLower(Name) = \"readme.txt\"</literal> - Corrispondenza del nome " -"file senza distinzione tra maiuscole e minuscole" +msgid "<literal>toLower(Name) = \"readme.txt\"</literal> - Case-insensitive filename matching" +msgstr "<literal>toLower(Name) = \"readme.txt\"</literal> - Corrispondenza del nome file senza distinzione tra maiuscole e minuscole" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1285 -msgid "" -"<literal>toHalfWidth(Name) like \"*.txt\"</literal> - Match after converting " -"full-width to half-width" -msgstr "" -"<literal>toHalfWidth(Name) come \"*.txt\"</literal> - Corrisponde dopo la " -"conversione da larghezza intera a mezza larghezza" +msgid "<literal>toHalfWidth(Name) like \"*.txt\"</literal> - Match after converting full-width to half-width" +msgstr "<literal>toHalfWidth(Name) come \"*.txt\"</literal> - Corrisponde dopo la conversione da larghezza intera a mezza larghezza" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1286 -msgid "" -"<literal>Different</literal> - Show only files/folders that are different " -"(Display filter only)" -msgstr "" -"<literal>Different</literal>: visualizza solo file/cartelle differenti (solo " -"filtro di visualizzazione)" +msgid "<literal>Different</literal> - Show only files/folders that are different (Display filter only)" +msgstr "<literal>Different</literal>: visualizza solo file/cartelle differenti (solo filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1287 -msgid "" -"<literal>Identical</literal> - Show only files/folders that are identical " -"(Display filter only)" -msgstr "" -"<literal>Identical</literal>: visualizza solo file/cartelle identici (solo " -"filtro di visualizzazione)" +msgid "<literal>Identical</literal> - Show only files/folders that are identical (Display filter only)" +msgstr "<literal>Identical</literal>: visualizza solo file/cartelle identici (solo filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1288 -msgid "" -"<literal>allof(Binary)</literal> - Show only files that are binary on all " -"sides (Display filter only)" -msgstr "" -"<literal>allof(Binary)</literal> - Visualizza solo i file binari su tutti i " -"lati (solo filtro di visualizzazione)" +msgid "<literal>allof(Binary)</literal> - Show only files that are binary on all sides (Display filter only)" +msgstr "<literal>allof(Binary)</literal> - Visualizza solo i file binari su tutti i lati (solo filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1289 msgid "" -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - In 3-" -"way comparison, show files where only left-middle pair differs (Display " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - In 3-way comparison, show files where only left-middle pair differs (Display " "filter only)" msgstr "" -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - Nel " -"confronto a 3 vie visualizza i file in cui differisce solo la coppia " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - Nel confronto a 3 vie visualizza i file in cui differisce solo la coppia " "sinistra-centrale (solo filtro di visualizzazione)" #. type: Content of: <article><section><title> #: English/Filters.xml:1296 -msgid "" -"Using file filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Utilizzo dei filtri file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Using file filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Utilizzo dei filtri file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1306 msgid "" -"<glossterm>File filters</glossterm> are text files with an extension of " -"<filename>flt</filename>. They enable you to apply multiple filtering rules " -"to a folder comparison. Unlike file masks, file filters can either include " -"or exclude matches." +"<glossterm>File filters</glossterm> are text files with an extension of <filename>flt</filename>. They enable you to apply multiple filtering rules " +"to a folder comparison. Unlike file masks, file filters can either include or exclude matches." msgstr "" -"I <glossterm>filtri file</glossterm> sono file di testo con estensione " -"<filename>flt</filename>.Consentono di applicare più regole di filtro a un " -"confronto di cartelle.A differenza delle maschere di file, i filtri di file " -"possono includere o escludere corrispondenze." +"I <glossterm>filtri file</glossterm> sono file di testo con estensione <filename>flt</filename>.Consentono di applicare più regole di filtro a un " +"confronto di cartelle.A differenza delle maschere di file, i filtri di file possono includere o escludere corrispondenze." #. type: Content of: <article><section><para><indexterm><secondary> #: English/Filters.xml:1314 @@ -17138,22 +13017,15 @@ msgstr "modello" #. type: Content of: <article><section><para> #: English/Filters.xml:1311 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installs a number of " -"predefined file filters. If these file filters do not provide the filtering " -"you need, you can create your own. To make that task easier, WinMerge also " -"provides a template file named <filename>FileFilter.tmpl</filename>. This " -"section describes how to apply file filters to comparisons, and documents " -"the file filter syntax. <xref linkend=\"Filters_dlg\" /> describes how to " +"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installs a number of predefined file filters. If these file filters do not provide the filtering " +"you need, you can create your own. To make that task easier, WinMerge also provides a template file named <filename>FileFilter.tmpl</filename>. This " +"section describes how to apply file filters to comparisons, and documents the file filter syntax. <xref linkend=\"Filters_dlg\" /> describes how to " "add, edit, and manage filters." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installa una serie di " -"filtri di file predefiniti.Se questi filtri di file non forniscono il " -"filtraggio necessario, puoi crearne uno tuo.Per semplificare questo compito, " -"WinMerge fornisce anche un file modello denominato <filename>FileFilter." -"tmpl</filename>.Questa sezione descrive come applicare i filtri di file ai " -"confronti e documenta la sintassi del filtro di file.<xref " -"linkend=\"Filters_dlg\" /> descrive come aggiungere, modificare e gestire i " -"filtri." +"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installa una serie di filtri di file predefiniti.Se questi filtri di file non forniscono il " +"filtraggio necessario, puoi crearne uno tuo.Per semplificare questo compito, WinMerge fornisce anche un file modello denominato " +"<filename>FileFilter.tmpl</filename>.Questa sezione descrive come applicare i filtri di file ai confronti e documenta la sintassi del filtro di file." +"<xref linkend=\"Filters_dlg\" /> descrive come aggiungere, modificare e gestire i filtri." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1327 English/Filters.xml:1331 @@ -17162,12 +13034,8 @@ msgstr "posizioni" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1324 -msgid "" -"File filter locations<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Posizioni filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>" +msgid "File filter locations<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Posizioni filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1334 @@ -17182,26 +13050,20 @@ msgstr "Sottocartella Filtri nella cartella di installazione di WinMerge" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1342 msgid "" -"This is where the predefined file filters are installed. For example, " -"<filename>C:\\Program Files\\WinMerge\\Filters</filename>. You can create or " -"copy filter files in this location to make them available to all users on " -"your system." +"This is where the predefined file filters are installed. For example, <filename>C:\\Program Files\\WinMerge\\Filters</filename>. You can create or " +"copy filter files in this location to make them available to all users on your system." msgstr "" -"Qui è dove vengono installati i filtri di file predefiniti.Ad esempio, " -"<filename>C:\\Programmi\\WinMerge\\Filters</filename>.Puoi creare o copiare " -"file di filtro in questa posizione per renderli disponibili a tutti gli " -"utenti del tuo sistema." +"Qui è dove vengono installati i filtri di file predefiniti.Ad esempio, <filename>C:\\Programmi\\WinMerge\\Filters</filename>.Puoi creare o copiare " +"file di filtro in questa posizione per renderli disponibili a tutti gli utenti del tuo sistema." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1347 msgid "" -"Before creating a new file filter, see if the predefined ones already " -"contain what you need. If not, you might find useful rule examples in the " +"Before creating a new file filter, see if the predefined ones already contain what you need. If not, you might find useful rule examples in the " "existing files." msgstr "" -"Prima di creare un nuovo filtro file, verifica se quelli predefiniti " -"contengono già ciò che ti serve.In caso contrario, potresti trovare utili " -"esempi di regole nei file esistenti." +"Prima di creare un nuovo filtro file, verifica se quelli predefiniti contengono già ciò che ti serve.In caso contrario, potresti trovare utili esempi " +"di regole nei file esistenti." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1354 @@ -17211,27 +13073,18 @@ msgstr "Cartella di filtro privata predefinita" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1357 msgid "" -"The location of this folder is defined in the System page of WinMerge " -"options. By default, it is specified as a subfolder in your user profile " -"folder (for example, <filename>Documents</filename> in Windows 10). Filters " -"that are created or copied here are normally visible only to you. If you " -"create new file filters, you can copy them here to keep them private." +"The location of this folder is defined in the System page of WinMerge options. By default, it is specified as a subfolder in your user profile folder " +"(for example, <filename>Documents</filename> in Windows 10). Filters that are created or copied here are normally visible only to you. If you create " +"new file filters, you can copy them here to keep them private." msgstr "" -"La posizione di questa cartella è definita nella pagina Sistema delle " -"opzioni WinMerge.Per impostazione predefinita, è specificata come " -"sottocartella nella cartella del profilo utente (ad esempio, " -"<filename>Documents</filename> in Windows 10).I filtri creati o copiati qui " -"sono normalmente visibili solo a te.Se crei nuovi filtri di file, puoi " -"copiarli qui per mantenerli privati." +"La posizione di questa cartella è definita nella pagina Sistema delle opzioni WinMerge.Per impostazione predefinita, è specificata come sottocartella " +"nella cartella del profilo utente (ad esempio, <filename>Documents</filename> in Windows 10).I filtri creati o copiati qui sono normalmente visibili " +"solo a te.Se crei nuovi filtri di file, puoi copiarli qui per mantenerli privati." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1367 -msgid "" -"Before you can apply file filters that exist in any other folder, you must " -"first install them." -msgstr "" -"Prima di poter applicare i filtri di file esistenti in qualsiasi altra " -"cartella, devi prima installarli." +msgid "Before you can apply file filters that exist in any other folder, you must first install them." +msgstr "Prima di poter applicare i filtri di file esistenti in qualsiasi altra cartella, devi prima installarli." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1375 @@ -17241,8 +13094,7 @@ msgstr "applicando" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1372 msgid "Applying file filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Applicazione dei filtri ai file<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Applicazione dei filtri ai file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1378 @@ -17251,87 +13103,59 @@ msgstr "Puoi applicare un filtro file utilizzando uno di questi metodi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1382 -msgid "" -"When you launch a folder compare from the Select Files or Folders dialog:" -msgstr "" -"Quando avvii un confronto di cartelle dalla finestra di dialogo Seleziona " -"file o cartelle:" +msgid "When you launch a folder compare from the Select Files or Folders dialog:" +msgstr "Quando avvii un confronto di cartelle dalla finestra di dialogo Seleziona file o cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1387 msgid "" -"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> " -"folders, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" +"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" "guilabel> field." msgstr "" -"Dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</" -"guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " +"Dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " "<guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1394 -msgid "" -"In the Filters dialog, use the File Filters tab to choose a file filter and " -"load it in the <guilabel>Filter</guilabel> field." +msgid "In the Filters dialog, use the File Filters tab to choose a file filter and load it in the <guilabel>Filter</guilabel> field." msgstr "" -"Nella finestra di dialogo Filtri, usa la scheda Filtri di file per scegliere " -"un filtro di file e caricarlo nel campo <guilabel >Filtro</guilabel >." +"Nella finestra di dialogo Filtri, usa la scheda Filtri di file per scegliere un filtro di file e caricarlo nel campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><note><para> #: English/Filters.xml:1399 -msgid "" -"If a file filter is currently enabled, the selected file filter is already " -"loaded in the <guilabel>Filter</guilabel> field." -msgstr "" -"Se un filtro file è attualmente abilitato, il filtro file selezionato è già " -"caricato nel campo <guilabel >Filtro</guilabel >." +msgid "If a file filter is currently enabled, the selected file filter is already loaded in the <guilabel>Filter</guilabel> field." +msgstr "Se un filtro file è attualmente abilitato, il filtro file selezionato è già caricato nel campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1407 -msgid "" -"Proceed with the compare operation. The file in the <guilabel>Filter</" -"guilabel> field is applied when you start the operation." -msgstr "" -"Procedere con l'operazione di confronto.Il file nel campo <guilabel >Filtro</" -"guilabel > viene applicato quando avvii l'operazione." +msgid "Proceed with the compare operation. The file in the <guilabel>Filter</guilabel> field is applied when you start the operation." +msgstr "Procedere con l'operazione di confronto.Il file nel campo <guilabel >Filtro</guilabel > viene applicato quando avvii l'operazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1415 msgid "" -"To change file filtering after you have already launched a folder compare " -"operation (for example, applying a different filter or disabling filtering):" +"To change file filtering after you have already launched a folder compare operation (for example, applying a different filter or disabling filtering):" msgstr "" -"Per modificare il filtro dei file dopo aver già avviato un'operazione di " -"confronto delle cartelle (ad esempio, applicando un filtro diverso o " +"Per modificare il filtro dei file dopo aver già avviato un'operazione di confronto delle cartelle (ad esempio, applicando un filtro diverso o " "disabilitando il filtro):" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1421 English/Filters.xml:1689 -msgid "" -"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" -"guimenuitem> </menuchoice>." -msgstr "" -"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" -"guimenuitem > </menuchoice >." +msgid "Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>." +msgstr "Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1429 -msgid "" -"In the Filters dialog, configure your new file filter setting, and click " -"<guibutton>OK</guibutton>." -msgstr "" -"Nella finestra di dialogo Filtri, configura la nuova impostazione del filtro " -"file e fai clic su <guibutton >OK</guibutton >." +msgid "In the Filters dialog, configure your new file filter setting, and click <guibutton>OK</guibutton>." +msgstr "Nella finestra di dialogo Filtri, configura la nuova impostazione del filtro file e fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1434 msgid "" -"The new filtering is not automatically applied when you close the Filters " -"dialog: press <keycap>F5</keycap> to see the new results in the Folder " +"The new filtering is not automatically applied when you close the Filters dialog: press <keycap>F5</keycap> to see the new results in the Folder " "Compare window." msgstr "" -"Il nuovo filtro non viene applicato automaticamente quando chiudi la " -"finestra di dialogo Filtri: premi <keycap>F5</keycap> per vedere i nuovi " +"Il nuovo filtro non viene applicato automaticamente quando chiudi la finestra di dialogo Filtri: premi <keycap>F5</keycap> per vedere i nuovi " "risultati nella finestra Confronto cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para><indexterm><secondary> @@ -17342,12 +13166,10 @@ msgstr "applicare filtri ai file" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1442 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>When you launch a folder compare " -"from the WinMerge command line, use the <option>-f</option> flag to specify " -"a file filter." +"<placeholder type=\"indexterm\" id=\"0\"/>When you launch a folder compare from the WinMerge command line, use the <option>-f</option> flag to " +"specify a file filter." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Quando avvii un confronto di " -"cartelle dalla riga di comando di WinMerge, utilizza il flag <option>-f</" +"<placeholder type=\"indexterm\" id=\"0\"/>Quando avvii un confronto di cartelle dalla riga di comando di WinMerge, utilizza il flag <option>-f</" "option> per specificare un filtro file." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -17362,37 +13184,24 @@ msgstr "sintassi" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1454 -msgid "" -"File filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Sintassi del filtro file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "File filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Sintassi del filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1464 -msgid "" -"This section describes the syntax of WinMerge file filters and provides " -"guidelines for writing them." -msgstr "" -"Questa sezione descrive la sintassi dei filtri di file WinMerge e fornisce " -"linee guida per scriverli." +msgid "This section describes the syntax of WinMerge file filters and provides guidelines for writing them." +msgstr "Questa sezione descrive la sintassi dei filtri di file WinMerge e fornisce linee guida per scriverli." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1467 msgid "" -"The comment delimiter is <code>##</code>. After a comment delimiter, all " -"characters in a line are ignored. WinMerge ignores most whitespace " -"characters in rules. However, a comment must always be preceded by one or " -"more whitespace (space or tab) characters. To use <code>##</code> as " +"The comment delimiter is <code>##</code>. After a comment delimiter, all characters in a line are ignored. WinMerge ignores most whitespace " +"characters in rules. However, a comment must always be preceded by one or more whitespace (space or tab) characters. To use <code>##</code> as " "characters in a rule, omit the whitespace prefix." msgstr "" -"Il delimitatore del commento è <code>##</code>.Dopo un delimitatore di " -"commento, tutti i caratteri in una riga vengono ignorati.WinMerge ignora la " -"maggior parte dei caratteri di spazio bianco nelle regole.Tuttavia, un " -"commento deve essere sempre preceduto da uno o più caratteri di spazio " -"bianco (spazio o tabulazione).Per utilizzare <code>##</code> come caratteri " -"in una regola, ometti il ​​prefisso dello spazio bianco." +"Il delimitatore del commento è <code>##</code>.Dopo un delimitatore di commento, tutti i caratteri in una riga vengono ignorati.WinMerge ignora la " +"maggior parte dei caratteri di spazio bianco nelle regole.Tuttavia, un commento deve essere sempre preceduto da uno o più caratteri di spazio bianco " +"(spazio o tabulazione).Per utilizzare <code>##</code> come caratteri in una regola, ometti il ​​prefisso dello spazio bianco." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1473 @@ -17427,8 +13236,7 @@ msgstr "includere" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1496 msgid "Includes everything except items matching the specified rule." -msgstr "" -"Include tutto tranne gli elementi che corrispondono alla regola specificata." +msgstr "Include tutto tranne gli elementi che corrispondono alla regola specificata." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><term> #: English/Filters.xml:1502 @@ -17438,18 +13246,15 @@ msgstr "escludere" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1505 msgid "Excludes everything except items matching the specified rule." -msgstr "" -"Esclude tutto tranne gli elementi che corrispondono alla regola specificata." +msgstr "Esclude tutto tranne gli elementi che corrispondono alla regola specificata." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1508 msgid "" -"When you choose the exclude method, you must also add a <guilabel>d</" -"guilabel> (directory) rule that specifies the subfolders. It's usually a " -"good idea to specify all subfolders, like this:" +"When you choose the exclude method, you must also add a <guilabel>d</guilabel> (directory) rule that specifies the subfolders. It's usually a good " +"idea to specify all subfolders, like this:" msgstr "" -"Quando scegli il metodo di esclusione, devi anche aggiungere una regola " -"<guilabel >d</guilabel > (cartella) che specifichi le sottocartelle. Di " +"Quando scegli il metodo di esclusione, devi anche aggiungere una regola <guilabel >d</guilabel > (cartella) che specifichi le sottocartelle. Di " "solito è una buona idea specificare tutte le sottocartelle, in questo modo:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><screen> @@ -17461,31 +13266,22 @@ msgstr "d: \\\\*$ ## Sottocartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Filters.xml:1519 msgid "" -"Don't confuse these terms. Remember, in file filters, an <guilabel>include</" -"guilabel> rule does not specify what to include, it specifies what " -"<emphasis>not</emphasis> to include. Similarly, <guilabel>exclude</" -"guilabel> does not specify what to exclude, it specifies what not to exclude." +"Don't confuse these terms. Remember, in file filters, an <guilabel>include</guilabel> rule does not specify what to include, it specifies what " +"<emphasis>not</emphasis> to include. Similarly, <guilabel>exclude</guilabel> does not specify what to exclude, it specifies what not to exclude." msgstr "" -"Non confondere questi termini.Ricorda, nei filtri dei file, una regola " -"<guilabel >include</guilabel > non specifica cosa includere, specifica cosa " -"<emphasis >non</emphasis > includere.Allo stesso modo, <guilabel >exclude</" -"guilabel > non specifica cosa escludere, specifica cosa non escludere." +"Non confondere questi termini.Ricorda, nei filtri dei file, una regola <guilabel >include</guilabel > non specifica cosa includere, specifica cosa " +"<emphasis >non</emphasis > includere.Allo stesso modo, <guilabel >exclude</guilabel > non specifica cosa escludere, specifica cosa non escludere." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1529 msgid "" -"Next, your file should contain one or more filter rules. You can add as many " -"rules as you like. There must be one rule per line, and each rule must be " -"entirely on one line (no line breaks are allowed in a rule). A rule begins " -"with a type designator, followed by either a regular expression or a filter " -"expression. The supported type designators are:" +"Next, your file should contain one or more filter rules. You can add as many rules as you like. There must be one rule per line, and each rule must " +"be entirely on one line (no line breaks are allowed in a rule). A rule begins with a type designator, followed by either a regular expression or a " +"filter expression. The supported type designators are:" msgstr "" -"Successivamente, il file dovrebbe contenere una o più regole di filtro.Puoi " -"aggiungere tutte le regole che desideri.Deve esserci una regola per riga e " -"ciascuna regola deve essere interamente su una riga (in una regola non sono " -"consentite interruzioni di riga).Una regola inizia con un identificatore di " -"tipo, seguito da un'espressione regolare o da un'espressione di filtro.I " -"designatori di tipo supportati sono:" +"Successivamente, il file dovrebbe contenere una o più regole di filtro.Puoi aggiungere tutte le regole che desideri.Deve esserci una regola per riga " +"e ciascuna regola deve essere interamente su una riga (in una regola non sono consentite interruzioni di riga).Una regola inizia con un " +"identificatore di tipo, seguito da un'espressione regolare o da un'espressione di filtro.I designatori di tipo supportati sono:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1537 @@ -17495,8 +13291,7 @@ msgstr "Abbina i nomi dei file utilizzando le espressioni regolari" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1538 msgid "Exclude files matching regex (Available since 2.16.19)" -msgstr "" -"Escludi file corrispondenti a regex (disponibile dalla versione 2.16.19)" +msgstr "Escludi file corrispondenti a regex (disponibile dalla versione 2.16.19)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1539 @@ -17515,12 +13310,8 @@ msgstr "e: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1545 -msgid "" -"Filter expression applied to both files and folders (e.g. e:Name like " -"\"Common*.*\") (Available since 2.16.56)" -msgstr "" -"Espressione di filtro applicata sia a file che a cartelle (ad esempio e:Nome " -"come \"Comune*.*\") (disponibile dalla 2.16.56)" +msgid "Filter expression applied to both files and folders (e.g. e:Name like \"Common*.*\") (Available since 2.16.56)" +msgstr "Espressione di filtro applicata sia a file che a cartelle (ad esempio e:Nome come \"Comune*.*\") (disponibile dalla 2.16.56)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1546 @@ -17529,11 +13320,8 @@ msgstr "e!: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1546 -msgid "" -"Filter expression to exclude both files and folders (Available since 2.16.56)" -msgstr "" -"Espressione di filtro per escludere sia file che cartelle (disponibile dalla " -"2.16.56)" +msgid "Filter expression to exclude both files and folders (Available since 2.16.56)" +msgstr "Espressione di filtro per escludere sia file che cartelle (disponibile dalla 2.16.56)" #. type: Content of: <article><section><section><para><indexterm><secondary> #: English/Filters.xml:1553 @@ -17548,12 +13336,10 @@ msgstr "nei filtri dei file" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1549 msgid "" -"Among the many regexp special characters, the following are particularly " -"important in file filter rules:<placeholder type=\"indexterm\" id=\"0\"/" +"Among the many regexp special characters, the following are particularly important in file filter rules:<placeholder type=\"indexterm\" id=\"0\"/" "><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Tra i tanti caratteri speciali regexp, i seguenti sono particolarmente " -"importanti nelle regole di filtro dei file:<placeholder type=\"indexterm\" " +"Tra i tanti caratteri speciali regexp, i seguenti sono particolarmente importanti nelle regole di filtro dei file:<placeholder type=\"indexterm\" " "id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -17574,8 +13360,7 @@ msgstr "$ (fine riga)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1573 msgid "Frequently required for rules to work correctly. For example:" -msgstr "" -"Spesso richiesto affinché le regole funzionino correttamente.Per esempio:" +msgstr "Spesso richiesto affinché le regole funzionino correttamente.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Filters.xml:1576 @@ -17595,35 +13380,25 @@ msgstr "\\ (fuga)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1585 msgid "" -"Forces special characters to match normal characters. For example, to match " -"a folder name, precede the folder backslash delimiter with a backslash " -"(<code>\\\\</code>). To match the dot in a file name, specify a backslash " -"followed by a dot (<code>\\.</code>)." +"Forces special characters to match normal characters. For example, to match a folder name, precede the folder backslash delimiter with a backslash " +"(<code>\\\\</code>). To match the dot in a file name, specify a backslash followed by a dot (<code>\\.</code>)." msgstr "" -"Forza i caratteri speciali a corrispondere ai caratteri normali.Ad esempio, " -"per abbinare il nome di una cartella, anteporre al delimitatore della barra " -"rovesciata della cartella una barra rovesciata (<code>\\\\</code>).Per far " -"corrispondere il punto nel nome di un file, specificare una barra rovesciata " -"seguita da un punto (<code>\\.</code>)." +"Forza i caratteri speciali a corrispondere ai caratteri normali.Ad esempio, per abbinare il nome di una cartella, anteporre al delimitatore della " +"barra rovesciata della cartella una barra rovesciata (<code>\\\\</code>).Per far corrispondere il punto nel nome di un file, specificare una barra " +"rovesciata seguita da un punto (<code>\\.</code>)." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1594 -msgid "" -"No special characters or wildcards are used to match file names. To match " -"all filenames of a certain type, simply omit the filename." +msgid "No special characters or wildcards are used to match file names. To match all filenames of a certain type, simply omit the filename." msgstr "" -"Non vengono utilizzati caratteri speciali o caratteri jolly per abbinare i " -"nomi dei file.Per abbinare tutti i nomi di file di un certo tipo, ometti " +"Non vengono utilizzati caratteri speciali o caratteri jolly per abbinare i nomi dei file.Per abbinare tutti i nomi di file di un certo tipo, ometti " "semplicemente il nome del file." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1597 -msgid "" -"Rules are case-insensitive. For example, <code>f: \\.bat$</code> matches " -"<filename>winmerge.bat</filename> and <filename>compare.BAT</filename>." +msgid "Rules are case-insensitive. For example, <code>f: \\.bat$</code> matches <filename>winmerge.bat</filename> and <filename>compare.BAT</filename>." msgstr "" -"Le regole non fanno distinzione tra maiuscole e minuscole.Ad esempio, " -"<code>f: \\.bat$</code> corrisponde a <filename>winmerge.bat</filename> e " +"Le regole non fanno distinzione tra maiuscole e minuscole.Ad esempio, <code>f: \\.bat$</code> corrisponde a <filename>winmerge.bat</filename> e " "<filename>compare.BAT</filename>." #. type: Content of: <article><section><section><example><title> @@ -17691,35 +13466,23 @@ msgstr "nei confronti dei file" #. type: Content of: <article><section><title> #: English/Filters.xml:1627 -msgid "" -"Using line filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Utilizzo dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Using line filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Utilizzo dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1637 msgid "" -"In a file comparison, you can use line filters to ignore single lines. For " -"example, you might use line filters to ignore comments or certain type of " -"generated code, like version control system timestamps. Each line filter is " -"a rule, and you can apply any number of line filters to a file comparison." +"In a file comparison, you can use line filters to ignore single lines. For example, you might use line filters to ignore comments or certain type of " +"generated code, like version control system timestamps. Each line filter is a rule, and you can apply any number of line filters to a file comparison." msgstr "" -"In un confronto di file è possibile utilizzare i filtri di riga per ignorare " -"singole righe.Ad esempio, potresti utilizzare filtri di riga per ignorare i " -"commenti o determinati tipi di codice generato, come i timestamp del sistema " -"di controllo della versione.Ogni filtro di linea è una regola ed è possibile " -"applicare un numero qualsiasi di filtri di linea a un confronto di file." +"In un confronto di file è possibile utilizzare i filtri di riga per ignorare singole righe.Ad esempio, potresti utilizzare filtri di riga per " +"ignorare i commenti o determinati tipi di codice generato, come i timestamp del sistema di controllo della versione.Ogni filtro di linea è una regola " +"ed è possibile applicare un numero qualsiasi di filtri di linea a un confronto di file." #. type: Content of: <article><section><para> #: English/Filters.xml:1643 -msgid "" -"To learn how to add, edit, and manage filters, see <xref " -"linkend=\"Filters_dlg\" />." -msgstr "" -"Per informazioni su come aggiungere, modificare e gestire i filtri, vedi " -"<xref linkend=\"Filters_dlg\" />." +msgid "To learn how to add, edit, and manage filters, see <xref linkend=\"Filters_dlg\" />." +msgstr "Per informazioni su come aggiungere, modificare e gestire i filtri, vedi <xref linkend=\"Filters_dlg\" />." #. type: Content of: <article><section><section><title> #: English/Filters.xml:1647 @@ -17729,63 +13492,45 @@ msgstr "Applicazione di filtri di linea" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1649 msgid "You can apply line filters using any of these methods:" -msgstr "" -"È possibile applicare filtri di linea utilizzando uno di questi metodi:" +msgstr "È possibile applicare filtri di linea utilizzando uno di questi metodi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1653 msgid "When you launch a file compare from the Select Files or Folders dialog" -msgstr "" -"Quando si avvia un confronto di file dalla finestra di dialogo Seleziona " -"file o cartelle" +msgstr "Quando si avvia un confronto di file dalla finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1658 msgid "" -"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> " -"files, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" +"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> files, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" "guilabel> field." msgstr "" -"Dopo aver scelto il file <guilabel >primo</guilabel > e <guilabel >secondo</" -"guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " -"<guilabel >Filtro</guilabel >." +"Dopo aver scelto il file <guilabel >primo</guilabel > e <guilabel >secondo</guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al " +"campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1665 msgid "" -"In the Filters dialog, use the Line Filters tab to enable the line filters " -"you want to use (if any), or to see what line filters are currently enabled." +"In the Filters dialog, use the Line Filters tab to enable the line filters you want to use (if any), or to see what line filters are currently " +"enabled." msgstr "" -"Nella finestra di dialogo Filtri, utilizzare la scheda Filtri di linea per " -"abilitare i filtri di linea che si desidera utilizzare (se presenti) o per " +"Nella finestra di dialogo Filtri, utilizzare la scheda Filtri di linea per abilitare i filtri di linea che si desidera utilizzare (se presenti) o per " "vedere quali filtri di linea sono attualmente abilitati." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><note><para> #: English/Filters.xml:1670 -msgid "" -"The <guilabel>Filter</guilabel> field does not indicate what line filters " -"are enabled." -msgstr "" -"Il campo <guilabel >Filtro</guilabel > non indica quali filtri di linea sono " -"abilitati." +msgid "The <guilabel>Filter</guilabel> field does not indicate what line filters are enabled." +msgstr "Il campo <guilabel >Filtro</guilabel > non indica quali filtri di linea sono abilitati." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1677 -msgid "" -"Proceed with the file compare operation. The enabled line filters are " -"applied when you start the operation." -msgstr "" -"Procedere con l'operazione di confronto dei file.I filtri di linea abilitati " -"vengono applicati all'avvio dell'operazione." +msgid "Proceed with the file compare operation. The enabled line filters are applied when you start the operation." +msgstr "Procedere con l'operazione di confronto dei file.I filtri di linea abilitati vengono applicati all'avvio dell'operazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1684 -msgid "" -"After you have already launched a file compare operation (for example, to " -"apply different filters or disabling filtering)" -msgstr "" -"Dopo aver già avviato un'operazione di confronto dei file (ad esempio, per " -"applicare filtri diversi o disabilitare i filtri)" +msgid "After you have already launched a file compare operation (for example, to apply different filters or disabling filtering)" +msgstr "Dopo aver già avviato un'operazione di confronto dei file (ad esempio, per applicare filtri diversi o disabilitare i filtri)" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1697 @@ -17794,49 +13539,34 @@ msgstr "Apri la scheda Filtri file." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1701 -msgid "" -"Check the individual line filters you want to apply, and uncheck filters " -"that you don't want to apply." -msgstr "" -"Seleziona i singoli filtri di linea che desideri applicare e deseleziona i " -"filtri che non desideri applicare." +msgid "Check the individual line filters you want to apply, and uncheck filters that you don't want to apply." +msgstr "Seleziona i singoli filtri di linea che desideri applicare e deseleziona i filtri che non desideri applicare." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1704 msgid "" -"You can also add, edit, and remove filters from the list by using the " -"<guibutton>New</guibutton>, <guibutton>Edit</guibutton>, and " -"<guibutton>Remove</guibutton> buttons." +"You can also add, edit, and remove filters from the list by using the <guibutton>New</guibutton>, <guibutton>Edit</guibutton>, and <guibutton>Remove</" +"guibutton> buttons." msgstr "" -"Puoi anche aggiungere, modificare e rimuovere filtri dall'elenco utilizzando " -"i pulsanti <guibutton >Nuovo</guibutton >, <guibutton >Modifica</guibutton > " -"e <guibutton >Rimuovi</guibutton >." +"Puoi anche aggiungere, modificare e rimuovere filtri dall'elenco utilizzando i pulsanti <guibutton >Nuovo</guibutton >, <guibutton >Modifica</" +"guibutton > e <guibutton >Rimuovi</guibutton >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1710 -msgid "" -"To turn on line filtering, check the <guilabel>Enable Line Filters</" -"guilabel>. To turn line filtering off, uncheck the option." +msgid "To turn on line filtering, check the <guilabel>Enable Line Filters</guilabel>. To turn line filtering off, uncheck the option." msgstr "" -"Per attivare i filtri di linea, seleziona <guilabel >Abilita filtri di " -"linea</guilabel >.Per disattivare il filtraggio della linea, deseleziona " +"Per attivare i filtri di linea, seleziona <guilabel >Abilita filtri di linea</guilabel >.Per disattivare il filtraggio della linea, deseleziona " "l'opzione." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1716 msgid "Click <guibutton>OK</guibutton> to dismiss the File Filters dialog." -msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " -"Filtri file." +msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri file." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1721 -msgid "" -"Click <keycap>F5</keycap> to apply your changes and refresh the File Compare " -"window." -msgstr "" -"Fai clic su <keycap>F5</keycap> per applicare le modifiche e aggiornare la " -"finestra Confronta file." +msgid "Click <keycap>F5</keycap> to apply your changes and refresh the File Compare window." +msgstr "Fai clic su <keycap>F5</keycap> per applicare le modifiche e aggiornare la finestra Confronta file." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1733 @@ -17850,58 +13580,43 @@ msgstr "filtri in linea" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1730 -msgid "" -"Line filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "Line filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Sintassi del filtro di linea<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " +"Sintassi del filtro di linea<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " "id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1744 msgid "" -"A line filter is a rule that is evaluated against each single-line " -"difference in your compared files, if line filter rules are enabled. When a " -"rule matches a single-line difference, the difference is ignored." +"A line filter is a rule that is evaluated against each single-line difference in your compared files, if line filter rules are enabled. When a rule " +"matches a single-line difference, the difference is ignored." msgstr "" -"Un filtro di riga è una regola che viene valutata rispetto a ogni differenza " -"di riga singola nei file confrontati, se le regole di filtro di riga sono " -"abilitate.Quando una regola corrisponde a una differenza di riga singola, la " -"differenza viene ignorata." +"Un filtro di riga è una regola che viene valutata rispetto a ogni differenza di riga singola nei file confrontati, se le regole di filtro di riga " +"sono abilitate.Quando una regola corrisponde a una differenza di riga singola, la differenza viene ignorata." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1748 msgid "" -"Ignored differences are marked in the File Compare window with the " -"<guilabel>Ignored Difference</guilabel> color (as defined in the Colors page " -"of WinMerge Options). This enables you to distinguish ignored differences " -"from other types. However, you cannot select or merge ignored difference." +"Ignored differences are marked in the File Compare window with the <guilabel>Ignored Difference</guilabel> color (as defined in the Colors page of " +"WinMerge Options). This enables you to distinguish ignored differences from other types. However, you cannot select or merge ignored difference." msgstr "" -"Le differenze ignorate sono contrassegnate nella finestra Confronta file con " -"il colore <guilabel >Differenza ignorata</guilabel > (come definito nella " -"pagina Colori delle Opzioni di WinMerge).Ciò consente di distinguere le " -"differenze ignorate da altri tipi.Tuttavia, non è possibile selezionare o " -"unire la differenza ignorata." +"Le differenze ignorate sono contrassegnate nella finestra Confronta file con il colore <guilabel >Differenza ignorata</guilabel > (come definito " +"nella pagina Colori delle Opzioni di WinMerge).Ciò consente di distinguere le differenze ignorate da altri tipi.Tuttavia, non è possibile selezionare " +"o unire la differenza ignorata." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1754 msgid "Line filter matching can be described in terms of two ideas:" -msgstr "" -"La corrispondenza del filtro di linea può essere descritta in termini di due " -"idee:" +msgstr "La corrispondenza del filtro di linea può essere descritta in termini di due idee:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1758 msgid "" -"When a rule matches any part of the line, the entire difference is ignored. " -"Therefore, you cannot filter just part of a line. For example, suppose two " -"files have the following single-line difference:" +"When a rule matches any part of the line, the entire difference is ignored. Therefore, you cannot filter just part of a line. For example, suppose " +"two files have the following single-line difference:" msgstr "" -"Quando una regola corrisponde a qualsiasi parte della linea, l'intera " -"differenza viene ignorata.Pertanto non è possibile filtrare solo parte di " -"una riga.Ad esempio, supponiamo che due file abbiano la seguente differenza " -"di una sola riga:" +"Quando una regola corrisponde a qualsiasi parte della linea, l'intera differenza viene ignorata.Pertanto non è possibile filtrare solo parte di una " +"riga.Ad esempio, supponiamo che due file abbiano la seguente differenza di una sola riga:" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><title> #: English/Filters.xml:1764 English/Filters.xml:1786 English/Intro_diffs.xml:60 @@ -17928,24 +13643,17 @@ msgstr "#Janne Sibelius" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1775 msgid "" -"With no filtering, the line is detected as a difference. But if we apply a " -"line filter rule with the expression, <code>^#</code>, the lines are " -"reported as identical, because the expression specifies only the first " -"character, which matches in both files." +"With no filtering, the line is detected as a difference. But if we apply a line filter rule with the expression, <code>^#</code>, the lines are " +"reported as identical, because the expression specifies only the first character, which matches in both files." msgstr "" -"Senza filtraggio, la linea viene rilevata come differenza.Ma se applichiamo " -"una regola di filtro di riga con l'espressione <code>^#</code>, le righe " -"vengono riportate come identiche, poiché l'espressione specifica solo il " -"primo carattere, che corrisponde in entrambi i file." +"Senza filtraggio, la linea viene rilevata come differenza.Ma se applichiamo una regola di filtro di riga con l'espressione <code>^#</code>, le righe " +"vengono riportate come identiche, poiché l'espressione specifica solo il primo carattere, che corrisponde in entrambi i file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1782 -msgid "" -"A rule is applied to a multi-line difference only if all the lines match. " -"For example, consider this two-line difference:" +msgid "A rule is applied to a multi-line difference only if all the lines match. For example, consider this two-line difference:" msgstr "" -"Una regola viene applicata a una differenza su più righe solo se tutte le " -"righe corrispondono.Ad esempio, considera questa differenza di due righe:" +"Una regola viene applicata a una differenza su più righe solo se tutte le righe corrispondono.Ad esempio, considera questa differenza di due righe:" #. type: Content of: <article><section><section><itemizedlist><listitem><formalpara><para><screen> #: English/Filters.xml:1788 @@ -17969,25 +13677,17 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1799 -msgid "" -"The same <code>^#</code> rule matches the first line, but not the second " -"line. Therefore, the difference is not ignored." -msgstr "" -"La stessa regola <code>^#</code> corrisponde alla prima riga, ma non alla " -"seconda riga.Pertanto, la differenza non viene ignorata." +msgid "The same <code>^#</code> rule matches the first line, but not the second line. Therefore, the difference is not ignored." +msgstr "La stessa regola <code>^#</code> corrisponde alla prima riga, ma non alla seconda riga.Pertanto, la differenza non viene ignorata." #. type: Content of: <article><section><section><tip><para> #: English/Filters.xml:1805 msgid "" -"It's usually good practice to use the beginning of line ( <code>^</code> ) " -"and end of line ( <code>$</code> ) markers to control your patterns " -"precisely, because the rule is applied if any part of a line matches the " -"expression." +"It's usually good practice to use the beginning of line ( <code>^</code> ) and end of line ( <code>$</code> ) markers to control your patterns " +"precisely, because the rule is applied if any part of a line matches the expression." msgstr "" -"Di solito è buona norma utilizzare i marcatori di inizio riga ( <code>^</" -"code> ) e di fine riga ( <code>$</code> ) per controllare con precisione i " -"modelli, poiché la regola viene applicata se qualsiasi parte di una riga " -"corrisponde all'espressione." +"Di solito è buona norma utilizzare i marcatori di inizio riga ( <code>^</code> ) e di fine riga ( <code>$</code> ) per controllare con precisione i " +"modelli, poiché la regola viene applicata se qualsiasi parte di una riga corrisponde all'espressione." #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:1812 @@ -18003,8 +13703,7 @@ msgstr "^IL MIOTAG$" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:1816 msgid "Filters lines that exactly match <literal>MYTAG</literal>" -msgstr "" -"Filtra le righe che corrispondono esattamente a <literal>MYTAG</literal>" +msgstr "Filtra le righe che corrispondono esattamente a <literal>MYTAG</literal>" #. type: Content of: <article><section><section><example><screen> #: English/Filters.xml:1818 @@ -18025,12 +13724,8 @@ msgstr "^/\\*.*\\*/$" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:1824 -msgid "" -"Filters lines beginning with <literal><constant>/*</constant></literal> and " -"ending with <literal>*/</literal>" -msgstr "" -"Filtra le righe che iniziano con <literal><constant>/*</constant></literal> " -"e finiscono con <literal>*/</literal>" +msgid "Filters lines beginning with <literal><constant>/*</constant></literal> and ending with <literal>*/</literal>" +msgstr "Filtra le righe che iniziano con <literal><constant>/*</constant></literal> e finiscono con <literal>*/</literal>" #. type: Content of: <article><section><section><example><screen> #: English/Filters.xml:1828 @@ -18099,12 +13794,8 @@ msgstr "sostituzione" #. type: Content of: <article><section><title> #: English/Filters.xml:1861 -msgid "" -"Using substitution filters<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Utilizzo dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Using substitution filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Utilizzo dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Filters.xml:1876 @@ -18118,58 +13809,41 @@ msgstr "gestire e abilitare" #. type: Content of: <article><section><title> #: English/Filters.xml:1875 -msgid "" -"Using the Filters dialog<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Utilizzo della finestra di dialogo Filtri<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Using the Filters dialog<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Utilizzo della finestra di dialogo Filtri<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1883 -msgid "" -"This section describes the Filters dialog, which provides functions to " -"create and manage file filters and line filters." -msgstr "" -"Questa sezione descrive la finestra di dialogo Filtri, che fornisce funzioni " -"per creare e gestire filtri di file e filtri di linea." +msgid "This section describes the Filters dialog, which provides functions to create and manage file filters and line filters." +msgstr "Questa sezione descrive la finestra di dialogo Filtri, che fornisce funzioni per creare e gestire filtri di file e filtri di linea." #. type: Content of: <article><section><para> #: English/Filters.xml:1886 msgid "To open the Filters dialog, use either of these methods:" -msgstr "" -"Per aprire la finestra di dialogo Filtri, utilizzare uno di questi metodi:" +msgstr "Per aprire la finestra di dialogo Filtri, utilizzare uno di questi metodi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Filters.xml:1890 msgid "" -"In the Select Files or Folders dialog, click <guibutton>Select</guibutton> " -"to the right of the <guilabel>Filter</guilabel> field. You use this method " +"In the Select Files or Folders dialog, click <guibutton>Select</guibutton> to the right of the <guilabel>Filter</guilabel> field. You use this method " "when you want to apply a file filter to a folder compare operation." msgstr "" -"Nella finestra di dialogo Seleziona file o cartelle, fai clic su <guibutton " -">Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel >." -"Utilizzare questo metodo quando si desidera applicare un filtro di file a " -"un'operazione di confronto di cartelle." +"Nella finestra di dialogo Seleziona file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel " +">.Utilizzare questo metodo quando si desidera applicare un filtro di file a un'operazione di confronto di cartelle." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Filters.xml:1897 msgid "" -"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" -"guimenuitem> </menuchoice>. This method can be used at any time except when " -"the Select Files or Folders dialog is open." +"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>. This method can be used at any time except when the " +"Select Files or Folders dialog is open." msgstr "" -"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" -"guimenuitem > </menuchoice >.Questo metodo può essere utilizzato in " -"qualsiasi momento, tranne quando è aperta la finestra di dialogo Seleziona " -"file o cartelle." +"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >.Questo metodo può essere utilizzato in " +"qualsiasi momento, tranne quando è aperta la finestra di dialogo Seleziona file o cartelle." #. type: Content of: <article><section><para> #: English/Filters.xml:1906 msgid "The Filters dialog has a tab for each type of WinMerge filter:" -msgstr "" -"La finestra di dialogo Filtri dispone di una scheda per ciascun tipo di " -"filtro WinMerge:" +msgstr "La finestra di dialogo Filtri dispone di una scheda per ciascun tipo di filtro WinMerge:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1910 @@ -18178,11 +13852,8 @@ msgstr "Filtri di file" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1913 -msgid "" -"Choose this tab to work with file filters for folder compare operations." -msgstr "" -"Scegli questa scheda per utilizzare i filtri dei file per le operazioni di " -"confronto delle cartelle." +msgid "Choose this tab to work with file filters for folder compare operations." +msgstr "Scegli questa scheda per utilizzare i filtri dei file per le operazioni di confronto delle cartelle." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1919 @@ -18192,9 +13863,7 @@ msgstr "Filtri di linea" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1922 msgid "Choose this tab to work with line filters for file compare operations." -msgstr "" -"Scegli questa scheda per lavorare con i filtri di riga per le operazioni di " -"confronto dei file." +msgstr "Scegli questa scheda per lavorare con i filtri di riga per le operazioni di confronto dei file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1928 @@ -18203,12 +13872,8 @@ msgstr "Filtri di sostituzione" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1931 -msgid "" -"Choose this tab to work with substitution filters for file compare " -"operations." -msgstr "" -"Scegli questa scheda per lavorare con i filtri di sostituzione per le " -"operazioni di confronto dei file." +msgid "Choose this tab to work with substitution filters for file compare operations." +msgstr "Scegli questa scheda per lavorare con i filtri di sostituzione per le operazioni di confronto dei file." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1941 English/Filters.xml:2207 English/Filters.xml:2299 @@ -18218,21 +13883,16 @@ msgstr "abilitante" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1938 msgid "Using the File Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Utilizzando la scheda Filtri file<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Utilizzando la scheda Filtri file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1944 msgid "" -"The main part of this tab is a list of file filters that are available for " -"folder compare operations. The list includes shared, private, and installed " -"file filters that WinMerge knows about, as described in <xref " -"linkend=\"Filters_FileFilterLoc\" />." +"The main part of this tab is a list of file filters that are available for folder compare operations. The list includes shared, private, and " +"installed file filters that WinMerge knows about, as described in <xref linkend=\"Filters_FileFilterLoc\" />." msgstr "" -"La parte principale di questa scheda è un elenco di filtri di file " -"disponibili per le operazioni di confronto delle cartelle.L'elenco include " -"filtri di file condivisi, privati ​​e installati conosciuti da WinMerge, come " -"descritto in <xref linkend=\"Filters_FileFilterLoc\" />." +"La parte principale di questa scheda è un elenco di filtri di file disponibili per le operazioni di confronto delle cartelle.L'elenco include filtri " +"di file condivisi, privati ​​e installati conosciuti da WinMerge, come descritto in <xref linkend=\"Filters_FileFilterLoc\" />." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1950 @@ -18241,12 +13901,9 @@ msgstr "Abilitazione e disabilitazione dei filtri file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1952 -msgid "" -"You must enable a file filter to make it available in a folder comparison " -"operation, or to disable a current filter to stop it from being used:" +msgid "You must enable a file filter to make it available in a folder comparison operation, or to disable a current filter to stop it from being used:" msgstr "" -"È necessario abilitare un filtro file per renderlo disponibile in " -"un'operazione di confronto di cartelle o disabilitare un filtro corrente per " +"È necessario abilitare un filtro file per renderlo disponibile in un'operazione di confronto di cartelle o disabilitare un filtro corrente per " "impedirne l'utilizzo:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> @@ -18256,28 +13913,18 @@ msgstr "Apri la finestra di dialogo Filtri, se non è già aperta." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:1962 -msgid "" -"Select a file filter or <guimenuitem><None></guimenuitem> from the " -"list." -msgstr "" -"Seleziona un filtro file o <guimenuitem ><Nessuno></guimenuitem> " -"dall'elenco." +msgid "Select a file filter or <guimenuitem><None></guimenuitem> from the list." +msgstr "Seleziona un filtro file o <guimenuitem ><Nessuno></guimenuitem> dall'elenco." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:1967 msgid "Click <guibutton>OK</guibutton> to dismiss the Filters dialog." -msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " -"Filtri." +msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1972 -msgid "" -"There are several ways to apply file filters after enabling them. For " -"details, see <xref linkend=\"Filters_FileFilterApply\" />." -msgstr "" -"Esistono diversi modi per applicare i filtri dei file dopo averli abilitati." -"Per i dettagli, vedi <xref linkend=\"Filters_FileFilterApply\" />." +msgid "There are several ways to apply file filters after enabling them. For details, see <xref linkend=\"Filters_FileFilterApply\" />." +msgstr "Esistono diversi modi per applicare i filtri dei file dopo averli abilitati.Per i dettagli, vedi <xref linkend=\"Filters_FileFilterApply\" />." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1977 @@ -18286,12 +13933,8 @@ msgstr "Configurazione dei filtri dei file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1979 -msgid "" -"Use these buttons to manage your <guilabel>File Filters</guilabel> list and " -"create new file filters:" -msgstr "" -"Usa questi pulsanti per gestire l'elenco dei <guilabel >filtri file</" -"guilabel > e creare nuovi filtri file:" +msgid "Use these buttons to manage your <guilabel>File Filters</guilabel> list and create new file filters:" +msgstr "Usa questi pulsanti per gestire l'elenco dei <guilabel >filtri file</guilabel > e creare nuovi filtri file:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1984 @@ -18301,12 +13944,10 @@ msgstr "Test" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1987 msgid "" -"Select a file filter in the list and click <guibutton>Test</guibutton> to " -"quickly see how the filter works. See <xref linkend=\"Filters_TestingDlg\" /" -"> for details." +"Select a file filter in the list and click <guibutton>Test</guibutton> to quickly see how the filter works. See <xref " +"linkend=\"Filters_TestingDlg\" /> for details." msgstr "" -"Seleziona un filtro di file nell'elenco e fai clic su <guibutton >Prova</" -"guibutton > per vedere rapidamente come funziona il filtro.Vedi <xref " +"Seleziona un filtro di file nell'elenco e fai clic su <guibutton >Prova</guibutton > per vedere rapidamente come funziona il filtro.Vedi <xref " "linkend=\"Filters_TestingDlg\" /> per i dettagli." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -18317,12 +13958,10 @@ msgstr "Installare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1997 msgid "" -"Enables you to locate a file filter and adds it to the Filters list. File " -"filters that are not in either the shared or default private folder are not " +"Enables you to locate a file filter and adds it to the Filters list. File filters that are not in either the shared or default private folder are not " "detected unless you install them." msgstr "" -"Consente di individuare un filtro file e di aggiungerlo all'elenco Filtri.I " -"filtri dei file che non si trovano nella cartella condivisa o privata " +"Consente di individuare un filtro file e di aggiungerlo all'elenco Filtri.I filtri dei file che non si trovano nella cartella condivisa o privata " "predefinita non vengono rilevati a meno che non li installi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -18333,14 +13972,11 @@ msgstr "Nuovo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2008 msgid "" -"Creates a new copy of a file template in either the shared or private filter " -"folders, and opens it in your default editor. Edit the template and add " +"Creates a new copy of a file template in either the shared or private filter folders, and opens it in your default editor. Edit the template and add " "your rules, as described in <xref linkend=\"Filters_CreatingFile\" />." msgstr "" -"Crea una nuova copia di un modello di file nelle cartelle dei filtri " -"condivise o private e la apre nell'editor predefinito.Modifica il modello e " -"aggiungi le tue regole, come descritto in <xref " -"linkend=\"Filters_CreatingFile\" />." +"Crea una nuova copia di un modello di file nelle cartelle dei filtri condivise o private e la apre nell'editor predefinito.Modifica il modello e " +"aggiungi le tue regole, come descritto in <xref linkend=\"Filters_CreatingFile\" />." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:2016 @@ -18349,12 +13985,8 @@ msgstr "Modificare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2019 -msgid "" -"Select a file filter in the list and click <guibutton>Edit</guibutton> to " -"open the file in your default editor." -msgstr "" -"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Modifica</" -"guibutton > per aprire il file nel tuo editor predefinito." +msgid "Select a file filter in the list and click <guibutton>Edit</guibutton> to open the file in your default editor." +msgstr "Seleziona un filtro file nell'elenco e fai clic su <guibutton >Modifica</guibutton > per aprire il file nel tuo editor predefinito." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:2026 @@ -18364,22 +13996,18 @@ msgstr "Eliminare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2029 msgid "" -"Select a file filter in the list and click <guibutton>Delete</guibutton> to " -"delete the file and remove it from the list. Yes, the file is really deleted!" +"Select a file filter in the list and click <guibutton>Delete</guibutton> to delete the file and remove it from the list. Yes, the file is really " +"deleted!" msgstr "" -"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Elimina</" -"guibutton > per eliminare il file e rimuoverlo dall'elenco.Sì, il file è " +"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Elimina</guibutton > per eliminare il file e rimuoverlo dall'elenco.Sì, il file è " "stato davvero eliminato!" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2036 -msgid "" -"Your changes are saved when you click <guibutton>OK</guibutton> to dismiss " -"the Filters dialog. Line filters are stored in the Windows registry." +msgid "Your changes are saved when you click <guibutton>OK</guibutton> to dismiss the Filters dialog. Line filters are stored in the Windows registry." msgstr "" -"Le tue modifiche vengono salvate quando fai clic su <guibutton >OK</" -"guibutton > per chiudere la finestra di dialogo Filtri.I filtri di linea " -"sono memorizzati nel registro di Windows." +"Le tue modifiche vengono salvate quando fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri.I filtri di linea sono " +"memorizzati nel registro di Windows." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2042 @@ -18388,159 +14016,113 @@ msgstr "Creazione di un filtro di file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2044 -msgid "" -"If the file filters that are installed with WinMerge do not provide the " -"filtering you need, you can create your own:" -msgstr "" -"Se i filtri file installati con WinMerge non forniscono il filtro " -"necessario, puoi crearne uno tuo:" +msgid "If the file filters that are installed with WinMerge do not provide the filtering you need, you can create your own:" +msgstr "Se i filtri file installati con WinMerge non forniscono il filtro necessario, puoi crearne uno tuo:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2049 msgid "" -"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" -"guimenuitem> </menuchoice>. Or, from the Select Files or Folders dialog, " -"click <guibutton>Select</guibutton> to the right of the <guilabel>Filter</" -"guilabel> field." +"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>. Or, from the Select Files or Folders dialog, click " +"<guibutton>Select</guibutton> to the right of the <guilabel>Filter</guilabel> field." msgstr "" -"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" -"guimenuitem > </menuchoice >.Oppure, dalla finestra di dialogo Seleziona " -"file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del " -"campo <guilabel >Filtro</guilabel >." +"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >.Oppure, dalla finestra di dialogo Seleziona " +"file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2059 -msgid "" -"In the Filters dialog File Filters tab, click <guibutton>New</guibutton>." -msgstr "" -"Nella scheda Filtri file della finestra di dialogo Filtri, fai clic su " -"<guibutton >Nuovo</guibutton >." +msgid "In the Filters dialog File Filters tab, click <guibutton>New</guibutton>." +msgstr "Nella scheda Filtri file della finestra di dialogo Filtri, fai clic su <guibutton >Nuovo</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2064 msgid "" -"In the Shared or Private Filter dialog, choose <guilabel>Shared Filter</" -"guilabel> or <guilabel>Private Filter</guilabel> (see <xref " -"linkend=\"Filters_FileFilterLoc\" /> for their uses) and click <keycap>OK</" -"keycap>." +"In the Shared or Private Filter dialog, choose <guilabel>Shared Filter</guilabel> or <guilabel>Private Filter</guilabel> (see <xref " +"linkend=\"Filters_FileFilterLoc\" /> for their uses) and click <keycap>OK</keycap>." msgstr "" -"Nella finestra di dialogo Filtro condiviso o privato, scegli <guilabel " -">Filtro condiviso</guilabel > o <guilabel >Filtro privato</guilabel > (vedi " -"<xref linkend=\"Filters_FileFilterLoc\" /> per i loro usi) e fai clic su " -"<keycap >OK</keycap >." +"Nella finestra di dialogo Filtro condiviso o privato, scegli <guilabel >Filtro condiviso</guilabel > o <guilabel >Filtro privato</guilabel > (vedi " +"<xref linkend=\"Filters_FileFilterLoc\" /> per i loro usi) e fai clic su <keycap >OK</keycap >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2069 msgid "" -"The Select Filename for New Filter dialog opens in the shared or private " -"files folder on your system (if the private folder does not exist, WinMerge " +"The Select Filename for New Filter dialog opens in the shared or private files folder on your system (if the private folder does not exist, WinMerge " "creates it)." msgstr "" -"La finestra di dialogo Seleziona nome file per nuovo filtro si apre nella " -"cartella dei file condivisi o privati ​​sul sistema (se la cartella privata " +"La finestra di dialogo Seleziona nome file per nuovo filtro si apre nella cartella dei file condivisi o privati ​​sul sistema (se la cartella privata " "non esiste, WinMerge la crea)." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2075 -msgid "" -"In the Select Filename for New Filter dialog, enter a new file name and " -"click <guibutton>Save</guibutton>." -msgstr "" -"Nella finestra di dialogo Seleziona nome file per nuovo filtro, inserisci un " -"nuovo nome file e fai clic su <guibutton >Salva</guibutton >." +msgid "In the Select Filename for New Filter dialog, enter a new file name and click <guibutton>Save</guibutton>." +msgstr "Nella finestra di dialogo Seleziona nome file per nuovo filtro, inserisci un nuovo nome file e fai clic su <guibutton >Salva</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><note><para> #: English/Filters.xml:2079 msgid "" -"Don't choose an existing file name: to edit an existing file, go back to " -"Step <xref linkend=\"Filters_New_step\" /> and click Edit instead of New." +"Don't choose an existing file name: to edit an existing file, go back to Step <xref linkend=\"Filters_New_step\" /> and click Edit instead of New." msgstr "" -"Non scegliere un nome di file esistente: per modificare un file esistente, " -"torna al passaggio <xref linkend=\"Filters_New_step\" /> e fai clic su " +"Non scegliere un nome di file esistente: per modificare un file esistente, torna al passaggio <xref linkend=\"Filters_New_step\" /> e fai clic su " "Modifica invece che su Nuovo." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2084 msgid "" -"WinMerge initializes the new file with the contents of the " -"<filename>FileFilter.tmpl</filename> template, and opens it in your default " -"text editor." +"WinMerge initializes the new file with the contents of the <filename>FileFilter.tmpl</filename> template, and opens it in your default text editor." msgstr "" -"WinMerge inizializza il nuovo file con il contenuto del modello " -"<filename>FileFilter.tmpl</filename> e lo apre nel tuo editor di testo " -"predefinito." +"WinMerge inizializza il nuovo file con il contenuto del modello <filename>FileFilter.tmpl</filename> e lo apre nel tuo editor di testo predefinito." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2090 msgid "" -"Follow the template instructions to edit the template, updating the " -"placeholder name and description and adding filter rules as described in " -"<xref linkend=\"Filters_FileFilterSyntax\" />. Save the file in your text " -"editor." +"Follow the template instructions to edit the template, updating the placeholder name and description and adding filter rules as described in <xref " +"linkend=\"Filters_FileFilterSyntax\" />. Save the file in your text editor." msgstr "" -"Segui le istruzioni del modello per modificare il modello, aggiornando il " -"nome e la descrizione del segnaposto e aggiungendo regole di filtro come " -"descritto in <xref linkend=\"Filters_FileFilterSyntax\" />.Salva il file nel " -"tuo editor di testo." +"Segui le istruzioni del modello per modificare il modello, aggiornando il nome e la descrizione del segnaposto e aggiungendo regole di filtro come " +"descritto in <xref linkend=\"Filters_FileFilterSyntax\" />.Salva il file nel tuo editor di testo." #. type: Content of: <article><section><section><section><orderedlist><listitem><tip><para> #: English/Filters.xml:2096 msgid "" -"If you want to quickly test a rule that you are defining, try clicking Test " -"in the Filters dialog. See <xref linkend=\"Filters_TestingDlg\" /> for " +"If you want to quickly test a rule that you are defining, try clicking Test in the Filters dialog. See <xref linkend=\"Filters_TestingDlg\" /> for " "details." msgstr "" -"Se desideri testare rapidamente una regola che stai definendo, prova a fare " -"clic su Test nella finestra di dialogo Filtri.Vedi <xref " +"Se desideri testare rapidamente una regola che stai definendo, prova a fare clic su Test nella finestra di dialogo Filtri.Vedi <xref " "linkend=\"Filters_TestingDlg\" /> per i dettagli." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2104 msgid "" -"If you created your file filter in one of the standard <filename>Filters</" -"filename> folders, and the Filters dialog does not list your new file " -"filter, try clicking <guibutton>OK</guibutton> to close it, then click " -"<menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </" -"menuchoice> again to reopen it. The <guilabel>File Filters</guilabel> list " -"should now include the new file filter." -msgstr "" -"Se hai creato il tuo filtro di file in una delle cartelle standard " -"<filename>Filtri</filename> e la finestra di dialogo Filtri non elenca il " -"tuo nuovo filtro di file, prova a fare clic su <guibutton >OK</guibutton > " -"per chiuderlo, quindi fai di nuovo clic su <menuchoice > <guimenu " -">Strumenti</guimenu > <guimenuitem >Filtri</guimenuitem > </menuchoice > per " -"riaprirlo.L'elenco <guilabel >Filtri file</guilabel > ora dovrebbe includere " -"il nuovo filtro file." +"If you created your file filter in one of the standard <filename>Filters</filename> folders, and the Filters dialog does not list your new file " +"filter, try clicking <guibutton>OK</guibutton> to close it, then click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </" +"menuchoice> again to reopen it. The <guilabel>File Filters</guilabel> list should now include the new file filter." +msgstr "" +"Se hai creato il tuo filtro di file in una delle cartelle standard <filename>Filtri</filename> e la finestra di dialogo Filtri non elenca il tuo " +"nuovo filtro di file, prova a fare clic su <guibutton >OK</guibutton > per chiuderlo, quindi fai di nuovo clic su <menuchoice > <guimenu >Strumenti</" +"guimenu > <guimenuitem >Filtri</guimenuitem > </menuchoice > per riaprirlo.L'elenco <guilabel >Filtri file</guilabel > ora dovrebbe includere il " +"nuovo filtro file." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2115 msgid "" -"If you saved the file in an alternate location on your file system), " -"WinMerge cannot detect it unless you install it. To make a file filter " +"If you saved the file in an alternate location on your file system), WinMerge cannot detect it unless you install it. To make a file filter " "detectable anywhere on your system:" msgstr "" -"Se hai salvato il file in una posizione alternativa sul tuo file system), " -"WinMerge non potrà rilevarlo a meno che non lo installi.Per rendere un " +"Se hai salvato il file in una posizione alternativa sul tuo file system), WinMerge non potrà rilevarlo a meno che non lo installi.Per rendere un " "filtro file rilevabile ovunque sul tuo sistema:" #. type: Content of: <article><section><section><section><orderedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:2121 msgid "Click <guibutton>Install</guibutton> in the Filters dialog." -msgstr "" -"Fai clic su <guibutton >Installa</guibutton > nella finestra di dialogo " -"Filtri." +msgstr "Fai clic su <guibutton >Installa</guibutton > nella finestra di dialogo Filtri." #. type: Content of: <article><section><section><section><orderedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:2126 msgid "" -"In the Locate Filter File to Install dialog, navigate to the <filename>flt</" -"filename> file on your system, and click <guibutton>Open</guibutton>. The " +"In the Locate Filter File to Install dialog, navigate to the <filename>flt</filename> file on your system, and click <guibutton>Open</guibutton>. The " "File Filters list should now include the installed file filter." msgstr "" -"Nella finestra di dialogo Individua il file del filtro da installare, vai al " -"file <filename >flt</filename > sul tuo sistema e fai clic su <guibutton " -">Apri</guibutton >.L'elenco Filtri file ora dovrebbe includere il filtro " -"file installato." +"Nella finestra di dialogo Individua il file del filtro da installare, vai al file <filename >flt</filename > sul tuo sistema e fai clic su <guibutton " +">Apri</guibutton >.L'elenco Filtri file ora dovrebbe includere il filtro file installato." #. type: Content of: <article><section><section><section><title><indexterm><secondary> #: English/Filters.xml:2140 @@ -18554,24 +14136,17 @@ msgstr "testare i filtri dei file" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2137 -msgid "" -"Testing file filter rules<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Test delle regole di filtro dei file<placeholder type=\"indexterm\" id=\"0\"/" -">><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Testing file filter rules<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Test delle regole di filtro dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2145 msgid "" -"Use the Test Filter dialog to quickly test a file filter against sample " -"data, to help you develop new rules or to understand how existing rules " -"work. It can be easier than running a full compare operation." +"Use the Test Filter dialog to quickly test a file filter against sample data, to help you develop new rules or to understand how existing rules work. " +"It can be easier than running a full compare operation." msgstr "" -"Utilizza la finestra di dialogo Prova filtro per testare rapidamente un " -"filtro di file rispetto a dati di esempio, per sviluppare nuove regole o per " -"comprendere come funzionano le regole esistenti.Può essere più semplice che " -"eseguire un'operazione di confronto completa." +"Utilizza la finestra di dialogo Prova filtro per testare rapidamente un filtro di file rispetto a dati di esempio, per sviluppare nuove regole o per " +"comprendere come funzionano le regole esistenti.Può essere più semplice che eseguire un'operazione di confronto completa." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2150 @@ -18586,12 +14161,10 @@ msgstr "Nella scheda Filtri file, scegli il filtro file che desideri testare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2159 msgid "" -"If you want to see the rules you will be testing, click <guibutton>Edit</" -"guibutton> now to open the file so that you can view it during the next " +"If you want to see the rules you will be testing, click <guibutton>Edit</guibutton> now to open the file so that you can view it during the next " "steps." msgstr "" -"Se vuoi vedere le regole che testerai, fai clic su <guibutton >Modifica</" -"guibutton > ora per aprire il file in modo da poterlo visualizzare durante i " +"Se vuoi vedere le regole che testerai, fai clic su <guibutton >Modifica</guibutton > ora per aprire il file in modo da poterlo visualizzare durante i " "passaggi successivi." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> @@ -18602,26 +14175,17 @@ msgstr "Fai clic su <guibutton >Prova</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2169 msgid "In the Test Filter dialog, choose the type of rule to test:" -msgstr "" -"Nella finestra di dialogo Filtro test, scegli il tipo di regola da testare:" +msgstr "Nella finestra di dialogo Filtro test, scegli il tipo di regola da testare:" #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Filters.xml:2174 -msgid "" -"To test an <guilabel>f:</guilabel> file rule in your file filter, uncheck " -"the <guilabel>Folder Name</guilabel> option." -msgstr "" -"Per testare una regola di file <guilabel >f:</guilabel > nel tuo filtro " -"file, deseleziona l'opzione <guilabel >Nome cartella</guilabel >." +msgid "To test an <guilabel>f:</guilabel> file rule in your file filter, uncheck the <guilabel>Folder Name</guilabel> option." +msgstr "Per testare una regola di file <guilabel >f:</guilabel > nel tuo filtro file, deseleziona l'opzione <guilabel >Nome cartella</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Filters.xml:2180 -msgid "" -"To test a <guilabel>d:</guilabel> folder rule, check the <guilabel>Folder " -"Name</guilabel> option." -msgstr "" -"Per testare una regola della cartella <guilabel >d:</guilabel >, seleziona " -"l'opzione <guilabel >Nome cartella</guilabel >." +msgid "To test a <guilabel>d:</guilabel> folder rule, check the <guilabel>Folder Name</guilabel> option." +msgstr "Per testare una regola della cartella <guilabel >d:</guilabel >, seleziona l'opzione <guilabel >Nome cartella</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2187 @@ -18631,44 +14195,35 @@ msgstr "Inserisci il testo da testare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2189 msgid "" -"The text should be appropriate for the type of rule you are testing. For " -"example, if you have checked the <guilabel>Folder Name</guilabel> option, " +"The text should be appropriate for the type of rule you are testing. For example, if you have checked the <guilabel>Folder Name</guilabel> option, " "you probably want to enter a folder name, such as \\temp." msgstr "" -"Il testo deve essere appropriato per il tipo di regola che stai testando.Ad " -"esempio, se hai selezionato l'opzione <guilabel >Nome cartella</guilabel >, " -"probabilmente vorrai inserire il nome di una cartella, come \\temp." +"Il testo deve essere appropriato per il tipo di regola che stai testando.Ad esempio, se hai selezionato l'opzione <guilabel >Nome cartella</guilabel " +">, probabilmente vorrai inserire il nome di una cartella, come \\temp." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2194 msgid "" -"The <guilabel>Result</guilabel> box displays your entry, followed by its " -"status: either <computeroutput>passed</computeroutput> or " +"The <guilabel>Result</guilabel> box displays your entry, followed by its status: either <computeroutput>passed</computeroutput> or " "<computeroutput>failed</computeroutput>." msgstr "" -"La casella <guilabel >Risultato</guilabel > mostra la tua voce, seguita dal " -"suo stato: <computeroutput >superato</computeroutput > o <computeroutput " +"La casella <guilabel >Risultato</guilabel > mostra la tua voce, seguita dal suo stato: <computeroutput >superato</computeroutput > o <computeroutput " ">non riuscito</computeroutput >." #. type: Content of: <article><section><section><title> #: English/Filters.xml:2204 msgid "Using the Line Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Utilizzando la scheda Filtri di linea<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgstr "Utilizzando la scheda Filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:2210 msgid "" -"Use this tab to configure and enable line filters for file compare " -"operations. The tab features a list of rules. Each rule contains a single " -"regular expression. You can apply any combination of rules from the list to " -"a file comparison." +"Use this tab to configure and enable line filters for file compare operations. The tab features a list of rules. Each rule contains a single regular " +"expression. You can apply any combination of rules from the list to a file comparison." msgstr "" -"Utilizzare questa scheda per configurare e abilitare i filtri di riga per le " -"operazioni di confronto dei file.La scheda presenta un elenco di regole.Ogni " -"regola contiene una singola espressione regolare.È possibile applicare " -"qualsiasi combinazione di regole dall'elenco a un confronto di file." +"Utilizzare questa scheda per configurare e abilitare i filtri di riga per le operazioni di confronto dei file.La scheda presenta un elenco di " +"regole.Ogni regola contiene una singola espressione regolare.È possibile applicare qualsiasi combinazione di regole dall'elenco a un confronto di " +"file." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2216 @@ -18678,12 +14233,10 @@ msgstr "Configurazione dei filtri di linea" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2218 msgid "" -"Below the <guilabel>Regular Expressions</guilabel> list is an edit box and " -"buttons that you can use to maintain the list at any time by adding, " +"Below the <guilabel>Regular Expressions</guilabel> list is an edit box and buttons that you can use to maintain the list at any time by adding, " "editing, and removing rules." msgstr "" -"Sotto l'elenco delle <guilabel >Espressioni regolari</guilabel > c'è una " -"casella di modifica e dei pulsanti che puoi utilizzare per mantenere " +"Sotto l'elenco delle <guilabel >Espressioni regolari</guilabel > c'è una casella di modifica e dei pulsanti che puoi utilizzare per mantenere " "l'elenco in qualsiasi momento aggiungendo, modificando e rimuovendo regole." #. type: Content of: <article><section><section><section><para> @@ -18693,30 +14246,18 @@ msgstr "Per aggiungere una nuova regola:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2226 -msgid "" -"Click <guibutton>New</guibutton>. Your edit cursor is automatically enabled " -"in the edit box." -msgstr "" -"Fai clic su <guibutton >Nuovo</guibutton >.Il cursore di modifica viene " -"automaticamente abilitato nella casella di modifica." +msgid "Click <guibutton>New</guibutton>. Your edit cursor is automatically enabled in the edit box." +msgstr "Fai clic su <guibutton >Nuovo</guibutton >.Il cursore di modifica viene automaticamente abilitato nella casella di modifica." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2231 -msgid "" -"Enter an expression in the edit box below the <guilabel>Regular Expressions</" -"guilabel> list." -msgstr "" -"Inserisci un'espressione nella casella di modifica sotto l'elenco <guilabel " -">Espressioni regolari</guilabel >." +msgid "Enter an expression in the edit box below the <guilabel>Regular Expressions</guilabel> list." +msgstr "Inserisci un'espressione nella casella di modifica sotto l'elenco <guilabel >Espressioni regolari</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2236 -msgid "" -"Click <guibutton>Save</guibutton> to load the expression in a new line in " -"the list." -msgstr "" -"Fai clic su <guibutton >Salva</guibutton > per caricare l'espressione in una " -"nuova riga nell'elenco." +msgid "Click <guibutton>Save</guibutton> to load the expression in a new line in the list." +msgstr "Fai clic su <guibutton >Salva</guibutton > per caricare l'espressione in una nuova riga nell'elenco." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2241 @@ -18735,20 +14276,13 @@ msgstr "Modifica l'espressione nella casella di modifica." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2253 -msgid "" -"Click <guibutton>Save</guibutton><guibutton> </guibutton>when you're done." -msgstr "" -"Fai clic su <guibutton >Salva</guibutton ><guibutton > </guibutton >quando " -"hai finito." +msgid "Click <guibutton>Save</guibutton><guibutton> </guibutton>when you're done." +msgstr "Fai clic su <guibutton >Salva</guibutton ><guibutton > </guibutton >quando hai finito." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2258 -msgid "" -"To delete an existing rule, select (check) the rule and click " -"<guibutton>Remove</guibutton>." -msgstr "" -"Per eliminare una regola esistente, seleziona (seleziona) la regola e fai " -"clic su <guibutton >Rimuovi</guibutton >." +msgid "To delete an existing rule, select (check) the rule and click <guibutton>Remove</guibutton>." +msgstr "Per eliminare una regola esistente, seleziona (seleziona) la regola e fai clic su <guibutton >Rimuovi</guibutton >." #. type: Content of: <article><section><section><section><title><indexterm><secondary> #: English/Filters.xml:2266 English/Filters.xml:2315 @@ -18757,61 +14291,41 @@ msgstr "elenco dei disponibili" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2263 -msgid "" -"Enabling and disabling line filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Abilitazione e disabilitazione dei filtri di linea<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Enabling and disabling line filters<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Abilitazione e disabilitazione dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2271 msgid "" -"In the <guilabel>Regular Expressions</guilabel> list, check just the filters " -"that you want to apply, and uncheck any filters you do not want to apply." +"In the <guilabel>Regular Expressions</guilabel> list, check just the filters that you want to apply, and uncheck any filters you do not want to apply." msgstr "" -"Nell'elenco <guilabel >Espressioni regolari</guilabel >, seleziona solo i " -"filtri che vuoi applicare e deseleziona tutti i filtri che non vuoi " +"Nell'elenco <guilabel >Espressioni regolari</guilabel >, seleziona solo i filtri che vuoi applicare e deseleziona tutti i filtri che non vuoi " "applicare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2277 msgid "" -"Check or uncheck the <guilabel>Enable Line Filters</guilabel> option. If you " -"turn filtering on, all the rules that are currently checked in the " -"<guilabel>Regular Expression</guilabel> list are used. If filtering is off, " -"no rules are used even if they are checked." +"Check or uncheck the <guilabel>Enable Line Filters</guilabel> option. If you turn filtering on, all the rules that are currently checked in the " +"<guilabel>Regular Expression</guilabel> list are used. If filtering is off, no rules are used even if they are checked." msgstr "" -"Seleziona o deseleziona l'opzione <guilabel >Abilita filtri di linea</" -"guilabel >.Se attivi il filtro, verranno utilizzate tutte le regole " -"attualmente selezionate nell'elenco <guilabel >Espressione regolare</" -"guilabel >.Se il filtro è disattivato, non verrà utilizzata alcuna regola " -"anche se selezionata." +"Seleziona o deseleziona l'opzione <guilabel >Abilita filtri di linea</guilabel >.Se attivi il filtro, verranno utilizzate tutte le regole attualmente " +"selezionate nell'elenco <guilabel >Espressione regolare</guilabel >.Se il filtro è disattivato, non verrà utilizzata alcuna regola anche se " +"selezionata." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2285 -msgid "" -"Click <guibutton>OK</guibutton> to dismiss the Filters dialog and save your " -"settings." -msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " -"Filtri e salvare le tue impostazioni." +msgid "Click <guibutton>OK</guibutton> to dismiss the Filters dialog and save your settings." +msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri e salvare le tue impostazioni." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2290 -msgid "" -"There are several ways to apply file filters after enabling them. For " -"details, see <xref linkend=\"Filters_LineFilterApply\" />." -msgstr "" -"Esistono diversi modi per applicare i filtri dei file dopo averli abilitati." -"Per i dettagli, vedi <xref linkend=\"Filters_LineFilterApply\" />." +msgid "There are several ways to apply file filters after enabling them. For details, see <xref linkend=\"Filters_LineFilterApply\" />." +msgstr "Esistono diversi modi per applicare i filtri dei file dopo averli abilitati.Per i dettagli, vedi <xref linkend=\"Filters_LineFilterApply\" />." #. type: Content of: <article><section><section><title> #: English/Filters.xml:2296 -msgid "" -"Using the Substitution Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Utilizzando la scheda Filtri di sostituzione<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Using the Substitution Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Utilizzando la scheda Filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2305 @@ -18820,12 +14334,8 @@ msgstr "Configurazione dei filtri di sostituzione" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2312 -msgid "" -"Enabling and disabling substitution filters<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Abilitazione e disabilitazione dei filtri di sostituzione<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Enabling and disabling substitution filters<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Abilitazione e disabilitazione dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><secondary> #: English/Filters.xml:2327 @@ -18834,34 +14344,22 @@ msgstr "ottenere aiuto" #. type: Content of: <article><section><title> #: English/Filters.xml:2324 -msgid "" -"Getting help with regular expressions<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Ottieni assistenza con le espressioni regolari<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Getting help with regular expressions<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ottieni assistenza con le espressioni regolari<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:2330 msgid "" -"Regular expressions can be very complex. Fortunately, most file filters in " -"WinMerge involve simple extension expressions, as shown in the examples in " -"this topic. The filter files installed with WinMerge include many other " -"useful examples." +"Regular expressions can be very complex. Fortunately, most file filters in WinMerge involve simple extension expressions, as shown in the examples in " +"this topic. The filter files installed with WinMerge include many other useful examples." msgstr "" -"Le espressioni regolari possono essere molto complesse.Fortunatamente, la " -"maggior parte dei filtri di file in WinMerge coinvolge semplici espressioni " -"di estensione, come mostrato negli esempi in questo argomento.I file filtro " -"installati con WinMerge includono molti altri esempi utili." +"Le espressioni regolari possono essere molto complesse.Fortunatamente, la maggior parte dei filtri di file in WinMerge coinvolge semplici espressioni " +"di estensione, come mostrato negli esempi in questo argomento.I file filtro installati con WinMerge includono molti altri esempi utili." #. type: Content of: <article><section><para> #: English/Filters.xml:2335 -msgid "" -"Finally, there are lots of resources on the Web for help with regexps, " -"including these sites:" -msgstr "" -"Infine, ci sono molte risorse sul Web per assistenza con le espressioni " -"regolari, inclusi questi siti:" +msgid "Finally, there are lots of resources on the Web for help with regexps, including these sites:" +msgstr "Infine, ci sono molte risorse sul Web per assistenza con le espressioni regolari, inclusi questi siti:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2340 @@ -18870,12 +14368,8 @@ msgstr "Buon sito dedicato alle espressioni regolari:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2343 -msgid "" -"<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-" -"expressions.info/</ulink>" -msgstr "" -"<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-" -"expressions.info/</ulink>" +msgid "<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-expressions.info/</ulink>" +msgstr "<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-expressions.info/</ulink>" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2349 @@ -18884,12 +14378,8 @@ msgstr "Esercitazione:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2352 -msgid "" -"<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon." -"org/comp/r/tut-Regexp.html</ulink>" -msgstr "" -"<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon." -"org/comp/r/tut-Regexp.html</ulink>" +msgid "<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon.org/comp/r/tut-Regexp.html</ulink>" +msgstr "<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon.org/comp/r/tut-Regexp.html</ulink>" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2358 @@ -18899,13 +14389,11 @@ msgstr "Riferimento rapido PDF:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2361 msgid "" -"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex." -"pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf</" -"ulink>" +"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/" +"regex.pdf</ulink>" msgstr "" -"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex." -"pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf</" -"ulink>" +"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/" +"regex.pdf</ulink>" #. type: Content of: <book><bookinfo><title> #: English/Index.xml:31 @@ -18924,24 +14412,17 @@ msgstr "<emphasis>Revisione &ManualRevision;</emphasis>" #. type: Content of: <book><bookinfo> #: English/Index.xml:37 -msgid "" -"<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> " -"</copyright>" -msgstr "" -"<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> " -"</copyright>" +msgid "<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> </copyright>" +msgstr "<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> </copyright>" #. type: Content of: <book><bookinfo><legalnotice><para> #: English/Index.xml:44 msgid "" -"Information in this document is subject to change without notice. Other " -"products and companies referred to herein are trademarks or registered " +"Information in this document is subject to change without notice. Other products and companies referred to herein are trademarks or registered " "trademarks of their respective companies or mark holders." msgstr "" -"Le informazioni contenute in questo documento sono soggette a modifiche " -"senza preavviso.Altri prodotti e società a cui si fa riferimento nel " -"presente documento sono marchi o marchi registrati delle rispettive società " -"o titolari del marchio." +"Le informazioni contenute in questo documento sono soggette a modifiche senza preavviso.Altri prodotti e società a cui si fa riferimento nel presente " +"documento sono marchi o marchi registrati delle rispettive società o titolari del marchio." #. type: Content of: <book><bookinfo><authorgroup><author><surname> #: English/Index.xml:52 @@ -19025,19 +14506,14 @@ msgstr "installazione di WinMerge" #. type: Content of: <article><title> #: English/Install.xml:3 -msgid "" -"Getting and installing WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Ottenere e installare WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Getting and installing WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Ottenere e installare WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Install.xml:7 -msgid "" -"WinMerge can be installed using the installer or by unzipping files from an " -"archive. Using the installer is the recommended method." +msgid "WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method." msgstr "" -"WinMerge può essere installato utilizzando il programma di installazione o " -"decomprimendo i file da un archivio.L'utilizzo del programma di " +"WinMerge può essere installato utilizzando il programma di installazione o decomprimendo i file da un archivio.L'utilizzo del programma di " "installazione è il metodo consigliato." #. type: Content of: <article><section><title> @@ -19048,19 +14524,13 @@ msgstr "Ottenere file" #. type: Content of: <article><section><para> #: English/Install.xml:13 msgid "" -"The latest release can be always downloaded from the WinMerge home page: " -"<ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>. Note that delays " -"can occur in updating home pages for the latest releases, but the project " -"status page at <ulink url=\"https://sourceforge.net/projects/winmerge/" -"\">SourceForge.net</ulink> shows the latest files. Stable releases are also " -"available in several file download sites." -msgstr "" -"L'ultima versione può essere sempre scaricata dalla home page di WinMerge: " -"<ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>.Tieni presente che " -"possono verificarsi ritardi nell'aggiornamento delle home page per le ultime " -"versioni, ma la pagina di stato del progetto su <ulink url=\"https://" -"sourceforge.net/projects/winmerge/\">SourceForge.net</ulink> mostra i file " -"più recenti.Le versioni stabili sono disponibili anche in diversi siti di " +"The latest release can be always downloaded from the WinMerge home page: <ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>. Note that delays " +"can occur in updating home pages for the latest releases, but the project status page at <ulink url=\"https://sourceforge.net/projects/winmerge/" +"\">SourceForge.net</ulink> shows the latest files. Stable releases are also available in several file download sites." +msgstr "" +"L'ultima versione può essere sempre scaricata dalla home page di WinMerge: <ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>.Tieni presente " +"che possono verificarsi ritardi nell'aggiornamento delle home page per le ultime versioni, ma la pagina di stato del progetto su <ulink url=\"https://" +"sourceforge.net/projects/winmerge/\">SourceForge.net</ulink> mostra i file più recenti.Le versioni stabili sono disponibili anche in diversi siti di " "download di file." #. type: Content of: <article><section><title> @@ -19071,50 +14541,39 @@ msgstr "Compatibilità" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:27 msgid "WinMerge 2.16.8 and later (64 bit) require Windows 7 or later." -msgstr "" -"WinMerge 2.16.8 e versioni successive (64 bit) richiedono Windows 7 o " -"versioni successive." +msgstr "WinMerge 2.16.8 e versioni successive (64 bit) richiedono Windows 7 o versioni successive." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:30 -msgid "" -"WinMerge (32 bit) supports Windows XP SP3 and later, including the latest " -"versions. It runs on both 32 bit and 64 bit Windows." +msgid "WinMerge (32 bit) supports Windows XP SP3 and later, including the latest versions. It runs on both 32 bit and 64 bit Windows." msgstr "" -"WinMerge (32 bit) supporta Windows XP SP3 e versioni successive, comprese le " -"versioni più recenti.Funziona sia su Windows a 32 bit che su Windows a 64 " -"bit." +"WinMerge (32 bit) supporta Windows XP SP3 e versioni successive, comprese le versioni più recenti.Funziona sia su Windows a 32 bit che su Windows a " +"64 bit." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:34 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/" -"\">WinMerge 2.16.6 (64 bit)</ulink> was the last 64-bit version to support " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/\">WinMerge 2.16.6 (64 bit)</ulink> was the last 64-bit version to support " "Windows XP 64 bit." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/" -"\">WinMerge 2.16.6 (64 bit)</ulink> è stata l'ultima versione a 64 bit a " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/\">WinMerge 2.16.6 (64 bit)</ulink> è stata l'ultima versione a 64 bit a " "supportare Windows XP a 64 bit." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:38 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/" -"\">WinMerge 2.14.0</ulink> was the last version to support Windows 2000." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/\">WinMerge 2.14.0</ulink> was the last version to support Windows 2000." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/" -"\">WinMerge 2.14.0</ulink> è stata l'ultima versione a supportare Windows " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/\">WinMerge 2.14.0</ulink> è stata l'ultima versione a supportare Windows " "2000." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:42 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/" -"\">WinMerge 2.12.4</ulink> was the last version to support Windows 95, 98, " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/\">WinMerge 2.12.4</ulink> was the last version to support Windows 95, 98, " "ME and NT." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/" -"\">WinMerge 2.12.4</ulink> è stata l'ultima versione a supportare Windows " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/\">WinMerge 2.12.4</ulink> è stata l'ultima versione a supportare Windows " "95, 98, ME e NT." #. type: Content of: <article><section><itemizedlist><listitem><para> @@ -19130,74 +14589,54 @@ msgstr "Utilizzo del programma di installazione (consigliato)" #. type: Content of: <article><section><note><para> #: English/Install.xml:55 msgid "" -"The installer requires Administrator user privileges. If you don't have " -"admin user privileges, you can install WinMerge by unzipping from an archive " -"file (see <xref linkend=\"InstallFromArchive\" />) or by using per-user " -"installer (WinMerge-x.x.x-x64-PerUser-Setup.exe)." +"The installer requires Administrator user privileges. If you don't have admin user privileges, you can install WinMerge by unzipping from an archive " +"file (see <xref linkend=\"InstallFromArchive\" />) or by using per-user installer (WinMerge-x.x.x-x64-PerUser-Setup.exe)." msgstr "" -"Il programma di installazione richiede i privilegi utente di amministratore." -"Se non disponi dei privilegi di amministratore, puoi installare WinMerge " -"decomprimendolo da un file di archivio (vedi <xref " -"linkend=\"InstallFromArchive\" />) o utilizzando il programma di " -"installazione per utente (WinMerge-x.x.x-x64-PerUser-Setup.exe)." +"Il programma di installazione richiede i privilegi utente di amministratore.Se non disponi dei privilegi di amministratore, puoi installare WinMerge " +"decomprimendolo da un file di archivio (vedi <xref linkend=\"InstallFromArchive\" />) o utilizzando il programma di installazione per utente " +"(WinMerge-x.x.x-x64-PerUser-Setup.exe)." #. type: Content of: <article><section><para> #: English/Install.xml:60 msgid "" -"Using the installer is recommended for most users. The installer prompts for " -"the location where WinMerge is installed. It then installs the files, " -"configures the shell integration, and adds WinMerge to the Start menu. To " -"install WinMerge:" +"Using the installer is recommended for most users. The installer prompts for the location where WinMerge is installed. It then installs the files, " +"configures the shell integration, and adds WinMerge to the Start menu. To install WinMerge:" msgstr "" -"L'utilizzo del programma di installazione è consigliato per la maggior parte " -"degli utenti.Il programma di installazione richiede il percorso in cui è " -"installato WinMerge.Quindi installa i file, configura l'integrazione della " -"shell e aggiunge WinMerge al menu Start.Per installare WinMerge:" +"L'utilizzo del programma di installazione è consigliato per la maggior parte degli utenti.Il programma di installazione richiede il percorso in cui è " +"installato WinMerge.Quindi installa i file, configura l'integrazione della shell e aggiunge WinMerge al menu Start.Per installare WinMerge:" #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:67 -msgid "" -"Start the installer executable (usually named <filename>WinMerge-" -"<replaceable>version</replaceable>-setup.exe</filename>)." +msgid "Start the installer executable (usually named <filename>WinMerge-<replaceable>version</replaceable>-setup.exe</filename>)." msgstr "" -"Avviare l'eseguibile del programma di installazione (solitamente denominato " -"<filename>WinMerge-<replaceable>versione</replaceable>-setup.exe</filename>)." +"Avviare l'eseguibile del programma di installazione (solitamente denominato <filename>WinMerge-<replaceable>versione</replaceable>-setup.exe</" +"filename>)." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:72 msgid "Click <guibutton>Next</guibutton> in the License Agreement screen." -msgstr "" -"Fai clic su <guibutton >Avanti</guibutton > nella schermata del contratto di " -"licenza." +msgstr "Fai clic su <guibutton >Avanti</guibutton > nella schermata del contratto di licenza." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:77 msgid "" -"In the Select Destination Location page, accept the location for WinMerge " -"or, if you choose another location, we recommend that you install WinMerge " +"In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge " "in its own folder. Click <guibutton>Next</guibutton>." msgstr "" -"Nella pagina Seleziona percorso di destinazione, accetta il percorso per " -"WinMerge o, se scegli un altro percorso, ti consigliamo di installare " +"Nella pagina Seleziona percorso di destinazione, accetta il percorso per WinMerge o, se scegli un altro percorso, ti consigliamo di installare " "WinMerge nella sua cartella.Fai clic su <guibutton >Avanti</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:84 msgid "" -"In the Select Components page, choose one of the preconfigured installations " -"in the top control. We recommend the <guilabel>Typical</guilabel> " -"configuration for most users. The lower box shows all the available " -"components. You can modify the default configuration by checking or " -"unchecking components. For example, if you want to use a WinMerge " -"localization for a different language than English, select the " -"<guilabel>Languages</guilabel> component." -msgstr "" -"Nella pagina Seleziona componenti, scegli una delle installazioni " -"preconfigurate nel controllo superiore.Raccomandiamo la configurazione " -"<guilabel >Tipica</guilabel > per la maggior parte degli utenti.Il riquadro " -"inferiore mostra tutti i componenti disponibili.È possibile modificare la " -"configurazione predefinita selezionando o deselezionando i componenti.Ad " -"esempio, se desideri utilizzare una localizzazione WinMerge per una lingua " +"In the Select Components page, choose one of the preconfigured installations in the top control. We recommend the <guilabel>Typical</guilabel> " +"configuration for most users. The lower box shows all the available components. You can modify the default configuration by checking or unchecking " +"components. For example, if you want to use a WinMerge localization for a different language than English, select the <guilabel>Languages</guilabel> " +"component." +msgstr "" +"Nella pagina Seleziona componenti, scegli una delle installazioni preconfigurate nel controllo superiore.Raccomandiamo la configurazione <guilabel " +">Tipica</guilabel > per la maggior parte degli utenti.Il riquadro inferiore mostra tutti i componenti disponibili.È possibile modificare la " +"configurazione predefinita selezionando o deselezionando i componenti.Ad esempio, se desideri utilizzare una localizzazione WinMerge per una lingua " "diversa dall'inglese, seleziona il componente <guilabel >Lingue</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> @@ -19213,9 +14652,7 @@ msgstr "File principali di WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:99 msgid "WinMerge executable, Help, and other needed files. Cannot be unchecked." -msgstr "" -"Eseguibile WinMerge, Guida e altri file necessari.Non può essere " -"deselezionato." +msgstr "Eseguibile WinMerge, Guida e altri file necessari.Non può essere deselezionato." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:106 @@ -19224,19 +14661,13 @@ msgstr "Estensione della shell" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:105 -msgid "" -"32-bit WinMerge ShellExtension<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"WinMerge ShellExtension a 32 bit<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "32-bit WinMerge ShellExtension<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "WinMerge ShellExtension a 32 bit<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:110 -msgid "" -"The option enables you to launch WinMerge directly from Windows Explorer, " -"comparing items that you have selected there." -msgstr "" -"L'opzione ti consente di avviare WinMerge direttamente da Esplora risorse, " -"confrontando gli elementi selezionati lì." +msgid "The option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected there." +msgstr "L'opzione ti consente di avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi selezionati lì." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:115 @@ -19255,12 +14686,8 @@ msgstr "Plugin" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:127 -msgid "" -"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that " -"you can use to preprocess data before a comparison." -msgstr "" -"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, " -"che puoi utilizzare per preelaborare i dati prima di un confronto." +msgid "WinMerge plugins are custom dlls or scriptlets, written in the COM API, that you can use to preprocess data before a comparison." +msgstr "I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, che puoi utilizzare per preelaborare i dati prima di un confronto." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:134 @@ -19270,52 +14697,35 @@ msgstr "Lingue" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:137 msgid "" -"WinMerge translation files. If you want to configure WinMerge to use a " -"different language than English, expand this item and choose one or more " -"available translations. The installer creates a Languages subfolder in the " -"WinMerge folder, containing a *.po translation file for each of your " -"selections. After installation, you can open WinMerge and change its " -"localization to one of the translation file languages. See <xref " +"WinMerge translation files. If you want to configure WinMerge to use a different language than English, expand this item and choose one or more " +"available translations. The installer creates a Languages subfolder in the WinMerge folder, containing a *.po translation file for each of your " +"selections. After installation, you can open WinMerge and change its localization to one of the translation file languages. See <xref " "linkend=\"Locales\" /> for details." msgstr "" -"File di traduzione WinMerge.Se desideri configurare WinMerge per utilizzare " -"una lingua diversa dall'inglese, espandi questa voce e scegli una o più " -"traduzioni disponibili.Il programma di installazione crea una sottocartella " -"Lingue nella cartella WinMerge, contenente un file di traduzione *.po per " -"ciascuna delle selezioni.Dopo l'installazione, puoi aprire WinMerge e " -"modificarne la localizzazione in una delle lingue del file di traduzione." -"Vedi <xref linkend=\"Locales\" /> per i dettagli." +"File di traduzione WinMerge.Se desideri configurare WinMerge per utilizzare una lingua diversa dall'inglese, espandi questa voce e scegli una o più " +"traduzioni disponibili.Il programma di installazione crea una sottocartella Lingue nella cartella WinMerge, contenente un file di traduzione *.po per " +"ciascuna delle selezioni.Dopo l'installazione, puoi aprire WinMerge e modificarne la localizzazione in una delle lingue del file di traduzione.Vedi " +"<xref linkend=\"Locales\" /> per i dettagli." #. type: Content of: <article><section><orderedlist><listitem><para> -#: English/Install.xml:149 English/Install.xml:168 English/Install.xml:253 -#: English/Install.xml:307 +#: English/Install.xml:149 English/Install.xml:168 English/Install.xml:253 English/Install.xml:307 msgid "Click <guibutton>Next</guibutton>." msgstr "Fai clic su <guibutton >Avanti</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:153 msgid "In the Select Start Menu Folder page, configure WinMerge shortcuts." -msgstr "" -"Nella pagina Seleziona cartella del menu Start, configurare i collegamenti " -"WinMerge." +msgstr "Nella pagina Seleziona cartella del menu Start, configurare i collegamenti WinMerge." #. type: Content of: <article><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Install.xml:158 -msgid "" -"Accept the default setting to create a program shortcut, or specify a " -"different folder." -msgstr "" -"Accettare l'impostazione predefinita per creare un collegamento al programma " -"o specificare una cartella diversa." +msgid "Accept the default setting to create a program shortcut, or specify a different folder." +msgstr "Accettare l'impostazione predefinita per creare un collegamento al programma o specificare una cartella diversa." #. type: Content of: <article><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Install.xml:163 -msgid "" -"Optionally, check the option <guilabel>Don't create a Start Menu folder</" -"guilabel>." -msgstr "" -"Facoltativamente, seleziona l'opzione <guilabel >Non creare una cartella nel " -"menu Start</guilabel >." +msgid "Optionally, check the option <guilabel>Don't create a Start Menu folder</guilabel>." +msgstr "Facoltativamente, seleziona l'opzione <guilabel >Non creare una cartella nel menu Start</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><para><indexterm><secondary> #: English/Install.xml:176 @@ -19330,12 +14740,9 @@ msgstr "VCS" #. type: Content of: <article><section><orderedlist><listitem><para> #: English/Install.xml:172 msgid "" -"In the Select Additional Tasks page, specify any additional tasks:" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>" +"In the Select Additional Tasks page, specify any additional tasks:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Nella pagina Seleziona attività aggiuntive, specifica eventuali attività " -"aggiuntive:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"Nella pagina Seleziona attività aggiuntive, specifica eventuali attività aggiuntive:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> @@ -19351,13 +14758,11 @@ msgstr "Integrazione della shell di Windows" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:198 msgid "" -"Enables you to <link linkend=\"OpenPaths_shell-integ\">launch WinMerge " -"compare operations from Windows Explorer</link> (this integration can be " +"Enables you to <link linkend=\"OpenPaths_shell-integ\">launch WinMerge compare operations from Windows Explorer</link> (this integration can be " "enabled or disabled later in WinMerge options)." msgstr "" -"Ti consente di <link linkend=\"OpenPaths_shell-integ\">avviare le operazioni " -"di confronto di WinMerge da Esplora risorse</link> (questa integrazione può " -"essere abilitata o disabilitata in seguito nelle opzioni di WinMerge)." +"Ti consente di <link linkend=\"OpenPaths_shell-integ\">avviare le operazioni di confronto di WinMerge da Esplora risorse</link> (questa integrazione " +"può essere abilitata o disabilitata in seguito nelle opzioni di WinMerge)." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:206 @@ -19366,12 +14771,8 @@ msgstr "Aggiungi la cartella WinMerge al percorso di sistema" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:209 -msgid "" -"Adds the WinMerge installation folder to your system's Path environment " -"variable." -msgstr "" -"Aggiunge la cartella di installazione di WinMerge alla variabile di ambiente " -"Path del sistema." +msgid "Adds the WinMerge installation folder to your system's Path environment variable." +msgstr "Aggiunge la cartella di installazione di WinMerge alla variabile di ambiente Path del sistema." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:216 @@ -19389,8 +14790,7 @@ msgid "Sets WinMerge to be the TortoiseCVS diff application." msgstr "Imposta WinMerge come applicazione diff TortoiseCVS." #. type: Content of: <article><section><section><example><title> -#: English/Install.xml:226 English/Version_control.xml:65 -#: English/Version_control.xml:74 +#: English/Install.xml:226 English/Version_control.xml:65 English/Version_control.xml:74 msgid "TortoiseSVN integration" msgstr "Integrazione TortoiseSVN" @@ -19431,12 +14831,8 @@ msgstr "Aggiunge il collegamento WinMerge al desktop di Windows." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:257 -msgid "" -"In the 3-way merge wizard page, register WinMerge as 3-way merge tool for " -"TortoiseSVN/Git." -msgstr "" -"Nella pagina della procedura guidata di unione a 3 vie registra WinMerge " -"come strumento di unione a 3 vie per TortoiseSVN/Git." +msgid "In the 3-way merge wizard page, register WinMerge as 3-way merge tool for TortoiseSVN/Git." +msgstr "Nella pagina della procedura guidata di unione a 3 vie registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:263 @@ -19445,18 +14841,13 @@ msgstr "Strumento unione a 3 vie" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:262 -msgid "" -"Register WinMerge as a 3-way merge tool<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Registra WinMerge come strumento di unione a 3 vie<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Register WinMerge as a 3-way merge tool<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Registra WinMerge come strumento di unione a 3 vie<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:267 msgid "Register WinMerge as 3-way merge tool for TortoiseSVN/Git." -msgstr "" -"Registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." +msgstr "Registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:273 @@ -19495,37 +14886,26 @@ msgstr "Unione automatica all'avvio" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:301 -msgid "" -"Optionally, disable the option <guilabel>Auto-merge at startup time</" -"guilabel>." -msgstr "" -"Facoltativamente, disabilita l'opzione <guilabel >Unisci automaticamente " -"all'avvio</guilabel >." +msgid "Optionally, disable the option <guilabel>Auto-merge at startup time</guilabel>." +msgstr "Facoltativamente, disabilita l'opzione <guilabel >Unisci automaticamente all'avvio</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:311 msgid "" -"In the Ready to Install page, verify your install selections. If necessary, " -"click <guibutton>Back</guibutton> to change anything in a previous page. " -"When you are sure that you are ready to proceed, click <guibutton>Install</" -"guibutton>." +"In the Ready to Install page, verify your install selections. If necessary, click <guibutton>Back</guibutton> to change anything in a previous page. " +"When you are sure that you are ready to proceed, click <guibutton>Install</guibutton>." msgstr "" -"Nella pagina Pronto per l'installazione, verifica le selezioni di " -"installazione.Se necessario, fai clic su <guibutton >Indietro</guibutton > " -"per modificare qualcosa nella pagina precedente.Quando sei sicuro di essere " -"pronto per procedere, fai clic su <guibutton >Installa</guibutton >." +"Nella pagina Pronto per l'installazione, verifica le selezioni di installazione.Se necessario, fai clic su <guibutton >Indietro</guibutton > per " +"modificare qualcosa nella pagina precedente.Quando sei sicuro di essere pronto per procedere, fai clic su <guibutton >Installa</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:319 msgid "" -"After the installer has copied files, the final screen appears. Using the " -"two check boxes, confirm whether the created WinMerge Start menu folder " +"After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder " "should be opened, and whether the WinMerge application should be started." msgstr "" -"Dopo che il programma di installazione ha copiato i file, viene visualizzata " -"la schermata finale.Utilizzando le due caselle di controllo, confermare se " -"la cartella del menu Start WinMerge creata deve essere aperta e se " -"l'applicazione WinMerge deve essere avviata." +"Dopo che il programma di installazione ha copiato i file, viene visualizzata la schermata finale.Utilizzando le due caselle di controllo, confermare " +"se la cartella del menu Start WinMerge creata deve essere aperta e se l'applicazione WinMerge deve essere avviata." #. type: Content of: <article><section><title><indexterm><primary> #: English/Install.xml:329 @@ -19539,87 +14919,61 @@ msgstr "Installazione da un archivio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Install.xml:332 -msgid "" -"WinMerge is pretty much independent of other system components. It is not " -"tightly integrated with Windows, and does not use many DLLs." -msgstr "" -"WinMerge è praticamente indipendente dagli altri componenti del sistema.Non " -"è strettamente integrato con Windows e non utilizza molte DLL." +msgid "WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs." +msgstr "WinMerge è praticamente indipendente dagli altri componenti del sistema.Non è strettamente integrato con Windows e non utilizza molte DLL." #. type: Content of: <article><section><para> #: English/Install.xml:335 msgid "" -"Archive files have the correct folder structure. WinMerge should be unzipped " -"preserving this folder structure in the destination folder. For example, the " -"root folder created under <filename class=\"directory\">C:\\Program Files\\</" -"filename> has the name, <filename class=\"directory\">WinMerge-" -"<replaceable>version</replaceable></filename> (for example, <filename " -"class=\"directory\">WinMerge-2.6.0</filename>). You can rename this folder " -"or copy its files to another folder (preserving the folder structure!)." -msgstr "" -"I file di archivio hanno la struttura di cartelle corretta.WinMerge dovrebbe " -"essere decompresso preservando questa struttura di cartelle nella cartella " -"di destinazione. Ad esempio, la cartella principale creata in <filename " -"class=\"directory\">C:\\Programmi\\</filename> ha il nome <filename " -"class=\"directory\">WinMerge-<replaceable>versione</replaceable></filename> " -"(ad esempio, <filename class=\"directory\">WinMerge-2.6.0</filename>). Puoi " -"rinominare questa cartella o copiare i suoi file in un'altra cartella " -"(preservando la struttura delle cartelle!)." +"Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, " +"the root folder created under <filename class=\"directory\">C:\\Program Files\\</filename> has the name, <filename class=\"directory\">WinMerge-" +"<replaceable>version</replaceable></filename> (for example, <filename class=\"directory\">WinMerge-2.6.0</filename>). You can rename this folder or " +"copy its files to another folder (preserving the folder structure!)." +msgstr "" +"I file di archivio hanno la struttura di cartelle corretta.WinMerge dovrebbe essere decompresso preservando questa struttura di cartelle nella " +"cartella di destinazione. Ad esempio, la cartella principale creata in <filename class=\"directory\">C:\\Programmi\\</filename> ha il nome <filename " +"class=\"directory\">WinMerge-<replaceable>versione</replaceable></filename> (ad esempio, <filename class=\"directory\">WinMerge-2.6.0</filename>). " +"Puoi rinominare questa cartella o copiare i suoi file in un'altra cartella (preservando la struttura delle cartelle!)." #. type: Content of: <article><section><para> #: English/Install.xml:344 msgid "" -"After the files are unzipped, WinMerge is ready to run! Shell integration " -"and archive integration may need additional steps, as described in the next " +"After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next " "section." msgstr "" -"Dopo che i file sono stati decompressi, WinMerge è pronto per essere " -"eseguito!L'integrazione della shell e l'integrazione dell'archivio " -"potrebbero richiedere passaggi aggiuntivi, come descritto nella sezione " -"successiva." +"Dopo che i file sono stati decompressi, WinMerge è pronto per essere eseguito!L'integrazione della shell e l'integrazione dell'archivio potrebbero " +"richiedere passaggi aggiuntivi, come descritto nella sezione successiva." #. type: Content of: <article><section><title> #: English/Install.xml:350 msgid "" -"Enabling Windows Explorer shell integration without the installer " -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>" +"Enabling Windows Explorer shell integration without the installer <placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Abilitazione dell'integrazione della shell di Esplora risorse senza il " -"programma di installazione <placeholder type=\"indexterm\" id=\"0\"/" +"Abilitazione dell'integrazione della shell di Esplora risorse senza il programma di installazione <placeholder type=\"indexterm\" id=\"0\"/" ">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Install.xml:359 msgid "" -"If you do not use the install program and you want to enable Windows " -"Explorer shell integration, you must register the shell integration DLL " +"If you do not use the install program and you want to enable Windows Explorer shell integration, you must register the shell integration DLL " "(<filename>ShellExtension*.dll</filename>) separately." msgstr "" -"Se non si utilizza il programma di installazione e si desidera abilitare " -"l'integrazione della shell di Windows Explorer, è necessario registrare " -"separatamente la DLL di integrazione della shell (<filename>ShellExtension*." -"dll</filename>)." +"Se non si utilizza il programma di installazione e si desidera abilitare l'integrazione della shell di Windows Explorer, è necessario registrare " +"separatamente la DLL di integrazione della shell (<filename>ShellExtension*.dll</filename>)." #. type: Content of: <article><section><note><para> #: English/Install.xml:364 msgid "Installing shell integration requires Administrator user privileges." -msgstr "" -"L'installazione dell'integrazione della shell richiede i privilegi utente di " -"amministratore." +msgstr "L'installazione dell'integrazione della shell richiede i privilegi utente di amministratore." #. type: Content of: <article><section><para> #: English/Install.xml:368 msgid "" -"Open WinMerge and using the <xref linkend=\"Configuration_shell-integ\" /> " -"in the Options window. In the Options window use the <guibutton>Register " -"shell extension</guibutton> or <guibutton>Unregister shell extension</" -"guibutton> buttons." +"Open WinMerge and using the <xref linkend=\"Configuration_shell-integ\" /> in the Options window. In the Options window use the <guibutton>Register " +"shell extension</guibutton> or <guibutton>Unregister shell extension</guibutton> buttons." msgstr "" -"Apri WinMerge e utilizza <xref linkend=\"Configuration_shell-integ\" /> " -"nella finestra Opzioni.Nella finestra Opzioni usa i pulsanti <guibutton " -">Registra estensione della shell</guibutton > o <guibutton >Annulla " -"registrazione estensione della shell</guibutton >." +"Apri WinMerge e utilizza <xref linkend=\"Configuration_shell-integ\" /> nella finestra Opzioni.Nella finestra Opzioni usa i pulsanti <guibutton " +">Registra estensione della shell</guibutton > o <guibutton >Annulla registrazione estensione della shell</guibutton >." #. type: Content of: <article><title> #: English/Intro_diffs.xml:3 @@ -19629,14 +14983,11 @@ msgstr "Panoramica del confronto e dell'unione dei file" #. type: Content of: <article><para> #: English/Intro_diffs.xml:5 msgid "" -"This topic describes how WinMerge detects and displays differences within " -"text files, and demonstrates simple file comparing and merging operations. " +"This topic describes how WinMerge detects and displays differences within text files, and demonstrates simple file comparing and merging operations. " "See <xref linkend=\"Compare_bin\" /> for related information about hex files." msgstr "" -"Questo argomento descrive il modo in cui WinMerge rileva e visualizza le " -"differenze all'interno dei file di testo e illustra semplici operazioni di " -"confronto e unione dei file.Vedi <xref linkend=\"Compare_bin\" /> per " -"informazioni correlate sui file esadecimali." +"Questo argomento descrive il modo in cui WinMerge rileva e visualizza le differenze all'interno dei file di testo e illustra semplici operazioni di " +"confronto e unione dei file.Vedi <xref linkend=\"Compare_bin\" /> per informazioni correlate sui file esadecimali." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Intro_diffs.xml:14 @@ -19651,73 +15002,50 @@ msgstr "Confronto di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:17 msgid "" -"We usually compare two files that are related in some way, such as two " -"versions that were edited at different times, or by different people. If you " -"examine two such files you can usually see some similar areas, and also " -"identify several types of differences: different characters and words, " -"different lines, even entire blocks of text that are different. But trying " -"to understanding all the differences between two files by scanning them in " -"your favorite editor can be tedious and error-prone. Specialized difference/" -"merging tools like WinMerge are designed make this work more systematic and " -"efficient." -msgstr "" -"Di solito confrontiamo due file che sono in qualche modo correlati, ad " -"esempio due versioni modificate in momenti diversi o da persone diverse.Se " -"esamini due di questi file puoi solitamente vedere alcune aree simili e " -"identificare anche diversi tipi di differenze: caratteri e parole diversi, " -"righe diverse, persino interi blocchi di testo diversi.Ma cercare di " -"comprendere tutte le differenze tra due file scansionandoli nel tuo editor " -"preferito può essere noioso e soggetto a errori.Strumenti specializzati di " -"differenza/unione come WinMerge sono progettati per rendere questo lavoro " +"We usually compare two files that are related in some way, such as two versions that were edited at different times, or by different people. If you " +"examine two such files you can usually see some similar areas, and also identify several types of differences: different characters and words, " +"different lines, even entire blocks of text that are different. But trying to understanding all the differences between two files by scanning them in " +"your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge are designed make this work more systematic " +"and efficient." +msgstr "" +"Di solito confrontiamo due file che sono in qualche modo correlati, ad esempio due versioni modificate in momenti diversi o da persone diverse.Se " +"esamini due di questi file puoi solitamente vedere alcune aree simili e identificare anche diversi tipi di differenze: caratteri e parole diversi, " +"righe diverse, persino interi blocchi di testo diversi.Ma cercare di comprendere tutte le differenze tra due file scansionandoli nel tuo editor " +"preferito può essere noioso e soggetto a errori.Strumenti specializzati di differenza/unione come WinMerge sono progettati per rendere questo lavoro " "più sistematico ed efficiente." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:27 msgid "" -"A simple difference utility that most people have used is a spell checker: " -"it systematically steps you through a document, highlights words that are " -"different from those in its dictionary, and helps you resolve each spelling " -"problem. However, looking only at characters and words is not an effective " -"way to understand differences between multiple files. For this reason, many " -"difference utilities use lines as the basic unit of comparison instead." -msgstr "" -"Una semplice utilità di differenza utilizzata dalla maggior parte delle " -"persone è un controllo ortografico: ti guida sistematicamente attraverso un " -"documento, evidenzia le parole diverse da quelle presenti nel dizionario e " -"ti aiuta a risolvere ogni problema di ortografia.Tuttavia, guardare solo i " -"caratteri e le parole non è un modo efficace per comprendere le differenze " -"tra più file.Per questo motivo, molte utilità di differenza utilizzano " +"A simple difference utility that most people have used is a spell checker: it systematically steps you through a document, highlights words that are " +"different from those in its dictionary, and helps you resolve each spelling problem. However, looking only at characters and words is not an " +"effective way to understand differences between multiple files. For this reason, many difference utilities use lines as the basic unit of comparison " +"instead." +msgstr "" +"Una semplice utilità di differenza utilizzata dalla maggior parte delle persone è un controllo ortografico: ti guida sistematicamente attraverso un " +"documento, evidenzia le parole diverse da quelle presenti nel dizionario e ti aiuta a risolvere ogni problema di ortografia.Tuttavia, guardare solo i " +"caratteri e le parole non è un modo efficace per comprendere le differenze tra più file.Per questo motivo, molte utilità di differenza utilizzano " "invece le linee come unità di confronto di base." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:35 msgid "" -"WinMerge also uses lines as its basic unit of difference. Words and " -"characters are not treated individually in comparing and merging " -"operations. To illustrate, consider two files that are identical except for " -"one line that is different. If the two versions of the line have four words " -"that are different and one version has an extra space, then we say that the " -"file has one difference, not five." +"WinMerge also uses lines as its basic unit of difference. Words and characters are not treated individually in comparing and merging operations. To " +"illustrate, consider two files that are identical except for one line that is different. If the two versions of the line have four words that are " +"different and one version has an extra space, then we say that the file has one difference, not five." msgstr "" -"WinMerge utilizza anche le linee come unità di differenza di base.Parole e " -"caratteri non vengono trattati individualmente nelle operazioni di confronto " -"e unione.Per illustrare, considera due file identici tranne che per una riga " -"diversa.Se le due versioni della riga hanno quattro parole diverse e una " -"versione ha uno spazio extra, allora diciamo che il file ha una differenza, " -"non cinque." +"WinMerge utilizza anche le linee come unità di differenza di base.Parole e caratteri non vengono trattati individualmente nelle operazioni di " +"confronto e unione.Per illustrare, considera due file identici tranne che per una riga diversa.Se le due versioni della riga hanno quattro parole " +"diverse e una versione ha uno spazio extra, allora diciamo che il file ha una differenza, non cinque." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:42 msgid "" -"If it's quicker to compare lines than words, sometimes it's also useful to " -"treat an entire block of lines as a single difference, instead of comparing " -"one line at a time. As we will see later, detecting multiple-line " -"differences makes merging more efficient too." +"If it's quicker to compare lines than words, sometimes it's also useful to treat an entire block of lines as a single difference, instead of " +"comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too." msgstr "" -"Se è più veloce confrontare le righe che le parole, a volte è anche utile " -"trattare un intero blocco di righe come un'unica differenza, invece di " -"confrontare una riga alla volta.Come vedremo più avanti, il rilevamento " -"delle differenze su più righe rende anche la fusione più efficiente." +"Se è più veloce confrontare le righe che le parole, a volte è anche utile trattare un intero blocco di righe come un'unica differenza, invece di " +"confrontare una riga alla volta.Come vedremo più avanti, il rilevamento delle differenze su più righe rende anche la fusione più efficiente." #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:48 @@ -19726,21 +15054,14 @@ msgstr "Operazione di confronto semplice" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:50 -msgid "" -"This section offers a simple example that demonstrates how to compare line " -"differences between two files in WinMerge:" -msgstr "" -"Questa sezione offre un semplice esempio che dimostra come confrontare le " -"differenze di riga tra due file in WinMerge:" +msgid "This section offers a simple example that demonstrates how to compare line differences between two files in WinMerge:" +msgstr "Questa sezione offre un semplice esempio che dimostra come confrontare le differenze di riga tra due file in WinMerge:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:55 -msgid "" -"Using a text editor, create two files with the names and contents shown " -"here, being careful to preserve the words and line breaks exactly:" +msgid "Using a text editor, create two files with the names and contents shown here, being careful to preserve the words and line breaks exactly:" msgstr "" -"Utilizzando un editor di testo, crea due file con i nomi e i contenuti " -"mostrati qui, facendo attenzione a preservare esattamente le parole e le " +"Utilizzando un editor di testo, crea due file con i nomi e i contenuti mostrati qui, facendo attenzione a preservare esattamente le parole e le " "interruzioni di riga:" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para><screen> @@ -19771,12 +15092,8 @@ msgstr "" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> #: English/Intro_diffs.xml:79 -msgid "" -"<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon." -"png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon." -"png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Intro_diffs.xml:84 @@ -19785,36 +15102,24 @@ msgstr "Collegamento sul desktop di WinMerge" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:78 -msgid "" -"Start WinMerge. For example, double-click the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> WinMerge desktop shortcut." -msgstr "" -"Avvia WinMerge.Ad esempio, fai doppio clic sul <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> collegamento sul desktop WinMerge." +msgid "Start WinMerge. For example, double-click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> WinMerge desktop shortcut." +msgstr "Avvia WinMerge.Ad esempio, fai doppio clic sul <placeholder type=\"inlinemediaobject\" id=\"0\"/> collegamento sul desktop WinMerge." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:90 msgid "" -"In the Select Files and Folders dialog, specify <filename>File1</filename> " -"as the <guilabel>1st</guilabel> file and <filename>File2</filename> as the " -"<guilabel>2nd</guilabel> file, then click <guibutton>Compare</guibutton>. " -"The File Compare window displays the two files in the left and right File " +"In the Select Files and Folders dialog, specify <filename>File1</filename> as the <guilabel>1st</guilabel> file and <filename>File2</filename> as the " +"<guilabel>2nd</guilabel> file, then click <guibutton>Compare</guibutton>. The File Compare window displays the two files in the left and right File " "pane, like this:" msgstr "" -"Nella finestra di dialogo Seleziona file e cartelle, specifica " -"<filename>File1</filename> come <guilabel>primo</guilabel> file e " -"<filename>File2</filename> come <guilabel>2°</guilabel> file, quindi fai " -"clic su <guibutton >Confronta</guibutton >.La finestra Confronto file " -"visualizza i due file nel riquadro File sinistro e destro, in questo modo:" +"Nella finestra di dialogo Seleziona file e cartelle, specifica <filename>File1</filename> come <guilabel>primo</guilabel> file e <filename>File2</" +"filename> come <guilabel>2°</guilabel> file, quindi fai clic su <guibutton >Confronta</guibutton >.La finestra Confronto file visualizza i due file " +"nel riquadro File sinistro e destro, in questo modo:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:97 -msgid "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"missing_lines.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"missing_lines.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/missing_lines.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/missing_lines.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Intro_diffs.xml:103 @@ -19823,14 +15128,9 @@ msgstr "Schermata Confronta file" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:107 -msgid "" -"The elements are described in more detail in <xref " -"linkend=\"Compare_files\" />. Here are some features you should notice in " -"this example:" +msgid "The elements are described in more detail in <xref linkend=\"Compare_files\" />. Here are some features you should notice in this example:" msgstr "" -"Gli elementi sono descritti più dettagliatamente in <xref " -"linkend=\"Compare_files\" />.Ecco alcune funzionalità che dovresti notare in " -"questo esempio:" +"Gli elementi sono descritti più dettagliatamente in <xref linkend=\"Compare_files\" />.Ecco alcune funzionalità che dovresti notare in questo esempio:" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:113 @@ -19839,12 +15139,8 @@ msgstr "Numero di differenze" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:116 -msgid "" -"The message in the status bar at the bottom of the WinMerge window tells you " -"that two differences were detected." -msgstr "" -"Il messaggio nella barra di stato nella parte inferiore della finestra " -"WinMerge informa che sono state rilevate due differenze." +msgid "The message in the status bar at the bottom of the WinMerge window tells you that two differences were detected." +msgstr "Il messaggio nella barra di stato nella parte inferiore della finestra WinMerge informa che sono state rilevate due differenze." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:123 @@ -19853,31 +15149,20 @@ msgstr "Colori di differenza" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:126 -msgid "" -"Difference blocks are marked with the difference background color (gold, by " -"default)." -msgstr "" -"I blocchi di differenza sono contrassegnati con il colore di sfondo della " -"differenza (oro, per impostazione predefinita)." +msgid "Difference blocks are marked with the difference background color (gold, by default)." +msgstr "I blocchi di differenza sono contrassegnati con il colore di sfondo della differenza (oro, per impostazione predefinita)." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:129 -msgid "" -"Line differences can be enabled to mark changed text within differences " -"blocks, using the word background color (light yellow, by default)." +msgid "Line differences can be enabled to mark changed text within differences blocks, using the word background color (light yellow, by default)." msgstr "" -"È possibile abilitare le differenze di linea per contrassegnare il testo " -"modificato all'interno dei blocchi di differenze, utilizzando il colore di " +"È possibile abilitare le differenze di linea per contrassegnare il testo modificato all'interno dei blocchi di differenze, utilizzando il colore di " "sfondo della parola (giallo chiaro, per impostazione predefinita)." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:133 -msgid "" -"Identical lines are unmarked: they have white backgrounds, like the third " -"line in the example." -msgstr "" -"Le linee identiche non sono contrassegnate: hanno lo sfondo bianco, come la " -"terza linea nell'esempio." +msgid "Identical lines are unmarked: they have white backgrounds, like the third line in the example." +msgstr "Le linee identiche non sono contrassegnate: hanno lo sfondo bianco, come la terza linea nell'esempio." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:139 @@ -19887,99 +15172,69 @@ msgstr "Righe vuote" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:142 msgid "" -"Notice that in the left comparison pane, the second line has text: the other " -"pane has a blank gray line in the same location. This blank line does not " -"exist in the <filename>File2</filename> source file, so what is it doing in " -"WinMerge?" +"Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does " +"not exist in the <filename>File2</filename> source file, so what is it doing in WinMerge?" msgstr "" -"Si noti che nel riquadro di confronto sinistro la seconda riga contiene del " -"testo: l'altro riquadro presenta una riga grigia vuota nella stessa " -"posizione.Questa riga vuota non esiste nel file sorgente <filename>File2</" -"filename>, quindi cosa ci fa in WinMerge?" +"Si noti che nel riquadro di confronto sinistro la seconda riga contiene del testo: l'altro riquadro presenta una riga grigia vuota nella stessa " +"posizione.Questa riga vuota non esiste nel file sorgente <filename>File2</filename>, quindi cosa ci fa in WinMerge?" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:148 msgid "" -"WinMerge inserts one or more gray blank lines in one version of a difference " -"when the other version has more lines. These empty gray lines do not " -"represent blank lines in the source file; they are only placeholders in the " -"display. The purpose of placeholder lines is to keep the left and right " -"versions of differences vertically aligned. Thus in our example, the text, " -"<computeroutput>WinMerge compares lines</computeroutput>, appears side by " -"side in the Comparison window, even though they are on different lines in " -"the source files. This makes it easier to compare differences in WinMerge " +"WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not " +"represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right " +"versions of differences vertically aligned. Thus in our example, the text, <computeroutput>WinMerge compares lines</computeroutput>, appears side by " +"side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge " "than in a conventional editor." msgstr "" -"WinMerge inserisce una o più righe vuote grigie in una versione di una " -"differenza quando l'altra versione ha più righe.Queste linee grigie vuote " -"non rappresentano righe vuote nel file di origine;sono solo segnaposto nel " -"display.Lo scopo delle linee segnaposto è mantenere allineate verticalmente " -"le versioni sinistra e destra delle differenze.Pertanto, nel nostro esempio, " -"il testo <computeroutput>WinMerge confronta le righe</computeroutput>, " -"appare fianco a fianco nella finestra di confronto, anche se si trovano su " -"righe diverse nei file di origine.Ciò rende più semplice confrontare le " +"WinMerge inserisce una o più righe vuote grigie in una versione di una differenza quando l'altra versione ha più righe.Queste linee grigie vuote non " +"rappresentano righe vuote nel file di origine;sono solo segnaposto nel display.Lo scopo delle linee segnaposto è mantenere allineate verticalmente le " +"versioni sinistra e destra delle differenze.Pertanto, nel nostro esempio, il testo <computeroutput>WinMerge confronta le righe</computeroutput>, " +"appare fianco a fianco nella finestra di confronto, anche se si trovano su righe diverse nei file di origine.Ciò rende più semplice confrontare le " "differenze in WinMerge rispetto a un editor convenzionale." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><tip><para> #: English/Intro_diffs.xml:161 msgid "" -"One consequence of the blank lines is that both panes in the File Compare " -"window always display the same total number of lines, even if their source " +"One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source " "files do not." msgstr "" -"Una conseguenza delle righe vuote è che entrambi i riquadri della finestra " -"Confronto file visualizzano sempre lo stesso numero totale di righe, anche " +"Una conseguenza delle righe vuote è che entrambi i riquadri della finestra Confronto file visualizzano sempre lo stesso numero totale di righe, anche " "se i file di origine non lo fanno." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:169 msgid "" -"Now that you understand how WinMerge detects and displays differences, you " -"can use the comparing functions effectively, as shown in the next steps." +"Now that you understand how WinMerge detects and displays differences, you can use the comparing functions effectively, as shown in the next steps." msgstr "" -"Ora che hai compreso come WinMerge rileva e visualizza le differenze, puoi " -"utilizzare le funzioni di confronto in modo efficace, come mostrato nei " +"Ora che hai compreso come WinMerge rileva e visualizza le differenze, puoi utilizzare le funzioni di confronto in modo efficace, come mostrato nei " "passaggi successivi." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:175 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current " -"Difference</guibutton> in the toolbar (or press <keycombo> <keycap>Alt</" -"keycap> <keycap>Enter</keycap> </keycombo>). If this button is not enabled " -"(for example, if your cursor is in a different line), click <placeholder " -"type=\"inlinemediaobject\" id=\"1\"/> First Difference (or press <keycombo> " -"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>) instead." -msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Differenza corrente</guibutton > nella barra degli strumenti (o premi " -"<keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >).Se " -"questo pulsante non è abilitato (ad esempio, se il cursore si trova su una " -"riga diversa), fai clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/" -"> Prima differenza (o premi <keycombo> <keycap>Alt</keycap> <keycap>Home</" +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current Difference</guibutton> in the toolbar (or press <keycombo> <keycap>Alt</" +"keycap> <keycap>Enter</keycap> </keycombo>). If this button is not enabled (for example, if your cursor is in a different line), click <placeholder " +"type=\"inlinemediaobject\" id=\"1\"/> First Difference (or press <keycombo> <keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>) instead." +msgstr "" +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza corrente</guibutton > nella barra degli strumenti (o premi " +"<keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >).Se questo pulsante non è abilitato (ad esempio, se il cursore si trova su una " +"riga diversa), fai clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> Prima differenza (o premi <keycombo> <keycap>Alt</keycap> <keycap>Home</" "keycap> </keycombo>)." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:205 msgid "" -"When you select a difference, the two versions are loaded in the Diff pane. " -"The Diff pane confirms which lines are included in a difference, and lets " -"you examine them in isolation from the rest of the file. In our example, " -"Difference 1 clearly has two lines." +"When you select a difference, the two versions are loaded in the Diff pane. The Diff pane confirms which lines are included in a difference, and lets " +"you examine them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines." msgstr "" -"Quando selezioni una differenza, le due versioni vengono caricate nel " -"riquadro Diff.Il riquadro Diff conferma quali righe sono incluse in una " -"differenza e consente di esaminarle isolandole dal resto del file.Nel nostro " -"esempio, la Differenza 1 ha chiaramente due linee." +"Quando selezioni una differenza, le due versioni vengono caricate nel riquadro Diff.Il riquadro Diff conferma quali righe sono incluse in una " +"differenza e consente di esaminarle isolandole dal resto del file.Nel nostro esempio, la Differenza 1 ha chiaramente due linee." #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:211 -msgid "" -"<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/" -"filecomp_diffpane1.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/" -"filecomp_diffpane1.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/filecomp_diffpane1.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/filecomp_diffpane1.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Intro_diffs.xml:217 @@ -19989,29 +15244,21 @@ msgstr "Riquadro differenze file Confronta" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:224 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next " -"Difference</guibutton> in the toolbar (or click <keycombo> <keycap>Alt</" -"keycap> <keycap>Enter</keycap> </keycombo>). This jumps over the identical " -"line (which is not a difference) and selects the last line." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next Difference</guibutton> in the toolbar (or click <keycombo> <keycap>Alt</" +"keycap> <keycap>Enter</keycap> </keycombo>). This jumps over the identical line (which is not a difference) and selects the last line." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Differenza successiva</guibutton > nella barra degli strumenti (o fai clic " -"su <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo>)." -"Questo salta sulla riga identica (che non è una differenza) e seleziona " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza successiva</guibutton > nella barra degli strumenti (o fai clic " +"su <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo>).Questo salta sulla riga identica (che non è una differenza) e seleziona " "l'ultima riga." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:241 msgid "" -"You have reached the end of the file and had a chance to examine every " -"difference. This was a trivial example — there were only two differences — " -"and there are other ways to compare differences in WinMerge. But it " -"demonstrates the efficiency of using the WinMerge navigation controls." +"You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences — and " +"there are other ways to compare differences in WinMerge. But it demonstrates the efficiency of using the WinMerge navigation controls." msgstr "" -"Hai raggiunto la fine del file e hai avuto la possibilità di esaminare ogni " -"differenza.Questo era un esempio banale – c'erano solo due differenze – e ci " -"sono altri modi per confrontare le differenze in WinMerge.Ma dimostra " -"l'efficienza dell'utilizzo dei controlli di navigazione WinMerge." +"Hai raggiunto la fine del file e hai avuto la possibilità di esaminare ogni differenza.Questo era un esempio banale – c'erano solo due differenze – e " +"ci sono altri modi per confrontare le differenze in WinMerge.Ma dimostra l'efficienza dell'utilizzo dei controlli di navigazione WinMerge." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Intro_diffs.xml:255 @@ -20026,79 +15273,52 @@ msgstr "Unione di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:258 msgid "" -"The purpose of merging is to combine changes from two files into one file. " -"Merging extends the concepts and functions used in comparing operation: " -"please read the preceding section before beginning this section. In " -"addition to detecting differences between two file versions, we resolve the " -"differences and save the result in a single <glossterm>target</glossterm> " -"version." +"The purpose of merging is to combine changes from two files into one file. Merging extends the concepts and functions used in comparing operation: " +"please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the " +"differences and save the result in a single <glossterm>target</glossterm> version." msgstr "" -"Lo scopo dell'unione è combinare le modifiche di due file in un unico file." -"L'unione estende i concetti e le funzioni utilizzate nell'operazione di " -"confronto: leggere la sezione precedente prima di iniziare questa sezione." -"Oltre a rilevare le differenze tra due versioni di file, risolviamo le " -"differenze e salviamo il risultato in un'unica versione <glossterm>target</" -"glossterm>." +"Lo scopo dell'unione è combinare le modifiche di due file in un unico file.L'unione estende i concetti e le funzioni utilizzate nell'operazione di " +"confronto: leggere la sezione precedente prima di iniziare questa sezione.Oltre a rilevare le differenze tra due versioni di file, risolviamo le " +"differenze e salviamo il risultato in un'unica versione <glossterm>target</glossterm>." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:265 msgid "" -"Merging files makes concurrent development possible, and it is a common task " -"in team environments. For example, suppose you and another person want to " -"add code to the same program file at the same time. You both begin with an " -"identical copy of the file, but during development you create separate " -"versions that are not identical. At some point, the two versions must be " -"merged into one version that preserves the changes from each contributor." -msgstr "" -"L'unione di file rende possibile lo sviluppo simultaneo ed è un'attività " -"comune negli ambienti di team.Ad esempio, supponiamo che tu e un'altra " -"persona vogliate aggiungere codice allo stesso file di programma " -"contemporaneamente.Entrambi iniziate con una copia identica del file, ma " -"durante lo sviluppo create versioni separate che non sono identiche.Ad un " -"certo punto, le due versioni devono essere unite in un'unica versione che " -"preservi le modifiche di ciascun contributore." +"Merging files makes concurrent development possible, and it is a common task in team environments. For example, suppose you and another person want " +"to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate " +"versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor." +msgstr "" +"L'unione di file rende possibile lo sviluppo simultaneo ed è un'attività comune negli ambienti di team.Ad esempio, supponiamo che tu e un'altra " +"persona vogliate aggiungere codice allo stesso file di programma contemporaneamente.Entrambi iniziate con una copia identica del file, ma durante lo " +"sviluppo create versioni separate che non sono identiche.Ad un certo punto, le due versioni devono essere unite in un'unica versione che preservi le " +"modifiche di ciascun contributore." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:273 msgid "" -"Merging can be prompted (or even initiated) by version control systems like " -"Subversion and Git. For example, your version control system might prevent " -"you from submitting changes to its repository because of merge conflicts. A " -"conflict can occur if someone else checked in a different version of the " -"same file while you were working on your version, and the version control " -"system was not able to automatically merge the differences. When that " -"happens, you might need to merge the conflicting versions before trying " -"again to contribute your version. Many systems have integrated difference " -"and merge tools, but you might prefer to use WinMerge instead." -msgstr "" -"L'unione può essere richiesta (o addirittura avviata) da sistemi di " -"controllo della versione come Subversion e Git.Ad esempio, il tuo sistema di " -"controllo della versione potrebbe impedirti di inviare modifiche al suo " -"repository a causa di conflitti di unione.Può verificarsi un conflitto se " -"qualcun altro ha archiviato una versione diversa dello stesso file mentre " -"stavi lavorando sulla tua versione e il sistema di controllo della versione " -"non è stato in grado di unire automaticamente le differenze.Quando ciò " -"accade, potresti dover unire le versioni in conflitto prima di riprovare a " -"contribuire con la tua versione.Molti sistemi dispongono di strumenti " -"integrati per la differenza e l'unione, ma potresti preferire utilizzare " +"Merging can be prompted (or even initiated) by version control systems like Subversion and Git. For example, your version control system might " +"prevent you from submitting changes to its repository because of merge conflicts. A conflict can occur if someone else checked in a different version " +"of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When " +"that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated " +"difference and merge tools, but you might prefer to use WinMerge instead." +msgstr "" +"L'unione può essere richiesta (o addirittura avviata) da sistemi di controllo della versione come Subversion e Git.Ad esempio, il tuo sistema di " +"controllo della versione potrebbe impedirti di inviare modifiche al suo repository a causa di conflitti di unione.Può verificarsi un conflitto se " +"qualcun altro ha archiviato una versione diversa dello stesso file mentre stavi lavorando sulla tua versione e il sistema di controllo della versione " +"non è stato in grado di unire automaticamente le differenze.Quando ciò accade, potresti dover unire le versioni in conflitto prima di riprovare a " +"contribuire con la tua versione.Molti sistemi dispongono di strumenti integrati per la differenza e l'unione, ma potresti preferire utilizzare " "WinMerge." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:284 msgid "" -"Just as with comparing, you use WinMerge's toolbar controls (or keyboard " -"shortcuts) to systematically step through the differences. Resolve each " -"difference by copying either its left or right <glossterm>candidate</" -"glossterm> to the other side. When you have resolved all the differences, " -"WinMerge lets you know that all differences are resolved (the versions are " -"identical), and you are done merging." +"Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through the differences. Resolve each " +"difference by copying either its left or right <glossterm>candidate</glossterm> to the other side. When you have resolved all the differences, " +"WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging." msgstr "" -"Proprio come per il confronto, utilizzi i controlli della barra degli " -"strumenti di WinMerge (o le scorciatoie da tastiera) per esaminare " -"sistematicamente le differenze.Risolvi ogni differenza copiando il " -"<glossterm>candidato</glossterm> sinistro o destro sull'altro lato.Una volta " -"risolte tutte le differenze, WinMerge ti informa che tutte le differenze " -"sono state risolte (le versioni sono identiche) e che l'unione è terminata." +"Proprio come per il confronto, utilizzi i controlli della barra degli strumenti di WinMerge (o le scorciatoie da tastiera) per esaminare " +"sistematicamente le differenze.Risolvi ogni differenza copiando il <glossterm>candidato</glossterm> sinistro o destro sull'altro lato.Una volta " +"risolte tutte le differenze, WinMerge ti informa che tutte le differenze sono state risolte (le versioni sono identiche) e che l'unione è terminata." #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:292 @@ -20107,114 +15327,83 @@ msgstr "Semplice operazione di unione" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:294 -msgid "" -"This short exercise demonstrates how to use the controls in the File Compare " -"window in a systematic way to merge the simple files shown earlier:" +msgid "This short exercise demonstrates how to use the controls in the File Compare window in a systematic way to merge the simple files shown earlier:" msgstr "" -"Questo breve esercizio dimostra come utilizzare i controlli nella finestra " -"Confronta file in modo sistematico per unire i file semplici mostrati in " +"Questo breve esercizio dimostra come utilizzare i controlli nella finestra Confronta file in modo sistematico per unire i file semplici mostrati in " "precedenza:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:300 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current " -"Difference</guibutton> in the toolbar to select the first difference. If " -"this button is not enabled, click <placeholder type=\"inlinemediaobject\" " -"id=\"1\"/> <guibutton>First Difference</guibutton> instead." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current Difference</guibutton> in the toolbar to select the first difference. If " +"this button is not enabled, click <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton>First Difference</guibutton> instead." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Differenza corrente</guibutton > nella barra degli strumenti per " -"selezionare la prima differenza.Se questo pulsante non è abilitato, fai " -"invece clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza corrente</guibutton > nella barra degli strumenti per " +"selezionare la prima differenza.Se questo pulsante non è abilitato, fai invece clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton " ">Prima differenza</guibutton >." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:325 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy " -"Right</guibutton> to merge Difference 1 from <filename>File1</filename> to " -"<filename>File2</filename>. In <filename>File</filename>2, notice that the " -"single difference line is replaced by the two lines from <filename>File1</" +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Right</guibutton> to merge Difference 1 from <filename>File1</filename> to " +"<filename>File2</filename>. In <filename>File</filename>2, notice that the single difference line is replaced by the two lines from <filename>File1</" "filename>, and the gray blank line is now gone." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Copia a destra</guibutton > per unire la Differenza 1 da <filename>File1</" -"filename> a <filename>File2</filename>.In <filename>File</filename>2, nota " -"che la singola riga di differenza è sostituita dalle due righe di " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton > per unire la Differenza 1 da <filename>File1</" +"filename> a <filename>File2</filename>.In <filename>File</filename>2, nota che la singola riga di differenza è sostituita dalle due righe di " "<filename>File1</filename>, e la riga grigia vuota ora è scomparsa." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:343 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next " -"Difference</guibutton> to select Difference 2. This is easier than finding " -"and selecting the difference yourself. It's especially useful if you want to " -"step through all differences without accidentally missing any." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next Difference</guibutton> to select Difference 2. This is easier than finding " +"and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Differenza successiva</guibutton > per selezionare Differenza 2. Questo è " -"più semplice che trovare e selezionare la differenza da solo.È " -"particolarmente utile se desideri esaminare tutte le differenze senza " -"tralasciarne nessuna accidentalmente." +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza successiva</guibutton > per selezionare Differenza 2. Questo è " +"più semplice che trovare e selezionare la differenza da solo.È particolarmente utile se desideri esaminare tutte le differenze senza tralasciarne " +"nessuna accidentalmente." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:359 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy " -"Left</guibutton> to merge Difference 2 from <filename>File2</filename> to " +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Left</guibutton> to merge Difference 2 from <filename>File2</filename> to " "<filename>File1</filename>." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " -">Copia a sinistra</guibutton > per unire la differenza 2 da <filename " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a sinistra</guibutton > per unire la differenza 2 da <filename " ">File2</filename > a <filename >File1</filename >." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:372 -msgid "" -"The message that the files are identical tells you that the merge is " -"complete:" +msgid "The message that the files are identical tells you that the merge is complete:" msgstr "Il messaggio che i file sono identici ti dice che l'unione è completa:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:376 -msgid "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"filemerged1.png\" format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" -"filemerged1.png\" format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filemerged1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filemerged1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:385 msgid "" -"Click <guibutton>OK</guibutton> to dismiss the message. The status " -"Difference message changes from <computeroutput>Difference 1 of 1</" -"computeroutput> to <computeroutput>identical</computeroutput>." +"Click <guibutton>OK</guibutton> to dismiss the message. The status Difference message changes from <computeroutput>Difference 1 of 1</computeroutput> " +"to <computeroutput>identical</computeroutput>." msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere il messaggio.Il " -"messaggio di differenza di stato cambia da <computeroutput>Differenza 1 di " -"1</computeroutput> a <computeroutput>identico</computeroutput>." +"Fai clic su <guibutton >OK</guibutton > per chiudere il messaggio.Il messaggio di differenza di stato cambia da <computeroutput>Differenza 1 di 1</" +"computeroutput> a <computeroutput>identico</computeroutput>." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:392 -msgid "" -"Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to " -"save your changes." -msgstr "" -"Premi <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> per " -"salvare le modifiche." +msgid "Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to save your changes." +msgstr "Premi <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> per salvare le modifiche." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:400 msgid "" -"While very simple, this example demonstrates a basic methodology that you " -"can use to step through a comparison of any length, merging each difference " +"While very simple, this example demonstrates a basic methodology that you can use to step through a comparison of any length, merging each difference " "one by one until you have the result that you want." msgstr "" -"Sebbene sia molto semplice, questo esempio dimostra una metodologia di base " -"che puoi utilizzare per eseguire un confronto di qualsiasi lunghezza, unendo " -"ciascuna differenza una per una finché non ottieni il risultato desiderato." +"Sebbene sia molto semplice, questo esempio dimostra una metodologia di base che puoi utilizzare per eseguire un confronto di qualsiasi lunghezza, " +"unendo ciascuna differenza una per una finché non ottieni il risultato desiderato." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Intro_diffs.xml:411 @@ -20223,63 +15412,43 @@ msgstr "file dei risultati, in unione" #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:406 -msgid "" -"Choosing a merge result file <placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Scelta di un file dei risultati dell'unione <placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Choosing a merge result file <placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Scelta di un file dei risultati dell'unione <placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:414 msgid "" -"You control where your merge result is preserved. The WinMerge File Compare " -"window does not have a separate result pane, as some merge tools do. So the " -"simplest strategy is to save your changes to one, two or three source files. " -"Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> at any " -"time to save the current changes to all files; alternatively, click " -"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Left</guimenuitem> </" -"menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Middle</" -"guimenuitem> </menuchoice> or <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Save Right</guimenuitem> </menuchoice> to save only one file." -msgstr "" -"Sei tu a controllare dove viene conservato il risultato dell'unione.La " -"finestra Confronto file WinMerge non dispone di un riquadro dei risultati " -"separato, come fanno alcuni strumenti di unione.Quindi la strategia più " -"semplice è salvare le modifiche su uno, due o tre file sorgente.Premi " -"<keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> in qualsiasi " -"momento per salvare le modifiche correnti su tutti i file;in alternativa, " -"fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva a " -"sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu >File</" -"guimenu > <guimenuitem >Salva a destra</guimenuitem > </menuchoice > o " -"<menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva a destra</" +"You control where your merge result is preserved. The WinMerge File Compare window does not have a separate result pane, as some merge tools do. So " +"the simplest strategy is to save your changes to one, two or three source files. Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </" +"keycombo> at any time to save the current changes to all files; alternatively, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Left</" +"guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Middle</guimenuitem> </menuchoice> or <menuchoice> <guimenu>File</" +"guimenu> <guimenuitem>Save Right</guimenuitem> </menuchoice> to save only one file." +msgstr "" +"Sei tu a controllare dove viene conservato il risultato dell'unione.La finestra Confronto file WinMerge non dispone di un riquadro dei risultati " +"separato, come fanno alcuni strumenti di unione.Quindi la strategia più semplice è salvare le modifiche su uno, due o tre file sorgente.Premi " +"<keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> in qualsiasi momento per salvare le modifiche correnti su tutti i file;in " +"alternativa, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva a sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu " +">File</guimenu > <guimenuitem >Salva a destra</guimenuitem > </menuchoice > o <menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva a destra</" "guimenuitem > </menuchoice > per salvare soloun file." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:436 msgid "" -"To write to a third file instead of either source file, use <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>. " -"For example, your target file might be the difference or conflict file " -"generated by a version control system." +"To write to a third file instead of either source file, use <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>. " +"For example, your target file might be the difference or conflict file generated by a version control system." msgstr "" -"Per scrivere su un terzo file invece che su uno dei file sorgente, usa " -"<menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva con nome</" -"guimenuitem > </menuchoice >.Ad esempio, il file di destinazione potrebbe " -"essere il file delle differenze o dei conflitti generato da un sistema di " +"Per scrivere su un terzo file invece che su uno dei file sorgente, usa <menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva con nome</" +"guimenuitem > </menuchoice >.Ad esempio, il file di destinazione potrebbe essere il file delle differenze o dei conflitti generato da un sistema di " "controllo della versione." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:444 msgid "" -"Similarly, in the WinMerge command line, you can leave both or all three " -"source versions unchanged by using the optional <option>outputfile </option> " +"Similarly, in the WinMerge command line, you can leave both or all three source versions unchanged by using the optional <option>outputfile </option> " "argument, as described in <xref linkend=\"Command_line\" />." msgstr "" -"Allo stesso modo, nella riga di comando di WinMerge, puoi lasciare entrambe " -"o tutte e tre le versioni sorgente invariate utilizzando l'argomento " -"facoltativo <option>outputfile </option>, come descritto in <xref " -"linkend=\"Command_line\" />." +"Allo stesso modo, nella riga di comando di WinMerge, puoi lasciare entrambe o tutte e tre le versioni sorgente invariate utilizzando l'argomento " +"facoltativo <option>outputfile </option>, come descritto in <xref linkend=\"Command_line\" />." #. type: Content of: <article><title> #: English/Introduction.xml:3 @@ -20289,94 +15458,69 @@ msgstr "Introduzione a WinMerge" #. type: Content of: <article><para> #: English/Introduction.xml:5 msgid "" -"WinMerge is an <ulink url=\"https://opensource.org/\">Open Source</ulink> " -"differencing and merging tool for Windows. WinMerge can compare two or three " -"folders and files, presenting differences in a visual text format that is " -"easy to understand and handle." +"WinMerge is an <ulink url=\"https://opensource.org/\">Open Source</ulink> differencing and merging tool for Windows. WinMerge can compare two or " +"three folders and files, presenting differences in a visual text format that is easy to understand and handle." msgstr "" -"WinMerge è uno strumento di differenziazione e fusione <ulink url=\"https://" -"opensource.org/\">Open Source</ulink> per Windows.WinMerge può confrontare " -"due o tre cartelle e file, presentando le differenze in un formato di testo " -"visivo facile da comprendere e gestire." +"WinMerge è uno strumento di differenziazione e fusione <ulink url=\"https://opensource.org/\">Open Source</ulink> per Windows.WinMerge può " +"confrontare due o tre cartelle e file, presentando le differenze in un formato di testo visivo facile da comprendere e gestire." #. type: Content of: <article><para> #: English/Introduction.xml:10 msgid "" -"WinMerge is highly useful for determining what has changed between project " -"versions, and then merging changes between versions. WinMerge can be used as " -"an external differencing/merging tool or as a standalone application." +"WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used " +"as an external differencing/merging tool or as a standalone application." msgstr "" -"WinMerge è molto utile per determinare cosa è cambiato tra le versioni del " -"progetto e quindi unire le modifiche tra le versioni.WinMerge può essere " -"utilizzato come strumento di differenziazione/unione esterno o come " -"applicazione autonoma." +"WinMerge è molto utile per determinare cosa è cambiato tra le versioni del progetto e quindi unire le modifiche tra le versioni.WinMerge può essere " +"utilizzato come strumento di differenziazione/unione esterno o come applicazione autonoma." #. type: Content of: <article><para> #: English/Introduction.xml:15 msgid "" -"In addition, WinMerge has many helpful supporting features that make " -"comparing, synchronising, and merging as easy and useful as possible. " -"Several programming languages and other file formats are syntax-highlighted." +"In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible. Several " +"programming languages and other file formats are syntax-highlighted." msgstr "" -"Inoltre, WinMerge dispone di molte utili funzionalità di supporto che " -"rendono il confronto, la sincronizzazione e l'unione il più semplice e utile " -"possibile.Diversi linguaggi di programmazione e altri formati di file sono " -"evidenziati dalla sintassi." +"Inoltre, WinMerge dispone di molte utili funzionalità di supporto che rendono il confronto, la sincronizzazione e l'unione il più semplice e utile " +"possibile.Diversi linguaggi di programmazione e altri formati di file sono evidenziati dalla sintassi." #. type: Content of: <article><para> #: English/Introduction.xml:19 msgid "" -"WinMerge is not a hex editor. WinMerge can show binary files contents and " -"differences between them. But the information is meant for viewing only: " +"WinMerge is not a hex editor. WinMerge can show binary files contents and differences between them. But the information is meant for viewing only: " "editing binary files with WinMerge can break the files." msgstr "" -"WinMerge non è un editor esadecimale.WinMerge può mostrare il contenuto dei " -"file binari e le differenze tra loro.Ma le informazioni sono destinate solo " -"alla visualizzazione: la modifica di file binari con WinMerge può " -"danneggiare i file." +"WinMerge non è un editor esadecimale.WinMerge può mostrare il contenuto dei file binari e le differenze tra loro.Ma le informazioni sono destinate " +"solo alla visualizzazione: la modifica di file binari con WinMerge può danneggiare i file." #. type: Content of: <article><para> #: English/Introduction.xml:23 msgid "" -"The goal of WinMerge development is to make comparing, synchronizing, and " -"merging folders and files easy and fast, while maintaining maximum " +"The goal of WinMerge development is to make comparing, synchronizing, and merging folders and files easy and fast, while maintaining maximum " "reliability. Ease of use is of key importance for reducing errors." msgstr "" -"L'obiettivo dello sviluppo di WinMerge è rendere il confronto, la " -"sincronizzazione e l'unione di cartelle e file facili e veloci, mantenendo " -"la massima affidabilità.La facilità d’uso è di fondamentale importanza per " -"ridurre gli errori." +"L'obiettivo dello sviluppo di WinMerge è rendere il confronto, la sincronizzazione e l'unione di cartelle e file facili e veloci, mantenendo la " +"massima affidabilità.La facilità d’uso è di fondamentale importanza per ridurre gli errori." #. type: Content of: <article><para> #: English/Introduction.xml:27 -msgid "" -"The latest version &WinMergeVersion; is considered a stable and reliable " -"program to use." -msgstr "" -"L'ultima versione &WinMergeVersion;è considerato un programma stabile e " -"affidabile da utilizzare." +msgid "The latest version &WinMergeVersion; is considered a stable and reliable program to use." +msgstr "L'ultima versione &WinMergeVersion;è considerato un programma stabile e affidabile da utilizzare." #. type: Content of: <article><note><para> #: English/Introduction.xml:31 msgid "" -"WinMerge is not freeware (as many sites on the Web have stated): It is " -"<ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> " -"licensed." +"WinMerge is not freeware (as many sites on the Web have stated): It is <ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> licensed." msgstr "" -"WinMerge non è freeware (come hanno affermato molti siti sul Web): è " -"concesso in licenza <ulink url=\"https://www.gnu.org/licenses/gpl-2.0." -"html\">GPL</ulink>." +"WinMerge non è freeware (come hanno affermato molti siti sul Web): è concesso in licenza <ulink url=\"https://www.gnu.org/licenses/" +"gpl-2.0.html\">GPL</ulink>." #. type: Content of: <article><note><para> #: English/Introduction.xml:33 msgid "" -"We provide you with a good tool for free, so please honor your license " -"agreement and submit improvements to us. We are happy to get help improving " +"We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving " "WinMerge, to the advantage of all WinMerge users." msgstr "" -"Ti forniamo un buon strumento gratuitamente, quindi rispetta il tuo " -"contratto di licenza e inviaci miglioramenti.Siamo felici di ricevere aiuto " -"per migliorare WinMerge, a vantaggio di tutti gli utenti WinMerge." +"Ti forniamo un buon strumento gratuitamente, quindi rispetta il tuo contratto di licenza e inviaci miglioramenti.Siamo felici di ricevere aiuto per " +"migliorare WinMerge, a vantaggio di tutti gli utenti WinMerge." #. type: Content of: <article><section><title><indexterm><primary> #: English/Introduction.xml:40 @@ -20390,12 +15534,8 @@ msgstr "Versioni WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Introduction.xml:43 -msgid "" -"There are two kind of versions available in the <ulink url=\"https://" -"sourceforge.net/projects/winmerge/files/\">downloads</ulink> page." -msgstr "" -"Sono disponibili due tipi di versioni nella pagina <ulink url=\"https://" -"sourceforge.net/projects/winmerge/files/\">download</ulink>." +msgid "There are two kind of versions available in the <ulink url=\"https://sourceforge.net/projects/winmerge/files/\">downloads</ulink> page." +msgstr "Sono disponibili due tipi di versioni nella pagina <ulink url=\"https://sourceforge.net/projects/winmerge/files/\">download</ulink>." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Introduction.xml:49 @@ -20410,16 +15550,12 @@ msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Versioni stabili" #. type: Content of: <article><section><section><para> #: English/Introduction.xml:52 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/" -"\">Stable versions</ulink> are recommended for most users. If you are unsure " -"about what version to use, use the latest stable version. Stable versions " -"have an even last number, for example, 2.14.0, 2.16.2 and 2.16.4." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Stable versions</ulink> are recommended for most users. If you are unsure " +"about what version to use, use the latest stable version. Stable versions have an even last number, for example, 2.14.0, 2.16.2 and 2.16.4." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Le " -"versioni stabili</ulink> sono consigliate per la maggior parte degli utenti." -"Se non sei sicuro di quale versione utilizzare, utilizza l'ultima versione " -"stabile.Le versioni stabili hanno un ultimo numero pari, ad esempio 2.14.0, " -"2.16.2 e 2.16.4." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Le versioni stabili</ulink> sono consigliate per la maggior parte degli " +"utenti.Se non sei sicuro di quale versione utilizzare, utilizza l'ultima versione stabile.Le versioni stabili hanno un ultimo numero pari, ad esempio " +"2.14.0, 2.16.2 e 2.16.4." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Introduction.xml:61 @@ -20434,26 +15570,17 @@ msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Versioni beta" #. type: Content of: <article><section><section><para> #: English/Introduction.xml:64 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">Beta " -"versions</ulink> are for people who want to test latest features and " -"improvements made after last stable version. Beta versions are not tested as " -"extensively as stable versions and probably have some bugs. Beta versions " -"have an odd last number, for example 2.16.3 and 2.16.5. Beta versions can be " -"used in production, because they are not expected to have major bugs. But " -"there is always a risk with using beta-level releases, so consider it " -"carefully. We have tried to release a new stable series once a year, so it " -"may be worth waiting for few months for the next stable release..." -msgstr "" -"Le <ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/" -"\">versioni beta</ulink> sono per le persone che desiderano testare le " -"ultime funzionalità e i miglioramenti apportati dopo l'ultima versione " -"stabile.Le versioni beta non sono testate così estesamente come le versioni " -"stabili e probabilmente presentano alcuni bug.Le versioni beta hanno un " -"ultimo numero dispari, ad esempio 2.16.3 e 2.16.5.Le versioni beta possono " -"essere utilizzate in produzione perché non si prevede che presentino bug " -"importanti.Ma c'è sempre un rischio nell'usare versioni di livello beta, " -"quindi consideralo attentamente.Abbiamo provato a rilasciare una nuova serie " -"stabile una volta all'anno, quindi potrebbe valere la pena aspettare qualche " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">Beta versions</ulink> are for people who want to test latest features and " +"improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta " +"versions have an odd last number, for example 2.16.3 and 2.16.5. Beta versions can be used in production, because they are not expected to have major " +"bugs. But there is always a risk with using beta-level releases, so consider it carefully. We have tried to release a new stable series once a year, " +"so it may be worth waiting for few months for the next stable release..." +msgstr "" +"Le <ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">versioni beta</ulink> sono per le persone che desiderano testare le ultime " +"funzionalità e i miglioramenti apportati dopo l'ultima versione stabile.Le versioni beta non sono testate così estesamente come le versioni stabili e " +"probabilmente presentano alcuni bug.Le versioni beta hanno un ultimo numero dispari, ad esempio 2.16.3 e 2.16.5.Le versioni beta possono essere " +"utilizzate in produzione perché non si prevede che presentino bug importanti.Ma c'è sempre un rischio nell'usare versioni di livello beta, quindi " +"consideralo attentamente.Abbiamo provato a rilasciare una nuova serie stabile una volta all'anno, quindi potrebbe valere la pena aspettare qualche " "mese per la prossima versione stabile..." #. type: Content of: <article><section><title><indexterm><secondary> @@ -20463,18 +15590,13 @@ msgstr "segnalazione bug" #. type: Content of: <article><section><title> #: English/Introduction.xml:79 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>Getting support and reporting bugs" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Ottenere supporto e segnalare bug" +msgid "<placeholder type=\"indexterm\" id=\"0\"/>Getting support and reporting bugs" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Ottenere supporto e segnalare bug" #. type: Content of: <article><section><para> #: English/Introduction.xml:85 -msgid "" -"The <emphasis>Discussion forums</emphasis> are the fastest way to get help:" -msgstr "" -"I <emphasis>Forum di discussione</emphasis> sono il modo più veloce per " -"ottenere aiuto:" +msgid "The <emphasis>Discussion forums</emphasis> are the fastest way to get help:" +msgstr "I <emphasis>Forum di discussione</emphasis> sono il modo più veloce per ottenere aiuto:" #. type: Content of: <article><section><itemizedlist><listitem><ulink> #: English/Introduction.xml:88 @@ -20494,34 +15616,24 @@ msgstr "Discussioni sul sito web" #. type: Content of: <article><section><para> #: English/Introduction.xml:98 msgid "" -"If you find a bug, please submit it as a <ulink url=\"https://github.com/" -"WinMerge/winmerge/issues\">bug report</ulink>. Please attach as much " -"information as you can: at a minimum, the version number of WinMerge that " -"you are using. If you can, also attach a configuration log which, you can " -"display by clicking <menuchoice> <guimenu>Help</guimenu> " -"<guimenuitem>Configuration</guimenuitem> </menuchoice> in the WinMerge " -"window. Good information in a bug report makes it more likely that your bug " -"will be fixed quickly." -msgstr "" -"Se trovi un bug, invialo come <ulink url=\"https://github.com/WinMerge/" -"winmerge/issues\">segnalazione di bug</ulink>.Allega quante più informazioni " -"possibili: come minimo il numero di versione di WinMerge che stai " -"utilizzando.Se puoi, allega anche un registro di configurazione che puoi " -"visualizzare facendo clic su <menuchoice> <guimenu >Aiuto</guimenu > " -"<guimenuitem >Configurazione</guimenuitem > </menuchoice > nella finestra di " -"WinMerge.Buone informazioni in una segnalazione di bug aumentano le " -"probabilità che il bug venga risolto rapidamente." +"If you find a bug, please submit it as a <ulink url=\"https://github.com/WinMerge/winmerge/issues\">bug report</ulink>. Please attach as much " +"information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can " +"display by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>Configuration</guimenuitem> </menuchoice> in the WinMerge window. Good " +"information in a bug report makes it more likely that your bug will be fixed quickly." +msgstr "" +"Se trovi un bug, invialo come <ulink url=\"https://github.com/WinMerge/winmerge/issues\">segnalazione di bug</ulink>.Allega quante più informazioni " +"possibili: come minimo il numero di versione di WinMerge che stai utilizzando.Se puoi, allega anche un registro di configurazione che puoi " +"visualizzare facendo clic su <menuchoice> <guimenu >Aiuto</guimenu > <guimenuitem >Configurazione</guimenuitem > </menuchoice > nella finestra di " +"WinMerge.Buone informazioni in una segnalazione di bug aumentano le probabilità che il bug venga risolto rapidamente." #. type: Content of: <article><section><important><para> #: English/Introduction.xml:110 msgid "" -"Include the version number in bug reports. You can check the version number " -"by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>About " +"Include the version number in bug reports. You can check the version number by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>About " "WinMerge</guimenuitem> </menuchoice>." msgstr "" -"Includere il numero di versione nelle segnalazioni di bug.Puoi controllare " -"il numero di versione facendo clic su <menuchoice> <guimenu >Aiuto</guimenu " -"> <guimenuitem >Informazioni su WinMerge</guimenuitem > </menuchoice >." +"Includere il numero di versione nelle segnalazioni di bug.Puoi controllare il numero di versione facendo clic su <menuchoice> <guimenu >Aiuto</" +"guimenu > <guimenuitem >Informazioni su WinMerge</guimenuitem > </menuchoice >." #. type: Content of: <article><section><title><indexterm><primary> #: English/Introduction.xml:121 @@ -20530,51 +15642,35 @@ msgstr "Sviluppo WinMerge" #. type: Content of: <article><section><title> #: English/Introduction.xml:120 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge source code and " -"development" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Codice sorgente e sviluppo di " -"WinMerge" +msgid "<placeholder type=\"indexterm\" id=\"0\"/>WinMerge source code and development" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Codice sorgente e sviluppo di WinMerge" #. type: Content of: <article><section><para> #: English/Introduction.xml:124 msgid "" -"WinMerge source code is available on our <ulink url=\"https://winmerge.org/" -"source-code/\">website</ulink> and from the <ulink url=\"https://github.com/" -"WinMerge/\">GitHub</ulink> project pages. Anyone can download the sources, " -"study them, and alter them. If you find (and fix) bugs, improve something, " -"and so on, please submit your changes to us as patches or pull requests and " -"help improve this product! If you publish your altered version, you are " -"required to publish the changes to source code too. This is what the <ulink " -"url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> license is " -"about: please respect it." -msgstr "" -"Il codice sorgente WinMerge è disponibile sul nostro <ulink url=\"https://" -"winmerge.org/source-code/\">sito web</ulink> e dalle pagine del progetto " -"<ulink url=\"https://github.com/WinMerge/\">GitHub</ulink>.Chiunque può " -"scaricare i sorgenti, studiarli e modificarli.Se trovi (e risolvi) bug, " -"migliori qualcosa e così via, inviaci le tue modifiche come patch o " -"richieste pull e aiutaci a migliorare questo prodotto!Se pubblichi la " -"versione modificata, sei tenuto a pubblicare anche le modifiche al codice " -"sorgente.Questo è ciò che riguarda la licenza <ulink url=\"https://www.gnu." -"org/licenses/gpl-2.0.html\">GPL</ulink>: rispettala." +"WinMerge source code is available on our <ulink url=\"https://winmerge.org/source-code/\">website</ulink> and from the <ulink url=\"https://" +"github.com/WinMerge/\">GitHub</ulink> project pages. Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, " +"improve something, and so on, please submit your changes to us as patches or pull requests and help improve this product! If you publish your altered " +"version, you are required to publish the changes to source code too. This is what the <ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</" +"ulink> license is about: please respect it." +msgstr "" +"Il codice sorgente WinMerge è disponibile sul nostro <ulink url=\"https://winmerge.org/source-code/\">sito web</ulink> e dalle pagine del progetto " +"<ulink url=\"https://github.com/WinMerge/\">GitHub</ulink>.Chiunque può scaricare i sorgenti, studiarli e modificarli.Se trovi (e risolvi) bug, " +"migliori qualcosa e così via, inviaci le tue modifiche come patch o richieste pull e aiutaci a migliorare questo prodotto!Se pubblichi la versione " +"modificata, sei tenuto a pubblicare anche le modifiche al codice sorgente.Questo è ciò che riguarda la licenza <ulink url=\"https://www.gnu.org/" +"licenses/gpl-2.0.html\">GPL</ulink>: rispettala." #. type: Content of: <article><section><para> #: English/Introduction.xml:135 msgid "" -"WinMerge development work is done by people in their spare time. Nobody " -"gets paid for improving WinMerge. We try to fix bugs as we find them or when " -"somebody reports them to us. We really try - we use WinMerge too. But there " -"are absolutely no promises for new features. We always appreciate any help " -"with WinMerge, be it testing, documenting, translating, or coding." +"WinMerge development work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when " +"somebody reports them to us. We really try - we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any " +"help with WinMerge, be it testing, documenting, translating, or coding." msgstr "" -"Il lavoro di sviluppo di WinMerge viene svolto dalle persone nel loro tempo " -"libero.Nessuno viene pagato per migliorare WinMerge.Cerchiamo di correggere " -"i bug non appena li troviamo o quando qualcuno ce li segnala.Ci proviamo " -"davvero: usiamo anche WinMerge.Ma non ci sono assolutamente promesse per " -"nuove funzionalità.Apprezziamo sempre qualsiasi aiuto con WinMerge, sia che " -"si tratti di testare, documentare, tradurre o scrivere codice." +"Il lavoro di sviluppo di WinMerge viene svolto dalle persone nel loro tempo libero.Nessuno viene pagato per migliorare WinMerge.Cerchiamo di " +"correggere i bug non appena li troviamo o quando qualcuno ce li segnala.Ci proviamo davvero: usiamo anche WinMerge.Ma non ci sono assolutamente " +"promesse per nuove funzionalità.Apprezziamo sempre qualsiasi aiuto con WinMerge, sia che si tratti di testare, documentare, tradurre o scrivere " +"codice." #. type: Content of: <article><title><indexterm><primary> #: English/Locales.xml:4 @@ -20589,56 +15685,38 @@ msgstr "Supporto locale<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Locales.xml:7 msgid "" -"The WinMerge user interface is in English by default, but you can localize " -"your installation to other languages for which translations have been " -"contributed. Localizing WinMerge changes text strings that are displayed in " -"the interface, including menus, dialogs, tooltips, and messages, to the " +"The WinMerge user interface is in English by default, but you can localize your installation to other languages for which translations have been " +"contributed. Localizing WinMerge changes text strings that are displayed in the interface, including menus, dialogs, tooltips, and messages, to the " "language you choose." msgstr "" -"L'interfaccia utente di WinMerge è in inglese per impostazione predefinita, " -"ma è possibile localizzare l'installazione in altre lingue per le quali sono " -"state fornite traduzioni.La localizzazione di WinMerge modifica le stringhe " -"di testo visualizzate nell'interfaccia, inclusi menu, finestre di dialogo, " -"descrizioni comandi e messaggi, nella lingua scelta." +"L'interfaccia utente di WinMerge è in inglese per impostazione predefinita, ma è possibile localizzare l'installazione in altre lingue per le quali " +"sono state fornite traduzioni.La localizzazione di WinMerge modifica le stringhe di testo visualizzate nell'interfaccia, inclusi menu, finestre di " +"dialogo, descrizioni comandi e messaggi, nella lingua scelta." #. type: Content of: <article><para> #: English/Locales.xml:13 msgid "" -"Note that localization does not extend beyond the translation of strings. " -"For example, it does not affect how numbers are divided or how words are " -"alphabetized. (Those issues should be addressed in the conventional Windows " -"manner by using the Regional settings in the Control Panel.)" +"Note that localization does not extend beyond the translation of strings. For example, it does not affect how numbers are divided or how words are " +"alphabetized. (Those issues should be addressed in the conventional Windows manner by using the Regional settings in the Control Panel.)" msgstr "" -"Tieni presente che la localizzazione non si estende oltre la traduzione " -"delle stringhe.Ad esempio, non influisce sulla suddivisione dei numeri o " -"sull'ordine alfabetico delle parole.(Questi problemi dovrebbero essere " -"risolti nel modo convenzionale di Windows utilizzando le impostazioni " +"Tieni presente che la localizzazione non si estende oltre la traduzione delle stringhe.Ad esempio, non influisce sulla suddivisione dei numeri o " +"sull'ordine alfabetico delle parole.(Questi problemi dovrebbero essere risolti nel modo convenzionale di Windows utilizzando le impostazioni " "internazionali nel Pannello di controllo.)" #. type: Content of: <article><para> #: English/Locales.xml:18 msgid "Localizing your WinMerge installation involves these two basic steps:" -msgstr "" -"La localizzazione dell'installazione di WinMerge prevede questi due passaggi " -"fondamentali:" +msgstr "La localizzazione dell'installazione di WinMerge prevede questi due passaggi fondamentali:" #. type: Content of: <article><orderedlist><listitem><para> #: English/Locales.xml:23 -msgid "" -"<xref linkend=\"Locales_config_files\" />: Make one or more language files " -"available to WinMerge." -msgstr "" -"<xref linkend=\"Locales_config_files\" />: rende disponibili uno o più file " -"di lingua per WinMerge." +msgid "<xref linkend=\"Locales_config_files\" />: Make one or more language files available to WinMerge." +msgstr "<xref linkend=\"Locales_config_files\" />: rende disponibili uno o più file di lingua per WinMerge." #. type: Content of: <article><orderedlist><listitem><para> #: English/Locales.xml:28 -msgid "" -"<xref linkend=\"Locales_changing\" />: Choose one of the configured language " -"files." -msgstr "" -"<xref linkend=\"Locales_changing\" />: Scegli uno dei file di lingua " -"configurati." +msgid "<xref linkend=\"Locales_changing\" />: Choose one of the configured language files." +msgstr "<xref linkend=\"Locales_changing\" />: Scegli uno dei file di lingua configurati." #. type: Content of: <article><section><title> #: English/Locales.xml:34 @@ -20647,81 +15725,60 @@ msgstr "Configurazione della localizzazione" #. type: Content of: <article><section><para> #: English/Locales.xml:36 -msgid "" -"Configuring a localization simply involves making its translation file " -"available to WinMerge, either during or after the installation." -msgstr "" -"Configurare una localizzazione implica semplicemente rendere disponibile il " -"file di traduzione a WinMerge, durante o dopo l'installazione." +msgid "Configuring a localization simply involves making its translation file available to WinMerge, either during or after the installation." +msgstr "Configurare una localizzazione implica semplicemente rendere disponibile il file di traduzione a WinMerge, durante o dopo l'installazione." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:41 msgid "" -"It's easiest to configure a language file during WinMerge installation. The " -"instructions in <xref linkend=\"Installing_usinginstaller\" /> describe how " -"to use the Select Components page to install one or more translation files." +"It's easiest to configure a language file during WinMerge installation. The instructions in <xref linkend=\"Installing_usinginstaller\" /> describe " +"how to use the Select Components page to install one or more translation files." msgstr "" -"È più semplice configurare un file di lingua durante l'installazione di " -"WinMerge.Le istruzioni in <xref linkend=\"Installing_usinginstaller\" /> " -"descrivono come utilizzare la pagina Seleziona componenti per installare uno " -"o più file di traduzione." +"È più semplice configurare un file di lingua durante l'installazione di WinMerge.Le istruzioni in <xref linkend=\"Installing_usinginstaller\" /> " +"descrivono come utilizzare la pagina Seleziona componenti per installare uno o più file di traduzione." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:48 msgid "" -"If you did not configure a language file when you installed WinMerge (or did " -"not use the installer at all), there is no need to re-install WinMerge. You " -"can get the latest translation files from the WinMerge site and configure it " -"yourself:" +"If you did not configure a language file when you installed WinMerge (or did not use the installer at all), there is no need to re-install WinMerge. " +"You can get the latest translation files from the WinMerge site and configure it yourself:" msgstr "" -"Se non hai configurato un file di lingua quando hai installato WinMerge (o " -"non hai utilizzato affatto il programma di installazione), non è necessario " -"reinstallare WinMerge.Puoi ottenere i file di traduzione più recenti dal " -"sito WinMerge e configurarli tu stesso:" +"Se non hai configurato un file di lingua quando hai installato WinMerge (o non hai utilizzato affatto il programma di installazione), non è " +"necessario reinstallare WinMerge.Puoi ottenere i file di traduzione più recenti dal sito WinMerge e configurarli tu stesso:" #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:55 msgid "" -"Create a folder named <filename class=\"directory\" >Languages</filename> " -"under the WinMerge installation directory (where <filename>WinMergeU.exe</" +"Create a folder named <filename class=\"directory\" >Languages</filename> under the WinMerge installation directory (where <filename>WinMergeU.exe</" "filename> is located), if it does not already exist." msgstr "" -"Crea una cartella denominata <filename class=\"cartella\" >Languages</" -"filename> nella cartella di installazione di WinMerge (dove si trova " +"Crea una cartella denominata <filename class=\"cartella\" >Languages</filename> nella cartella di installazione di WinMerge (dove si trova " "<filename>WinMergeU.exe</filename>), se non esiste già." #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:62 msgid "" -"Go to the <ulink url=\"https://winmerge.org/downloads/\">WinMerge download</" -"ulink> site. Download one of the archived binary files (either Zip or 7z " +"Go to the <ulink url=\"https://winmerge.org/downloads/\">WinMerge download</ulink> site. Download one of the archived binary files (either Zip or 7z " "format) for the current WinMerge version, and save it to your file system." msgstr "" -"Vai al sito di <ulink url=\"https://winmerge.org/downloads/\">download di " -"WinMerge</ulink>.Scarica uno dei file binari archiviati (in formato Zip o " +"Vai al sito di <ulink url=\"https://winmerge.org/downloads/\">download di WinMerge</ulink>.Scarica uno dei file binari archiviati (in formato Zip o " "7z) per la versione corrente di WinMerge e salvalo nel tuo file system." #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:70 msgid "" -"Open the downloaded archive, and locate the <filename>*.po</filename> files, " -"where * is a language (for example, <filename>Swedish.po</filename> for the " -"Swedish translation). Extract the language files you want to the " -"<filename>Languages</filename> subfolder in your WinMerge installation " +"Open the downloaded archive, and locate the <filename>*.po</filename> files, where * is a language (for example, <filename>Swedish.po</filename> for " +"the Swedish translation). Extract the language files you want to the <filename>Languages</filename> subfolder in your WinMerge installation " "directory." msgstr "" -"Apri l'archivio scaricato e individua i file <filename>*.po</filename>, dove " -"* è una lingua (ad esempio, <filename>Swedish.po</filename> per la " -"traduzione svedese).Estrai i file della lingua che desideri nella " -"sottocartella <filename>Languages</filename> nella cartella di installazione " -"di WinMerge." +"Apri l'archivio scaricato e individua i file <filename>*.po</filename>, dove * è una lingua (ad esempio, <filename>Swedish.po</filename> per la " +"traduzione svedese).Estrai i file della lingua che desideri nella sottocartella <filename>Languages</filename> nella cartella di installazione di " +"WinMerge." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:79 msgid "The language files are now available the next time you run WinMerge." -msgstr "" -"I file della lingua saranno ora disponibili alla successiva esecuzione di " -"WinMerge." +msgstr "I file della lingua saranno ora disponibili alla successiva esecuzione di WinMerge." #. type: Content of: <article><section><title> #: English/Locales.xml:86 @@ -20731,12 +15788,10 @@ msgstr "Modifica della lingua dell'interfaccia di WinMerge" #. type: Content of: <article><section><para> #: English/Locales.xml:88 msgid "" -"If you have configured one or more translation files, as described in the " -"preceding section, you can change the localization of WinMerge to any of " +"If you have configured one or more translation files, as described in the preceding section, you can change the localization of WinMerge to any of " "them:" msgstr "" -"Se hai configurato uno o più file di traduzione, come descritto nella " -"sezione precedente, puoi modificare la localizzazione di WinMerge in uno " +"Se hai configurato uno o più file di traduzione, come descritto nella sezione precedente, puoi modificare la localizzazione di WinMerge in uno " "qualsiasi di essi:" #. type: Content of: <article><section><orderedlist><listitem><simpara> @@ -20746,27 +15801,18 @@ msgstr "Esegui WinMerge." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Locales.xml:98 -msgid "" -"Select <guimenuitem>Options</guimenuitem> from the <guimenu>Edit</guimenu> " -"menu." -msgstr "" -"Seleziona <guimenuitem >Opzioni</guimenuitem > dal menu <guimenu >Modifica</" -"guimenu >." +msgid "Select <guimenuitem>Options</guimenuitem> from the <guimenu>Edit</guimenu> menu." +msgstr "Seleziona <guimenuitem >Opzioni</guimenuitem > dal menu <guimenu >Modifica</guimenu >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Locales.xml:103 -msgid "" -"Select your language and click <guibutton>OK</guibutton> in the Options " -"dialog General page." -msgstr "" -"Seleziona la tua lingua e fai clic su <guibutton >OK</guibutton > nella " -"pagina Generale della finestra di dialogo Opzioni." +msgid "Select your language and click <guibutton>OK</guibutton> in the Options dialog General page." +msgstr "Seleziona la tua lingua e fai clic su <guibutton >OK</guibutton > nella pagina Generale della finestra di dialogo Opzioni." #. type: Content of: <article><section><para> #: English/Locales.xml:108 msgid "The language of the WinMerge user interface is instantly updated." -msgstr "" -"La lingua dell'interfaccia utente WinMerge viene aggiornata immediatamente." +msgstr "La lingua dell'interfaccia utente WinMerge viene aggiornata immediatamente." #. type: Content of: <article><section><title><indexterm><primary> #: English/Locales.xml:114 @@ -20775,19 +15821,13 @@ msgstr "localizzazioni, disponibili" #. type: Content of: <article><section><title> #: English/Locales.xml:113 -msgid "" -"Available WinMerge localizations<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Localizzazioni WinMerge disponibili<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Available WinMerge localizations<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Localizzazioni WinMerge disponibili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:117 -msgid "" -"WinMerge localizations contributed to date include the following " -"translations:" -msgstr "" -"Le localizzazioni WinMerge fornite fino ad oggi includono le seguenti " -"traduzioni:" +msgid "WinMerge localizations contributed to date include the following translations:" +msgstr "Le localizzazioni WinMerge fornite fino ad oggi includono le seguenti traduzioni:" #. type: Content of: <article><section><itemizedlist><listitem><simpara> #: English/Locales.xml:122 @@ -20986,23 +16026,17 @@ msgstr "traduzioni, segnalazione errori" #. type: Content of: <article><section><title> #: English/Locales.xml:276 -msgid "" -"Reporting errors in translation<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Segnalazione errori di traduzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Reporting errors in translation<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Segnalazione errori di traduzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:280 msgid "" -"Please submit any errors you find in translations as bugs to our <ulink " -"url=\"https://github.com/WinMerge/winmerge/issues\">bug-list</ulink>. It " -"would be great if you also provide a corrected version of the translated " -"text." +"Please submit any errors you find in translations as bugs to our <ulink url=\"https://github.com/WinMerge/winmerge/issues\">bug-list</ulink>. It " +"would be great if you also provide a corrected version of the translated text." msgstr "" -"Ti preghiamo di inviare eventuali errori che trovi nelle traduzioni come bug " -"al nostro <ulink url=\"https://github.com/WinMerge/winmerge/issues\">elenco " -"dei bug</ulink>.Sarebbe fantastico se fornissi anche una versione corretta " -"del testo tradotto." +"Ti preghiamo di inviare eventuali errori che trovi nelle traduzioni come bug al nostro <ulink url=\"https://github.com/WinMerge/winmerge/" +"issues\">elenco dei bug</ulink>.Sarebbe fantastico se fornissi anche una versione corretta del testo tradotto." #. type: Content of: <article><section><title><indexterm><primary> #: English/Locales.xml:289 @@ -21012,31 +16046,21 @@ msgstr "invio di traduzioni" #. type: Content of: <article><section><title> #: English/Locales.xml:288 msgid "Submitting a new translation<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Invio di una nuova traduzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Invio di una nuova traduzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:292 msgid "" -"If you would like to add your language to the list, then please read the " -"<ulink url=\"https://winmerge.org/translations/\">translation documentation</" -"ulink> on the WinMerge Web site to learn how. Most of the translations are " -"incomplete, so your help improving them would be appreciated. Translating " -"(or improving translation) does not require you to have all the compile " -"tools or to know about WinMerge internals. You just need to follow the " -"instructions in the preceding link. And if you have problems, ask for help " -"from us in one of the <ulink url=\"https://forums.winmerge.org/\">WinMerge " +"If you would like to add your language to the list, then please read the <ulink url=\"https://winmerge.org/translations/\">translation documentation</" +"ulink> on the WinMerge Web site to learn how. Most of the translations are incomplete, so your help improving them would be appreciated. Translating " +"(or improving translation) does not require you to have all the compile tools or to know about WinMerge internals. You just need to follow the " +"instructions in the preceding link. And if you have problems, ask for help from us in one of the <ulink url=\"https://forums.winmerge.org/\">WinMerge " "forums</ulink>." msgstr "" -"Se desideri aggiungere la tua lingua all'elenco, leggi la <ulink " -"url=\"https://winmerge.org/translations/\">documentazione di traduzione</" -"ulink> sul sito Web WinMerge per sapere come.La maggior parte delle " -"traduzioni sono incomplete, quindi il tuo aiuto per migliorarle sarebbe " -"apprezzato.Tradurre (o migliorare la traduzione) non richiede di avere tutti " -"gli strumenti di compilazione o di conoscere gli interni di WinMerge.Devi " -"solo seguire le istruzioni nel link precedente.E se hai problemi, chiedi " -"aiuto a noi in uno dei <ulink url=\"https://forums.winmerge.org/\">forum " -"WinMerge</ulink>." +"Se desideri aggiungere la tua lingua all'elenco, leggi la <ulink url=\"https://winmerge.org/translations/\">documentazione di traduzione</ulink> sul " +"sito Web WinMerge per sapere come.La maggior parte delle traduzioni sono incomplete, quindi il tuo aiuto per migliorarle sarebbe apprezzato.Tradurre " +"(o migliorare la traduzione) non richiede di avere tutti gli strumenti di compilazione o di conoscere gli interni di WinMerge.Devi solo seguire le " +"istruzioni nel link precedente.E se hai problemi, chiedi aiuto a noi in uno dei <ulink url=\"https://forums.winmerge.org/\">forum WinMerge</ulink>." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:4 English/Quick_start.xml:207 @@ -21056,12 +16080,10 @@ msgstr "file" #. type: Content of: <article><para> #: English/Open_paths.xml:7 msgid "" -"WinMerge provides several ways to specify paths and open files or folders:" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"WinMerge provides several ways to specify paths and open files or folders:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " "id=\"1\"/>" msgstr "" -"WinMerge offre diversi modi per specificare percorsi e aprire file o " -"cartelle:<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"WinMerge offre diversi modi per specificare percorsi e aprire file o cartelle:<placeholder type=\"indexterm\" id=\"0\"/><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><itemizedlist><listitem><para> @@ -21086,23 +16108,17 @@ msgstr "<xref linkend=\"OpenPaths_project\" />" #. type: Content of: <article><section><title> #: English/Open_paths.xml:37 -msgid "" -"Select Files or Folders dialog<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Seleziona la finestra di dialogo File o Cartelle<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Select Files or Folders dialog<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Seleziona la finestra di dialogo File o Cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Open_paths.xml:41 msgid "" -"<xref linkend=\"Quick_start\" /> describes the Select Files or Folders " -"dialog. This section provides more details, and some tips for using the " -"Select Files or Folders dialog more efficiently." +"<xref linkend=\"Quick_start\" /> describes the Select Files or Folders dialog. This section provides more details, and some tips for using the Select " +"Files or Folders dialog more efficiently." msgstr "" -"<xref linkend=\"Quick_start\" /> descrive la finestra di dialogo Seleziona " -"file o cartelle.Questa sezione fornisce ulteriori dettagli e alcuni " -"suggerimenti per utilizzare la finestra di dialogo Seleziona file o cartelle " -"in modo più efficiente." +"<xref linkend=\"Quick_start\" /> descrive la finestra di dialogo Seleziona file o cartelle.Questa sezione fornisce ulteriori dettagli e alcuni " +"suggerimenti per utilizzare la finestra di dialogo Seleziona file o cartelle in modo più efficiente." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Open_paths.xml:47 @@ -21112,26 +16128,18 @@ msgstr "variabili di ambiente, nel confronto dei percorsi target" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:46 msgid "Using environment variables<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Utilizzo delle variabili di ambiente<placeholder type=\"indexterm\" id=\"0\"/" -">" +msgstr "Utilizzo delle variabili di ambiente<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:50 msgid "" -"You can use environment variables in your paths. Windows expands the " -"variable name between % (percent) delimiters. For example, if an environment " -"variable named <envar>WORKDIR</envar> has the value <filename " -"class=\"directory\">c:\\workfiles</filename>, then the path <envar>%WORKDIR%" -"\\project1</envar> is expanded to <filename class=\"directory\">c:" -"\\workfiles\\project1</filename> ." +"You can use environment variables in your paths. Windows expands the variable name between % (percent) delimiters. For example, if an environment " +"variable named <envar>WORKDIR</envar> has the value <filename class=\"directory\">c:\\workfiles</filename>, then the path <envar>%WORKDIR%\\project1</" +"envar> is expanded to <filename class=\"directory\">c:\\workfiles\\project1</filename> ." msgstr "" -"Puoi utilizzare variabili di ambiente nei tuoi percorsi. Windows espande il " -"nome della variabile tra i delimitatori % (percentuale).Ad esempio, se una " -"variabile di ambiente denominata <envar>WORKDIR</envar> ha il valore " -"<filename class=\"directory\">c:\\workfiles</filename>, il percorso " -"<envar>%WORKDIR%\\project1</envar> viene espanso in <filename " -"class=\"directory\">c:\\workfiles\\project1</filename> ." +"Puoi utilizzare variabili di ambiente nei tuoi percorsi. Windows espande il nome della variabile tra i delimitatori % (percentuale).Ad esempio, se " +"una variabile di ambiente denominata <envar>WORKDIR</envar> ha il valore <filename class=\"directory\">c:\\workfiles</filename>, il percorso " +"<envar>%WORKDIR%\\project1</envar> viene espanso in <filename class=\"directory\">c:\\workfiles\\project1</filename> ." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:62 @@ -21141,61 +16149,43 @@ msgstr "apertura" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:59 msgid "Opening archive files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Apertura dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Apertura dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:65 -msgid "" -"WinMerge archive support is provided in the 7-Zip plugin. See <xref " -"linkend=\"Install\" /> to install this plugin." -msgstr "" -"Il supporto per l'archivio WinMerge è fornito nel plugin 7-Zip.Vedi <xref " -"linkend=\"Install\" /> per installare questo plugin." +msgid "WinMerge archive support is provided in the 7-Zip plugin. See <xref linkend=\"Install\" /> to install this plugin." +msgstr "Il supporto per l'archivio WinMerge è fornito nel plugin 7-Zip.Vedi <xref linkend=\"Install\" /> per installare questo plugin." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:68 msgid "" -"Opening two archive files is similar to opening normal files: specify two " -"archive files in the Open-dialog's <guilabel>1st</guilabel> and " -"<guilabel>2nd</guilabel> fields. If WinMerge recognizes the archive format, " -"it opens the contents of the archive files in the Folder Compare window." +"Opening two archive files is similar to opening normal files: specify two archive files in the Open-dialog's <guilabel>1st</guilabel> and " +"<guilabel>2nd</guilabel> fields. If WinMerge recognizes the archive format, it opens the contents of the archive files in the Folder Compare window." msgstr "" -"L'apertura di due file di archivio è simile all'apertura di file normali: " -"specifica due file di archivio nei campi <guilabel >1°</guilabel > e " -"<guilabel >2°</guilabel > della finestra di dialogo Apri.Se WinMerge " -"riconosce il formato di archivio, apre il contenuto dei file di archivio " -"nella finestra Confronto cartelle." +"L'apertura di due file di archivio è simile all'apertura di file normali: specifica due file di archivio nei campi <guilabel >1°</guilabel > e " +"<guilabel >2°</guilabel > della finestra di dialogo Apri.Se WinMerge riconosce il formato di archivio, apre il contenuto dei file di archivio nella " +"finestra Confronto cartelle." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:74 msgid "" -"The <xref linkend=\"Compare_dirs\" /> topic describes how to work with " -"archive files. For example, if an archive file contains two subfolders named " -"<filename class=\"directory\">Original/</filename> and <filename " -"class=\"directory\">Altered/</filename>, you can compare the contents of the " -"two subfolders by specifying the same archive file in both sides in the " -"Select Files or Folders dialog or WinMerge command line." -msgstr "" -"L'argomento <xref linkend=\"Compare_dirs\" /> descrive come lavorare con i " -"file di archivio. Ad esempio, se un file di archivio contiene due " -"sottocartelle denominate <filename class=\"directory\">Originale/</filename> " -"e <filename class=\"directory\">Altered/</filename>, è possibile confrontare " -"il contenuto delle due sottocartelle specificando lo stesso file di archivio " -"su entrambi i lati nella finestra di dialogo Seleziona file o cartelle o " -"nella riga di comando di WinMerge." +"The <xref linkend=\"Compare_dirs\" /> topic describes how to work with archive files. For example, if an archive file contains two subfolders named " +"<filename class=\"directory\">Original/</filename> and <filename class=\"directory\">Altered/</filename>, you can compare the contents of the two " +"subfolders by specifying the same archive file in both sides in the Select Files or Folders dialog or WinMerge command line." +msgstr "" +"L'argomento <xref linkend=\"Compare_dirs\" /> descrive come lavorare con i file di archivio. Ad esempio, se un file di archivio contiene due " +"sottocartelle denominate <filename class=\"directory\">Originale/</filename> e <filename class=\"directory\">Altered/</filename>, è possibile " +"confrontare il contenuto delle due sottocartelle specificando lo stesso file di archivio su entrambi i lati nella finestra di dialogo Seleziona file " +"o cartelle o nella riga di comando di WinMerge." #. type: Content of: <article><section><section><tip><para> #: English/Open_paths.xml:82 msgid "" -"When you drag an archive file to the WinMerge window, press <keycap>Shift</" -"keycap> when dropping the file: WinMerge automatically copies the same " +"When you drag an archive file to the WinMerge window, press <keycap>Shift</keycap> when dropping the file: WinMerge automatically copies the same " "filename to both sides and opens the archive file." msgstr "" -"Quando trascini un file di archivio nella finestra WinMerge, premi " -"<keycap>Shift</keycap> quando rilasci il file: WinMerge copia " -"automaticamente lo stesso nome file su entrambi i lati e apre il file di " -"archivio." +"Quando trascini un file di archivio nella finestra WinMerge, premi <keycap>Shift</keycap> quando rilasci il file: WinMerge copia automaticamente lo " +"stesso nome file su entrambi i lati e apre il file di archivio." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:93 @@ -21210,25 +16200,20 @@ msgstr "Applicazione dei filtri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:96 msgid "" -"The <guilabel>Filter</guilabel> edit field enables you to restrict the files " -"to be included in your folder compare. You can specify one or more file " +"The <guilabel>Filter</guilabel> edit field enables you to restrict the files to be included in your folder compare. You can specify one or more file " "masks, or a single file filter (not both)." msgstr "" -"Il campo di modifica <guilabel >Filtro</guilabel > ti consente di limitare i " -"file da includere nel confronto delle cartelle.È possibile specificare una o " -"più maschere di file o un singolo filtro di file (non entrambi)." +"Il campo di modifica <guilabel >Filtro</guilabel > ti consente di limitare i file da includere nel confronto delle cartelle.È possibile specificare " +"una o più maschere di file o un singolo filtro di file (non entrambi)." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:100 msgid "" -"A mask is a simple expression based on file extensions. For example, this " -"list of file masks includes only files with the specified extensions; all " +"A mask is a simple expression based on file extensions. For example, this list of file masks includes only files with the specified extensions; all " "others are excluded from the selection when the compare operation starts:" msgstr "" -"Una maschera è una semplice espressione basata sulle estensioni dei file.Ad " -"esempio, questo elenco di maschere di file include solo i file con le " -"estensioni specificate;tutti gli altri vengono esclusi dalla selezione " -"all'avvio dell'operazione di confronto:" +"Una maschera è una semplice espressione basata sulle estensioni dei file.Ad esempio, questo elenco di maschere di file include solo i file con le " +"estensioni specificate;tutti gli altri vengono esclusi dalla selezione all'avvio dell'operazione di confronto:" #. type: Content of: <article><section><section><screen> #: English/Open_paths.xml:105 @@ -21239,39 +16224,27 @@ msgstr "*.h;*.cpp;*.txt,*.ini" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:107 msgid "" -"File masks are practical for simple filtering; for more advanced selecting, " -"use filter files. Filter files are collections of regular expressions that " -"can either include or exclude files. WinMerge installs a number of " -"predefined filter files in its <filename>Filters</filename> folder, and you " +"File masks are practical for simple filtering; for more advanced selecting, use filter files. Filter files are collections of regular expressions " +"that can either include or exclude files. WinMerge installs a number of predefined filter files in its <filename>Filters</filename> folder, and you " "can create your own, too." msgstr "" -"Le maschere dei file sono pratiche per un semplice filtraggio;per una " -"selezione più avanzata, utilizzare i file filtro.I file filtro sono raccolte " -"di espressioni regolari che possono includere o escludere file.WinMerge " -"installa una serie di file di filtro predefiniti nella sua cartella " +"Le maschere dei file sono pratiche per un semplice filtraggio;per una selezione più avanzata, utilizzare i file filtro.I file filtro sono raccolte di " +"espressioni regolari che possono includere o escludere file.WinMerge installa una serie di file di filtro predefiniti nella sua cartella " "<filename>Filters</filename> e puoi anche crearne di tuoi." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:113 msgid "" -"To specify a filter, click the <guibutton>Select</guibutton> button next to " -"the <guilabel>Filters</guilabel> field to choose from a list of available " -"filters. Or, click the Filter drop-down list and choose a recently-used " -"filter file." +"To specify a filter, click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</guilabel> field to choose from a list of available " +"filters. Or, click the Filter drop-down list and choose a recently-used filter file." msgstr "" -"Per specificare un filtro, fai clic sul pulsante <guibutton >Seleziona</" -"guibutton > accanto al campo <guilabel >Filtri</guilabel > per scegliere da " -"un elenco di filtri disponibili.Oppure fai clic sull'elenco a discesa Filtro " -"e scegli un file di filtro utilizzato di recente." +"Per specificare un filtro, fai clic sul pulsante <guibutton >Seleziona</guibutton > accanto al campo <guilabel >Filtri</guilabel > per scegliere da " +"un elenco di filtri disponibili.Oppure fai clic sull'elenco a discesa Filtro e scegli un file di filtro utilizzato di recente." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:118 -msgid "" -"For full information about filter masks and filter files, see <xref " -"linkend=\"Filters\" />." -msgstr "" -"Per informazioni complete sulle maschere di filtro e sui file di filtro, " -"vedi <xref linkend=\"Filters\" />." +msgid "For full information about filter masks and filter files, see <xref linkend=\"Filters\" />." +msgstr "Per informazioni complete sulle maschere di filtro e sui file di filtro, vedi <xref linkend=\"Filters\" />." #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> #: English/Open_paths.xml:124 English/Plugins.xml:54 @@ -21280,49 +16253,36 @@ msgstr "plugin di decompressione" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:123 -msgid "" -"Selecting an unpacker for file comparisons<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Selezione di un programma di decompressione per i confronti di " -"file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "Selecting an unpacker for file comparisons<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Selezione di un programma di decompressione per i confronti di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:127 msgid "" -"Unpackers are plugins that are installed with WinMerge to provide " -"functionality that is not used by default. Plugins that can be used to " -"preprocess certain types of files before comparing them. For example, " -"WinMerge cannot normally compare MS Word doc files, but by unpacking them, " -"you can compare just the text contents. See <xref linkend=\"Plugins\" /> for " -"details." +"Unpackers are plugins that are installed with WinMerge to provide functionality that is not used by default. Plugins that can be used to preprocess " +"certain types of files before comparing them. For example, WinMerge cannot normally compare MS Word doc files, but by unpacking them, you can compare " +"just the text contents. See <xref linkend=\"Plugins\" /> for details." msgstr "" -"Gli unpacker sono plugin installati con WinMerge per fornire funzionalità " -"non utilizzate per impostazione predefinita.Plugin che possono essere " -"utilizzati per preelaborare determinati tipi di file prima di confrontarli." -"Ad esempio, WinMerge normalmente non può confrontare i file doc di MS Word, " -"ma decomprimendoli è possibile confrontare solo il contenuto del testo.Vedi " -"<xref linkend=\"Plugins\" /> per i dettagli." +"Gli unpacker sono plugin installati con WinMerge per fornire funzionalità non utilizzate per impostazione predefinita.Plugin che possono essere " +"utilizzati per preelaborare determinati tipi di file prima di confrontarli.Ad esempio, WinMerge normalmente non può confrontare i file doc di MS " +"Word, ma decomprimendoli è possibile confrontare solo il contenuto del testo.Vedi <xref linkend=\"Plugins\" /> per i dettagli." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:134 msgid "" -"To apply a plugin to your file comparison, click the <guibutton>Select</" -"guibutton> button for the <guilabel>Unpacker</guilabel> option. In the " -"Select Unpacker dialog:" +"To apply a plugin to your file comparison, click the <guibutton>Select</guibutton> button for the <guilabel>Unpacker</guilabel> option. In the Select " +"Unpacker dialog:" msgstr "" -"Per applicare un plugin al confronto dei file, fai clic sul pulsante " -"<guibutton >Seleziona</guibutton > per l'opzione <guilabel >Unpacker</" -"guilabel >.Nella finestra di dialogo Seleziona decompressore:" +"Per applicare un plugin al confronto dei file, fai clic sul pulsante <guibutton >Seleziona</guibutton > per l'opzione <guilabel >Unpacker</guilabel " +">.Nella finestra di dialogo Seleziona decompressore:" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:142 msgid "" -"Your choice is displayed in the <guilabel>Unpacker</guilabel> field. Note " -"that you cannot select an unpacker when launching a Folder Compare operation." +"Your choice is displayed in the <guilabel>Unpacker</guilabel> field. Note that you cannot select an unpacker when launching a Folder Compare " +"operation." msgstr "" -"La tua scelta verrà visualizzata nel campo <guilabel >Unpacker</guilabel >." -"Tieni presente che non è possibile selezionare un programma di " +"La tua scelta verrà visualizzata nel campo <guilabel >Unpacker</guilabel >.Tieni presente che non è possibile selezionare un programma di " "decompressione quando si avvia un'operazione di confronto cartelle." #. type: Content of: <article><section><title><indexterm><primary> @@ -21332,23 +16292,17 @@ msgstr "menu contestuale, scorciatoie WinMerge in Esplora risorse" #. type: Content of: <article><section><title> #: English/Open_paths.xml:149 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>Launching WinMerge operations in Windows Explorer" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " -"id=\"1\"/>Avvio delle operazioni WinMerge in Esplora risorse" +msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Launching WinMerge operations in Windows Explorer" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Avvio delle operazioni WinMerge in Esplora risorse" #. type: Content of: <article><section><para> #: English/Open_paths.xml:155 msgid "" -"The optional Windows shell integration enables you to run WinMerge compare " -"operations directly from Windows Explorer, using WinMerge shortcuts in the " +"The optional Windows shell integration enables you to run WinMerge compare operations directly from Windows Explorer, using WinMerge shortcuts in the " "context menu." msgstr "" -"L'integrazione opzionale della shell di Windows consente di eseguire " -"operazioni di confronto WinMerge direttamente da Esplora risorse, " -"utilizzando i collegamenti WinMerge nel menu contestuale." +"L'integrazione opzionale della shell di Windows consente di eseguire operazioni di confronto WinMerge direttamente da Esplora risorse, utilizzando i " +"collegamenti WinMerge nel menu contestuale." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:162 @@ -21358,20 +16312,13 @@ msgstr "Abilitazione dell'integrazione di Esplora risorse" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:164 msgid "" -"The Windows Explorer shell integration is available only if enabled. You " -"can enable it either <link linkend=\"Installing_usinginstaller\">during " -"WinMerge installation</link> or later, using the <xref " -"linkend=\"Configuration_shell-integ\" /> in the Options window. In the " -"Options window, configure the <option>Add to context menu</option> option, " -"including its suboptions if you like." -msgstr "" -"L'integrazione della shell di Windows Explorer è disponibile solo se " -"abilitata.Puoi abilitarlo <link " -"linkend=\"Installing_usinginstaller\">durante l'installazione di WinMerge</" -"link> o successivamente, utilizzando <xref linkend=\"Configuration_shell-" -"integ\" /> nella finestra Opzioni.Nella finestra Opzioni, configura " -"l'opzione <option>Aggiungi al menu contestuale</option>, incluse le sue " -"opzioni secondarie, se lo desideri." +"The Windows Explorer shell integration is available only if enabled. You can enable it either <link linkend=\"Installing_usinginstaller\">during " +"WinMerge installation</link> or later, using the <xref linkend=\"Configuration_shell-integ\" /> in the Options window. In the Options window, " +"configure the <option>Add to context menu</option> option, including its suboptions if you like." +msgstr "" +"L'integrazione della shell di Windows Explorer è disponibile solo se abilitata.Puoi abilitarlo <link linkend=\"Installing_usinginstaller\">durante " +"l'installazione di WinMerge</link> o successivamente, utilizzando <xref linkend=\"Configuration_shell-integ\" /> nella finestra Opzioni.Nella " +"finestra Opzioni, configura l'opzione <option>Aggiungi al menu contestuale</option>, incluse le sue opzioni secondarie, se lo desideri." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:173 @@ -21381,33 +16328,25 @@ msgstr "Utilizzando il collegamento WinMerge" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:175 msgid "" -"If you enable <option>Add to context menu</option> without the advanced menu " -"suboption, the <guimenuitem>WinMerge</guimenuitem> shortcut is added to the " -"Explorer context menu. For example:" +"If you enable <option>Add to context menu</option> without the advanced menu suboption, the <guimenuitem>WinMerge</guimenuitem> shortcut is added to " +"the Explorer context menu. For example:" msgstr "" -"Se abiliti <option >Aggiungi al menu contestuale</option > senza l'opzione " -"secondaria del menu avanzato, la scorciatoia <guimenuitem >WinMerge</" +"Se abiliti <option >Aggiungi al menu contestuale</option > senza l'opzione secondaria del menu avanzato, la scorciatoia <guimenuitem >WinMerge</" "guimenuitem > verrà aggiunta al menu contestuale di Explorer.Per esempio:" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:179 msgid "" -"To use the basic shell integration, begin by selecting two paths in Windows " -"Explorer. Then, right-click and choose WinMerge in the context menu. For " +"To use the basic shell integration, begin by selecting two paths in Windows Explorer. Then, right-click and choose WinMerge in the context menu. For " "example:" msgstr "" -"Per utilizzare l'integrazione di base della shell, iniziare selezionando due " -"percorsi in Esplora risorse.Quindi, fai clic con il pulsante destro del " +"Per utilizzare l'integrazione di base della shell, iniziare selezionando due percorsi in Esplora risorse.Quindi, fai clic con il pulsante destro del " "mouse e scegli WinMerge nel menu contestuale.Per esempio:" #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:184 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:189 @@ -21416,55 +16355,37 @@ msgstr "Comando WinMerge nel menu contestuale di Windows Explorer" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:193 -msgid "" -"WinMerge opens the paths directly in the File Compare or Folder Compare " -"window." -msgstr "" -"WinMerge apre i percorsi direttamente nella finestra Confronta file o " -"Confronta cartelle." +msgid "WinMerge opens the paths directly in the File Compare or Folder Compare window." +msgstr "WinMerge apre i percorsi direttamente nella finestra Confronta file o Confronta cartelle." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:196 msgid "" -"The left and right sides are determined by the sort order in Windows " -"Explorer. In the preceding screenshot, the Windows Explorer file list is in " -"ascending order, so WinMerge opens with <filename>File2</filename> on the " -"1st side and <filename>File1</filename> on the 2nd.." +"The left and right sides are determined by the sort order in Windows Explorer. In the preceding screenshot, the Windows Explorer file list is in " +"ascending order, so WinMerge opens with <filename>File2</filename> on the 1st side and <filename>File1</filename> on the 2nd.." msgstr "" -"I lati sinistro e destro sono determinati dall'ordinamento in Esplora " -"risorse.Nello screenshot precedente, l'elenco dei file di Esplora risorse è " -"in ordine crescente, quindi WinMerge si apre con <filename>File2</filename> " -"sul 1° lato e <filename>File1</filename> sul 2°." +"I lati sinistro e destro sono determinati dall'ordinamento in Esplora risorse.Nello screenshot precedente, l'elenco dei file di Esplora risorse è in " +"ordine crescente, quindi WinMerge si apre con <filename>File2</filename> sul 1° lato e <filename>File1</filename> sul 2°." #. type: Content of: <article><section><section><note><para> #: English/Open_paths.xml:202 msgid "" -"If either path cannot be opened for any reason, WinMerge opens the Select " -"Files or Folders dialog, where you can specify new paths. Similarly, if you " -"select only a single path, the Select Files or Folders dialog opens with the " -"selected file or folder in the <guilabel>1st</guilabel> field, leaving the " -"<guilabel>2nd</guilabel> path for you to specify." +"If either path cannot be opened for any reason, WinMerge opens the Select Files or Folders dialog, where you can specify new paths. Similarly, if " +"you select only a single path, the Select Files or Folders dialog opens with the selected file or folder in the <guilabel>1st</guilabel> field, " +"leaving the <guilabel>2nd</guilabel> path for you to specify." msgstr "" -"Se per qualsiasi motivo non è possibile aprire uno dei percorsi, WinMerge " -"apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " -"specificare nuovi percorsi.Allo stesso modo, se selezioni un solo percorso, " -"la finestra di dialogo Seleziona file o cartelle si apre con il file o la " -"cartella selezionati nel campo <guilabel >1°</guilabel >, lasciando il " -"percorso <guilabel >2°</guilabel > da specificare." +"Se per qualsiasi motivo non è possibile aprire uno dei percorsi, WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " +"specificare nuovi percorsi.Allo stesso modo, se selezioni un solo percorso, la finestra di dialogo Seleziona file o cartelle si apre con il file o la " +"cartella selezionati nel campo <guilabel >1°</guilabel >, lasciando il percorso <guilabel >2°</guilabel > da specificare." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:210 msgid "" -"The <guimenuitem>WinMerge</guimenuitem> shortcut is quick and easy to use, " -"but you can compare only files or folders that you are able to select " -"concurrently in Windows Explorer. For more flexible selections, consider " -"enabling the advanced menu, described in the next section." +"The <guimenuitem>WinMerge</guimenuitem> shortcut is quick and easy to use, but you can compare only files or folders that you are able to select " +"concurrently in Windows Explorer. For more flexible selections, consider enabling the advanced menu, described in the next section." msgstr "" -"La scorciatoia <guimenuitem >WinMerge</guimenuitem > è veloce e facile da " -"usare, ma puoi confrontare solo i file o le cartelle che puoi selezionare " -"contemporaneamente in Esplora risorse.Per selezioni più flessibili, " -"considera l'attivazione del menu avanzato, descritto nella sezione " -"successiva." +"La scorciatoia <guimenuitem >WinMerge</guimenuitem > è veloce e facile da usare, ma puoi confrontare solo i file o le cartelle che puoi selezionare " +"contemporaneamente in Esplora risorse.Per selezioni più flessibili, considera l'attivazione del menu avanzato, descritto nella sezione successiva." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:217 @@ -21474,22 +16395,16 @@ msgstr "Utilizzando il menu avanzato" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:219 msgid "" -"If you choose the <option>Enable advanced menu</option>, the " -"<guimenuitem>WinMerge</guimenuitem> shortcut is replaced with two " -"<guimenuitem>Compare</guimenuitem> shortcuts:" +"If you choose the <option>Enable advanced menu</option>, the <guimenuitem>WinMerge</guimenuitem> shortcut is replaced with two <guimenuitem>Compare</" +"guimenuitem> shortcuts:" msgstr "" -"Se scegli <option >Abilita menu avanzato</option >, la scorciatoia " -"<guimenuitem >WinMerge</guimenuitem > sarà sostituita con due scorciatoie " +"Se scegli <option >Abilita menu avanzato</option >, la scorciatoia <guimenuitem >WinMerge</guimenuitem > sarà sostituita con due scorciatoie " "<guimenuitem >Confronta</guimenuitem >:" #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:224 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:229 @@ -21499,96 +16414,67 @@ msgstr "Menu contestuale avanzato di WinMerge" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:233 msgid "Use the <guimenuitem>Compare</guimenuitem> shortcuts in this order:" -msgstr "" -"Usa le scorciatoie <guimenuitem >Confronta</guimenuitem > in questo ordine:" +msgstr "Usa le scorciatoie <guimenuitem >Confronta</guimenuitem > in questo ordine:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:238 msgid "" -"Right-click the first path and choose <guimenuitem>Compare To</guimenuitem>. " -"WinMerge stores the path in memory until you select the second path." +"Right-click the first path and choose <guimenuitem>Compare To</guimenuitem>. WinMerge stores the path in memory until you select the second path." msgstr "" -"Fai clic con il pulsante destro del mouse sul primo percorso e scegli " -"<guimenuitem >Confronta con</guimenuitem >.WinMerge memorizza il percorso in " +"Fai clic con il pulsante destro del mouse sul primo percorso e scegli <guimenuitem >Confronta con</guimenuitem >.WinMerge memorizza il percorso in " "memoria finché non si seleziona il secondo percorso." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:244 -msgid "" -"If you decide that you have chosen the wrong first path, you can change it " -"before choosing the second path:" -msgstr "" -"Se decidi di aver scelto la prima strada sbagliata, puoi cambiarla prima di " -"scegliere la seconda strada:" +msgid "If you decide that you have chosen the wrong first path, you can change it before choosing the second path:" +msgstr "Se decidi di aver scelto la prima strada sbagliata, puoi cambiarla prima di scegliere la seconda strada:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:247 msgid "" -"Right-click the new path and choose the <guimenuitem>Re-select First</" -"guimenuitem> shortcut. The new selection overrides your previous path, and " -"you can go on to the next step." +"Right-click the new path and choose the <guimenuitem>Re-select First</guimenuitem> shortcut. The new selection overrides your previous path, and you " +"can go on to the next step." msgstr "" -"Fai clic con il pulsante destro del mouse sul nuovo percorso e scegli la " -"scorciatoia <guimenuitem >Riseleziona primo</guimenuitem >.La nuova " -"selezione sovrascrive il percorso precedente e puoi procedere al passaggio " -"successivo." +"Fai clic con il pulsante destro del mouse sul nuovo percorso e scegli la scorciatoia <guimenuitem >Riseleziona primo</guimenuitem >.La nuova " +"selezione sovrascrive il percorso precedente e puoi procedere al passaggio successivo." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:253 msgid "" -"Navigate to the second file or folder that you want to compare. The second " -"path can be in any folder, or even in a different Windows Explorer window " -"from the first path. Right-click the second path and choose " -"<guimenuitem>Compare</guimenuitem>." +"Navigate to the second file or folder that you want to compare. The second path can be in any folder, or even in a different Windows Explorer window " +"from the first path. Right-click the second path and choose <guimenuitem>Compare</guimenuitem>." msgstr "" -"Passare al secondo file o cartella che si desidera confrontare.Il secondo " -"percorso può trovarsi in qualsiasi cartella o anche in una finestra di " -"Esplora risorse diversa dal primo percorso.Fai clic con il pulsante destro " -"del mouse sul secondo percorso e scegli <guimenuitem >Confronta</guimenuitem " -">." +"Passare al secondo file o cartella che si desidera confrontare.Il secondo percorso può trovarsi in qualsiasi cartella o anche in una finestra di " +"Esplora risorse diversa dal primo percorso.Fai clic con il pulsante destro del mouse sul secondo percorso e scegli <guimenuitem >Confronta</" +"guimenuitem >." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:258 -msgid "" -"WinMerge opens the File Compare or Folder Compare window, loading the first " -"and second paths in the 1st and 2nd sides, respectively." -msgstr "" -"WinMerge apre la finestra Confronta file o Confronta cartelle, caricando il " -"primo e il secondo percorso rispettivamente nel 1° e nel 2° lato." +msgid "WinMerge opens the File Compare or Folder Compare window, loading the first and second paths in the 1st and 2nd sides, respectively." +msgstr "WinMerge apre la finestra Confronta file o Confronta cartelle, caricando il primo e il secondo percorso rispettivamente nel 1° e nel 2° lato." #. type: Content of: <article><section><section><note><para> #: English/Open_paths.xml:265 msgid "" -"If you click <guimenuitem>Compare</guimenuitem> before designating the first " -"path, the Select Files or Folders dialog is opened, with your selection as " -"the first (<guilabel>1st</guilabel>) path. Specify the second path in the " -"<guilabel>2nd</guilabel> field to continue with the comparison." +"If you click <guimenuitem>Compare</guimenuitem> before designating the first path, the Select Files or Folders dialog is opened, with your selection " +"as the first (<guilabel>1st</guilabel>) path. Specify the second path in the <guilabel>2nd</guilabel> field to continue with the comparison." msgstr "" -"Se fai clic su <guimenuitem >Confronta</guimenuitem > prima di designare il " -"primo percorso, si aprirà la finestra di dialogo Seleziona file o cartelle, " -"con la tua selezione come primo (<guilabel >1°</guilabel >) percorso." -"Specifica il secondo percorso nel campo <guilabel >2°</guilabel > per " +"Se fai clic su <guimenuitem >Confronta</guimenuitem > prima di designare il primo percorso, si aprirà la finestra di dialogo Seleziona file o " +"cartelle, con la tua selezione come primo (<guilabel >1°</guilabel >) percorso.Specifica il secondo percorso nel campo <guilabel >2°</guilabel > per " "continuare con il confronto." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:276 msgid "" -"The <guimenuitem>Compare To</guimenuitem> paths is stored in memory until " -"WinMerge is opened. As a result, you don't need to select both files at the " -"same time or even using the same Windows Explorer view: you can choose one, " -"open a different directory, and choose the other one. Both paths are " -"discarded from memory after a compare operation. This means that you cannot " -"select one <guimenuitem>Compare To</guimenuitem> path and compare it against " -"several paths." -msgstr "" -"I percorsi <guimenuitem >Confronta con</guimenuitem > vengono archiviati in " -"memoria fino all'apertura di WinMerge. Di conseguenza, non è necessario " -"selezionare entrambi i file contemporaneamente o addirittura utilizzare la " -"stessa visualizzazione di Esplora risorse: puoi sceglierne uno, apri una " -"cartella diversa e scegliere l'altra. Entrambi i percorsi vengono eliminati " -"dalla memoria dopo un'operazione di confronto. Ciò significa che non puoi " -"selezionare un percorso <guimenuitem >Confronta con</guimenuitem > e " -"confrontarlo con diversi percorsi." +"The <guimenuitem>Compare To</guimenuitem> paths is stored in memory until WinMerge is opened. As a result, you don't need to select both files at the " +"same time or even using the same Windows Explorer view: you can choose one, open a different directory, and choose the other one. Both paths are " +"discarded from memory after a compare operation. This means that you cannot select one <guimenuitem>Compare To</guimenuitem> path and compare it " +"against several paths." +msgstr "" +"I percorsi <guimenuitem >Confronta con</guimenuitem > vengono archiviati in memoria fino all'apertura di WinMerge. Di conseguenza, non è necessario " +"selezionare entrambi i file contemporaneamente o addirittura utilizzare la stessa visualizzazione di Esplora risorse: puoi sceglierne uno, apri una " +"cartella diversa e scegliere l'altra. Entrambi i percorsi vengono eliminati dalla memoria dopo un'operazione di confronto. Ciò significa che non puoi " +"selezionare un percorso <guimenuitem >Confronta con</guimenuitem > e confrontarlo con diversi percorsi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:290 @@ -21598,47 +16484,33 @@ msgstr "specificando nella finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:286 msgid "" -"Including subfolders when using the Windows Explorer integration<placeholder " -"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +"Including subfolders when using the Windows Explorer integration<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Inclusione delle sottocartelle quando si utilizza l'integrazione di Esplora " -"risorse<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"Inclusione delle sottocartelle quando si utilizza l'integrazione di Esplora risorse<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:297 msgid "" -"By default, folder compares that you do using the <guimenuitem>WinMerge</" -"guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut are recursive. " -"There is a way to launch non-recursive compares with the Windows Explorer " -"integration:" +"By default, folder compares that you do using the <guimenuitem>WinMerge</guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut are recursive. " +"There is a way to launch non-recursive compares with the Windows Explorer integration:" msgstr "" -"Per impostazione predefinita, i confronti di cartelle che fai usando la " -"scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</" -"guimenuitem > sono ricorsivi.Esiste un modo per avviare confronti non " -"ricorsivi con l'integrazione di Windows Explorer:" +"Per impostazione predefinita, i confronti di cartelle che fai usando la scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</" +"guimenuitem > sono ricorsivi.Esiste un modo per avviare confronti non ricorsivi con l'integrazione di Windows Explorer:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Open_paths.xml:305 -msgid "" -"Disable <guilabel>Include subfolders</guilabel> in the Folder page of the " -"WinMerge Options dialog." -msgstr "" -"Disabilita <guilabel >Includi sottocartelle</guilabel > nella pagina " -"Cartella della finestra di dialogo Opzioni di WinMerge." +msgid "Disable <guilabel>Include subfolders</guilabel> in the Folder page of the WinMerge Options dialog." +msgstr "Disabilita <guilabel >Includi sottocartelle</guilabel > nella pagina Cartella della finestra di dialogo Opzioni di WinMerge." #. type: Content of: <article><section><section><tip><para> #: English/Open_paths.xml:311 msgid "" -"Press <keycap>Ctrl</keycap> while selecting the <guimenuitem>WinMerge</" -"guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut in the Windows " -"Explorer context menu to force a reverse comparison with the current " -"'Include subfolders' settings." +"Press <keycap>Ctrl</keycap> while selecting the <guimenuitem>WinMerge</guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut in the Windows " +"Explorer context menu to force a reverse comparison with the current 'Include subfolders' settings." msgstr "" -"Premi <keycap >Ctrl</keycap > mentre selezioni la scorciatoia <guimenuitem " -">WinMerge</guimenuitem > o <guimenuitem >Confronta</guimenuitem > nel menu " -"contestuale di Esplora risorse per forzare un confronto inverso con le " -"attuali impostazioni 'Includi sottocartelle'." +"Premi <keycap >Ctrl</keycap > mentre selezioni la scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</guimenuitem > nel menu " +"contestuale di Esplora risorse per forzare un confronto inverso con le attuali impostazioni 'Includi sottocartelle'." #. type: Content of: <article><section><title><indexterm><primary> #: English/Open_paths.xml:321 @@ -21648,60 +16520,41 @@ msgstr "trascina e rilascia, nella finestra WinMerge" #. type: Content of: <article><section><title> #: English/Open_paths.xml:320 msgid "<placeholder type=\"indexterm\" id=\"0\"/>Using Drag and drop" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Utilizzo del trascinamento della " -"selezione" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Utilizzo del trascinamento della selezione" #. type: Content of: <article><section><para> #: English/Open_paths.xml:324 msgid "" -"From any Windows source that allows you to drag objects, such as Windows " -"Explorer or the Desktop, you can drag and drop one or two paths into the " -"WinMerge window. If you drop only one path into WinMerge, the Select Files " -"or Folders dialog opens for you to select the second path. If the single " +"From any Windows source that allows you to drag objects, such as Windows Explorer or the Desktop, you can drag and drop one or two paths into the " +"WinMerge window. If you drop only one path into WinMerge, the Select Files or Folders dialog opens for you to select the second path. If the single " "path specifies a project file, then the project file is opened." msgstr "" -"Da qualsiasi origine Windows che ti consenta di trascinare oggetti, come " -"Esplora risorse o il desktop, puoi trascinare e rilasciare uno o due " -"percorsi nella finestra WinMerge.Se si rilascia un solo percorso in " -"WinMerge, si apre la finestra di dialogo Seleziona file o cartelle per " -"selezionare il secondo percorso.Se il percorso singolo specifica un file di " -"progetto, viene aperto il file di progetto." +"Da qualsiasi origine Windows che ti consenta di trascinare oggetti, come Esplora risorse o il desktop, puoi trascinare e rilasciare uno o due " +"percorsi nella finestra WinMerge.Se si rilascia un solo percorso in WinMerge, si apre la finestra di dialogo Seleziona file o cartelle per " +"selezionare il secondo percorso.Se il percorso singolo specifica un file di progetto, viene aperto il file di progetto." #. type: Content of: <article><section><para> #: English/Open_paths.xml:331 msgid "" -"By default, WinMerge does include subfolders in compare operations. To not " -"include subfolders, press and hold <keycap>Ctrl</keycap> while dropping " -"paths. Another useful key when dropping paths is <keycap>Shift</keycap>: To " -"open the same path in both sides of a Compare window, press and hold " -"<keycap>Shift</keycap> while dropping only one path. This is a handy way to " -"open archive files (see <xref linkend=\"OpeningArchives\" />)." -msgstr "" -"Per impostazione predefinita, WinMerge include le sottocartelle nelle " -"operazioni di confronto.Per non includere sottocartelle, tieni premuto " -"<keycap>Ctrl</keycap> mentre trascini i percorsi.Un altro tasto utile quando " -"si eliminano i percorsi è <keycap>Maiusc</keycap>: per aprire lo stesso " -"percorso su entrambi i lati di una finestra di confronto, premere e tenere " -"premuto <keycap>Maiusc</keycap> mentre si rilascia solo un percorso.Questo è " -"un modo pratico per aprire i file di archivio (vedi <xref " -"linkend=\"OpeningArchives\" />)." +"By default, WinMerge does include subfolders in compare operations. To not include subfolders, press and hold <keycap>Ctrl</keycap> while dropping " +"paths. Another useful key when dropping paths is <keycap>Shift</keycap>: To open the same path in both sides of a Compare window, press and hold " +"<keycap>Shift</keycap> while dropping only one path. This is a handy way to open archive files (see <xref linkend=\"OpeningArchives\" />)." +msgstr "" +"Per impostazione predefinita, WinMerge include le sottocartelle nelle operazioni di confronto.Per non includere sottocartelle, tieni premuto " +"<keycap>Ctrl</keycap> mentre trascini i percorsi.Un altro tasto utile quando si eliminano i percorsi è <keycap>Maiusc</keycap>: per aprire lo stesso " +"percorso su entrambi i lati di una finestra di confronto, premere e tenere premuto <keycap>Maiusc</keycap> mentre si rilascia solo un percorso.Questo " +"è un modo pratico per aprire i file di archivio (vedi <xref linkend=\"OpeningArchives\" />)." #. type: Content of: <article><section><para> #: English/Open_paths.xml:339 msgid "" -"You can drop paths into the Select Files or Folders dialog. A typical " -"procedure is to drag and drop the first path into the WinMerge window, and " -"then drag and drop the second path into the Select Files or Folders dialog. " -"When a path is dropped into the Select Files or Folders dialog, it is loaded " +"You can drop paths into the Select Files or Folders dialog. A typical procedure is to drag and drop the first path into the WinMerge window, and then " +"drag and drop the second path into the Select Files or Folders dialog. When a path is dropped into the Select Files or Folders dialog, it is loaded " "into either the 1st or 2nd path field:" msgstr "" -"È possibile trascinare i percorsi nella finestra di dialogo Seleziona file o " -"cartelle.Una procedura tipica consiste nel trascinare e rilasciare il primo " -"percorso nella finestra WinMerge, quindi trascinare e rilasciare il secondo " -"percorso nella finestra di dialogo Seleziona file o cartelle.Quando un " -"percorso viene rilasciato nella finestra di dialogo Seleziona file o " -"cartelle, viene caricato nel primo o nel secondo campo del percorso:" +"È possibile trascinare i percorsi nella finestra di dialogo Seleziona file o cartelle.Una procedura tipica consiste nel trascinare e rilasciare il " +"primo percorso nella finestra WinMerge, quindi trascinare e rilasciare il secondo percorso nella finestra di dialogo Seleziona file o cartelle.Quando " +"un percorso viene rilasciato nella finestra di dialogo Seleziona file o cartelle, viene caricato nel primo o nel secondo campo del percorso:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Open_paths.xml:347 @@ -21711,9 +16564,7 @@ msgstr "1°" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Open_paths.xml:350 msgid "If the 1st field is empty or both path fields already contain paths" -msgstr "" -"Se il primo campo è vuoto o entrambi i campi del percorso contengono già " -"percorsi" +msgstr "Se il primo campo è vuoto o entrambi i campi del percorso contengono già percorsi" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Open_paths.xml:356 @@ -21732,24 +16583,17 @@ msgstr "specificando i file di progetto" #. type: Content of: <article><section><title> #: English/Open_paths.xml:366 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>Project files" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " -"id=\"1\"/>File di progetto" +msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Project files" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>File di progetto" #. type: Content of: <article><section><para> #: English/Open_paths.xml:374 msgid "" -"You can save the currently open paths and filters in a project file. Then, " -"you can easily open the project later to compare the same files. Project " +"You can save the currently open paths and filters in a project file. Then, you can easily open the project later to compare the same files. Project " "files are handy if you compare the same files repeatedly." msgstr "" -"È possibile salvare i percorsi e i filtri attualmente aperti in un file di " -"progetto.Quindi, puoi facilmente aprire il progetto in un secondo momento " -"per confrontare gli stessi file.I file di progetto sono utili se si " -"confrontano ripetutamente gli stessi file." +"È possibile salvare i percorsi e i filtri attualmente aperti in un file di progetto.Quindi, puoi facilmente aprire il progetto in un secondo momento " +"per confrontare gli stessi file.I file di progetto sono utili se si confrontano ripetutamente gli stessi file." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:379 @@ -21759,62 +16603,42 @@ msgstr "Utilizzo dei file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:381 msgid "" -"To use a project file In the WinMerge window, click <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </" -"menuchoice>. WinMerge reads the paths from the project file. If the project " -"file has two or three paths, two or three paths are opened. If only one path " -"is given or one of the paths is invalid, WinMerge opens the Select Files or " -"Folders dialog, where you can add or correct the path information. Here are " -"a few things to consider:" -msgstr "" -"Per usare un file di progetto Nella finestra WinMerge, fai clic su " -"<menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</" -"guimenuitem > </menuchoice >.WinMerge legge i percorsi dal file di progetto." -"Se il file di progetto ha due o tre percorsi, verranno aperti due o tre " -"percorsi.Se viene fornito un solo percorso o uno dei percorsi non è valido, " -"WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è " -"possibile aggiungere o correggere le informazioni sul percorso.Ecco alcune " -"cose da considerare:" +"To use a project file In the WinMerge window, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </menuchoice>. " +"WinMerge reads the paths from the project file. If the project file has two or three paths, two or three paths are opened. If only one path is given " +"or one of the paths is invalid, WinMerge opens the Select Files or Folders dialog, where you can add or correct the path information. Here are a few " +"things to consider:" +msgstr "" +"Per usare un file di progetto Nella finestra WinMerge, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</guimenuitem > " +"</menuchoice >.WinMerge legge i percorsi dal file di progetto.Se il file di progetto ha due o tre percorsi, verranno aperti due o tre percorsi.Se " +"viene fornito un solo percorso o uno dei percorsi non è valido, WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " +"aggiungere o correggere le informazioni sul percorso.Ecco alcune cose da considerare:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:393 -msgid "" -"If you specify two project files, the project files themselves are compared." -msgstr "" -"Se si specificano due file di progetto, vengono confrontati i file di " -"progetto stessi." +msgid "If you specify two project files, the project files themselves are compared." +msgstr "Se si specificano due file di progetto, vengono confrontati i file di progetto stessi." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:398 msgid "" -"If you specify a project file as the left file but do not specify a right " -"file, the single project file is opened as if you had used the <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </" -"menuchoice> command." +"If you specify a project file as the left file but do not specify a right file, the single project file is opened as if you had used the <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </menuchoice> command." msgstr "" -"Se specifichi un file di progetto come file di sinistra ma non specifichi un " -"file di destra, il singolo file di progetto viene aperto come se avessi " -"usato il comando <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri " -"progetto</guimenuitem > </menuchoice >." +"Se specifichi un file di progetto come file di sinistra ma non specifichi un file di destra, il singolo file di progetto viene aperto come se avessi " +"usato il comando <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:408 msgid "" -"If you specify a project file as the left file and any other file on the " -"right side, the contents of the project file and the other file are compared." +"If you specify a project file as the left file and any other file on the right side, the contents of the project file and the other file are compared." msgstr "" -"Se specifichi un file di progetto come file di sinistra e qualsiasi altro " -"file sul lato destro, vengono confrontati i contenuti del file di progetto e " -"dell'altro file." +"Se specifichi un file di progetto come file di sinistra e qualsiasi altro file sul lato destro, vengono confrontati i contenuti del file di progetto " +"e dell'altro file." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:414 -msgid "" -"To specify a project file on the command line, simply enter it as a single " -"file path." -msgstr "" -"Per specificare un file di progetto sulla riga di comando, è sufficiente " -"inserirlo come percorso di file singolo." +msgid "To specify a project file on the command line, simply enter it as a single file path." +msgstr "Per specificare un file di progetto sulla riga di comando, è sufficiente inserirlo come percorso di file singolo." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:419 @@ -21824,43 +16648,26 @@ msgstr "Modifica e salvataggio dei file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:421 msgid "" -"To save a project file, click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Save Project</guimenuitem> </menuchoice>. The <guilabel>Project " -"File</guilabel> dialog provides fields and options that you can easily edit " -"to build a project file. If a compare window is currently open, the " -"<guilabel>Project File</guilabel> dialog is initialized with values from the " -"current compare; otherwise, you provide the values yourself. To use an " -"existing project, click <guibutton>Open</guibutton> and select a project to " -"load its values (any existing values are overwritten in the dialog)." -msgstr "" -"Per salvare un file di progetto, fai clic su <menuchoice> <guimenu >File</" -"guimenu > <guimenuitem >Salva progetto</guimenuitem > </menuchoice >.La " -"finestra di dialogo <guilabel >File di progetto</guilabel > fornisce campi e " -"opzioni che puoi modificare facilmente per creare un file di progetto.Se una " -"finestra di confronto è attualmente aperta, la finestra di dialogo <guilabel " -">File di progetto</guilabel > viene inizializzata con i valori del confronto " -"corrente;in caso contrario, fornisci tu stesso i valori.Per utilizzare un " -"progetto esistente, fai clic su <guibutton >Apri</guibutton > e seleziona un " -"progetto per caricarne i valori (tutti i valori esistenti verranno " -"sovrascritti nella finestra di dialogo)." +"To save a project file, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Project</guimenuitem> </menuchoice>. The <guilabel>Project File</" +"guilabel> dialog provides fields and options that you can easily edit to build a project file. If a compare window is currently open, the " +"<guilabel>Project File</guilabel> dialog is initialized with values from the current compare; otherwise, you provide the values yourself. To use an " +"existing project, click <guibutton>Open</guibutton> and select a project to load its values (any existing values are overwritten in the dialog)." +msgstr "" +"Per salvare un file di progetto, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva progetto</guimenuitem > </menuchoice >.La " +"finestra di dialogo <guilabel >File di progetto</guilabel > fornisce campi e opzioni che puoi modificare facilmente per creare un file di progetto.Se " +"una finestra di confronto è attualmente aperta, la finestra di dialogo <guilabel >File di progetto</guilabel > viene inizializzata con i valori del " +"confronto corrente;in caso contrario, fornisci tu stesso i valori.Per utilizzare un progetto esistente, fai clic su <guibutton >Apri</guibutton > e " +"seleziona un progetto per caricarne i valori (tutti i valori esistenti verranno sovrascritti nella finestra di dialogo)." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:433 -msgid "" -"When you finished editing, click <guibutton>Save</guibutton> to store the " -"file." -msgstr "" -"Una volta terminata la modifica, fai clic su <guibutton >Salva</guibutton > " -"per archiviare il file." +msgid "When you finished editing, click <guibutton>Save</guibutton> to store the file." +msgstr "Una volta terminata la modifica, fai clic su <guibutton >Salva</guibutton > per archiviare il file." #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:437 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:442 @@ -21874,12 +16681,8 @@ msgstr "Formato del file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:450 -msgid "" -"Project files are simple XML files with <filename class=\"extension\">a ." -"WinMerge</filename> extension. For example:" -msgstr "" -"I file di progetto sono semplici file XML con estensione <filename " -"class=\"extension\">.WinMerge</filename>.Per esempio:" +msgid "Project files are simple XML files with <filename class=\"extension\">a .WinMerge</filename> extension. For example:" +msgstr "I file di progetto sono semplici file XML con estensione <filename class=\"extension\">.WinMerge</filename>.Per esempio:" #. type: Content of: <article><section><section><screen> #: English/Open_paths.xml:453 @@ -21915,12 +16718,8 @@ msgstr "" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:467 -msgid "" -"A project file contains a <sgmltag>paths</sgmltag> element that can contain " -"one of each of these elements:" -msgstr "" -"Un file di progetto contiene un elemento <sgmltag>paths</sgmltag> che può " -"contenere uno di ciascuno di questi elementi:" +msgid "A project file contains a <sgmltag>paths</sgmltag> element that can contain one of each of these elements:" +msgstr "Un file di progetto contiene un elemento <sgmltag>paths</sgmltag> che può contenere uno di ciascuno di questi elementi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Open_paths.xml:472 @@ -21948,14 +16747,12 @@ msgid "<sgmltag>left-readonly</sgmltag>" msgstr "<sgmltag>sola lettura a sinistra</sgmltag>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Open_paths.xml:491 English/Open_paths.xml:517 -#: English/Open_paths.xml:543 +#: English/Open_paths.xml:491 English/Open_paths.xml:517 English/Open_paths.xml:543 msgid "1 = Open read only" msgstr "1 = Aperto in sola lettura" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Open_paths.xml:493 English/Open_paths.xml:519 -#: English/Open_paths.xml:545 +#: English/Open_paths.xml:493 English/Open_paths.xml:519 English/Open_paths.xml:545 msgid "0 = Open normally" msgstr "0 = Aperto normalmente" @@ -22271,12 +17068,8 @@ msgstr "5 = Dimensione" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:718 -msgid "" -"None of the fields is required, and they can be empty (<literal>for example, " -"<left></left> or <left/></literal>)." -msgstr "" -"Nessuno dei campi è obbligatorio e possono essere vuoti (<literal>ad " -"esempio, <left></left> o <left/></literal>)." +msgid "None of the fields is required, and they can be empty (<literal>for example, <left></left> or <left/></literal>)." +msgstr "Nessuno dei campi è obbligatorio e possono essere vuoti (<literal>ad esempio, <left></left> o <left/></literal>)." #. type: Content of: <article><section><title><indexterm><primary> #: English/Plugins.xml:4 English/Plugins.xml:378 English/Plugins.xml:2717 @@ -22291,14 +17084,11 @@ msgstr "Plugin<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Plugins.xml:7 msgid "" -"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that " -"preprocess data before a comparison. For example, you can use a plugin to " -"extract text data from MS Word files for WinMerge to compare." +"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that preprocess data before a comparison. For example, you can use a plugin " +"to extract text data from MS Word files for WinMerge to compare." msgstr "" -"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, " -"che preelaborano i dati prima di un confronto.Ad esempio, puoi utilizzare un " -"plug-in per estrarre dati di testo da file MS Word affinché WinMerge possa " -"confrontarli." +"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, che preelaborano i dati prima di un confronto.Ad esempio, puoi " +"utilizzare un plug-in per estrarre dati di testo da file MS Word affinché WinMerge possa confrontarli." #. type: Content of: <article><para><indexterm><primary> #: English/Plugins.xml:12 @@ -22312,36 +17102,24 @@ msgstr "Ogni plug-in è:<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:17 -msgid "" -"A single dll or a scriptlet (<filename class=\"extension\">sct</filename>) " -"file" -msgstr "" -"Un singolo file dll o scriptlet (<filename class=\"extension\">sct</" -"filename>)" +msgid "A single dll or a scriptlet (<filename class=\"extension\">sct</filename>) file" +msgstr "Un singolo file dll o scriptlet (<filename class=\"extension\">sct</filename>)" #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:22 -msgid "" -"Installed in the <filename class=\"directory\">MergePlugins</filename> " -"subfolder. A number of plugins can be installed for you by WinMerge." -msgstr "" -"Installato nella sottocartella <filename class=\"directory\">MergePlugins</" -"filename>. WinMerge può installare numerosi plugin." +msgid "Installed in the <filename class=\"directory\">MergePlugins</filename> subfolder. A number of plugins can be installed for you by WinMerge." +msgstr "Installato nella sottocartella <filename class=\"directory\">MergePlugins</filename>. WinMerge può installare numerosi plugin." #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:27 msgid "" -"Easy to install: To install a plugin that is not included in the WinMerge " -"installation, just copy the plugin file to <filename " -"class=\"directory\">MergePlugins</filename>. The plugin is available the " -"next time you open WinMerge. You can find more plugins on the web, written " +"Easy to install: To install a plugin that is not included in the WinMerge installation, just copy the plugin file to <filename " +"class=\"directory\">MergePlugins</filename>. The plugin is available the next time you open WinMerge. You can find more plugins on the web, written " "by other developers." msgstr "" -"Facile da installare: per installare un plugin che non è incluso " -"nell'installazione di WinMerge, basta copiare il file del plugin in " -"<filename class=\"directory\">MergePlugins</filename>.Il plugin sarà " -"disponibile la prossima volta che apri WinMerge. Puoi trovare altri plugin " -"sul web, scritti da altri sviluppatori." +"Facile da installare: per installare un plugin che non è incluso nell'installazione di WinMerge, basta copiare il file del plugin in <filename " +"class=\"directory\">MergePlugins</filename>.Il plugin sarà disponibile la prossima volta che apri WinMerge. Puoi trovare altri plugin sul web, " +"scritti da altri sviluppatori." #. type: Content of: <article><section><title> #: English/Plugins.xml:36 @@ -22365,88 +17143,63 @@ msgstr "Complemento dell'editor<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:47 -msgid "" -"This type of plugin performs custom operations on selected text in the " -"active editor (File pane) of the File Compare window." -msgstr "" -"Questo tipo di plugin esegue operazioni personalizzate sul testo selezionato " -"nell'editor attivo (pannello File) della finestra Confronta file." +msgid "This type of plugin performs custom operations on selected text in the active editor (File pane) of the File Compare window." +msgstr "Questo tipo di plugin esegue operazioni personalizzate sul testo selezionato nell'editor attivo (pannello File) della finestra Confronta file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Plugins.xml:53 -msgid "" -"Unpacker: transform a file to a text format<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Unpacker: trasforma un file in un formato testo<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Unpacker: transform a file to a text format<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Unpacker: trasforma un file in un formato testo<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:58 msgid "" -"This type of plugin transforms a compressed file to a viewable format by " -"decompressing it. The original file is not changed: a temporary transformed " +"This type of plugin transforms a compressed file to a viewable format by decompressing it. The original file is not changed: a temporary transformed " "file is created and loaded in WinMerge." msgstr "" -"Questo tipo di plugin trasforma un file compresso in un formato " -"visualizzabile decomprimendolo.Il file originale non viene modificato: viene " -"creato e caricato in WinMerge un file trasformato temporaneo." +"Questo tipo di plugin trasforma un file compresso in un formato visualizzabile decomprimendolo.Il file originale non viene modificato: viene creato e " +"caricato in WinMerge un file trasformato temporaneo." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:62 msgid "" -"Unpacker plugins operate on entire files, not to selected text or diffs " -"within files. Therefore, they are available only when you launch file " -"comparisons, from either the Folder Compare window or the Select Files or " -"Folders dialog. Unpacker plugins are not available in the File Compare " +"Unpacker plugins operate on entire files, not to selected text or diffs within files. Therefore, they are available only when you launch file " +"comparisons, from either the Folder Compare window or the Select Files or Folders dialog. Unpacker plugins are not available in the File Compare " "window." msgstr "" -"I plugin di unpacker operano su interi file, non sul testo selezionato o " -"sulle differenze all'interno dei file.Pertanto, sono disponibili solo quando " -"si avviano i confronti di file, dalla finestra Confronto cartelle o dalla " -"finestra di dialogo Seleziona file o cartelle.I plugin di decompressione non " -"sono disponibili nella finestra Confronto file." +"I plugin di unpacker operano su interi file, non sul testo selezionato o sulle differenze all'interno dei file.Pertanto, sono disponibili solo quando " +"si avviano i confronti di file, dalla finestra Confronto cartelle o dalla finestra di dialogo Seleziona file o cartelle.I plugin di decompressione " +"non sono disponibili nella finestra Confronto file." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:68 msgid "" -"Sometimes the unpacked file can be repacked (see the details in <xref " -"linkend=\"Plugins_available\" /> to check whether a plugin supports " -"repacking). Then, you can merge and save the transformed file. The packing " -"is done automatically in this case. To be safe, we suggest that you rename " -"the transformed file when you save it." +"Sometimes the unpacked file can be repacked (see the details in <xref linkend=\"Plugins_available\" /> to check whether a plugin supports repacking). " +"Then, you can merge and save the transformed file. The packing is done automatically in this case. To be safe, we suggest that you rename the " +"transformed file when you save it." msgstr "" -"A volte il file decompresso può essere recompresso (vedi i dettagli in <xref " -"linkend=\"Plugins_available\" /> per verificare se un plugin supporta la " -"recompressione).Quindi, puoi unire e salvare il file trasformato.In questo " -"caso l'imballaggio viene effettuato automaticamente.Per sicurezza, ti " +"A volte il file decompresso può essere recompresso (vedi i dettagli in <xref linkend=\"Plugins_available\" /> per verificare se un plugin supporta la " +"recompressione).Quindi, puoi unire e salvare il file trasformato.In questo caso l'imballaggio viene effettuato automaticamente.Per sicurezza, ti " "suggeriamo di rinominare il file trasformato quando lo salvi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><note><para> #: English/Plugins.xml:75 msgid "" -"When you compare folders, WinMerge can give different results for compressed " -"and uncompressed files. For example, files that are identical when " -"uncompressed might be different if they include the creation date. WinMerge " -"applies the unpacker in all situations, and you are sure to have the same " +"When you compare folders, WinMerge can give different results for compressed and uncompressed files. For example, files that are identical when " +"uncompressed might be different if they include the creation date. WinMerge applies the unpacker in all situations, and you are sure to have the same " "result when you compare a folder, or when you merge two versions of a file." msgstr "" -"Quando confronti le cartelle, WinMerge può fornire risultati diversi per i " -"file compressi e non compressi.Ad esempio, i file identici quando non " -"compressi potrebbero essere diversi se includono la data di creazione." -"WinMerge applica l'unpacker in tutte le situazioni e sarai sicuro di " -"ottenere lo stesso risultato quando confronti una cartella o quando unisci " -"due versioni di un file." +"Quando confronti le cartelle, WinMerge può fornire risultati diversi per i file compressi e non compressi.Ad esempio, i file identici quando non " +"compressi potrebbero essere diversi se includono la data di creazione.WinMerge applica l'unpacker in tutte le situazioni e sarai sicuro di ottenere " +"lo stesso risultato quando confronti una cartella o quando unisci due versioni di un file." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:83 msgid "" -"Example plugin: <xref linkend=\"CompareMSExcelFiles\" /> displays the text " -"contents of a <trademark class=\"registered\">Microsoft</trademark> " +"Example plugin: <xref linkend=\"CompareMSExcelFiles\" /> displays the text contents of a <trademark class=\"registered\">Microsoft</trademark> " "<application>Excel</application> file." msgstr "" -"Plugin di esempio: <xref linkend=\"CompareMSExcelFiles\" /> visualizza il " -"contenuto testuale di un file <trademark class=\"registered\">Microsoft</" +"Plugin di esempio: <xref linkend=\"CompareMSExcelFiles\" /> visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</" "trademark> <application>Excel</application>." #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> @@ -22456,32 +17209,24 @@ msgstr "plugin prediletti" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Plugins.xml:91 -msgid "" -"Prediffer: preprocess files to hide some differences<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Prediffer: preelabora i file per nascondere alcune differenze<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Prediffer: preprocess files to hide some differences<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Prediffer: preelabora i file per nascondere alcune differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:96 msgid "" -"This type of plugin does not operate on the source files displayed in the " -"Compare window. It operates instead on temporary copies of the files, and " +"This type of plugin does not operate on the source files displayed in the Compare window. It operates instead on temporary copies of the files, and " "the copies are then scanned to create the difference list." msgstr "" -"Questo tipo di plugin non funziona sui file sorgente visualizzati nella " -"finestra Confronta.Funziona invece su copie temporanee dei file e le copie " +"Questo tipo di plugin non funziona sui file sorgente visualizzati nella finestra Confronta.Funziona invece su copie temporanee dei file e le copie " "vengono quindi scansionate per creare l'elenco delle differenze." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:101 msgid "" -"Example plugin: <xref linkend=\"IgnoreColumns\" /> ignores the differences " -"inside specified columns, while displaying the characters in these columns." +"Example plugin: <xref linkend=\"IgnoreColumns\" /> ignores the differences inside specified columns, while displaying the characters in these columns." msgstr "" -"Plugin di esempio: <xref linkend=\"IgnoreColumns\" /> ignora le differenze " -"all'interno delle colonne specificate, mentre visualizza i caratteri in " +"Plugin di esempio: <xref linkend=\"IgnoreColumns\" /> ignora le differenze all'interno delle colonne specificate, mentre visualizza i caratteri in " "queste colonne." #. type: Content of: <article><section><title> @@ -22492,49 +17237,34 @@ msgstr "Plugin consigliati e modalità automatiche" #. type: Content of: <article><section><para> #: English/Plugins.xml:112 msgid "" -"How is WinMerge able to apply the right plugin for a given file? Each plugin " -"specifies a list of file extensions (also listed in each plugin's <xref " -"linkend=\"Plugins_available\" /> section, under <citetitle>File filter</" -"citetitle>). The extensions are used to associate one or more file types " -"with the plugin: when a compared file's extension matches an extension in " -"the plugin's list, the plugin is considered to be a <firstterm>suggested " -"plugin. </firstterm>" -msgstr "" -"In che modo WinMerge è in grado di applicare il plug-in giusto per un " -"determinato file?Ogni plugin specifica un elenco di estensioni di file " -"(elencate anche nella sezione <xref linkend=\"Plugins_available\" /> di ogni " -"plugin, sotto <citetitle>Filtro file</citetitle>).Le estensioni vengono " -"utilizzate per associare uno o più tipi di file al plugin: quando " -"l'estensione di un file confrontato corrisponde a un'estensione nell'elenco " -"del plugin, il plugin è considerato un plugin <firstterm>suggerito.</" -"firstterm>" +"How is WinMerge able to apply the right plugin for a given file? Each plugin specifies a list of file extensions (also listed in each plugin's <xref " +"linkend=\"Plugins_available\" /> section, under <citetitle>File filter</citetitle>). The extensions are used to associate one or more file types with " +"the plugin: when a compared file's extension matches an extension in the plugin's list, the plugin is considered to be a <firstterm>suggested plugin. " +"</firstterm>" +msgstr "" +"In che modo WinMerge è in grado di applicare il plug-in giusto per un determinato file?Ogni plugin specifica un elenco di estensioni di file " +"(elencate anche nella sezione <xref linkend=\"Plugins_available\" /> di ogni plugin, sotto <citetitle>Filtro file</citetitle>).Le estensioni vengono " +"utilizzate per associare uno o più tipi di file al plugin: quando l'estensione di un file confrontato corrisponde a un'estensione nell'elenco del " +"plugin, il plugin è considerato un plugin <firstterm>suggerito.</firstterm>" #. type: Content of: <article><section><para> #: English/Plugins.xml:120 msgid "" -"There are separate WinMerge options for the unpacking and prediffer types, " -"described later in this topic, that enable you to apply the plugins either " -"manually or automatically. There is no automatic mode for editor complement " -"plugins." +"There are separate WinMerge options for the unpacking and prediffer types, described later in this topic, that enable you to apply the plugins either " +"manually or automatically. There is no automatic mode for editor complement plugins." msgstr "" -"Sono disponibili opzioni WinMerge separate per i tipi di decompressione e " -"prediffer, descritti più avanti in questo argomento, che consentono di " -"applicare i plug-in manualmente o automaticamente.Non esiste una modalità " -"automatica per i plugin di complemento dell'editor." +"Sono disponibili opzioni WinMerge separate per i tipi di decompressione e prediffer, descritti più avanti in questo argomento, che consentono di " +"applicare i plug-in manualmente o automaticamente.Non esiste una modalità automatica per i plugin di complemento dell'editor." #. type: Content of: <article><section><para> #: English/Plugins.xml:125 msgid "" -"When you apply plugins to a selected file using automatic mode, WinMerge " -"searches its list of suggested plugins for that file type, and applies the " -"first plugin whose name matches. The search is performed in alphabetical " -"order, so if there are multiple suggested plugins for a file type, only the " +"When you apply plugins to a selected file using automatic mode, WinMerge searches its list of suggested plugins for that file type, and applies the " +"first plugin whose name matches. The search is performed in alphabetical order, so if there are multiple suggested plugins for a file type, only the " "first one found is applied." msgstr "" -"Quando applichi plug-in a un file selezionato utilizzando la modalità " -"automatica, WinMerge cerca nell'elenco dei plug-in suggeriti per quel tipo " -"di file e applica il primo plug-in il cui nome corrisponde.La ricerca viene " -"eseguita in ordine alfabetico, quindi se sono presenti più plugin suggeriti " +"Quando applichi plug-in a un file selezionato utilizzando la modalità automatica, WinMerge cerca nell'elenco dei plug-in suggeriti per quel tipo di " +"file e applica il primo plug-in il cui nome corrisponde.La ricerca viene eseguita in ordine alfabetico, quindi se sono presenti più plugin suggeriti " "per un tipo di file, verrà applicato solo il primo trovato." #. type: Content of: <article><section><title> @@ -22545,30 +17275,25 @@ msgstr "Applicazione dei plugin" #. type: Content of: <article><section><para> #: English/Plugins.xml:135 msgid "" -"The following subsections describe how to apply each type of plugin. The " -"methods are different for each type of plugin, and also vary depending on " +"The following subsections describe how to apply each type of plugin. The methods are different for each type of plugin, and also vary depending on " "whether you are comparing folders or files." msgstr "" -"Le seguenti sottosezioni descrivono come applicare ciascun tipo di plugin.I " -"metodi sono diversi per ogni tipo di plugin e variano anche a seconda che si " -"stia confrontando cartelle o file." +"Le seguenti sottosezioni descrivono come applicare ciascun tipo di plugin.I metodi sono diversi per ogni tipo di plugin e variano anche a seconda che " +"si stia confrontando cartelle o file." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:140 msgid "Applying editor complement plugins in the File Compare window" -msgstr "" -"Applicazione dei plugin complemento dell'editor nella finestra Confronta file" +msgstr "Applicazione dei plugin complemento dell'editor nella finestra Confronta file" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:143 msgid "" -"With your cursor in either File pane of the File Compare window, click " -"<menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </" +"With your cursor in either File pane of the File Compare window, click <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </" "menuchoice> and choose one of these functions:" msgstr "" -"Con il cursore nel pannello File della finestra Confronta file, fai clic su " -"<menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </" -"menuchoice > e scegli una di queste funzioni:" +"Con il cursore nel pannello File della finestra Confronta file, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu " +"> </menuchoice > e scegli una di queste funzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:152 @@ -22653,66 +17378,47 @@ msgstr "<function>Insert Time</function>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:216 msgid "" -"The functions are contributed to the <guisubmenu>Scripts</guisubmenu> menu " -"by the <xref linkend=\"EditorAddin\" /> and <xref " +"The functions are contributed to the <guisubmenu>Scripts</guisubmenu> menu by the <xref linkend=\"EditorAddin\" /> and <xref " "linkend=\"Plugins_datetime\" /> plugins." msgstr "" -"Le funzioni vengono fornite al menu <guisubmenu >Script</guisubmenu > dai " -"plugin <xref linkend=\"EditorAddin\" /> e <xref " +"Le funzioni vengono fornite al menu <guisubmenu >Script</guisubmenu > dai plugin <xref linkend=\"EditorAddin\" /> e <xref " "linkend=\"Plugins_datetime\" />." #. type: Content of: <article><section><section><note><para> #: English/Plugins.xml:222 -msgid "" -"Editor complement plugins are not available in the Folder Compare window." -msgstr "" -"I plugin di complemento dell'editor non sono disponibili nella finestra " -"Confronto cartelle." +msgid "Editor complement plugins are not available in the Folder Compare window." +msgstr "I plugin di complemento dell'editor non sono disponibili nella finestra Confronto cartelle." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:228 msgid "Applying unpacker plugins in the Folder Compare window" -msgstr "" -"Applicazione dei plugin di decompressione nella finestra Confronto cartelle" +msgstr "Applicazione dei plugin di decompressione nella finestra Confronto cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:230 -msgid "" -"Before applying unpacker plugins, you can set its mode to either automatic " -"or manual mode." -msgstr "" -"Prima di applicare i plugin di decompressione, puoi impostarne la modalità " -"su automatica o manuale." +msgid "Before applying unpacker plugins, you can set its mode to either automatic or manual mode." +msgstr "Prima di applicare i plugin di decompressione, puoi impostarne la modalità su automatica o manuale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:235 msgid "" -"To set automatic mode for this type of plugin, click <menuchoice> " -"<guimenu>Plugins</guimenu> <guimenuitem>Automatic Unpacking</guimenuitem> </" +"To set automatic mode for this type of plugin, click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Automatic Unpacking</guimenuitem> </" "menuchoice>." msgstr "" -"Per impostare la modalità automatica per questo tipo di plugin, fai clic su " -"<menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione " +"Per impostare la modalità automatica per questo tipo di plugin, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione " "automatica</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:243 -msgid "" -"To set manual mode, click <menuchoice> <guimenu>Plugins</guimenu> " -"<guimenuitem>Manual Unpacking</guimenuitem> </menuchoice>." +msgid "To set manual mode, click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Manual Unpacking</guimenuitem> </menuchoice>." msgstr "" -"Per impostare la modalità manuale, fai clic su <menuchoice> <guimenu " -">Plugin</guimenu > <guimenuitem >Decompressione manuale</guimenuitem > </" +"Per impostare la modalità manuale, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione manuale</guimenuitem > </" "menuchoice >." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:251 -msgid "" -"Remember to click <keycap>F5</keycap> to reload the Folder Compare window " -"using the new setting." -msgstr "" -"Ricordati di fare clic su <keycap>F5</keycap> per ricaricare la finestra " -"Confronto cartelle utilizzando la nuova impostazione." +msgid "Remember to click <keycap>F5</keycap> to reload the Folder Compare window using the new setting." +msgstr "Ricordati di fare clic su <keycap>F5</keycap> per ricaricare la finestra Confronto cartelle utilizzando la nuova impostazione." #. type: Content of: <article><section><section><section><title> #: English/Plugins.xml:255 @@ -22722,32 +17428,23 @@ msgstr "Utilizzando la modalità automatica" #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:257 msgid "" -"To apply plugins when automatic unpacking is set, simply launch a compare " -"operation on a file in the Folder Compare window. If the file's type " -"suggested unpacker plugin (if any) preprocesses the file before WinMerge " -"opens it in the File Compare window." +"To apply plugins when automatic unpacking is set, simply launch a compare operation on a file in the Folder Compare window. If the file's type " +"suggested unpacker plugin (if any) preprocesses the file before WinMerge opens it in the File Compare window." msgstr "" -"Per applicare i plugin quando è impostata la decompressione automatica, è " -"sufficiente avviare un'operazione di confronto su un file nella finestra " -"Confronto cartelle.Se il tipo di file suggerisce il plug-in di " -"decompressione (se presente), preelabora il file prima che WinMerge lo apra " -"nella finestra Confronta file." +"Per applicare i plugin quando è impostata la decompressione automatica, è sufficiente avviare un'operazione di confronto su un file nella finestra " +"Confronto cartelle.Se il tipo di file suggerisce il plug-in di decompressione (se presente), preelabora il file prima che WinMerge lo apra nella " +"finestra Confronta file." #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:262 msgid "" -"For example, suppose you right-click an MS Word <filename>doc</filename> " -"file and choose <guimenuitem>Compare</guimenuitem> (also assume that the " -"<xref linkend=\"Plugins_msword\" /> plugin is available). WinMerge converts " -"the doc file (or rather, a copy of it ) to a plain text file and opens it in " -"the File Compare window." -msgstr "" -"Ad esempio, supponiamo di fare clic con il pulsante destro del mouse su un " -"file <filename>doc</filename> di MS Word e scegliere <guimenuitem " -">Confronta</guimenuitem > (assumendo anche che il plugin <xref " -"linkend=\"Plugins_msword\" /> sia disponibile).WinMerge converte il file doc " -"(o meglio, una sua copia) in un file di testo semplice e lo apre nella " -"finestra Confronta file." +"For example, suppose you right-click an MS Word <filename>doc</filename> file and choose <guimenuitem>Compare</guimenuitem> (also assume that the " +"<xref linkend=\"Plugins_msword\" /> plugin is available). WinMerge converts the doc file (or rather, a copy of it ) to a plain text file and opens it " +"in the File Compare window." +msgstr "" +"Ad esempio, supponiamo di fare clic con il pulsante destro del mouse su un file <filename>doc</filename> di MS Word e scegliere <guimenuitem " +">Confronta</guimenuitem > (assumendo anche che il plugin <xref linkend=\"Plugins_msword\" /> sia disponibile).WinMerge converte il file doc (o " +"meglio, una sua copia) in un file di testo semplice e lo apre nella finestra Confronta file." #. type: Content of: <article><section><section><section><title> #: English/Plugins.xml:271 @@ -22757,12 +17454,10 @@ msgstr "Utilizzo della modalità manuale" #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:273 msgid "" -"Manual mode enables you to choose a different unpacker plugin than the one " -"that is selected for you in automatic mode. You can also launch the compare " -"using no plugin." +"Manual mode enables you to choose a different unpacker plugin than the one that is selected for you in automatic mode. You can also launch the " +"compare using no plugin." msgstr "" -"La modalità manuale ti consente di scegliere un plug-in di decompressione " -"diverso da quello selezionato per te in modalità automatica.Puoi anche " +"La modalità manuale ti consente di scegliere un plug-in di decompressione diverso da quello selezionato per te in modalità automatica.Puoi anche " "avviare il confronto senza plug-in." #. type: Content of: <article><section><section><section><para> @@ -22777,21 +17472,13 @@ msgstr "Seleziona il file che vuoi confrontare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:285 -msgid "" -"Click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Edit with " -"Unpacker</guimenuitem> </menuchoice>." -msgstr "" -"Fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Modifica " -"con Unpacker</guimenuitem > </menuchoice >." +msgid "Click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Edit with Unpacker</guimenuitem> </menuchoice>." +msgstr "Fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Modifica con Unpacker</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:291 -msgid "" -"This menu item is enabled only if the selected file's type is supported by " -"an available unpacking plugin." -msgstr "" -"Questa voce di menu è abilitata solo se il tipo di file selezionato è " -"supportato da un plug-in di decompressione disponibile." +msgid "This menu item is enabled only if the selected file's type is supported by an available unpacking plugin." +msgstr "Questa voce di menu è abilitata solo se il tipo di file selezionato è supportato da un plug-in di decompressione disponibile." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:296 @@ -22800,83 +17487,58 @@ msgstr "Nella finestra di dialogo Seleziona decompressore:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:304 -msgid "" -"Click <guibutton>OK</guibutton> to close the Select Unpacker dialog and " -"launch the file comparison." -msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " -"Seleziona Unpacker e avviare il confronto dei file." +msgid "Click <guibutton>OK</guibutton> to close the Select Unpacker dialog and launch the file comparison." +msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Seleziona Unpacker e avviare il confronto dei file." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:312 msgid "Applying unpacker plugins in the Select Files or Folders dialog" -msgstr "" -"Applicazione dei plugin di decompressione nella finestra di dialogo " -"Seleziona file o cartelle" +msgstr "Applicazione dei plugin di decompressione nella finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:315 msgid "" -"You can use the Select Unpacker dialog to apply a plugin when you launch a " -"file comparison from the Select Files or Folders dialog. See <xref " +"You can use the Select Unpacker dialog to apply a plugin when you launch a file comparison from the Select Files or Folders dialog. See <xref " "linkend=\"Open_paths_unpacker\" /> for details." msgstr "" -"È possibile utilizzare la finestra di dialogo Seleziona Unpacker per " -"applicare un plug-in quando si avvia un confronto di file dalla finestra di " -"dialogo Seleziona file o cartelle.Vedi <xref " -"linkend=\"Open_paths_unpacker\" /> per i dettagli." +"È possibile utilizzare la finestra di dialogo Seleziona Unpacker per applicare un plug-in quando si avvia un confronto di file dalla finestra di " +"dialogo Seleziona file o cartelle.Vedi <xref linkend=\"Open_paths_unpacker\" /> per i dettagli." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:321 msgid "Applying prediffer plugins in the Folder Compare window" -msgstr "" -"Applicazione dei plug-in di preferenza nella finestra Confronto cartelle" +msgstr "Applicazione dei plug-in di preferenza nella finestra Confronto cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:323 msgid "" -"With prediffer plugins, you set the mode (<firstterm><Automatic> </" -"firstterm> or <firstterm><None></firstterm>) or the plugin name for " -"individual files. (Contrast this with unpacker plugins, where you set the " -"mode for all files.) That is, some files in the same folder have different " +"With prediffer plugins, you set the mode (<firstterm><Automatic> </firstterm> or <firstterm><None></firstterm>) or the plugin name for " +"individual files. (Contrast this with unpacker plugins, where you set the mode for all files.) That is, some files in the same folder have different " "prediffer modes." msgstr "" -"Con i plugin prediffer, imposti la modalità (<firstterm><Automatica> </" -"firstterm> o <firstterm><None></firstterm>) o il nome del plugin per i " -"singoli file.(Confronta questo con i plugin di decompressione, dove imposti " -"la modalità per tutti i file.) Cioè, alcuni file nella stessa cartella hanno " -"modalità predifferenti diverse." +"Con i plugin prediffer, imposti la modalità (<firstterm><Automatica> </firstterm> o <firstterm><None></firstterm>) o il nome del plugin " +"per i singoli file.(Confronta questo con i plugin di decompressione, dove imposti la modalità per tutti i file.) Cioè, alcuni file nella stessa " +"cartella hanno modalità predifferenti diverse." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:329 msgid "" -"To set the mode for one or more files in the Folder Compare window, right-" -"click the files and choose <menuchoice> <guimenu>Plugin Settings</guimenu> " -"<guisubmenu>Prediffer Settings</guisubmenu> </menuchoice>, then choose one " -"of the submenu options:" +"To set the mode for one or more files in the Folder Compare window, right-click the files and choose <menuchoice> <guimenu>Plugin Settings</guimenu> " +"<guisubmenu>Prediffer Settings</guisubmenu> </menuchoice>, then choose one of the submenu options:" msgstr "" -"Per impostare la modalità per uno o più file nella finestra Confronto " -"cartelle, fai clic con il pulsante destro del mouse sui file e scegli " -"<menuchoice> <guimenu >Impostazioni plugin</guimenu > <guisubmenu " -">Impostazioni preferenze</guisubmenu > </menuchoice >, quindi scegli una " -"delle opzioni del sottomenu:" +"Per impostare la modalità per uno o più file nella finestra Confronto cartelle, fai clic con il pulsante destro del mouse sui file e scegli " +"<menuchoice> <guimenu >Impostazioni plugin</guimenu > <guisubmenu >Impostazioni preferenze</guisubmenu > </menuchoice >, quindi scegli una delle " +"opzioni del sottomenu:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:338 -msgid "" -"<guisubmenu><Automatic></guisubmenu> selects the first prediffer " -"plugin available for the file type." -msgstr "" -"<guisubmenu ><Automatico></guisubmenu > seleziona il primo plugin di " -"predifferenza disponibile per il tipo di file." +msgid "<guisubmenu><Automatic></guisubmenu> selects the first prediffer plugin available for the file type." +msgstr "<guisubmenu ><Automatico></guisubmenu > seleziona il primo plugin di predifferenza disponibile per il tipo di file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:343 -msgid "" -"<guisubmenu><None></guisubmenu> means that no prediffer plugin is used." -msgstr "" -"<guisubmenu ><None></guisubmenu > significa che non viene utilizzato " -"alcun plugin di prediffer." +msgid "<guisubmenu><None></guisubmenu> means that no prediffer plugin is used." +msgstr "<guisubmenu ><None></guisubmenu > significa che non viene utilizzato alcun plugin di prediffer." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:348 @@ -22885,22 +17547,16 @@ msgstr "Fai clic su <keycap>F5</keycap> per aggiornare la finestra." #. type: Content of: <article><section><section><note><para> #: English/Plugins.xml:351 -msgid "" -"When you open a subfolder during a non-recursive compare, the mode is always " -"reset to <guimenuitem><None></guimenuitem>." +msgid "When you open a subfolder during a non-recursive compare, the mode is always reset to <guimenuitem><None></guimenuitem>." msgstr "" -"Quando apri una sottocartella durante un confronto non ricorsivo, la " -"modalità viene sempre reimpostata su <guimenuitem ><Nessuno></" -"guimenuitem >." +"Quando apri una sottocartella durante un confronto non ricorsivo, la modalità viene sempre reimpostata su <guimenuitem ><Nessuno></guimenuitem " +">." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:355 -msgid "" -"When you open a file from the Folder Compare window, your prediffer setting " -"for that file is applied before the File Compare window is opened." +msgid "When you open a file from the Folder Compare window, your prediffer setting for that file is applied before the File Compare window is opened." msgstr "" -"Quando apri un file dalla finestra Confronto cartelle, l'impostazione " -"predefinita per quel file viene applicata prima dell'apertura della finestra " +"Quando apri un file dalla finestra Confronto cartelle, l'impostazione predefinita per quel file viene applicata prima dell'apertura della finestra " "Confronto file." #. type: Content of: <article><section><section><title> @@ -22911,18 +17567,13 @@ msgstr "Applicazione dei plug-in di preferenza nella finestra Confronto file" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:363 msgid "" -"In the File Compare window, you can apply a prediffer plugin by clicking " -"<menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Prediffer</guisubmenu> </" -"menuchoice> and choosing one of the plugins in the list. Suggested plugins " -"are indicated at the top of the list. The files are compared again after the " -"plugin is applied, so you don't need to rescan the files." +"In the File Compare window, you can apply a prediffer plugin by clicking <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Prediffer</guisubmenu> </" +"menuchoice> and choosing one of the plugins in the list. Suggested plugins are indicated at the top of the list. The files are compared again after " +"the plugin is applied, so you don't need to rescan the files." msgstr "" -"Nella finestra Confronta file, puoi applicare un plugin di prediffer facendo " -"clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Prediffer</" -"guisubmenu > </menuchoice > e scegliendo uno dei plugin nell'elenco.I plugin " -"suggeriti sono indicati in cima all'elenco.I file vengono confrontati " -"nuovamente dopo l'applicazione del plug-in, quindi non è necessario ripetere " -"la scansione dei file." +"Nella finestra Confronta file, puoi applicare un plugin di prediffer facendo clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Prediffer</" +"guisubmenu > </menuchoice > e scegliendo uno dei plugin nell'elenco.I plugin suggeriti sono indicati in cima all'elenco.I file vengono confrontati " +"nuovamente dopo l'applicazione del plug-in, quindi non è necessario ripetere la scansione dei file." #. type: Content of: <article><section><title><indexterm><primary> #: English/Plugins.xml:376 @@ -22936,12 +17587,8 @@ msgstr "Dll di Visual Basic" #. type: Content of: <article><section><title> #: English/Plugins.xml:375 -msgid "" -"Available plugins<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Plug-in disponibili<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " -"type=\"indexterm\" id=\"1\"/>" +msgid "Available plugins<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Plug-in disponibili<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:385 @@ -22950,128 +17597,82 @@ msgstr "File del plugin CompareEscapedJavaPropertiesFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:384 -msgid "" -"<filename>CompareEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" " -"id=\"0\"/></filename>" -msgstr "" -"<filename>ConfrontaEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" " -"id=\"0\"/></filename>" +msgid "<filename>CompareEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ConfrontaEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:388 -msgid "" -"This plugin unescapes Java .properties files for easy viewing, then re-" -"escapes them when saving." +msgid "This plugin unescapes Java .properties files for easy viewing, then re-escapes them when saving." msgstr "" -"Questo plugin esegue l'escape dei file Java .properties per facilitarne la " -"visualizzazione, quindi li esegue nuovamente l'escape durante il salvataggio." +"Questo plugin esegue l'escape dei file Java .properties per facilitarne la visualizzazione, quindi li esegue nuovamente l'escape durante il " +"salvataggio." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:392 English/Plugins.xml:426 English/Plugins.xml:472 -#: English/Plugins.xml:518 English/Plugins.xml:565 English/Plugins.xml:623 -#: English/Plugins.xml:677 English/Plugins.xml:730 English/Plugins.xml:783 -#: English/Plugins.xml:845 English/Plugins.xml:903 English/Plugins.xml:956 -#: English/Plugins.xml:1009 English/Plugins.xml:1062 English/Plugins.xml:1116 -#: English/Plugins.xml:1178 English/Plugins.xml:1236 English/Plugins.xml:1290 -#: English/Plugins.xml:1344 English/Plugins.xml:1398 English/Plugins.xml:1451 -#: English/Plugins.xml:1504 English/Plugins.xml:1557 English/Plugins.xml:1613 -#: English/Plugins.xml:1669 English/Plugins.xml:1706 English/Plugins.xml:1743 -#: English/Plugins.xml:1780 English/Plugins.xml:1817 English/Plugins.xml:1854 -#: English/Plugins.xml:1891 English/Plugins.xml:1928 English/Plugins.xml:1965 -#: English/Plugins.xml:2067 English/Plugins.xml:2160 English/Plugins.xml:2242 -#: English/Plugins.xml:2296 English/Plugins.xml:2333 English/Plugins.xml:2421 -#: English/Plugins.xml:2449 English/Plugins.xml:2491 English/Plugins.xml:2526 +#: English/Plugins.xml:392 English/Plugins.xml:426 English/Plugins.xml:472 English/Plugins.xml:518 English/Plugins.xml:565 English/Plugins.xml:623 +#: English/Plugins.xml:677 English/Plugins.xml:730 English/Plugins.xml:783 English/Plugins.xml:845 English/Plugins.xml:903 English/Plugins.xml:956 +#: English/Plugins.xml:1009 English/Plugins.xml:1062 English/Plugins.xml:1116 English/Plugins.xml:1178 English/Plugins.xml:1236 English/Plugins.xml:1290 +#: English/Plugins.xml:1344 English/Plugins.xml:1398 English/Plugins.xml:1451 English/Plugins.xml:1504 English/Plugins.xml:1557 English/Plugins.xml:1613 +#: English/Plugins.xml:1669 English/Plugins.xml:1706 English/Plugins.xml:1743 English/Plugins.xml:1780 English/Plugins.xml:1817 English/Plugins.xml:1854 +#: English/Plugins.xml:1891 English/Plugins.xml:1928 English/Plugins.xml:1965 English/Plugins.xml:2067 English/Plugins.xml:2160 English/Plugins.xml:2242 +#: English/Plugins.xml:2296 English/Plugins.xml:2333 English/Plugins.xml:2421 English/Plugins.xml:2449 English/Plugins.xml:2491 English/Plugins.xml:2526 #: English/Plugins.xml:2555 English/Plugins.xml:2662 English/Plugins.xml:2698 msgid "Category" msgstr "Categoria" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:394 English/Plugins.xml:428 English/Plugins.xml:474 -#: English/Plugins.xml:520 English/Plugins.xml:567 English/Plugins.xml:625 -#: English/Plugins.xml:679 English/Plugins.xml:732 English/Plugins.xml:785 -#: English/Plugins.xml:847 English/Plugins.xml:905 English/Plugins.xml:958 -#: English/Plugins.xml:1011 English/Plugins.xml:1064 English/Plugins.xml:1118 -#: English/Plugins.xml:1180 English/Plugins.xml:1238 English/Plugins.xml:1292 -#: English/Plugins.xml:1346 English/Plugins.xml:1400 English/Plugins.xml:1453 -#: English/Plugins.xml:1506 English/Plugins.xml:1559 English/Plugins.xml:1615 -#: English/Plugins.xml:1671 English/Plugins.xml:1708 English/Plugins.xml:1745 -#: English/Plugins.xml:1782 English/Plugins.xml:1819 English/Plugins.xml:1856 -#: English/Plugins.xml:1893 English/Plugins.xml:1930 English/Plugins.xml:1967 -#: English/Plugins.xml:2069 English/Plugins.xml:2162 English/Plugins.xml:2244 -#: English/Plugins.xml:2298 English/Plugins.xml:2335 English/Plugins.xml:2423 -#: English/Plugins.xml:2451 English/Plugins.xml:2493 English/Plugins.xml:2528 +#: English/Plugins.xml:394 English/Plugins.xml:428 English/Plugins.xml:474 English/Plugins.xml:520 English/Plugins.xml:567 English/Plugins.xml:625 +#: English/Plugins.xml:679 English/Plugins.xml:732 English/Plugins.xml:785 English/Plugins.xml:847 English/Plugins.xml:905 English/Plugins.xml:958 +#: English/Plugins.xml:1011 English/Plugins.xml:1064 English/Plugins.xml:1118 English/Plugins.xml:1180 English/Plugins.xml:1238 English/Plugins.xml:1292 +#: English/Plugins.xml:1346 English/Plugins.xml:1400 English/Plugins.xml:1453 English/Plugins.xml:1506 English/Plugins.xml:1559 English/Plugins.xml:1615 +#: English/Plugins.xml:1671 English/Plugins.xml:1708 English/Plugins.xml:1745 English/Plugins.xml:1782 English/Plugins.xml:1819 English/Plugins.xml:1856 +#: English/Plugins.xml:1893 English/Plugins.xml:1930 English/Plugins.xml:1967 English/Plugins.xml:2069 English/Plugins.xml:2162 English/Plugins.xml:2244 +#: English/Plugins.xml:2298 English/Plugins.xml:2335 English/Plugins.xml:2423 English/Plugins.xml:2451 English/Plugins.xml:2493 English/Plugins.xml:2528 #: English/Plugins.xml:2557 English/Plugins.xml:2663 English/Plugins.xml:2700 msgid "File filter" msgstr "Filtro file" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:396 English/Plugins.xml:430 English/Plugins.xml:476 -#: English/Plugins.xml:522 English/Plugins.xml:569 English/Plugins.xml:627 -#: English/Plugins.xml:681 English/Plugins.xml:734 English/Plugins.xml:787 -#: English/Plugins.xml:849 English/Plugins.xml:907 English/Plugins.xml:960 -#: English/Plugins.xml:1013 English/Plugins.xml:1066 English/Plugins.xml:1120 -#: English/Plugins.xml:1182 English/Plugins.xml:1240 English/Plugins.xml:1294 -#: English/Plugins.xml:1348 English/Plugins.xml:1402 English/Plugins.xml:1455 -#: English/Plugins.xml:1508 English/Plugins.xml:1561 English/Plugins.xml:1617 -#: English/Plugins.xml:1673 English/Plugins.xml:1710 English/Plugins.xml:1747 -#: English/Plugins.xml:1784 English/Plugins.xml:1821 English/Plugins.xml:1858 -#: English/Plugins.xml:1895 English/Plugins.xml:1932 English/Plugins.xml:1969 -#: English/Plugins.xml:2071 English/Plugins.xml:2164 English/Plugins.xml:2246 -#: English/Plugins.xml:2300 English/Plugins.xml:2337 English/Plugins.xml:2425 -#: English/Plugins.xml:2453 English/Plugins.xml:2495 English/Plugins.xml:2530 +#: English/Plugins.xml:396 English/Plugins.xml:430 English/Plugins.xml:476 English/Plugins.xml:522 English/Plugins.xml:569 English/Plugins.xml:627 +#: English/Plugins.xml:681 English/Plugins.xml:734 English/Plugins.xml:787 English/Plugins.xml:849 English/Plugins.xml:907 English/Plugins.xml:960 +#: English/Plugins.xml:1013 English/Plugins.xml:1066 English/Plugins.xml:1120 English/Plugins.xml:1182 English/Plugins.xml:1240 English/Plugins.xml:1294 +#: English/Plugins.xml:1348 English/Plugins.xml:1402 English/Plugins.xml:1455 English/Plugins.xml:1508 English/Plugins.xml:1561 English/Plugins.xml:1617 +#: English/Plugins.xml:1673 English/Plugins.xml:1710 English/Plugins.xml:1747 English/Plugins.xml:1784 English/Plugins.xml:1821 English/Plugins.xml:1858 +#: English/Plugins.xml:1895 English/Plugins.xml:1932 English/Plugins.xml:1969 English/Plugins.xml:2071 English/Plugins.xml:2164 English/Plugins.xml:2246 +#: English/Plugins.xml:2300 English/Plugins.xml:2337 English/Plugins.xml:2425 English/Plugins.xml:2453 English/Plugins.xml:2495 English/Plugins.xml:2530 #: English/Plugins.xml:2559 msgid "Plugin arguments" msgstr "Argomenti del plugin" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:398 English/Plugins.xml:432 English/Plugins.xml:478 -#: English/Plugins.xml:524 English/Plugins.xml:571 English/Plugins.xml:629 -#: English/Plugins.xml:683 English/Plugins.xml:736 English/Plugins.xml:789 -#: English/Plugins.xml:851 English/Plugins.xml:909 English/Plugins.xml:962 -#: English/Plugins.xml:1015 English/Plugins.xml:1068 English/Plugins.xml:1122 -#: English/Plugins.xml:1184 English/Plugins.xml:1242 English/Plugins.xml:1296 -#: English/Plugins.xml:1350 English/Plugins.xml:1404 English/Plugins.xml:1457 -#: English/Plugins.xml:1510 English/Plugins.xml:1563 English/Plugins.xml:1619 -#: English/Plugins.xml:1675 English/Plugins.xml:1712 English/Plugins.xml:1749 -#: English/Plugins.xml:1786 English/Plugins.xml:1823 English/Plugins.xml:1860 -#: English/Plugins.xml:1897 English/Plugins.xml:1934 English/Plugins.xml:1971 -#: English/Plugins.xml:2073 English/Plugins.xml:2166 English/Plugins.xml:2248 +#: English/Plugins.xml:398 English/Plugins.xml:432 English/Plugins.xml:478 English/Plugins.xml:524 English/Plugins.xml:571 English/Plugins.xml:629 +#: English/Plugins.xml:683 English/Plugins.xml:736 English/Plugins.xml:789 English/Plugins.xml:851 English/Plugins.xml:909 English/Plugins.xml:962 +#: English/Plugins.xml:1015 English/Plugins.xml:1068 English/Plugins.xml:1122 English/Plugins.xml:1184 English/Plugins.xml:1242 English/Plugins.xml:1296 +#: English/Plugins.xml:1350 English/Plugins.xml:1404 English/Plugins.xml:1457 English/Plugins.xml:1510 English/Plugins.xml:1563 English/Plugins.xml:1619 +#: English/Plugins.xml:1675 English/Plugins.xml:1712 English/Plugins.xml:1749 English/Plugins.xml:1786 English/Plugins.xml:1823 English/Plugins.xml:1860 +#: English/Plugins.xml:1897 English/Plugins.xml:1934 English/Plugins.xml:1971 English/Plugins.xml:2073 English/Plugins.xml:2166 English/Plugins.xml:2248 #: English/Plugins.xml:2302 English/Plugins.xml:2339 msgid "Packing" msgstr "Imballaggio" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:400 English/Plugins.xml:434 English/Plugins.xml:480 -#: English/Plugins.xml:526 English/Plugins.xml:573 English/Plugins.xml:631 -#: English/Plugins.xml:685 English/Plugins.xml:738 English/Plugins.xml:791 -#: English/Plugins.xml:853 English/Plugins.xml:911 English/Plugins.xml:964 -#: English/Plugins.xml:1017 English/Plugins.xml:1070 English/Plugins.xml:1124 -#: English/Plugins.xml:1186 English/Plugins.xml:1244 English/Plugins.xml:1298 -#: English/Plugins.xml:1352 English/Plugins.xml:1406 English/Plugins.xml:1459 -#: English/Plugins.xml:1512 English/Plugins.xml:1565 English/Plugins.xml:1621 -#: English/Plugins.xml:1677 English/Plugins.xml:1714 English/Plugins.xml:1751 -#: English/Plugins.xml:1788 English/Plugins.xml:1825 English/Plugins.xml:1862 -#: English/Plugins.xml:1899 English/Plugins.xml:1936 English/Plugins.xml:1973 -#: English/Plugins.xml:2075 English/Plugins.xml:2168 English/Plugins.xml:2250 -#: English/Plugins.xml:2304 English/Plugins.xml:2341 English/Plugins.xml:2427 -#: English/Plugins.xml:2455 English/Plugins.xml:2497 English/Plugins.xml:2532 +#: English/Plugins.xml:400 English/Plugins.xml:434 English/Plugins.xml:480 English/Plugins.xml:526 English/Plugins.xml:573 English/Plugins.xml:631 +#: English/Plugins.xml:685 English/Plugins.xml:738 English/Plugins.xml:791 English/Plugins.xml:853 English/Plugins.xml:911 English/Plugins.xml:964 +#: English/Plugins.xml:1017 English/Plugins.xml:1070 English/Plugins.xml:1124 English/Plugins.xml:1186 English/Plugins.xml:1244 English/Plugins.xml:1298 +#: English/Plugins.xml:1352 English/Plugins.xml:1406 English/Plugins.xml:1459 English/Plugins.xml:1512 English/Plugins.xml:1565 English/Plugins.xml:1621 +#: English/Plugins.xml:1677 English/Plugins.xml:1714 English/Plugins.xml:1751 English/Plugins.xml:1788 English/Plugins.xml:1825 English/Plugins.xml:1862 +#: English/Plugins.xml:1899 English/Plugins.xml:1936 English/Plugins.xml:1973 English/Plugins.xml:2075 English/Plugins.xml:2168 English/Plugins.xml:2250 +#: English/Plugins.xml:2304 English/Plugins.xml:2341 English/Plugins.xml:2427 English/Plugins.xml:2455 English/Plugins.xml:2497 English/Plugins.xml:2532 #: English/Plugins.xml:2561 English/Plugins.xml:2664 English/Plugins.xml:2702 msgid "Settings dialog support" msgstr "Supporto della finestra di dialogo Impostazioni" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:403 English/Plugins.xml:439 English/Plugins.xml:485 -#: English/Plugins.xml:531 English/Plugins.xml:578 English/Plugins.xml:636 -#: English/Plugins.xml:690 English/Plugins.xml:743 English/Plugins.xml:796 -#: English/Plugins.xml:858 English/Plugins.xml:916 English/Plugins.xml:969 -#: English/Plugins.xml:1022 English/Plugins.xml:1075 English/Plugins.xml:1129 -#: English/Plugins.xml:1191 English/Plugins.xml:1249 English/Plugins.xml:1303 -#: English/Plugins.xml:1357 English/Plugins.xml:1411 English/Plugins.xml:1464 -#: English/Plugins.xml:1517 English/Plugins.xml:1570 English/Plugins.xml:1626 -#: English/Plugins.xml:1682 English/Plugins.xml:1719 English/Plugins.xml:1756 -#: English/Plugins.xml:1793 English/Plugins.xml:1830 English/Plugins.xml:1867 -#: English/Plugins.xml:1904 English/Plugins.xml:1941 English/Plugins.xml:1978 -#: English/Plugins.xml:2080 English/Plugins.xml:2173 English/Plugins.xml:2255 +#: English/Plugins.xml:403 English/Plugins.xml:439 English/Plugins.xml:485 English/Plugins.xml:531 English/Plugins.xml:578 English/Plugins.xml:636 +#: English/Plugins.xml:690 English/Plugins.xml:743 English/Plugins.xml:796 English/Plugins.xml:858 English/Plugins.xml:916 English/Plugins.xml:969 +#: English/Plugins.xml:1022 English/Plugins.xml:1075 English/Plugins.xml:1129 English/Plugins.xml:1191 English/Plugins.xml:1249 English/Plugins.xml:1303 +#: English/Plugins.xml:1357 English/Plugins.xml:1411 English/Plugins.xml:1464 English/Plugins.xml:1517 English/Plugins.xml:1570 English/Plugins.xml:1626 +#: English/Plugins.xml:1682 English/Plugins.xml:1719 English/Plugins.xml:1756 English/Plugins.xml:1793 English/Plugins.xml:1830 English/Plugins.xml:1867 +#: English/Plugins.xml:1904 English/Plugins.xml:1941 English/Plugins.xml:1978 English/Plugins.xml:2080 English/Plugins.xml:2173 English/Plugins.xml:2255 #: English/Plugins.xml:2309 English/Plugins.xml:2346 msgid "Unpacker" msgstr "Disimballatore" @@ -23082,53 +17683,32 @@ msgid "<filename class=\"extension\">*.properties</filename>" msgstr "<filename class=\"extension\">*.properties</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:407 English/Plugins.xml:411 English/Plugins.xml:450 -#: English/Plugins.xml:452 English/Plugins.xml:496 English/Plugins.xml:498 -#: English/Plugins.xml:543 English/Plugins.xml:545 English/Plugins.xml:587 -#: English/Plugins.xml:589 English/Plugins.xml:644 English/Plugins.xml:646 -#: English/Plugins.xml:697 English/Plugins.xml:699 English/Plugins.xml:750 -#: English/Plugins.xml:752 English/Plugins.xml:804 English/Plugins.xml:806 -#: English/Plugins.xml:867 English/Plugins.xml:869 English/Plugins.xml:923 -#: English/Plugins.xml:925 English/Plugins.xml:976 English/Plugins.xml:978 -#: English/Plugins.xml:1029 English/Plugins.xml:1031 English/Plugins.xml:1083 -#: English/Plugins.xml:1085 English/Plugins.xml:1137 English/Plugins.xml:1139 -#: English/Plugins.xml:1200 English/Plugins.xml:1202 English/Plugins.xml:1257 -#: English/Plugins.xml:1259 English/Plugins.xml:1311 English/Plugins.xml:1313 -#: English/Plugins.xml:1365 English/Plugins.xml:1367 English/Plugins.xml:1418 -#: English/Plugins.xml:1420 English/Plugins.xml:1471 English/Plugins.xml:1473 -#: English/Plugins.xml:1524 English/Plugins.xml:1526 English/Plugins.xml:1580 -#: English/Plugins.xml:1582 English/Plugins.xml:1636 English/Plugins.xml:1638 -#: English/Plugins.xml:1689 English/Plugins.xml:1691 English/Plugins.xml:1724 -#: English/Plugins.xml:1726 English/Plugins.xml:1728 English/Plugins.xml:1761 -#: English/Plugins.xml:1763 English/Plugins.xml:1765 English/Plugins.xml:1798 -#: English/Plugins.xml:1800 English/Plugins.xml:1802 English/Plugins.xml:1835 -#: English/Plugins.xml:1837 English/Plugins.xml:1839 English/Plugins.xml:1872 -#: English/Plugins.xml:1874 English/Plugins.xml:1876 English/Plugins.xml:1909 -#: English/Plugins.xml:1911 English/Plugins.xml:1913 English/Plugins.xml:1946 -#: English/Plugins.xml:1948 English/Plugins.xml:1950 English/Plugins.xml:1983 -#: English/Plugins.xml:1985 English/Plugins.xml:1987 English/Plugins.xml:2087 -#: English/Plugins.xml:2089 English/Plugins.xml:2180 English/Plugins.xml:2182 -#: English/Plugins.xml:2262 English/Plugins.xml:2264 English/Plugins.xml:2316 -#: English/Plugins.xml:2318 English/Plugins.xml:2351 English/Plugins.xml:2353 -#: English/Plugins.xml:2355 English/Plugins.xml:2470 English/Plugins.xml:2472 -#: English/Plugins.xml:2570 English/Plugins.xml:2572 English/Plugins.xml:2669 +#: English/Plugins.xml:407 English/Plugins.xml:411 English/Plugins.xml:450 English/Plugins.xml:452 English/Plugins.xml:496 English/Plugins.xml:498 +#: English/Plugins.xml:543 English/Plugins.xml:545 English/Plugins.xml:587 English/Plugins.xml:589 English/Plugins.xml:644 English/Plugins.xml:646 +#: English/Plugins.xml:697 English/Plugins.xml:699 English/Plugins.xml:750 English/Plugins.xml:752 English/Plugins.xml:804 English/Plugins.xml:806 +#: English/Plugins.xml:867 English/Plugins.xml:869 English/Plugins.xml:923 English/Plugins.xml:925 English/Plugins.xml:976 English/Plugins.xml:978 +#: English/Plugins.xml:1029 English/Plugins.xml:1031 English/Plugins.xml:1083 English/Plugins.xml:1085 English/Plugins.xml:1137 English/Plugins.xml:1139 +#: English/Plugins.xml:1200 English/Plugins.xml:1202 English/Plugins.xml:1257 English/Plugins.xml:1259 English/Plugins.xml:1311 English/Plugins.xml:1313 +#: English/Plugins.xml:1365 English/Plugins.xml:1367 English/Plugins.xml:1418 English/Plugins.xml:1420 English/Plugins.xml:1471 English/Plugins.xml:1473 +#: English/Plugins.xml:1524 English/Plugins.xml:1526 English/Plugins.xml:1580 English/Plugins.xml:1582 English/Plugins.xml:1636 English/Plugins.xml:1638 +#: English/Plugins.xml:1689 English/Plugins.xml:1691 English/Plugins.xml:1724 English/Plugins.xml:1726 English/Plugins.xml:1728 English/Plugins.xml:1761 +#: English/Plugins.xml:1763 English/Plugins.xml:1765 English/Plugins.xml:1798 English/Plugins.xml:1800 English/Plugins.xml:1802 English/Plugins.xml:1835 +#: English/Plugins.xml:1837 English/Plugins.xml:1839 English/Plugins.xml:1872 English/Plugins.xml:1874 English/Plugins.xml:1876 English/Plugins.xml:1909 +#: English/Plugins.xml:1911 English/Plugins.xml:1913 English/Plugins.xml:1946 English/Plugins.xml:1948 English/Plugins.xml:1950 English/Plugins.xml:1983 +#: English/Plugins.xml:1985 English/Plugins.xml:1987 English/Plugins.xml:2087 English/Plugins.xml:2089 English/Plugins.xml:2180 English/Plugins.xml:2182 +#: English/Plugins.xml:2262 English/Plugins.xml:2264 English/Plugins.xml:2316 English/Plugins.xml:2318 English/Plugins.xml:2351 English/Plugins.xml:2353 +#: English/Plugins.xml:2355 English/Plugins.xml:2470 English/Plugins.xml:2472 English/Plugins.xml:2570 English/Plugins.xml:2572 English/Plugins.xml:2669 #: English/Plugins.xml:2709 msgid "No" msgstr "NO" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:409 English/Plugins.xml:454 English/Plugins.xml:500 -#: English/Plugins.xml:547 English/Plugins.xml:591 English/Plugins.xml:642 -#: English/Plugins.xml:695 English/Plugins.xml:748 English/Plugins.xml:802 -#: English/Plugins.xml:865 English/Plugins.xml:921 English/Plugins.xml:974 -#: English/Plugins.xml:1027 English/Plugins.xml:1081 English/Plugins.xml:1135 -#: English/Plugins.xml:1198 English/Plugins.xml:1255 English/Plugins.xml:1309 -#: English/Plugins.xml:1363 English/Plugins.xml:1416 English/Plugins.xml:1469 -#: English/Plugins.xml:1522 English/Plugins.xml:1578 English/Plugins.xml:1634 -#: English/Plugins.xml:1687 English/Plugins.xml:2085 English/Plugins.xml:2178 -#: English/Plugins.xml:2260 English/Plugins.xml:2314 English/Plugins.xml:2434 -#: English/Plugins.xml:2504 English/Plugins.xml:2506 English/Plugins.xml:2539 -#: English/Plugins.xml:2541 +#: English/Plugins.xml:409 English/Plugins.xml:454 English/Plugins.xml:500 English/Plugins.xml:547 English/Plugins.xml:591 English/Plugins.xml:642 +#: English/Plugins.xml:695 English/Plugins.xml:748 English/Plugins.xml:802 English/Plugins.xml:865 English/Plugins.xml:921 English/Plugins.xml:974 +#: English/Plugins.xml:1027 English/Plugins.xml:1081 English/Plugins.xml:1135 English/Plugins.xml:1198 English/Plugins.xml:1255 English/Plugins.xml:1309 +#: English/Plugins.xml:1363 English/Plugins.xml:1416 English/Plugins.xml:1469 English/Plugins.xml:1522 English/Plugins.xml:1578 English/Plugins.xml:1634 +#: English/Plugins.xml:1687 English/Plugins.xml:2085 English/Plugins.xml:2178 English/Plugins.xml:2260 English/Plugins.xml:2314 English/Plugins.xml:2434 +#: English/Plugins.xml:2504 English/Plugins.xml:2506 English/Plugins.xml:2539 English/Plugins.xml:2541 msgid "Yes" msgstr "SÌ" @@ -23139,37 +17719,25 @@ msgstr "Confronta il file del plug-in MSExcelFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:417 -msgid "" -"<filename>CompareMSExcelFiles<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>Confronta file MSExcel<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>CompareMSExcelFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Confronta file MSExcel<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:421 msgid "" -"Displays the text contents of a <trademark class=\"registered\">Microsoft</" -"trademark> <application>Excel</application> file, stripping away all " +"Displays the text contents of a <trademark class=\"registered\">Microsoft</trademark> <application>Excel</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark " -"class=\"registered\">Microsoft</trademark> <application>Excel</application>, " -"eliminando tutta la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>, eliminando tutta " +"la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:436 English/Plugins.xml:482 English/Plugins.xml:528 -#: English/Plugins.xml:575 English/Plugins.xml:633 English/Plugins.xml:687 -#: English/Plugins.xml:740 English/Plugins.xml:793 English/Plugins.xml:855 -#: English/Plugins.xml:913 English/Plugins.xml:966 English/Plugins.xml:1019 -#: English/Plugins.xml:1072 English/Plugins.xml:1126 English/Plugins.xml:1188 -#: English/Plugins.xml:1246 English/Plugins.xml:1300 English/Plugins.xml:1354 -#: English/Plugins.xml:1408 English/Plugins.xml:1461 English/Plugins.xml:1514 -#: English/Plugins.xml:1567 English/Plugins.xml:1623 English/Plugins.xml:1679 -#: English/Plugins.xml:1716 English/Plugins.xml:1753 English/Plugins.xml:1790 -#: English/Plugins.xml:1827 English/Plugins.xml:1864 English/Plugins.xml:1901 -#: English/Plugins.xml:1938 English/Plugins.xml:1975 English/Plugins.xml:2077 -#: English/Plugins.xml:2170 English/Plugins.xml:2252 English/Plugins.xml:2306 +#: English/Plugins.xml:436 English/Plugins.xml:482 English/Plugins.xml:528 English/Plugins.xml:575 English/Plugins.xml:633 English/Plugins.xml:687 +#: English/Plugins.xml:740 English/Plugins.xml:793 English/Plugins.xml:855 English/Plugins.xml:913 English/Plugins.xml:966 English/Plugins.xml:1019 +#: English/Plugins.xml:1072 English/Plugins.xml:1126 English/Plugins.xml:1188 English/Plugins.xml:1246 English/Plugins.xml:1300 English/Plugins.xml:1354 +#: English/Plugins.xml:1408 English/Plugins.xml:1461 English/Plugins.xml:1514 English/Plugins.xml:1567 English/Plugins.xml:1623 English/Plugins.xml:1679 +#: English/Plugins.xml:1716 English/Plugins.xml:1753 English/Plugins.xml:1790 English/Plugins.xml:1827 English/Plugins.xml:1864 English/Plugins.xml:1901 +#: English/Plugins.xml:1938 English/Plugins.xml:1975 English/Plugins.xml:2077 English/Plugins.xml:2170 English/Plugins.xml:2252 English/Plugins.xml:2306 #: English/Plugins.xml:2343 msgid "Dependency" msgstr "Dipendenza" @@ -23177,28 +17745,18 @@ msgstr "Dipendenza" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:441 msgid "" -"<filename class=\"extension\">*.xls</filename>, <filename " -"class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</" -"filename>, <filename class=\"extension\">*.xlsb</filename>, <filename " -"class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</" -"filename>, <filename class=\"extension\">*.xltx</filename>, <filename " -"class=\"extension\">*.xltm</filename>" +"<filename class=\"extension\">*.xls</filename>, <filename class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</filename>, " +"<filename class=\"extension\">*.xlsb</filename>, <filename class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</filename>, " +"<filename class=\"extension\">*.xltx</filename>, <filename class=\"extension\">*.xltm</filename>" msgstr "" -"<filename class=\"extension\">*.xls</filename>, <filename " -"class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</" -"filename>, <filename class=\"extension\">*.xlsb</filename>, <filename " -"class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</" -"filename>, <filename class=\"estensione\">*.xltx</filename>, <filename " -"class=\"estensione\">*.xltm</filename>" +"<filename class=\"extension\">*.xls</filename>, <filename class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</filename>, " +"<filename class=\"extension\">*.xlsb</filename>, <filename class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</filename>, " +"<filename class=\"estensione\">*.xltx</filename>, <filename class=\"estensione\">*.xltm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:456 -msgid "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Excel</" -"application>" -msgstr "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Excel</" -"application>" +msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>" +msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:464 @@ -23207,49 +17765,33 @@ msgstr "Confronta il file del plug-in MSPowerPointFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:463 -msgid "" -"<filename>CompareMSPowerPointFiles<placeholder type=\"indexterm\" id=\"0\"/" -"></filename>" -msgstr "" -"<filename>Confronta file MSPowerPoint<placeholder type=\"indexterm\" " -"id=\"0\"/></filename>" +msgid "<filename>CompareMSPowerPointFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Confronta file MSPowerPoint<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:467 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</" -"trademark> <application>PowerPoint</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark " -"class=\"registered\">Microsoft</trademark> <application>PowerPoint</" -"application>, eliminando tutta la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>, eliminando " +"tutta la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:487 msgid "" -"<filename class=\"extension\">*.ppt</filename>, <filename " -"class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</" -"filename>, <filename class=\"extension\">*.ppa</filename>, <filename " -"class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</" -"filename>, <filename class=\"extension\">*.potx</filename>, <filename " -"class=\"extension\">*.potm</filename>" +"<filename class=\"extension\">*.ppt</filename>, <filename class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</filename>, " +"<filename class=\"extension\">*.ppa</filename>, <filename class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</filename>, " +"<filename class=\"extension\">*.potx</filename>, <filename class=\"extension\">*.potm</filename>" msgstr "" -"<filename class=\"extension\">*.ppt</filename>, <filename " -"class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</" -"filename>, <filename class=\"extension\">*.ppa</filename>, <filename " -"class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</" -"filename>, <filename class=\"estensione\">*.potx</filename>, <filename " -"class=\"estensione\">*.potm</filename>" +"<filename class=\"extension\">*.ppt</filename>, <filename class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</filename>, " +"<filename class=\"extension\">*.ppa</filename>, <filename class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</filename>, " +"<filename class=\"estensione\">*.potx</filename>, <filename class=\"estensione\">*.potm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:502 -msgid "" -"<trademark class=\"registered\">Microsoft</trademark> " -"<application>PowerPoint</application>" -msgstr "" -"<trademark class=\"registered\">Microsoft</trademark> " -"<application>PowerPoint</application>" +msgid "<trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>" +msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:510 @@ -23258,51 +17800,33 @@ msgstr "Confronta il file del plug-in MSVisioFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:509 -msgid "" -"<filename>CompareMSVisioFiles<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>Confronta file MSVisio<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>CompareMSVisioFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Confronta file MSVisio<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:513 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</" -"trademark> <application>Visio</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>Visio</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark " -"class=\"registered\">Microsoft</trademark> <application>Visio</application>, " -"eliminando tutta la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>, eliminando tutta " +"la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:533 msgid "" -"<filename class=\"extension\">*.vsd</filename>, <filename " -"class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</" -"filename>, <filename class=\"extension\">*.vss</filename>, <filename " -"class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</" -"filename>, <filename class=\"extension\">*.vst</filename>, <filename " -"class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</" -"filename>" -msgstr "" -"<filename class=\"extension\">*.vsd</filename>, <filename " -"class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</" -"filename>, <filename class=\"extension\">*.vss</filename>, <filename " -"class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</" -"filename>, <filename class=\"extension\">*.vst</filename>, <filename " -"class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</" -"filename>" +"<filename class=\"extension\">*.vsd</filename>, <filename class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</filename>, " +"<filename class=\"extension\">*.vss</filename>, <filename class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</filename>, " +"<filename class=\"extension\">*.vst</filename>, <filename class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</filename>" +msgstr "" +"<filename class=\"extension\">*.vsd</filename>, <filename class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</filename>, " +"<filename class=\"extension\">*.vss</filename>, <filename class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</filename>, " +"<filename class=\"extension\">*.vst</filename>, <filename class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:549 -msgid "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Visio</" -"application>" -msgstr "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Visio</" -"application>" +msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>" +msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:557 @@ -23311,47 +17835,31 @@ msgstr "Confronta il file del plugin MSWordFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:556 -msgid "" -"<filename>CompareMSWordFiles<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>Confronta file MSWord<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>CompareMSWordFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Confronta file MSWord<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:560 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</" -"trademark> <application>Word</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>Word</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark " -"class=\"registered\">Microsoft</trademark> <application>Word</application>, " -"eliminando tutta la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Word</application>, eliminando tutta " +"la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:580 msgid "" -"<filename class=\"extension\">*.doc</filename>, <filename " -"class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</" -"filename>, <filename class=\"extension\">*.dot</filename>, <filename " -"class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</" -"filename>" +"<filename class=\"extension\">*.doc</filename>, <filename class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</filename>, " +"<filename class=\"extension\">*.dot</filename>, <filename class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</filename>" msgstr "" -"<filename class=\"extension\">*.doc</filename>, <filename " -"class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</" -"filename>, <filename class=\"extension\">*.dot</filename>, <filename " -"class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</" -"filename>" +"<filename class=\"extension\">*.doc</filename>, <filename class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</filename>, " +"<filename class=\"extension\">*.dot</filename>, <filename class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:593 -msgid "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Word</" -"application>" -msgstr "" -"<trademark class=\"registered\">Microsoft</trademark> <application>Word</" -"application>" +msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Word</application>" +msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Word</application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:601 @@ -23360,10 +17868,8 @@ msgstr "File del plugin PrettifyHTML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:600 -msgid "" -"<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:604 @@ -23372,20 +17878,13 @@ msgstr "HTML più carino con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:607 -msgid "" -"<command>PrettifyHTML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PrettifyHTML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PrettifyHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PrettifyHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Plugins.xml:615 English/Plugins.xml:669 English/Plugins.xml:722 -#: English/Plugins.xml:775 English/Plugins.xml:895 English/Plugins.xml:948 -#: English/Plugins.xml:1001 English/Plugins.xml:1054 English/Plugins.xml:1108 -#: English/Plugins.xml:1228 English/Plugins.xml:1282 English/Plugins.xml:1336 -#: English/Plugins.xml:1390 English/Plugins.xml:1443 English/Plugins.xml:1496 -#: English/Plugins.xml:1549 English/Plugins.xml:1605 +#: English/Plugins.xml:615 English/Plugins.xml:669 English/Plugins.xml:722 English/Plugins.xml:775 English/Plugins.xml:895 English/Plugins.xml:948 +#: English/Plugins.xml:1001 English/Plugins.xml:1054 English/Plugins.xml:1108 English/Plugins.xml:1228 English/Plugins.xml:1282 English/Plugins.xml:1336 +#: English/Plugins.xml:1390 English/Plugins.xml:1443 English/Plugins.xml:1496 English/Plugins.xml:1549 English/Plugins.xml:1605 msgid "<option><replaceable>arguments</replaceable></option>" msgstr "<option><replaceable>argomenti</replaceable></option>" @@ -23396,12 +17895,8 @@ msgstr "Opzioni della riga di comando passate al comando tidy" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:638 English/Plugins.xml:1131 -msgid "" -"<filename class=\"extension\">*.html</filename>, <filename " -"class=\"extension\">*.htm</filename>" -msgstr "" -"<filename class=\"extension\">*.html</filename>, <filename " -"class=\"extension\">*.htm</filename>" +msgid "<filename class=\"extension\">*.html</filename>, <filename class=\"extension\">*.htm</filename>" +msgstr "<filename class=\"extension\">*.html</filename>, <filename class=\"extension\">*.htm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:648 English/Plugins.xml:701 English/Plugins.xml:1141 @@ -23415,10 +17910,8 @@ msgstr "File del plug-in PrettifyXML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:654 -msgid "" -"<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:658 @@ -23427,12 +17920,8 @@ msgstr "XML più bello con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:661 -msgid "" -"<command>PrettifyXML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PrettifyXML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PrettifyXML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PrettifyXML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:692 @@ -23446,10 +17935,8 @@ msgstr "File del plugin PrettifyJSON" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:707 -msgid "" -"<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:711 @@ -23458,12 +17945,8 @@ msgstr "JSON Più carino con il comando jq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:714 -msgid "" -"<command>PrettifyJSON</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PrettifyJSON</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PrettifyJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PrettifyJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:724 English/Plugins.xml:1003 @@ -23487,10 +17970,8 @@ msgstr "File del plug-in PrettifyYAML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:760 -msgid "" -"<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:764 @@ -23499,12 +17980,8 @@ msgstr "YAML Più carino con il comando yq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:767 -msgid "" -"<command>PrettifyYAML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PrettifyYAML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PrettifyYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PrettifyYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:777 English/Plugins.xml:1056 @@ -23513,12 +17990,8 @@ msgstr "Opzioni del filtro o della riga di comando passate al comando yq" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:798 English/Plugins.xml:1077 -msgid "" -"<filename class=\"extension\">*.yaml</filename>, <filename " -"class=\"extension\">*.yml</filename>" -msgstr "" -"<filename class=\"extension\">*.yaml</filename>, <filename " -"class=\"extension\">*.yml</filename>" +msgid "<filename class=\"extension\">*.yaml</filename>, <filename class=\"extension\">*.yml</filename>" +msgstr "<filename class=\"extension\">*.yaml</filename>, <filename class=\"extension\">*.yml</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:808 @@ -23532,10 +18005,8 @@ msgstr "File del plug-in PrettifyPO" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:815 -msgid "" -"<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:819 @@ -23544,12 +18015,8 @@ msgstr "PO Più carino con gettext msgcat" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:822 -msgid "" -"<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> " -"<replaceable>arguments</replaceable> </arg>" -msgstr "" -"<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> " -"<replaceable>argomenti</replaceable> </arg>" +msgid "<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>arguments</replaceable> </arg>" +msgstr "<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>argomenti</replaceable> </arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:833 English/Plugins.xml:1166 @@ -23563,12 +18030,8 @@ msgstr "Opzioni della riga di comando passate al comando msgcat" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:861 English/Plugins.xml:1194 -msgid "" -"<filename class=\"extension\">*.po</filename> <filename " -"class=\"extension\">*.pot</filename>" -msgstr "" -"<filename class=\"extension\">*.po</filename> <filename " -"class=\"extension\">*.pot</filename>" +msgid "<filename class=\"extension\">*.po</filename> <filename class=\"extension\">*.pot</filename>" +msgstr "<filename class=\"extension\">*.po</filename> <filename class=\"extension\">*.pot</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:872 English/Plugins.xml:1205 @@ -23583,8 +18046,7 @@ msgstr "File del plug-in QueryCSV" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:880 msgid "<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:884 @@ -23593,12 +18055,8 @@ msgstr "CSV Querier con il comando q" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:887 -msgid "" -"<command>QueryCSV</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>QueryCSV</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>QueryCSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>QueryCSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:897 English/Plugins.xml:950 @@ -23623,8 +18081,7 @@ msgstr "File del plug-in QueryTSV" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:933 msgid "<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:937 @@ -23633,12 +18090,8 @@ msgstr "TSV Querier con il comando q" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:940 -msgid "" -"<command>QueryTSV</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>QueryTSV</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>QueryTSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>QueryTSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:971 @@ -23652,10 +18105,8 @@ msgstr "File del plug-in QueryJSON" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:986 -msgid "" -"<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:990 @@ -23664,12 +18115,8 @@ msgstr "Interrogante JSON con comando jq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:993 -msgid "" -"<command>QueryJSON</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>QueryJSON</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>QueryJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>QueryJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1040 @@ -23678,10 +18125,8 @@ msgstr "File del plug-in QueryYAML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1039 -msgid "" -"<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1043 @@ -23690,12 +18135,8 @@ msgstr "Interrogante YAML con il comando yq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1046 -msgid "" -"<command>QueryYAML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>QueryYAML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>QueryYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>QueryYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1087 @@ -23709,10 +18150,8 @@ msgstr "File del plugin ValidateHTML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1093 -msgid "" -"<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1097 @@ -23721,12 +18160,8 @@ msgstr "Validatore HTML con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1100 -msgid "" -"<command>ValidateHTML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>ValidateHTML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>ValidateHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>ValidateHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1149 @@ -23735,10 +18170,8 @@ msgstr "File del plug-in ValidatePO" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1148 -msgid "" -"<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1152 @@ -23747,12 +18180,8 @@ msgstr "Convalidatore PO con gettext msgfmt" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1155 -msgid "" -"<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> " -"<replaceable>arguments</replaceable> </arg>" -msgstr "" -"<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> " -"<replaceable>argomenti</replaceable> </arg>" +msgid "<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>arguments</replaceable> </arg>" +msgstr "<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>argomenti</replaceable> </arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1171 @@ -23766,12 +18195,8 @@ msgstr "Anteprima del file del plug-in Graphviz" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1213 -msgid "" -"<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1217 @@ -23780,12 +18205,8 @@ msgstr "Visualizzatore anteprima Graphviz" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1220 -msgid "" -"<command>PreviewGraphviz</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PreviewGraphviz</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PreviewGraphviz</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PreviewGraphviz</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1230 @@ -23794,12 +18215,8 @@ msgstr "Opzioni della riga di comando passate al comando punto" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1251 -msgid "" -"<filename class=\"extension\">*.gv</filename>, <filename " -"class=\"extension\">,*.dot</filename>" -msgstr "" -"<filename class=\"extension\">*.gv</filename>, <filename " -"class=\"extension\">,*.dot</filename>" +msgid "<filename class=\"extension\">*.gv</filename>, <filename class=\"extension\">,*.dot</filename>" +msgstr "<filename class=\"extension\">*.gv</filename>, <filename class=\"extension\">,*.dot</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1261 @@ -23813,12 +18230,8 @@ msgstr "File del plugin PreviewMarkdown" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1267 -msgid "" -"<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1271 @@ -23827,12 +18240,8 @@ msgstr "Visualizzatore anteprima Markdown" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1274 -msgid "" -"<command>PreviewMarkdown</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PreviewMarkdown</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PreviewMarkdown</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PreviewMarkdown</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1284 @@ -23841,12 +18250,8 @@ msgstr "Opzioni della riga di comando passate al comando md2html" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1305 -msgid "" -"<filename class=\"extension\">*.md</filename>, <filename " -"class=\"extension\">,*.markdown</filename>" -msgstr "" -"<filename class=\"extension\">*.md</filename>, <filename " -"class=\"extension\">,*.markdown</filename>" +msgid "<filename class=\"extension\">*.md</filename>, <filename class=\"extension\">,*.markdown</filename>" +msgstr "<filename class=\"extension\">*.md</filename>, <filename class=\"extension\">,*.markdown</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1315 @@ -23860,12 +18265,8 @@ msgstr "File del plugin PreviewPlantUML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1321 -msgid "" -"<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1325 @@ -23874,12 +18275,8 @@ msgstr "Visualizzatore anteprima PlantUML" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1328 -msgid "" -"<command>PreviewPlantUML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>PreviewPlantUML</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>PreviewPlantUML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>PreviewPlantUML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1338 @@ -23888,23 +18285,17 @@ msgstr "Opzioni della riga di comando passate al comando plantuml.jar" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1359 -msgid "" -"<filename class=\"extension\">*.pu</filename>, <filename " -"class=\"extension\">,*.puml</filename>" -msgstr "" -"<filename class=\"extension\">*.pu</filename>, <filename " -"class=\"extension\">,*.puml</filename>" +msgid "<filename class=\"extension\">*.pu</filename>, <filename class=\"extension\">,*.puml</filename>" +msgstr "<filename class=\"extension\">*.pu</filename>, <filename class=\"extension\">,*.puml</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1369 msgid "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink url=\"https://" -"graphviz.org/\">Graphviz</ulink>" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink " +"url=\"https://graphviz.org/\">Graphviz</ulink>" msgstr "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink url=\"https://" -"graphviz.org/\">Graphviz</ulink>" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink " +"url=\"https://graphviz.org/\">Graphviz</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1376 @@ -23913,10 +18304,8 @@ msgstr "File del plug-in ApacheTika" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1375 -msgid "" -"<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1379 @@ -23925,12 +18314,8 @@ msgstr "Estrattore di contenuti generali con Apache Tika" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1382 -msgid "" -"<command>ApacheTika</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>ApacheTika</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>ApacheTika</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>ApacheTika</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1392 @@ -23944,12 +18329,8 @@ msgstr "<filename class=\"estensione\">*.*</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1422 -msgid "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" -msgstr "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" +msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" +msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1429 @@ -23958,10 +18339,8 @@ msgstr "Disassemblare il file del plugin JVM" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1428 -msgid "" -"<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1432 @@ -23970,12 +18349,8 @@ msgstr "Disassemblatore di bytecode JVM con javap" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1435 -msgid "" -"<command>DisassembleJVM</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>DisassembleJVM</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>DisassembleJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>DisassembleJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1445 @@ -23989,10 +18364,8 @@ msgstr "<filename class=\"estensione\">*.class</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1475 -msgid "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" -msgstr "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" +msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" +msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1482 @@ -24001,28 +18374,18 @@ msgstr "Decompilare il file del plugin JVM" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1481 -msgid "" -"<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1485 -msgid "" -"Java decompiler with CFR - decompiles .class files into readable Java source " -"code" -msgstr "" -"Decompilatore Java con CFR: decompila i file .class in codice sorgente Java " -"leggibile" +msgid "Java decompiler with CFR - decompiles .class files into readable Java source code" +msgstr "Decompilatore Java con CFR: decompila i file .class in codice sorgente Java leggibile" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1488 -msgid "" -"<command>DecompileJVM</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>DecompileJVM</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>DecompileJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>DecompileJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1498 @@ -24031,12 +18394,8 @@ msgstr "Opzioni della riga di comando passate al decompilatore CFR" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1528 -msgid "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" -msgstr "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " -"<ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" +msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" +msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1535 @@ -24045,10 +18404,8 @@ msgstr "Disassemblare il file del plugin IL" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1534 -msgid "" -"<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1538 @@ -24057,12 +18414,8 @@ msgstr "Disassemblatore di codice IL con ildasm" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1541 -msgid "" -"<command>DisassembleIL</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>DisassembleIL</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>DisassembleIL</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>DisassembleIL</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1551 @@ -24072,20 +18425,16 @@ msgstr "Opzioni della riga di comando passate al comando ildasm" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1572 English/Plugins.xml:1628 msgid "" -"<filename class=\"extension\">*.obj</filename>, <filename " -"class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</" -"filename>, <filename class=\"extension\">*.dll</filename>" +"<filename class=\"extension\">*.obj</filename>, <filename class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</filename>, " +"<filename class=\"extension\">*.dll</filename>" msgstr "" -"<filename class=\"extension\">*.obj</filename>, <filename " -"class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</" -"filename>, <filename class=\"extension\">*.dll</filename>" +"<filename class=\"extension\">*.obj</filename>, <filename class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</filename>, " +"<filename class=\"extension\">*.dll</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1584 English/Plugins.xml:1640 -msgid "" -"<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" -msgstr "" -"<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" +msgid "<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" +msgstr "<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1591 @@ -24094,12 +18443,8 @@ msgstr "File del plugin DisassembleNative" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1590 -msgid "" -"<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1594 @@ -24108,12 +18453,8 @@ msgstr "Disassemblatore di codice nativo con dumpbin" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1597 -msgid "" -"<command>DisassembleNative</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "" -"<command>DisassembleNative</command> <arg choice=\"opt\" " -"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "<command>DisassembleNative</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "<command>DisassembleNative</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1607 @@ -24127,12 +18468,8 @@ msgstr "File del plug-in ExecFilterCommand" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1646 -msgid "" -"<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1650 @@ -24141,12 +18478,8 @@ msgstr "Applica il comando di filtro" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1653 -msgid "" -"<command>ExecFilterCommand</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>command</replaceable></arg>" -msgstr "" -"<command>ExecFilterCommand</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>comando</replaceable></arg>" +msgid "<command>ExecFilterCommand</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>command</replaceable></arg>" +msgstr "<command>ExecFilterCommand</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>comando</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:1661 @@ -24156,23 +18489,18 @@ msgstr "<option><replaceable>comando</replaceable></option>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1663 msgid "command to execute. %1 in the command is replaced with the filename" -msgstr "" -"comando da eseguire.%1 nel comando viene sostituito con il nome del file" +msgstr "comando da eseguire.%1 nel comando viene sostituito con il nome del file" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:1684 English/Plugins.xml:1721 English/Plugins.xml:1758 -#: English/Plugins.xml:1795 English/Plugins.xml:1832 English/Plugins.xml:1869 -#: English/Plugins.xml:1906 English/Plugins.xml:1943 English/Plugins.xml:1980 -#: English/Plugins.xml:2082 English/Plugins.xml:2175 English/Plugins.xml:2257 +#: English/Plugins.xml:1684 English/Plugins.xml:1721 English/Plugins.xml:1758 English/Plugins.xml:1795 English/Plugins.xml:1832 English/Plugins.xml:1869 +#: English/Plugins.xml:1906 English/Plugins.xml:1943 English/Plugins.xml:1980 English/Plugins.xml:2082 English/Plugins.xml:2175 English/Plugins.xml:2257 #: English/Plugins.xml:2311 English/Plugins.xml:2348 msgid "<filename class=\"extension\">*.nomatch</filename>" msgstr "<filename class=\"extension\">*.nomatch</filename>" #. type: Content of: <article><section><section><title> -#: English/Plugins.xml:1693 English/Plugins.xml:1730 English/Plugins.xml:1767 -#: English/Plugins.xml:1804 English/Plugins.xml:1841 English/Plugins.xml:1878 -#: English/Plugins.xml:1915 English/Plugins.xml:1952 English/Plugins.xml:1989 -#: English/Plugins.xml:2091 English/Plugins.xml:2184 English/Plugins.xml:2266 +#: English/Plugins.xml:1693 English/Plugins.xml:1730 English/Plugins.xml:1767 English/Plugins.xml:1804 English/Plugins.xml:1841 English/Plugins.xml:1878 +#: English/Plugins.xml:1915 English/Plugins.xml:1952 English/Plugins.xml:1989 English/Plugins.xml:2091 English/Plugins.xml:2184 English/Plugins.xml:2266 #: English/Plugins.xml:2320 English/Plugins.xml:2357 English/Plugins.xml:2723 msgid "Windows Script Host" msgstr "Host di script di Windows" @@ -24184,10 +18512,8 @@ msgstr "File del plugin MakeUpper" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1699 -msgid "" -"<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1703 @@ -24201,10 +18527,8 @@ msgstr "File del plugin MakeLower" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1736 -msgid "" -"<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1740 @@ -24218,12 +18542,8 @@ msgstr "File del plugin RemoveDuplicates" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1773 -msgid "" -"<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1777 @@ -24237,12 +18557,8 @@ msgstr "File del plugin CountDuplicates" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1810 -msgid "" -"<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1814 @@ -24256,11 +18572,8 @@ msgstr "File del plug-in con ordinamento ascendente" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1847 -msgid "" -"<filename>SortAscending<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>Ordinamento crescente<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>SortAscending<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Ordinamento crescente<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1851 @@ -24274,11 +18587,8 @@ msgstr "File del plug-in Ordinamento discendente" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1884 -msgid "" -"<filename>SortDescending<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>Ordinamento decrescente<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>SortDescending<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Ordinamento decrescente<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1888 @@ -24292,10 +18602,8 @@ msgstr "File del plugin ReverseColumns" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1921 -msgid "" -"<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1925 @@ -24309,10 +18617,8 @@ msgstr "File del plug-in ReverseLines" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1958 -msgid "" -"<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1962 @@ -24326,11 +18632,8 @@ msgstr "Seleziona il file del plugin Colonne" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1995 -msgid "" -"<filename>SelectColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>SelezionaColonne<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>SelectColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>SelezionaColonne<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1999 @@ -24339,23 +18642,17 @@ msgstr "Seleziona alcune colonne" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2002 -msgid "" -"<command>SelectColumns</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" -msgstr "" -"<command>SelectColumns</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" +msgid "<command>SelectColumns</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" +msgstr "<command>SelectColumns</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2009 msgid "" -"<command>SelectColumns</command> <arg><option>-v</option></arg> " -"<arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-" -"e</option> <replaceable>patterns</replaceable></arg>" +"<command>SelectColumns</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-e</" +"option> <replaceable>patterns</replaceable></arg>" msgstr "" -"<command>Selezionacolonne</command> <arg><option>-v</option></arg> " -"<arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-" -"e</option> <replaceable>modelli</replaceable></arg>" +"<command>Selezionacolonne</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-e</" +"option> <replaceable>modelli</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:2023 English/Plugins.xml:2123 @@ -24424,10 +18721,8 @@ msgstr "File del plug-in SelectLines" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2097 -msgid "" -"<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2101 @@ -24436,22 +18731,16 @@ msgstr "Seleziona alcune righe" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2104 -msgid "" -"<command>SelectLines</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" -msgstr "" -"<command>SelectLines</command> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" +msgid "<command>SelectLines</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" +msgstr "<command>SelectLines</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2111 msgid "" -"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-" -"i</option></arg> <arg><option>-e</option> <replaceable>patterns</" +"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-e</option> <replaceable>patterns</" "replaceable></arg>" msgstr "" -"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-" -"i</option></arg> <arg><option>-e</option> <replaceable>modelli</" +"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-e</option> <replaceable>modelli</" "replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> @@ -24472,8 +18761,7 @@ msgstr "Sostituisci il file del plugin" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2190 msgid "<filename>Replace<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>Sostituisci<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Sostituisci<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2194 @@ -24483,14 +18771,11 @@ msgstr "Sostituisce il testo con un altro testo" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2197 msgid "" -"<command>Replace</command> <arg><option>-i</option></arg> <arg><option>-e</" -"option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</replaceable></" -"arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" +"<command>Replace</command> <arg><option>-i</option></arg> <arg><option>-e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" +"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" msgstr "" -"<command>Sostituisci</command> <arg><option>-i</option></arg> <arg><option>-" -"e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" -"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</" -"replaceable></arg>" +"<command>Sostituisci</command> <arg><option>-i</option></arg> <arg><option>-e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" +"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:2212 @@ -24530,8 +18815,7 @@ msgstr "Tokenizza il file del plugin" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2272 msgid "<filename>Tokenize<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>Tokenizza<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>Tokenizza<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2276 @@ -24540,12 +18824,8 @@ msgstr "Tokenizza la selezione" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2279 -msgid "" -"<command>Tokenize</command> <arg rep=\"norepeat\"><replaceable>patterns</" -"replaceable></arg>" -msgstr "" -"<command>Tokenizza</command> <arg rep=\"norepeat\"><replaceable>modelli</" -"replaceable></arg>" +msgid "<command>Tokenize</command> <arg rep=\"norepeat\"><replaceable>patterns</replaceable></arg>" +msgstr "<command>Tokenizza</command> <arg rep=\"norepeat\"><replaceable>modelli</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:2289 @@ -24574,38 +18854,26 @@ msgstr "File del plugin IgnoreColumns" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2363 -msgid "" -"<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2367 -msgid "" -"This plugin ignores characters at specified columns. The first column is " -"number 1." -msgstr "" -"Questo plugin ignora i caratteri nelle colonne specificate.La prima colonna " -"è la numero 1." +msgid "This plugin ignores characters at specified columns. The first column is number 1." +msgstr "Questo plugin ignora i caratteri nelle colonne specificate.La prima colonna è la numero 1." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2370 -msgid "" -"Note that this plugin does not support files with tabs: the plugin does not " -"fail, but all tabs are be treated as normal characters." +msgid "Note that this plugin does not support files with tabs: the plugin does not fail, but all tabs are be treated as normal characters." msgstr "" -"Tieni presente che questo plugin non supporta file con tabulazioni: il " -"plugin non fallisce, ma tutte le tabulazioni vengono trattate come caratteri " +"Tieni presente che questo plugin non supporta file con tabulazioni: il plugin non fallisce, ma tutte le tabulazioni vengono trattate come caratteri " "normali." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2373 -msgid "" -"To specify columns, use plugin settings dialog or rename the <filename>dll</" -"filename> using following fields as parameters:" +msgid "To specify columns, use plugin settings dialog or rename the <filename>dll</filename> using following fields as parameters:" msgstr "" -"Per specificare le colonne, utilizza la finestra di dialogo delle " -"impostazioni del plugin o rinomina la <filename>dll</filename> utilizzando i " +"Per specificare le colonne, utilizza la finestra di dialogo delle impostazioni del plugin o rinomina la <filename>dll</filename> utilizzando i " "seguenti campi come parametri:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> @@ -24616,8 +18884,7 @@ msgstr "Delimitatori tra intervalli: _ o ," #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2382 msgid "Delimiters between min and max: <emphasis>anything else</emphasis>" -msgstr "" -"Delimitatori tra minimo e massimo: <emphasis>qualsiasi altra cosa</emphasis>" +msgstr "Delimitatori tra minimo e massimo: <emphasis>qualsiasi altra cosa</emphasis>" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2387 @@ -24641,11 +18908,8 @@ msgstr "<filename>IgnoraColumns _ 3 _ 10 - 20 _ 32 - 33.dll</filename>" #. type: Content of: <article><section><section><example><variablelist><varlistentry><listitem><simpara> #: English/Plugins.xml:2404 -msgid "" -"Ignore all characters at column 3, and in columns 10 to 20, and 32 to 33." -msgstr "" -"Ignora tutti i caratteri nella colonna 3 e nelle colonne da 10 a 20 e da 32 " -"a 33." +msgid "Ignore all characters at column 3, and in columns 10 to 20, and 32 to 33." +msgstr "Ignora tutti i caratteri nella colonna 3 e nelle colonne da 10 a 20 e da 32 a 33." #. type: Content of: <article><section><section><example><variablelist><varlistentry><term> #: English/Plugins.xml:2410 @@ -24663,8 +18927,7 @@ msgid "<placeholder type=\"variablelist\" id=\"0\"/>" msgstr "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:2430 English/Plugins.xml:2458 English/Plugins.xml:2500 -#: English/Plugins.xml:2535 English/Plugins.xml:2566 +#: English/Plugins.xml:2430 English/Plugins.xml:2458 English/Plugins.xml:2500 English/Plugins.xml:2535 English/Plugins.xml:2566 msgid "Prediffer" msgstr "Predifferire" @@ -24680,42 +18943,28 @@ msgstr "File del plugin IgnoreCommentsC" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2440 -msgid "" -"<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2444 msgid "" -"The plugin ignores comments within<constant> //</constant>... and <constant>/" -"*</constant> ... <constant>*/</constant> delimiters in C, C++, PHP and " +"The plugin ignores comments within<constant> //</constant>... and <constant>/*</constant> ... <constant>*/</constant> delimiters in C, C++, PHP and " "JavaScript files." msgstr "" -"Il plugin ignora i commenti all'interno dei delimitatori <constant> //</" -"constant>... e <constant>/*</constant> ... <constant>*/</constant> nei file " +"Il plugin ignora i commenti all'interno dei delimitatori <constant> //</constant>... e <constant>/*</constant> ... <constant>*/</constant> nei file " "C, C++, PHP e JavaScript." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:2460 msgid "" -"<filename class=\"extension\">*.cpp</filename>, <filename " -"class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</" -"filename>, <filename class=\"extension\">*.hxx</filename>, <filename " -"class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</" -"filename>, <filename class=\"extension\">*.js</filename>, <filename " -"class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</" -"filename>" -msgstr "" -"<filename class=\"extension\">*.cpp</filename>, <filename " -"class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</" -"filename>, <filename class=\"extension\">*.hxx</filename>, <filename " -"class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</" -"filename>, <filename class=\"extension\">*.js</filename>, <filename " -"class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</" -"filename>" +"<filename class=\"extension\">*.cpp</filename>, <filename class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</filename>, " +"<filename class=\"extension\">*.hxx</filename>, <filename class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</filename>, " +"<filename class=\"extension\">*.js</filename>, <filename class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</filename>" +msgstr "" +"<filename class=\"extension\">*.cpp</filename>, <filename class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</filename>, " +"<filename class=\"extension\">*.hxx</filename>, <filename class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</filename>, " +"<filename class=\"extension\">*.js</filename>, <filename class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</filename>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2479 @@ -24724,34 +18973,25 @@ msgstr "File del plugin IgnoreFieldsComma" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2478 -msgid "" -"<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2482 msgid "" -"This plugin is for files with fields and commas as delimiters (CSV files, " -"for example). It ignores the delimiter characters. The first field is number " -"1." +"This plugin is for files with fields and commas as delimiters (CSV files, for example). It ignores the delimiter characters. The first field is " +"number 1." msgstr "" -"Questo plugin è per file con campi e virgole come delimitatori (file CSV, ad " -"esempio).Ignora i caratteri delimitatori.Il primo campo è il numero 1." +"Questo plugin è per file con campi e virgole come delimitatori (file CSV, ad esempio).Ignora i caratteri delimitatori.Il primo campo è il numero 1." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2486 English/Plugins.xml:2521 msgid "" -"To specify the delimiters, use plugin settings dialog or rename the " -"<filename>dll</filename> using the same parameter fields used for <xref " +"To specify the delimiters, use plugin settings dialog or rename the <filename>dll</filename> using the same parameter fields used for <xref " "linkend=\"IgnoreColumns\" />." msgstr "" -"Per specificare i delimitatori, utilizzare la finestra di dialogo delle " -"impostazioni del plugin o rinominare la <filename>dll</filename> utilizzando " -"gli stessi campi dei parametri utilizzati per <xref " -"linkend=\"IgnoreColumns\" />." +"Per specificare i delimitatori, utilizzare la finestra di dialogo delle impostazioni del plugin o rinominare la <filename>dll</filename> utilizzando " +"gli stessi campi dei parametri utilizzati per <xref linkend=\"IgnoreColumns\" />." #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2513 @@ -24760,25 +19000,17 @@ msgstr "Ignora il file del pluginFieldsTab" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2512 -msgid "" -"<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2516 msgid "" -"This plugin is for files that use fields and tabs as delimiters " -"(<application>for example, Excel</application> files saved in the <filename " -"class=\"extension\">*.txt</filename> format). It ignores the delimiter " -"characters. The first field is number 1." +"This plugin is for files that use fields and tabs as delimiters (<application>for example, Excel</application> files saved in the <filename " +"class=\"extension\">*.txt</filename> format). It ignores the delimiter characters. The first field is number 1." msgstr "" -"Questo plugin è per i file che utilizzano campi e tabulazioni come " -"delimitatori (<application>ad esempio, file Excel</application> salvati nel " -"formato <filename class=\"extension\">*.txt</filename>).Ignora i caratteri " -"delimitatori.Il primo campo è il numero 1." +"Questo plugin è per i file che utilizzano campi e tabulazioni come delimitatori (<application>ad esempio, file Excel</application> salvati nel " +"formato <filename class=\"extension\">*.txt</filename>).Ignora i caratteri delimitatori.Il primo campo è il numero 1." #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2548 @@ -24787,21 +19019,13 @@ msgstr "Ignora il file plug-in LeadingLineNumbers" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2547 -msgid "" -"<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/" -"></filename>" -msgstr "" -"<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/" -"></filename>" +msgid "<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2551 -msgid "" -"This plugin ignores the leading line numbers in text files (for example, NC " -"and BASIC files)." -msgstr "" -"Questo plugin ignora i numeri di riga iniziali nei file di testo (ad " -"esempio, file NC e BASIC)." +msgid "This plugin ignores the leading line numbers in text files (for example, NC and BASIC files)." +msgstr "Questo plugin ignora i numeri di riga iniziali nei file di testo (ad esempio, file NC e BASIC)." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> #: English/Plugins.xml:2563 @@ -24820,147 +19044,88 @@ msgstr "file del plugin aggiuntivo dell'editor" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2578 -msgid "" -"<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "" -"<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2582 -msgid "" -"Adds some functions to the <menuchoice> <guimenu>Plugins</guimenu> " -"<guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" -msgstr "" -"Aggiunge alcune funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > " -"<guisubmenu >Script</guisubmenu > </menuchoice >:" +msgid "Adds some functions to the <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" +msgstr "Aggiunge alcune funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </menuchoice >:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2590 -msgid "" -"<guimenuitem>Make Uppercase</guimenuitem> convert the selection to UPPER " -"CASE." -msgstr "" -"<guimenuitem >Rendi maiuscolo</guimenuitem > converte la selezione in " -"MAIUSCOLO." +msgid "<guimenuitem>Make Uppercase</guimenuitem> convert the selection to UPPER CASE." +msgstr "<guimenuitem >Rendi maiuscolo</guimenuitem > converte la selezione in MAIUSCOLO." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2595 -msgid "" -"<guimenuitem>Make Lowercase</guimenuitem> convert the selection to lower " -"case." -msgstr "" -"<guimenuitem >Rendi minuscolo</guimenuitem > converte la selezione in " -"minuscolo." +msgid "<guimenuitem>Make Lowercase</guimenuitem> convert the selection to lower case." +msgstr "<guimenuitem >Rendi minuscolo</guimenuitem > converte la selezione in minuscolo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2600 -msgid "" -"<guimenuitem>Remove Duplicate Lines</guimenuitem> remove duplicate lines in " -"the selection." -msgstr "" -"<guimenuitem >Rimuovi linee duplicate</guimenuitem > rimuove le linee " -"duplicate nella selezione." +msgid "<guimenuitem>Remove Duplicate Lines</guimenuitem> remove duplicate lines in the selection." +msgstr "<guimenuitem >Rimuovi linee duplicate</guimenuitem > rimuove le linee duplicate nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2605 -msgid "" -"<guimenuitem>Count Duplicate Lines</guimenuitem> remove duplicate lines in " -"the selection and insert the number of duplicate lines on the right." +msgid "<guimenuitem>Count Duplicate Lines</guimenuitem> remove duplicate lines in the selection and insert the number of duplicate lines on the right." msgstr "" -"<guimenuitem >Conta righe duplicate</guimenuitem > rimuove le righe " -"duplicate nella selezione e inserisce il numero di righe duplicate sulla " -"destra." +"<guimenuitem >Conta righe duplicate</guimenuitem > rimuove le righe duplicate nella selezione e inserisce il numero di righe duplicate sulla destra." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2610 -msgid "" -"<guimenuitem>Sort Lines Ascending</guimenuitem> sort the selection in " -"ascending order." -msgstr "" -"<guimenuitem >Ordina le righe in ordine crescente</guimenuitem > ordina la " -"selezione in ordine crescente." +msgid "<guimenuitem>Sort Lines Ascending</guimenuitem> sort the selection in ascending order." +msgstr "<guimenuitem >Ordina le righe in ordine crescente</guimenuitem > ordina la selezione in ordine crescente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2615 -msgid "" -"<guimenuitem>Sort Lines Descending</guimenuitem> sort the selection in " -"descending order." -msgstr "" -"<guimenuitem >Ordina le righe discendente</guimenuitem > ordina la selezione " -"in ordine discendente." +msgid "<guimenuitem>Sort Lines Descending</guimenuitem> sort the selection in descending order." +msgstr "<guimenuitem >Ordina le righe discendente</guimenuitem > ordina la selezione in ordine discendente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2620 -msgid "" -"<guimenuitem>Reverse Columns</guimenuitem> reverse columns in the selection." -msgstr "" -"<guimenuitem >Inverti colonne</guimenuitem > inverte le colonne nella " -"selezione." +msgid "<guimenuitem>Reverse Columns</guimenuitem> reverse columns in the selection." +msgstr "<guimenuitem >Inverti colonne</guimenuitem > inverte le colonne nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2625 -msgid "" -"<guimenuitem>Reverse Lines</guimenuitem> reverse lines in the selection." -msgstr "" -"<guimenuitem >Inverti linee</guimenuitem > inverte le linee nella selezione." +msgid "<guimenuitem>Reverse Lines</guimenuitem> reverse lines in the selection." +msgstr "<guimenuitem >Inverti linee</guimenuitem > inverte le linee nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2630 -msgid "" -"<guimenuitem>Select Columns...</guimenuitem> select some columns in the " -"selection." -msgstr "" -"<guimenuitem >Seleziona colonne...</guimenuitem > seleziona alcune colonne " -"nella selezione." +msgid "<guimenuitem>Select Columns...</guimenuitem> select some columns in the selection." +msgstr "<guimenuitem >Seleziona colonne...</guimenuitem > seleziona alcune colonne nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2635 -msgid "" -"<guimenuitem>Select Lines...</guimenuitem> select some lines in the " -"selection." -msgstr "" -"<guimenuitem >Seleziona righe...</guimenuitem > seleziona alcune righe nella " -"selezione." +msgid "<guimenuitem>Select Lines...</guimenuitem> select some lines in the selection." +msgstr "<guimenuitem >Seleziona righe...</guimenuitem > seleziona alcune righe nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2640 -msgid "" -"<guimenuitem>Replace...</guimenuitem> replace text in the selection with " -"another text." -msgstr "" -"<guimenuitem >Sostituisci...</guimenuitem > sostituisce il testo nella " -"selezione con un altro testo." +msgid "<guimenuitem>Replace...</guimenuitem> replace text in the selection with another text." +msgstr "<guimenuitem >Sostituisci...</guimenuitem > sostituisce il testo nella selezione con un altro testo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2645 msgid "" -"<guimenuitem>Apply Filter Command...</guimenuitem> replace the selection " -"with the output of the specified filter command. Specifying %1 in the " -"argument of the filter command replaces it with the filename of the active " -"pane." +"<guimenuitem>Apply Filter Command...</guimenuitem> replace the selection with the output of the specified filter command. Specifying %1 in the " +"argument of the filter command replaces it with the filename of the active pane." msgstr "" -"<guimenuitem >Applica comando filtro...</guimenuitem > sostituisce la " -"selezione con l'output del comando filtro specificato.Specificando %1 " -"nell'argomento del comando filter lo sostituisce con il nome file del " -"riquadro attivo." +"<guimenuitem >Applica comando filtro...</guimenuitem > sostituisce la selezione con l'output del comando filtro specificato.Specificando %1 " +"nell'argomento del comando filter lo sostituisce con il nome file del riquadro attivo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2651 -msgid "" -"<guimenuitem>Tokenize...</guimenuitem> replaces the token delimiter with a " -"newline in the selection." -msgstr "" -"<guimenuitem >Tokenizza...</guimenuitem > sostituisce il delimitatore del " -"token con un fine riga nella selezione." +msgid "<guimenuitem>Tokenize...</guimenuitem> replaces the token delimiter with a newline in the selection." +msgstr "<guimenuitem >Tokenizza...</guimenuitem > sostituisce il delimitatore del token con un fine riga nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2656 -msgid "" -"<guimenuitem>Trim Spaces</guimenuitem> remove spaces at the beginning and " -"end of lines in the selection." -msgstr "" -"<guimenuitem >Taglia spazi</guimenuitem > rimuove gli spazi all'inizio e " -"alla fine delle righe nella selezione." +msgid "<guimenuitem>Trim Spaces</guimenuitem> remove spaces at the beginning and end of lines in the selection." +msgstr "<guimenuitem >Taglia spazi</guimenuitem > rimuove gli spazi all'inizio e alla fine delle righe nella selezione." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:2667 English/Plugins.xml:2705 @@ -24979,39 +19144,23 @@ msgstr "inserire il file del plugin datetime" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2675 -msgid "" -"<filename>insert datetime<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" -msgstr "" -"<filename>inserisci data/ora<placeholder type=\"indexterm\" id=\"0\"/></" -"filename>" +msgid "<filename>insert datetime<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "<filename>inserisci data/ora<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2679 -msgid "" -"Adds two functions to the <menuchoice> <guimenu>Plugins</guimenu> " -"<guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" -msgstr "" -"Aggiunge due funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > " -"<guisubmenu >Script</guisubmenu > </menuchoice >:" +msgid "Adds two functions to the <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" +msgstr "Aggiunge due funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </menuchoice >:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2687 -msgid "" -"<guimenuitem>Insert Date</guimenuitem> insert date in the current locale " -"format." -msgstr "" -"<guimenuitem >Inserisci data</guimenuitem > inserisce la data nel formato " -"locale corrente." +msgid "<guimenuitem>Insert Date</guimenuitem> insert date in the current locale format." +msgstr "<guimenuitem >Inserisci data</guimenuitem > inserisce la data nel formato locale corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2692 -msgid "" -"<guimenuitem>Insert Time</guimenuitem> insert time in the current locale " -"format." -msgstr "" -"<guimenuitem >Inserisci ora</guimenuitem > inserisce l'ora nel formato " -"locale corrente." +msgid "<guimenuitem>Insert Time</guimenuitem> insert time in the current locale format." +msgstr "<guimenuitem >Inserisci ora</guimenuitem > inserisce l'ora nel formato locale corrente." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Plugins.xml:2719 @@ -25025,21 +19174,13 @@ msgstr "Requisiti<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2725 -msgid "" -"Some editor complement plugins require this optional component from " -"<trademark class=\"registered\">Microsoft</trademark>." -msgstr "" -"Alcuni plugin di complemento dell'editor richiedono questo componente " -"opzionale da <trademark class=\"registered\">Microsoft</trademark>." +msgid "Some editor complement plugins require this optional component from <trademark class=\"registered\">Microsoft</trademark>." +msgstr "Alcuni plugin di complemento dell'editor richiedono questo componente opzionale da <trademark class=\"registered\">Microsoft</trademark>." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2728 -msgid "" -"It should already be included in your version of Windows, unless you use " -"some really old pre Windows XP version." -msgstr "" -"Dovrebbe essere già incluso nella tua versione di Windows, a meno che tu non " -"utilizzi una versione precedente a Windows XP molto vecchia." +msgid "It should already be included in your version of Windows, unless you use some really old pre Windows XP version." +msgstr "Dovrebbe essere già incluso nella tua versione di Windows, a meno che tu non utilizzi una versione precedente a Windows XP molto vecchia." #. type: Content of: <article><title> #: English/Quick_start.xml:3 @@ -25057,37 +19198,25 @@ msgid "choosing files and folders" msgstr "scelta di file e cartelle" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Quick_start.xml:11 English/Quick_start.xml:241 -#: English/Quick_start.xml:245 English/Quick_start.xml:327 -#: English/Quick_start.xml:331 +#: English/Quick_start.xml:11 English/Quick_start.xml:241 English/Quick_start.xml:245 English/Quick_start.xml:327 English/Quick_start.xml:331 msgid "getting started" msgstr "iniziare" #. type: Content of: <article><section><title> #: English/Quick_start.xml:6 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>Selecting files and folders to compare" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " -"id=\"1\"/>Selezione di file e cartelle da confrontare" +msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Selecting files and folders to compare" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Selezione di file e cartelle da confrontare" #. type: Content of: <article><section><para> #: English/Quick_start.xml:14 msgid "" -"After you have installed WinMerge, step through the procedure and " -"discussions in this topic to learn basic WinMerge operations and concepts. " -"The methods shown are not the only ways to do things: there are usually " -"several ways to do each task. When you are done, you can go on to learn " -"other methods and more advanced skills, which are covered in other help " -"topics." +"After you have installed WinMerge, step through the procedure and discussions in this topic to learn basic WinMerge operations and concepts. The " +"methods shown are not the only ways to do things: there are usually several ways to do each task. When you are done, you can go on to learn other " +"methods and more advanced skills, which are covered in other help topics." msgstr "" -"Dopo aver installato WinMerge, seguire la procedura e le discussioni " -"contenute in questo argomento per apprendere le operazioni e i concetti di " -"base di WinMerge.I metodi mostrati non sono gli unici modi per eseguire le " -"operazioni: in genere esistono diversi modi per eseguire ciascuna attività." -"Una volta terminato, puoi continuare ad apprendere altri metodi e competenze " -"più avanzate, trattate in altri argomenti della guida." +"Dopo aver installato WinMerge, seguire la procedura e le discussioni contenute in questo argomento per apprendere le operazioni e i concetti di base " +"di WinMerge.I metodi mostrati non sono gli unici modi per eseguire le operazioni: in genere esistono diversi modi per eseguire ciascuna attività.Una " +"volta terminato, puoi continuare ad apprendere altri metodi e competenze più avanzate, trattate in altri argomenti della guida." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:22 @@ -25111,54 +19240,33 @@ msgstr "Passare al launcher WinMerge nel menu Start." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:36 -msgid "" -"In a Command Prompt window, cd to the WinMerge installation folder and enter " -"<command>WinMergeU</command>." -msgstr "" -"In una finestra del prompt dei comandi, vai alla cartella di installazione " -"di WinMerge e inserisci <command>WinMergeU</command>." +msgid "In a Command Prompt window, cd to the WinMerge installation folder and enter <command>WinMergeU</command>." +msgstr "In una finestra del prompt dei comandi, vai alla cartella di installazione di WinMerge e inserisci <command>WinMergeU</command>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:41 -msgid "" -"Press <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> and " -"enter <command>winmerge</command>." -msgstr "" -"Premi <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> e " -"inserisci <command>winmerge</command>." +msgid "Press <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> and enter <command>winmerge</command>." +msgstr "Premi <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> e inserisci <command>winmerge</command>." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:47 msgid "Open the <guilabel>Select Files or Folders</guilabel> dialog" -msgstr "" -"Apri la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" +msgstr "Apri la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" #. type: Content of: <article><section><section><para> #: English/Quick_start.xml:49 -msgid "" -"In the WinMerge window use the following methods to open the " -"<guilabel>Select Files or Folders</guilabel> dialog:" -msgstr "" -"Nella finestra WinMerge utilizza i seguenti metodi per aprire la finestra di " -"dialogo <guilabel >Seleziona file o cartelle</guilabel >:" +msgid "In the WinMerge window use the following methods to open the <guilabel>Select Files or Folders</guilabel> dialog:" +msgstr "Nella finestra WinMerge utilizza i seguenti metodi per aprire la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:53 -msgid "" -"Click <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></" -"menuchoice>." -msgstr "" -"Fai clic su <menuchoice ><guimenu >File</guimenu ><guimenuitem >Apri</" -"guimenuitem ></menuchoice >." +msgid "Click <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>." +msgstr "Fai clic su <menuchoice ><guimenu >File</guimenu ><guimenuitem >Apri</guimenuitem ></menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject> #: English/Quick_start.xml:59 -msgid "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon." -"png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon." -"png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon.png\" /> </imageobject>" #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Quick_start.xml:62 @@ -25167,12 +19275,8 @@ msgstr "Pulsante di apertura di WinMerge" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:57 -msgid "" -"Click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Open tool bar " -"button." -msgstr "" -"Fai clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " -"Apri della barra degli strumenti." +msgid "Click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Open tool bar button." +msgstr "Fai clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> Apri della barra degli strumenti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:69 @@ -25181,21 +19285,13 @@ msgstr "Premi <keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo>." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:75 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/> The <guilabel>Select Files or " -"Folders</guilabel> dialog" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/> La finestra di dialogo <guilabel " -">Seleziona file o cartelle</guilabel >" +msgid "<placeholder type=\"indexterm\" id=\"0\"/> The <guilabel>Select Files or Folders</guilabel> dialog" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/> La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" #. type: Content of: <article><section><section><para><mediaobject> #: English/Quick_start.xml:80 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><title> #: English/Quick_start.xml:90 @@ -25204,12 +19300,8 @@ msgstr "Specificare i file e le cartelle" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:92 -msgid "" -"In the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> fields, specify " -"the files and folders to compare. Use any of these methods:" -msgstr "" -"Nei campi <guilabel >1°</guilabel > e <guilabel >2°</guilabel >, specifica i " -"file e le cartelle da confrontare.Utilizza uno di questi metodi:" +msgid "In the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> fields, specify the files and folders to compare. Use any of these methods:" +msgstr "Nei campi <guilabel >1°</guilabel > e <guilabel >2°</guilabel >, specifica i file e le cartelle da confrontare.Utilizza uno di questi metodi:" #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:98 @@ -25218,86 +19310,59 @@ msgstr "Immettere i nomi dei percorsi direttamente nei campi." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:102 -msgid "" -"Click the <guibutton>Browse</guibutton> button to navigate to the desired " -"path." -msgstr "" -"Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il " -"percorso desiderato." +msgid "Click the <guibutton>Browse</guibutton> button to navigate to the desired path." +msgstr "Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il percorso desiderato." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:105 msgid "" -"In the Open dialog, the text, <literal>Folder Selection</literal>, is " -"initially displayed in the <guilabel>File name</guilabel> field. Your " -"selection depends on the type of comparison you want to do:" +"In the Open dialog, the text, <literal>Folder Selection</literal>, is initially displayed in the <guilabel>File name</guilabel> field. Your selection " +"depends on the type of comparison you want to do:" msgstr "" -"Nella finestra di dialogo Apri, il testo <literal >Selezione cartella</" -"literal >, viene inizialmente visualizzato nel campo <guilabel >Nome file</" +"Nella finestra di dialogo Apri, il testo <literal >Selezione cartella</literal >, viene inizialmente visualizzato nel campo <guilabel >Nome file</" "guilabel >.La selezione dipende dal tipo di confronto che desideri eseguire:" #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Quick_start.xml:112 -msgid "" -"If you are comparing files, select the target file. The <literal>Folder " -"Selection</literal> text is overwritten with your selection." +msgid "If you are comparing files, select the target file. The <literal>Folder Selection</literal> text is overwritten with your selection." msgstr "" -"Se stai confrontando file, seleziona il file di destinazione.Il testo " -"<literal>Selezione cartella</literal> viene sovrascritto con la tua " -"selezione." +"Se stai confrontando file, seleziona il file di destinazione.Il testo <literal>Selezione cartella</literal> viene sovrascritto con la tua selezione." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Quick_start.xml:118 -msgid "" -"If you are comparing folders, open the target folder; do not select a file. " -"The <literal>Folder Selection</literal> text remains in place." +msgid "If you are comparing folders, open the target folder; do not select a file. The <literal>Folder Selection</literal> text remains in place." msgstr "" -"Se stai confrontando cartelle, apri la cartella di destinazione;non " -"selezionare un file.Il testo <literal>Selezione cartella</literal> rimane al " -"suo posto." +"Se stai confrontando cartelle, apri la cartella di destinazione;non selezionare un file.Il testo <literal>Selezione cartella</literal> rimane al suo " +"posto." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:124 msgid "" -"Click <guibutton>Open</guibutton> to dismiss the Open dialog and load your " -"selection in the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> field. " -"If you specified folders, the field includes a backslash ( \\ ) at end of " -"the path." +"Click <guibutton>Open</guibutton> to dismiss the Open dialog and load your selection in the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> " +"field. If you specified folders, the field includes a backslash ( \\ ) at end of the path." msgstr "" -"Fai clic su <guibutton >Apri</guibutton > per chiudere la finestra di " -"dialogo Apri e caricare la selezione nel campo <guilabel >1°</guilabel > o " -"<guilabel >2°</guilabel >.Se hai specificato le cartelle, il campo include " -"una barra rovesciata ( \\ ) alla fine del percorso." +"Fai clic su <guibutton >Apri</guibutton > per chiudere la finestra di dialogo Apri e caricare la selezione nel campo <guilabel >1°</guilabel > o " +"<guilabel >2°</guilabel >.Se hai specificato le cartelle, il campo include una barra rovesciata ( \\ ) alla fine del percorso." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:131 msgid "Click the combo box and choose a previously-used path." -msgstr "" -"Fare clic sulla casella combinata e scegliere un percorso utilizzato in " -"precedenza." +msgstr "Fare clic sulla casella combinata e scegliere un percorso utilizzato in precedenza." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><tip><para> #: English/Quick_start.xml:135 msgid "" -"To make it easier to select frequently-used paths, consider enabling the " -"<guilabel>Open-dialog Auto-completion</guilabel> option. With this option, " -"WinMerge shows a list of paths available as you type in the fields. See " -"<xref linkend=\"Configuration\" /> for details." +"To make it easier to select frequently-used paths, consider enabling the <guilabel>Open-dialog Auto-completion</guilabel> option. With this option, " +"WinMerge shows a list of paths available as you type in the fields. See <xref linkend=\"Configuration\" /> for details." msgstr "" -"Per rendere più semplice la selezione dei percorsi utilizzati di frequente, " -"valuta la possibilità di abilitare l'opzione <guilabel >Completamento " -"automatico finestra di apertura</guilabel >.Con questa opzione, WinMerge " -"mostra un elenco di percorsi disponibili durante la digitazione nei campi." -"Vedi <xref linkend=\"Configuration\" /> per i dettagli." +"Per rendere più semplice la selezione dei percorsi utilizzati di frequente, valuta la possibilità di abilitare l'opzione <guilabel >Completamento " +"automatico finestra di apertura</guilabel >.Con questa opzione, WinMerge mostra un elenco di percorsi disponibili durante la digitazione nei " +"campi.Vedi <xref linkend=\"Configuration\" /> per i dettagli." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:145 -msgid "" -"Drag and drop a file or folder into the dialog or the <guilabel>1st</" -"guilabel> or <guilabel>2nd</guilabel> field." -msgstr "" -"Trascina e rilascia un file o una cartella nella finestra di dialogo o nel " -"campo <guilabel >1°</guilabel > o <guilabel >2°</guilabel >." +msgid "Drag and drop a file or folder into the dialog or the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> field." +msgstr "Trascina e rilascia un file o una cartella nella finestra di dialogo o nel campo <guilabel >1°</guilabel > o <guilabel >2°</guilabel >." #. type: Content of: <article><section><section><section><para><note> #: English/Quick_start.xml:151 @@ -25307,24 +19372,16 @@ msgstr "<note>" #. type: Content of: <article><section><section><section><para><note><para> #: English/Quick_start.xml:152 msgid "" -"You can select only one pair of files or one pair of folders to compare. If " -"you select a file and a folder or if one of the files or folders is not " -"found, WinMerge disables the <guibutton>Compare</guibutton> button in the " -"dialog." +"You can select only one pair of files or one pair of folders to compare. If you select a file and a folder or if one of the files or folders is not " +"found, WinMerge disables the <guibutton>Compare</guibutton> button in the dialog." msgstr "" -"È possibile selezionare solo una coppia di file o una coppia di cartelle da " -"confrontare.Se selezioni un file e una cartella o se uno dei file o delle " -"cartelle non viene trovato, WinMerge disabilita il pulsante <guibutton " -">Confronta</guibutton > nella finestra di dialogo." +"È possibile selezionare solo una coppia di file o una coppia di cartelle da confrontare.Se selezioni un file e una cartella o se uno dei file o delle " +"cartelle non viene trovato, WinMerge disabilita il pulsante <guibutton >Confronta</guibutton > nella finestra di dialogo." #. type: Content of: <article><section><section><section><para><note><para> #: English/Quick_start.xml:157 -msgid "" -"The status message at the bottom of the dialog also informs you if one of " -"the paths is invalid." -msgstr "" -"Il messaggio di stato nella parte inferiore della finestra di dialogo " -"informa inoltre se uno dei percorsi non è valido." +msgid "The status message at the bottom of the dialog also informs you if one of the paths is invalid." +msgstr "Il messaggio di stato nella parte inferiore della finestra di dialogo informa inoltre se uno dei percorsi non è valido." #. type: Content of: <article><section><section><section><title> #: English/Quick_start.xml:163 @@ -25334,26 +19391,20 @@ msgstr "Controlla l'ambito dei confronti delle cartelle" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:165 msgid "" -"If you are comparing folders, you can use the <guilabel>Filter</guilabel> " -"field to eliminate some files from the operation. The field specifies a " -"subset of files in the selected paths that are to be included; all " -"unspecified files are excluded." +"If you are comparing folders, you can use the <guilabel>Filter</guilabel> field to eliminate some files from the operation. The field specifies a " +"subset of files in the selected paths that are to be included; all unspecified files are excluded." msgstr "" -"Se stai confrontando cartelle, puoi usare il campo <guilabel >Filtro</" -"guilabel > per eliminare alcuni file dall'operazione.Il campo specifica un " -"sottoinsieme di file nei percorsi selezionati che devono essere inclusi;" -"tutti i file non specificati sono esclusi." +"Se stai confrontando cartelle, puoi usare il campo <guilabel >Filtro</guilabel > per eliminare alcuni file dall'operazione.Il campo specifica un " +"sottoinsieme di file nei percorsi selezionati che devono essere inclusi;tutti i file non specificati sono esclusi." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:170 msgid "" -"You can enter file masks to filter files with certain extensions. For " -"example, this expression includes only C and C++ source files; all other " -"file types are eliminated from your selection." +"You can enter file masks to filter files with certain extensions. For example, this expression includes only C and C++ source files; all other file " +"types are eliminated from your selection." msgstr "" -"È possibile inserire maschere di file per filtrare i file con determinate " -"estensioni.Ad esempio, questa espressione include solo file di origine C e C+" -"+;tutti gli altri tipi di file vengono eliminati dalla selezione." +"È possibile inserire maschere di file per filtrare i file con determinate estensioni.Ad esempio, questa espressione include solo file di origine C e " +"C++;tutti gli altri tipi di file vengono eliminati dalla selezione." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:174 @@ -25363,45 +19414,29 @@ msgstr "<filename><userinput>*.cpp;*.hpp;*.c;*.h</userinput></filename>" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:176 msgid "" -"For more robust filtering, enter a filter file instead of file masks: click " -"the <guibutton>Select</guibutton> button next to the <guilabel>Filters</" -"guilabel> field to choose from a list of available filters. File filters " -"contain any number of rules to either include or exclude files. WinMerge " -"installs a set of filter files, which you can edit or augment with your own " -"files." +"For more robust filtering, enter a filter file instead of file masks: click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</" +"guilabel> field to choose from a list of available filters. File filters contain any number of rules to either include or exclude files. WinMerge " +"installs a set of filter files, which you can edit or augment with your own files." msgstr "" -"Per un filtraggio più efficace, inserisci un file filtro invece delle " -"maschere file: fai clic sul pulsante <guibutton >Seleziona</guibutton > " -"accanto al campo <guilabel >Filtri</guilabel > per scegliere da un elenco di " -"filtri disponibili.I filtri di file contengono un numero qualsiasi di regole " -"per includere o escludere file.WinMerge installa una serie di file filtro, " -"che puoi modificare o aumentare con i tuoi file." +"Per un filtraggio più efficace, inserisci un file filtro invece delle maschere file: fai clic sul pulsante <guibutton >Seleziona</guibutton > accanto " +"al campo <guilabel >Filtri</guilabel > per scegliere da un elenco di filtri disponibili.I filtri di file contengono un numero qualsiasi di regole per " +"includere o escludere file.WinMerge installa una serie di file filtro, che puoi modificare o aumentare con i tuoi file." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:183 -msgid "" -"See <xref linkend=\"Filters\" /> for full details about file masks and " -"filter files." -msgstr "" -"Vedi <xref linkend=\"Filters\" /> per i dettagli completi sulle maschere di " -"file e sui file di filtro." +msgid "See <xref linkend=\"Filters\" /> for full details about file masks and filter files." +msgstr "Vedi <xref linkend=\"Filters\" /> per i dettagli completi sulle maschere di file e sui file di filtro." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:186 msgid "" -"The <guilabel>Include subfolders</guilabel> check box provides another way " -"to control the scope of folder comparisons. If you check this option, " -"WinMerge recursively compares subfolders, and shows all the files and " -"folders it finds in one view. If you disable the option, only the current " -"folder is compared, and subfolders are listed by name (without their " -"contents), so you can browse into them." -msgstr "" -"La casella di controllo <guilabel >Includi sottocartelle</guilabel > " -"fornisce un altro modo per controllare l'ambito dei confronti delle cartelle." -"Se selezioni questa opzione, WinMerge confronta ricorsivamente le " -"sottocartelle e mostra tutti i file e le cartelle che trova in un'unica " -"visualizzazione.Se disabiliti l'opzione, viene confrontata solo la cartella " -"corrente e le sottocartelle vengono elencate per nome (senza il loro " +"The <guilabel>Include subfolders</guilabel> check box provides another way to control the scope of folder comparisons. If you check this option, " +"WinMerge recursively compares subfolders, and shows all the files and folders it finds in one view. If you disable the option, only the current " +"folder is compared, and subfolders are listed by name (without their contents), so you can browse into them." +msgstr "" +"La casella di controllo <guilabel >Includi sottocartelle</guilabel > fornisce un altro modo per controllare l'ambito dei confronti delle cartelle.Se " +"selezioni questa opzione, WinMerge confronta ricorsivamente le sottocartelle e mostra tutti i file e le cartelle che trova in un'unica " +"visualizzazione.Se disabiliti l'opzione, viene confrontata solo la cartella corrente e le sottocartelle vengono elencate per nome (senza il loro " "contenuto), in modo da poterle sfogliare." #. type: Content of: <article><section><section><section><title> @@ -25411,39 +19446,26 @@ msgstr "Utilizza i plugin Unpacker" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:196 -msgid "" -"The Unpacker field enables you to perform compare operations on plug-ins." -msgstr "" -"Il campo Unpacker consente di eseguire operazioni di confronto sui plug-in." +msgid "The Unpacker field enables you to perform compare operations on plug-ins." +msgstr "Il campo Unpacker consente di eseguire operazioni di confronto sui plug-in." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:202 -msgid "" -"Other ways to open files and folders<placeholder type=\"indexterm\" id=\"0\"/" -"><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "" -"Altri modi per aprire file e cartelle<placeholder type=\"indexterm\" " -"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "Other ways to open files and folders<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "Altri modi per aprire file e cartelle<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Quick_start.xml:210 msgid "" -"The <guilabel>Select Files or Folders</guilabel> dialog is the main " -"interface for opening files and folders. But you can use many other ways, " -"too:" +"The <guilabel>Select Files or Folders</guilabel> dialog is the main interface for opening files and folders. But you can use many other ways, too:" msgstr "" -"La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel > è " -"l'interfaccia principale per l'apertura di file e cartelle.Ma puoi usare " +"La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel > è l'interfaccia principale per l'apertura di file e cartelle.Ma puoi usare " "anche molti altri modi:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:215 -msgid "" -"<xref linkend=\"OpenPaths_project\" /> are the easiest and fastest way to " -"open frequently used paths." -msgstr "" -"<xref linkend=\"OpenPaths_project\" /> rappresenta il modo più semplice e " -"veloce per aprire i percorsi utilizzati di frequente." +msgid "<xref linkend=\"OpenPaths_project\" /> are the easiest and fastest way to open frequently used paths." +msgstr "<xref linkend=\"OpenPaths_project\" /> rappresenta il modo più semplice e veloce per aprire i percorsi utilizzati di frequente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:220 @@ -25452,100 +19474,67 @@ msgstr "<xref linkend=\"OpenPaths_shell-integ\" />." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:224 -msgid "" -"Use the <xref linkend=\"Command_line\" /> interface to start WinMerge from " -"other applications, from a command prompt, or a batch or script file." +msgid "Use the <xref linkend=\"Command_line\" /> interface to start WinMerge from other applications, from a command prompt, or a batch or script file." msgstr "" -"Utilizzare l'interfaccia <xref linkend=\"Command_line\" /> per avviare " -"WinMerge da altre applicazioni, da un prompt dei comandi o da un file batch " -"o script." +"Utilizzare l'interfaccia <xref linkend=\"Command_line\" /> per avviare WinMerge da altre applicazioni, da un prompt dei comandi o da un file batch o " +"script." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:230 -msgid "" -"Drag and drop files and folders directly into the WinMerge window or on the " -"WinMerge desktop shortcut." -msgstr "" -"Trascina e rilascia file e cartelle direttamente nella finestra WinMerge o " -"sul collegamento sul desktop di WinMerge." +msgid "Drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut." +msgstr "Trascina e rilascia file e cartelle direttamente nella finestra WinMerge o sul collegamento sul desktop di WinMerge." #. type: Content of: <article><section><title> #: English/Quick_start.xml:238 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>Comparing folders" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " -"id=\"1\"/>Confronto di cartelle" +msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Comparing folders" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Confronto di cartelle" #. type: Content of: <article><section><para> #: English/Quick_start.xml:248 msgid "" -"If you selected two folders in the Open dialog, the Folder Compare window is " -"opened. The Folder Compare window is a tabular list of items found in the " -"compared folders. Each row displays information about a found file, with the " -"file name in the left column and additional information in the other columns:" +"If you selected two folders in the Open dialog, the Folder Compare window is opened. The Folder Compare window is a tabular list of items found in " +"the compared folders. Each row displays information about a found file, with the file name in the left column and additional information in the other " +"columns:" msgstr "" -"Se hai selezionato due cartelle nella finestra di dialogo Apri, viene aperta " -"la finestra Confronto cartelle.La finestra Confronto cartelle è un elenco " -"tabellare degli elementi trovati nelle cartelle confrontate.Ogni riga " -"visualizza le informazioni su un file trovato, con il nome del file nella " -"colonna di sinistra e informazioni aggiuntive nelle altre colonne:" +"Se hai selezionato due cartelle nella finestra di dialogo Apri, viene aperta la finestra Confronto cartelle.La finestra Confronto cartelle è un " +"elenco tabellare degli elementi trovati nelle cartelle confrontate.Ogni riga visualizza le informazioni su un file trovato, con il nome del file " +"nella colonna di sinistra e informazioni aggiuntive nelle altre colonne:" #. type: Content of: <article><section><para> #: English/Quick_start.xml:265 msgid "" -"WinMerge does not have a concept of <wordasword>original</wordasword> and " -"<wordasword>changed</wordasword> sides. Instead, it simply shows what is " -"different between two selected folders. A file or folder that is found only " -"on one side is simply shown as a unique item on that side, not as added or " -"removed. For example, in the <guilabel>Comparison Result </guilabel>column " -"of the preceding figure, <filename>Merge.aps</filename> and <filename>Merge." -"rc.bak</filename> are each found in only one of the compared folders." -msgstr "" -"WinMerge non ha il concetto di lato <wordasword>originale</wordasword> e " -"<wordasword>modificato</wordasword>.Invece, mostra semplicemente cosa c'è di " -"diverso tra due cartelle selezionate.Un file o una cartella che si trova " -"solo su un lato viene semplicemente mostrato come un elemento univoco su " -"quel lato, non come aggiunto o rimosso.Ad esempio, nella colonna <guilabel " -">Risultato del confronto </guilabel >della figura precedente, " -"<filename>Merge.aps</filename> e <filename>Merge.rc.bak</filename> si " -"trovano ciascuno solo in una delle cartelle confrontate." +"WinMerge does not have a concept of <wordasword>original</wordasword> and <wordasword>changed</wordasword> sides. Instead, it simply shows what is " +"different between two selected folders. A file or folder that is found only on one side is simply shown as a unique item on that side, not as added " +"or removed. For example, in the <guilabel>Comparison Result </guilabel>column of the preceding figure, <filename>Merge.aps</filename> and " +"<filename>Merge.rc.bak</filename> are each found in only one of the compared folders." +msgstr "" +"WinMerge non ha il concetto di lato <wordasword>originale</wordasword> e <wordasword>modificato</wordasword>.Invece, mostra semplicemente cosa c'è di " +"diverso tra due cartelle selezionate.Un file o una cartella che si trova solo su un lato viene semplicemente mostrato come un elemento univoco su " +"quel lato, non come aggiunto o rimosso.Ad esempio, nella colonna <guilabel >Risultato del confronto </guilabel >della figura precedente, " +"<filename>Merge.aps</filename> e <filename>Merge.rc.bak</filename> si trovano ciascuno solo in una delle cartelle confrontate." #. type: Content of: <article><section><para> #: English/Quick_start.xml:274 msgid "" -"You can manage files and folders in many ways using the <guimenu>Merge</" -"guimenu> menu, toolbar buttons, or context (right-click) menu. The most " -"important action is making files or folders identical in both sides by " -"selecting one of several Copy items. When you copy a file or folder to other " +"You can manage files and folders in many ways using the <guimenu>Merge</guimenu> menu, toolbar buttons, or context (right-click) menu. The most " +"important action is making files or folders identical in both sides by selecting one of several Copy items. When you copy a file or folder to other " "side, the Comparison Result value changes to <literal>Identical</literal>." msgstr "" -"Puoi gestire file e cartelle in molti modi usando il menu <guimenu >Unisci</" -"guimenu >, i pulsanti della barra degli strumenti o il menu contestuale " -"(clicca con il tasto destro).L'azione più importante è rendere i file o le " -"cartelle identici su entrambi i lati selezionando uno dei numerosi elementi " -"Copia.Quando copi un file o una cartella sull'altro lato, il valore del " -"risultato del confronto cambia in <literal>Identical</literal>." +"Puoi gestire file e cartelle in molti modi usando il menu <guimenu >Unisci</guimenu >, i pulsanti della barra degli strumenti o il menu contestuale " +"(clicca con il tasto destro).L'azione più importante è rendere i file o le cartelle identici su entrambi i lati selezionando uno dei numerosi " +"elementi Copia.Quando copi un file o una cartella sull'altro lato, il valore del risultato del confronto cambia in <literal>Identical</literal>." #. type: Content of: <article><section><para> #: English/Quick_start.xml:281 -msgid "" -"If a file or folder exists in both sides (and it is not a binary file) it " -"can be opened for file comparison using one of these methods:" +msgid "If a file or folder exists in both sides (and it is not a binary file) it can be opened for file comparison using one of these methods:" msgstr "" -"Se un file o una cartella esiste su entrambi i lati (e non è un file " -"binario), può essere aperto per il confronto dei file utilizzando uno di " -"questi metodi:" +"Se un file o una cartella esiste su entrambi i lati (e non è un file binario), può essere aperto per il confronto dei file utilizzando uno di questi " +"metodi:" #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/Quick_start.xml:285 -msgid "" -"Click <menuchoice> <guimenuitem>Compare</guimenuitem> <guimenuitem>Merge</" -"guimenuitem> </menuchoice> in the WinMerge menu." -msgstr "" -"Fai clic su <menuchoice> <guimenuitem >Confronta</guimenuitem > <guimenuitem " -">Unisci</guimenuitem > </menuchoice > nel menu WinMerge." +msgid "Click <menuchoice> <guimenuitem>Compare</guimenuitem> <guimenuitem>Merge</guimenuitem> </menuchoice> in the WinMerge menu." +msgstr "Fai clic su <menuchoice> <guimenuitem >Confronta</guimenuitem > <guimenuitem >Unisci</guimenuitem > </menuchoice > nel menu WinMerge." #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/Quick_start.xml:298 @@ -25559,12 +19548,8 @@ msgstr "Seleziona la riga e premi <keycap>Invio</keycap>." #. type: Content of: <article><section><para><inlinemediaobject> #: English/Quick_start.xml:308 -msgid "" -"<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/" -"nav_uparrow_btn.png\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/" -"nav_uparrow_btn.png\" /> </imageobject>" +msgid "<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/nav_uparrow_btn.png\" /> </imageobject>" +msgstr "<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/nav_uparrow_btn.png\" /> </imageobject>" #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase> #: English/Quick_start.xml:313 @@ -25574,92 +19559,63 @@ msgstr "Pulsante freccia su del navigatore" #. type: Content of: <article><section><para> #: English/Quick_start.xml:304 msgid "" -"If you compare a subfolder, the new folder's comparison table is loaded in " -"the current Folder Compare window . When you are done with that folder's " -"comparison, you can navigate back to its parent folder by double-clicking " -"the <placeholder type=\"inlinemediaobject\" id=\"0\"/> up arrow at the top " +"If you compare a subfolder, the new folder's comparison table is loaded in the current Folder Compare window . When you are done with that folder's " +"comparison, you can navigate back to its parent folder by double-clicking the <placeholder type=\"inlinemediaobject\" id=\"0\"/> up arrow at the top " "of the Filename column." msgstr "" -"Se confronti una sottocartella, la tabella di confronto della nuova cartella " -"viene caricata nella finestra Confronto cartelle corrente.Una volta " -"terminato il confronto della cartella, puoi tornare alla cartella principale " -"facendo doppio clic sulla freccia su <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> nella parte superiore della colonna Nome file." +"Se confronti una sottocartella, la tabella di confronto della nuova cartella viene caricata nella finestra Confronto cartelle corrente.Una volta " +"terminato il confronto della cartella, puoi tornare alla cartella principale facendo doppio clic sulla freccia su <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> nella parte superiore della colonna Nome file." #. type: Content of: <article><section><para> #: English/Quick_start.xml:317 msgid "" -"If you compare a file, WinMerge opens the File Compare window, described in " -"the next section. If you change a file in the File Compare window, and then " -"return to the Folder Compare window, you will see the file's data is updated " -"there." +"If you compare a file, WinMerge opens the File Compare window, described in the next section. If you change a file in the File Compare window, and " +"then return to the Folder Compare window, you will see the file's data is updated there." msgstr "" -"Se confronti un file, WinMerge apre la finestra Confronta file, descritta " -"nella sezione successiva.Se modifichi un file nella finestra Confronta file " -"e poi ritorni alla finestra Confronta cartelle, vedrai che i dati del file " -"vengono aggiornati lì." +"Se confronti un file, WinMerge apre la finestra Confronta file, descritta nella sezione successiva.Se modifichi un file nella finestra Confronta file " +"e poi ritorni alla finestra Confronta cartelle, vedrai che i dati del file vengono aggiornati lì." #. type: Content of: <article><section><title> #: English/Quick_start.xml:324 -msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " -"id=\"1\"/>Comparing files" -msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " -"id=\"1\"/>Confronto di file" +msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Comparing files" +msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Confronto di file" #. type: Content of: <article><section><para> #: English/Quick_start.xml:345 msgid "" -"The File Compare window shows the two selected files side by side, in " -"separate File panes. Different lines are highlighted with a background " -"color. One or more consecutive different lines form one difference (or " -"<glossterm>diff</glossterm>). In the preceding example, a single difference " -"is selected in the File panes and displayed by itself in the Diff Pane. " -"WinMerge mainly works with these differences, not separate lines. When you " +"The File Compare window shows the two selected files side by side, in separate File panes. Different lines are highlighted with a background color. " +"One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>). In the preceding example, a single difference is " +"selected in the File panes and displayed by itself in the Diff Pane. WinMerge mainly works with these differences, not separate lines. When you " "merge a difference, you copy all of its lines from one side to the other." msgstr "" -"La finestra Confronto file mostra i due file selezionati fianco a fianco, in " -"riquadri File separati.Le diverse linee sono evidenziate con un colore di " -"sfondo.Una o più linee diverse consecutive formano una differenza (o " -"<glossterm>diff</glossterm>).Nell'esempio precedente, una singola differenza " -"viene selezionata nei riquadri File e visualizzata da sola nel riquadro Diff." -"WinMerge funziona principalmente con queste differenze, non con linee " -"separate.Quando unisci una differenza, copi tutte le sue linee da un lato " -"all'altro." +"La finestra Confronto file mostra i due file selezionati fianco a fianco, in riquadri File separati.Le diverse linee sono evidenziate con un colore " +"di sfondo.Una o più linee diverse consecutive formano una differenza (o <glossterm>diff</glossterm>).Nell'esempio precedente, una singola differenza " +"viene selezionata nei riquadri File e visualizzata da sola nel riquadro Diff.WinMerge funziona principalmente con queste differenze, non con linee " +"separate.Quando unisci una differenza, copi tutte le sue linee da un lato all'altro." #. type: Content of: <article><section><para><important><para> #: English/Quick_start.xml:355 msgid "" -"Notice how WinMerge fills missing lines, so that similar lines are always " -"aligned vertically, side by side. This is different from most other compare/" +"Notice how WinMerge fills missing lines, so that similar lines are always aligned vertically, side by side. This is different from most other compare/" "merge programs, and can take a while to learn." msgstr "" -"Nota come WinMerge riempie le righe mancanti, in modo che le righe simili " -"siano sempre allineate verticalmente, una accanto all'altra.Questo è diverso " -"dalla maggior parte degli altri programmi di confronto/unione e può " -"richiedere del tempo per essere appreso." +"Nota come WinMerge riempie le righe mancanti, in modo che le righe simili siano sempre allineate verticalmente, una accanto all'altra.Questo è " +"diverso dalla maggior parte degli altri programmi di confronto/unione e può richiedere del tempo per essere appreso." #. type: Content of: <article><section><para> #: English/Quick_start.xml:360 msgid "" -"WinMerge has a simple integrated editor that features basic typing, copying, " -"cutting and pasting of text. If <guilabel>Automatic rescan</guilabel> is " -"enabled, WinMerge updates file differences while you edit a file. If " -"<guilabel>Automatic rescan</guilabel> is disabled, you can update files by " -"selecting <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Refresh</" -"guimenuitem> </menuchoice>, clicking the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or pressing " -"<keycap>F5</keycap>." -msgstr "" -"WinMerge ha un semplice editor integrato che consente di digitare, copiare, " -"tagliare e incollare testo di base.Se la <guilabel >Riscansione automatica</" -"guilabel > è abilitata, WinMerge aggiorna le differenze tra i file mentre " -"modifichi un file.Se la <guilabel >Riscansione automatica</guilabel > è " -"disabilitata, puoi aggiornare i file selezionando <menuchoice> <guimenu " -">Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </menuchoice >, " -"facendo clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " -"nella barra degli strumenti, o premendo <keycap >F5</keycap >." +"WinMerge has a simple integrated editor that features basic typing, copying, cutting and pasting of text. If <guilabel>Automatic rescan</guilabel> is " +"enabled, WinMerge updates file differences while you edit a file. If <guilabel>Automatic rescan</guilabel> is disabled, you can update files by " +"selecting <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Refresh</guimenuitem> </menuchoice>, clicking the <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> toolbar button, or pressing <keycap>F5</keycap>." +msgstr "" +"WinMerge ha un semplice editor integrato che consente di digitare, copiare, tagliare e incollare testo di base.Se la <guilabel >Riscansione " +"automatica</guilabel > è abilitata, WinMerge aggiorna le differenze tra i file mentre modifichi un file.Se la <guilabel >Riscansione automatica</" +"guilabel > è disabilitata, puoi aggiornare i file selezionando <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </" +"menuchoice >, facendo clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> nella barra degli strumenti, o premendo <keycap >F5</" +"keycap >." #. type: Content of: <appendix><title><indexterm><primary> #: English/Shortcut_keys.xml:4 @@ -25673,12 +19629,8 @@ msgstr "Tasti di scelta rapida<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <appendix><para> #: English/Shortcut_keys.xml:7 -msgid "" -"WinMerge includes most of the familiar shortcut keys commonly used in other " -"Windows applications." -msgstr "" -"WinMerge include la maggior parte dei tasti di scelta rapida familiari " -"comunemente utilizzati in altre applicazioni Windows." +msgid "WinMerge includes most of the familiar shortcut keys commonly used in other Windows applications." +msgstr "WinMerge include la maggior parte dei tasti di scelta rapida familiari comunemente utilizzati in altre applicazioni Windows." #. type: Content of: <appendix><table><title> #: English/Shortcut_keys.xml:11 @@ -25686,18 +19638,14 @@ msgid "General" msgstr "Generale" #. type: Content of: <appendix><table><tgroup><thead><row><entry> -#: English/Shortcut_keys.xml:16 English/Shortcut_keys.xml:57 -#: English/Shortcut_keys.xml:162 English/Shortcut_keys.xml:409 -#: English/Shortcut_keys.xml:543 English/Shortcut_keys.xml:609 -#: English/Shortcut_keys.xml:683 English/Shortcut_keys.xml:740 +#: English/Shortcut_keys.xml:16 English/Shortcut_keys.xml:57 English/Shortcut_keys.xml:162 English/Shortcut_keys.xml:409 English/Shortcut_keys.xml:543 +#: English/Shortcut_keys.xml:609 English/Shortcut_keys.xml:683 English/Shortcut_keys.xml:740 msgid "Keys" msgstr "Chiavi" #. type: Content of: <appendix><table><tgroup><thead><row><entry> -#: English/Shortcut_keys.xml:18 English/Shortcut_keys.xml:59 -#: English/Shortcut_keys.xml:164 English/Shortcut_keys.xml:411 -#: English/Shortcut_keys.xml:545 English/Shortcut_keys.xml:611 -#: English/Shortcut_keys.xml:685 English/Shortcut_keys.xml:742 +#: English/Shortcut_keys.xml:18 English/Shortcut_keys.xml:59 English/Shortcut_keys.xml:164 English/Shortcut_keys.xml:411 English/Shortcut_keys.xml:545 +#: English/Shortcut_keys.xml:611 English/Shortcut_keys.xml:685 English/Shortcut_keys.xml:742 msgid "Function" msgstr "Funzione" @@ -25713,12 +19661,8 @@ msgstr "Passa alla scheda successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:35 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>Tab</keycap> " -"</keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>Tab</" -"keycap> </keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>Tab</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>Tab</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:43 @@ -25747,12 +19691,8 @@ msgstr "<keycap>Backspace</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:73 -msgid "" -"Open parent folder if possible (available only when subfolders are not " -"included in compare)" -msgstr "" -"Apri la cartella principale se possibile (disponibile solo quando le " -"sottocartelle non sono incluse nel confronto)" +msgid "Open parent folder if possible (available only when subfolders are not included in compare)" +msgstr "Apri la cartella principale se possibile (disponibile solo quando le sottocartelle non sono incluse nel confronto)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:78 English/Shortcut_keys.xml:188 @@ -25792,15 +19732,12 @@ msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Invio</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:110 msgid "Go to currently selected item (if scrolled off-screen)" -msgstr "" -"Vai all'elemento attualmente selezionato (se fatto scorrere fuori dallo " -"schermo)" +msgstr "Vai all'elemento attualmente selezionato (se fatto scorrere fuori dallo schermo)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:114 English/Shortcut_keys.xml:447 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Up Arrow</keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Freccia su</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia su</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:120 @@ -25810,8 +19747,7 @@ msgstr "Vai al file o alla cartella precedente diversa" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:124 English/Shortcut_keys.xml:457 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Down Arrow</keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Freccia giù</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia giù</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:130 @@ -25821,8 +19757,7 @@ msgstr "Vai al file o alla cartella successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:134 English/Shortcut_keys.xml:489 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Left Arrow</keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:140 @@ -25831,10 +19766,8 @@ msgstr "Copia gli elementi selezionati da destra a sinistra" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:144 English/Shortcut_keys.xml:499 -msgid "" -"<keycombo> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" +msgid "<keycombo> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:150 @@ -25912,8 +19845,7 @@ msgid "<keycap>F7</keycap>" msgstr "<keycap>F7</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> -#: English/Shortcut_keys.xml:214 English/Shortcut_keys.xml:453 -#: English/Shortcut_keys.xml:553 +#: English/Shortcut_keys.xml:214 English/Shortcut_keys.xml:453 English/Shortcut_keys.xml:553 msgid "Go to previous difference" msgstr "Vai alla differenza precedente" @@ -25943,8 +19875,7 @@ msgid "<keycap>F8</keycap>" msgstr "<keycap>F8</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> -#: English/Shortcut_keys.xml:232 English/Shortcut_keys.xml:463 -#: English/Shortcut_keys.xml:559 +#: English/Shortcut_keys.xml:232 English/Shortcut_keys.xml:463 English/Shortcut_keys.xml:559 msgid "Go to next difference" msgstr "Vai alla differenza successiva" @@ -26000,12 +19931,8 @@ msgstr "Attiva/disattiva la modalità contesto differenze" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:274 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </" -"keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:281 @@ -26024,12 +19951,8 @@ msgstr "Vai alla differenza o alla linea" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:295 English/Shortcut_keys.xml:306 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> " -"</keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:302 @@ -26043,27 +19966,18 @@ msgstr "Vai alla linea spostata tra il lato sinistro e il centro (3 riquadri)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:317 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </" -"keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:324 msgid "Go to moved line between middle and right side (3 panes)" -msgstr "" -"Vai alla linea spostata tra il lato centrale e quello destro (3 riquadri)" +msgstr "Vai alla linea spostata tra il lato centrale e quello destro (3 riquadri)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:328 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>M</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>M</keycap> " -"</keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>M</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>M</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:335 @@ -26072,12 +19986,8 @@ msgstr "Aggiungi marcatore" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:339 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </" -"keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:346 @@ -26106,12 +20016,8 @@ msgstr "Converti il ​​testo selezionato in minuscolo" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:370 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>U</keycap> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>U</keycap> " -"</keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>U</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>U</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:377 @@ -26160,21 +20066,13 @@ msgstr "Vai alla differenza attuale o seleziona la differenza" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:467 -msgid "" -"<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Up Arrow</" -"keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia su</" -"keycap> </keycombo>" +msgid "<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Up Arrow</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia su</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:478 -msgid "" -"<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Down Arrow</" -"keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia giù</" -"keycap> </keycombo>" +msgid "<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Down Arrow</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia giù</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:495 English/Shortcut_keys.xml:565 @@ -26188,35 +20086,23 @@ msgstr "Copia la differenza dal lato sinistro al lato destro" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:509 English/Shortcut_keys.xml:575 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left Arrow</" -"keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia " -"sinistra</keycap> </keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left Arrow</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:517 English/Shortcut_keys.xml:583 msgid "Copy difference from right side to left side and select next difference" -msgstr "" -"Copia la differenza dal lato destro a quello sinistro e seleziona la " -"differenza successiva" +msgstr "Copia la differenza dal lato destro a quello sinistro e seleziona la differenza successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:522 English/Shortcut_keys.xml:588 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right Arrow</" -"keycap> </keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia " -"destra</keycap> </keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:530 English/Shortcut_keys.xml:596 msgid "Copy difference from left side to right side and select next difference" -msgstr "" -"Copia la differenza dal lato sinistro al lato destro e seleziona la " -"differenza successiva" +msgstr "Copia la differenza dal lato sinistro al lato destro e seleziona la differenza successiva" #. type: Content of: <appendix><table><title> #: English/Shortcut_keys.xml:538 @@ -26300,12 +20186,8 @@ msgstr "Trova il testo selezionato nel file" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:663 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F3</keycap> " -"</keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F3</keycap> " -"</keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F3</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F3</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:671 @@ -26349,12 +20231,8 @@ msgstr "Attiva/disattiva segnalibro" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:719 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F2</keycap> " -"</keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F2</keycap> " -"</keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F2</keycap> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F2</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:727 @@ -26393,46 +20271,29 @@ msgstr "Ripristina lo zoom del testo alle dimensioni predefinite" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:778 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Up</mousebutton> </" -"keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotellina del mouse su</" -"mousebutton> </keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Up</mousebutton> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotellina del mouse su</mousebutton> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:788 -msgid "" -"<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Down</mousebutton> " -"</keycombo>" -msgstr "" -"<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotella del mouse giù</" -"mousebutton> </keycombo>" +msgid "<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Down</mousebutton> </keycombo>" +msgstr "<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotella del mouse giù</mousebutton> </keycombo>" #. type: Content of: <article><title> #: English/Version_control.xml:3 -msgid "" -"Using WinMerge with other tools<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"Utilizzo di WinMerge con altri strumenti<placeholder type=\"indexterm\" " -"id=\"0\"/>" +msgid "Using WinMerge with other tools<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Utilizzo di WinMerge con altri strumenti<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Version_control.xml:7 msgid "" -"Comparing and merging files are often subtasks in a larger change management " -"process. For that reason, WinMerge is often used not just by itself, but " -"also in conjunction with other tools. In addition, diff and merge utilities " -"provide different features, so it's sometimes handy to combine different " -"tools. This topic describes the primary methods for using WinMerge with " -"other tools." +"Comparing and merging files are often subtasks in a larger change management process. For that reason, WinMerge is often used not just by itself, but " +"also in conjunction with other tools. In addition, diff and merge utilities provide different features, so it's sometimes handy to combine different " +"tools. This topic describes the primary methods for using WinMerge with other tools." msgstr "" -"Il confronto e l'unione dei file sono spesso attività secondarie in un " -"processo di gestione delle modifiche più ampio.Per questo motivo WinMerge " -"viene spesso utilizzato non solo da solo, ma anche insieme ad altri " -"strumenti.Inoltre, le utilità diff e merge forniscono funzionalità diverse, " -"quindi a volte è utile combinare diversi strumenti.Questo argomento descrive " -"i metodi principali per utilizzare WinMerge con altri strumenti." +"Il confronto e l'unione dei file sono spesso attività secondarie in un processo di gestione delle modifiche più ampio.Per questo motivo WinMerge " +"viene spesso utilizzato non solo da solo, ma anche insieme ad altri strumenti.Inoltre, le utilità diff e merge forniscono funzionalità diverse, " +"quindi a volte è utile combinare diversi strumenti.Questo argomento descrive i metodi principali per utilizzare WinMerge con altri strumenti." #. type: Content of: <article><section><title> #: English/Version_control.xml:15 @@ -26442,18 +20303,13 @@ msgstr "Utilizzo dell'interfaccia della riga di comando (CLI)" #. type: Content of: <article><section><para> #: English/Version_control.xml:17 msgid "" -"The WinMerge command-line interface (CLI), described in <xref " -"linkend=\"Command_line\" />, enables you to run WinMerge from a Command " -"Prompt window, from scripts, or from another tool or program. Basically, any " -"program that allows you to call an external executable with at least one " -"path, can be used to launch a WinMerge operation." +"The WinMerge command-line interface (CLI), described in <xref linkend=\"Command_line\" />, enables you to run WinMerge from a Command Prompt window, " +"from scripts, or from another tool or program. Basically, any program that allows you to call an external executable with at least one path, can be " +"used to launch a WinMerge operation." msgstr "" -"L'interfaccia della riga di comando (CLI) di WinMerge, descritta in <xref " -"linkend=\"Command_line\" />, consente di eseguire WinMerge da una finestra " -"del prompt dei comandi, da script o da un altro strumento o programma.In " -"sostanza, qualsiasi programma che consenta di richiamare un eseguibile " -"esterno con almeno un percorso, può essere utilizzato per avviare " -"un'operazione WinMerge." +"L'interfaccia della riga di comando (CLI) di WinMerge, descritta in <xref linkend=\"Command_line\" />, consente di eseguire WinMerge da una finestra " +"del prompt dei comandi, da script o da un altro strumento o programma.In sostanza, qualsiasi programma che consenta di richiamare un eseguibile " +"esterno con almeno un percorso, può essere utilizzato per avviare un'operazione WinMerge." #. type: Content of: <article><section><para> #: English/Version_control.xml:23 @@ -26462,12 +20318,8 @@ msgstr "Ecco solo alcuni esempi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Version_control.xml:27 -msgid "" -"A batch file can launch WinMerge and enable users to specify parameters " -"interactively:" -msgstr "" -"Un file batch può avviare WinMerge e consentire agli utenti di specificare i " -"parametri in modo interattivo:" +msgid "A batch file can launch WinMerge and enable users to specify parameters interactively:" +msgstr "Un file batch può avviare WinMerge e consentire agli utenti di specificare i parametri in modo interattivo:" #. type: Content of: <article><section><itemizedlist><listitem><literallayout> #: English/Version_control.xml:30 @@ -26477,12 +20329,8 @@ msgstr "avviare \"WinMerge\" /B \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /e /s #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Version_control.xml:34 -msgid "" -"The Subversion client allows you to call an external diff program and pass " -"parameters, like this:" -msgstr "" -"Il client Subversion ti consente di chiamare un programma diff esterno e " -"passare parametri, come questo:" +msgid "The Subversion client allows you to call an external diff program and pass parameters, like this:" +msgstr "Il client Subversion ti consente di chiamare un programma diff esterno e passare parametri, come questo:" #. type: Content of: <article><section><itemizedlist><listitem><literallayout> #: English/Version_control.xml:37 @@ -26493,175 +20341,119 @@ msgstr "$ svn diff --diff-cmd \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" -x \"-d #. type: Content of: <article><section><tip><para> #: English/Version_control.xml:42 msgid "" -"Similarly, many GUI tools (like version control clients and IDEs) that " -"include built-in diff tools enable you to configure WinMerge as their " -"default diff tool, instead. The next section describes how to use WinMerge " -"this way with TortoiseSVN and Visual Studio Team Foundation Server. For " -"other tools, like Eclipse and Perforce, check their documentation or search " -"the Internet for details and examples." +"Similarly, many GUI tools (like version control clients and IDEs) that include built-in diff tools enable you to configure WinMerge as their default " +"diff tool, instead. The next section describes how to use WinMerge this way with TortoiseSVN and Visual Studio Team Foundation Server. For other " +"tools, like Eclipse and Perforce, check their documentation or search the Internet for details and examples." msgstr "" -"Allo stesso modo, molti strumenti GUI (come client di controllo versione e " -"IDE) che includono strumenti diff integrati consentono invece di configurare " -"WinMerge come strumento diff predefinito.La sezione successiva descrive come " -"utilizzare WinMerge in questo modo con TortoiseSVN e Visual Studio Team " -"Foundation Server.Per altri strumenti, come Eclipse e Perforce, controlla la " -"loro documentazione o cerca in Internet dettagli ed esempi." +"Allo stesso modo, molti strumenti GUI (come client di controllo versione e IDE) che includono strumenti diff integrati consentono invece di " +"configurare WinMerge come strumento diff predefinito.La sezione successiva descrive come utilizzare WinMerge in questo modo con TortoiseSVN e Visual " +"Studio Team Foundation Server.Per altri strumenti, come Eclipse e Perforce, controlla la loro documentazione o cerca in Internet dettagli ed esempi." #. type: Content of: <article><section><title> #: English/Version_control.xml:52 -msgid "" -"Using WinMerge with version control systems<placeholder type=\"indexterm\" " -"id=\"0\"/>" -msgstr "" -"Utilizzo di WinMerge con sistemi di controllo della versione<placeholder " -"type=\"indexterm\" id=\"0\"/>" +msgid "Using WinMerge with version control systems<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Utilizzo di WinMerge con sistemi di controllo della versione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Version_control.xml:58 msgid "" -"You can configure WinMerge to interact with a few supported version control " -"systems (VCS). This section describes the VCS integration and provides some " -"examples." +"You can configure WinMerge to interact with a few supported version control systems (VCS). This section describes the VCS integration and provides " +"some examples." msgstr "" -"È possibile configurare WinMerge per interagire con alcuni sistemi di " -"controllo della versione supportati (VCS).Questa sezione descrive " +"È possibile configurare WinMerge per interagire con alcuni sistemi di controllo della versione supportati (VCS).Questa sezione descrive " "l'integrazione VCS e fornisce alcuni esempi." #. type: Content of: <article><section><section><title> #: English/Version_control.xml:62 msgid "Using WinMerge as a version control system's diff tool" -msgstr "" -"Utilizzo di WinMerge come strumento diff del sistema di controllo della " -"versione" +msgstr "Utilizzo di WinMerge come strumento diff del sistema di controllo della versione" #. type: Content of: <article><section><section><para> #: English/Version_control.xml:68 msgid "" -"When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGit, you can " -"have the VCS launch WinMerge instead of its native diff utility. You can " -"configure some of these integrations during <link " -"linkend=\"Installing_usinginstaller\">WinMerge installation</link>." +"When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGit, you can have the VCS launch WinMerge instead of its native diff utility. You can " +"configure some of these integrations during <link linkend=\"Installing_usinginstaller\">WinMerge installation</link>." msgstr "" -"Quando confronti i file in TortoiseCVS, TortoiseSVN o TortoiseGit, puoi fare " -"in modo che VCS avvii WinMerge invece della sua utilità diff nativa.Puoi " -"configurare alcune di queste integrazioni durante l'<link " -"linkend=\"Installing_usinginstaller\">installazione di WinMerge</link>." +"Quando confronti i file in TortoiseCVS, TortoiseSVN o TortoiseGit, puoi fare in modo che VCS avvii WinMerge invece della sua utilità diff nativa.Puoi " +"configurare alcune di queste integrazioni durante l'<link linkend=\"Installing_usinginstaller\">installazione di WinMerge</link>." #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:76 -msgid "" -"Here is a sample diff operation in TortoiseSVN that uses the WinMerge " -"integration. The integration with TortoiseCVS and TortoiseGit is similar." +msgid "Here is a sample diff operation in TortoiseSVN that uses the WinMerge integration. The integration with TortoiseCVS and TortoiseGit is similar." msgstr "" -"Ecco un'operazione di confronto di esempio in TortoiseSVN che utilizza " -"l'integrazione WinMerge.L'integrazione con TortoiseCVS e TortoiseGit è " -"simile." +"Ecco un'operazione di confronto di esempio in TortoiseSVN che utilizza l'integrazione WinMerge.L'integrazione con TortoiseCVS e TortoiseGit è simile." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:82 -msgid "" -"In Windows Explorer, navigate to a Subversion working copy that you have " -"checked out." -msgstr "" -"In Esplora risorse, vai a una copia di lavoro di Subversion che hai estratto." +msgid "In Windows Explorer, navigate to a Subversion working copy that you have checked out." +msgstr "In Esplora risorse, vai a una copia di lavoro di Subversion che hai estratto." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:87 msgid "" -"Right-click a file that is under Subversion management (usually indicated by " -"a distinct TortoiseSVN icon), and click <guimenu>TortoiseSVN</guimenu> in " -"the context menu." +"Right-click a file that is under Subversion management (usually indicated by a distinct TortoiseSVN icon), and click <guimenu>TortoiseSVN</guimenu> " +"in the context menu." msgstr "" -"Fai clic con il pulsante destro del mouse su un file che si trova sotto la " -"gestione di Subversion (solitamente indicato da un'icona TortoiseSVN " -"distinta) e fai clic su <guimenu >TortoiseSVN</guimenu > nel menu " -"contestuale." +"Fai clic con il pulsante destro del mouse su un file che si trova sotto la gestione di Subversion (solitamente indicato da un'icona TortoiseSVN " +"distinta) e fai clic su <guimenu >TortoiseSVN</guimenu > nel menu contestuale." #. type: Content of: <article><section><section><example><orderedlist><listitem><itemizedlist><listitem><para> #: English/Version_control.xml:93 msgid "" -"If the file has not been modified, the context menu contains the shortcut, " -"<guimenuitem>Diff with previous version</guimenuitem>. This command compares " -"the checked-out version of the file with the previous version that was " -"checked in to the repository." +"If the file has not been modified, the context menu contains the shortcut, <guimenuitem>Diff with previous version</guimenuitem>. This command " +"compares the checked-out version of the file with the previous version that was checked in to the repository." msgstr "" -"Se il file non è stato modificato, il menu contestuale contiene la " -"scorciatoia <guimenuitem >Differenze con la versione precedente</guimenuitem " -">.Questo comando confronta la versione estratta del file con la versione " -"precedente archiviata nel repository." +"Se il file non è stato modificato, il menu contestuale contiene la scorciatoia <guimenuitem >Differenze con la versione precedente</guimenuitem " +">.Questo comando confronta la versione estratta del file con la versione precedente archiviata nel repository." #. type: Content of: <article><section><section><example><orderedlist><listitem><itemizedlist><listitem><para> #: English/Version_control.xml:101 msgid "" -"If you have modified the file, the context menu contains the same " -"<guimenuitem>Diff with previous version</guimenuitem> shortcut, plus the " -"<guimenuitem>Diff</guimenuitem> shortcut. This command compares your " -"revision to the current version (the one you checked out). It is useful for " +"If you have modified the file, the context menu contains the same <guimenuitem>Diff with previous version</guimenuitem> shortcut, plus the " +"<guimenuitem>Diff</guimenuitem> shortcut. This command compares your revision to the current version (the one you checked out). It is useful for " "reviewing the changes you have made." msgstr "" -"Se hai modificato il file, il menu contestuale contiene la stessa " -"scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem >, " -"più la scorciatoia <guimenuitem >Diff</guimenuitem >.Questo comando " -"confronta la tua revisione con la versione corrente (quella che hai " -"estratto).È utile per rivedere le modifiche apportate." +"Se hai modificato il file, il menu contestuale contiene la stessa scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem >, più la " +"scorciatoia <guimenuitem >Diff</guimenuitem >.Questo comando confronta la tua revisione con la versione corrente (quella che hai estratto).È utile " +"per rivedere le modifiche apportate." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:112 msgid "" -"Choose either the <guimenuitem>Diff with previous version</guimenuitem> or " -"<guimenuitem>Diff</guimenuitem> shortcut. The WinMerge window opens, with " +"Choose either the <guimenuitem>Diff with previous version</guimenuitem> or <guimenuitem>Diff</guimenuitem> shortcut. The WinMerge window opens, with " "the target file versions loaded in the File Compare window." msgstr "" -"Scegli la scorciatoia <guimenuitem >Diff con la versione precedente</" -"guimenuitem > o <guimenuitem >Diff</guimenuitem >.Si apre la finestra " -"WinMerge, con le versioni dei file di destinazione caricate nella finestra " -"Confronto file." +"Scegli la scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem > o <guimenuitem >Diff</guimenuitem >.Si apre la finestra WinMerge, " +"con le versioni dei file di destinazione caricate nella finestra Confronto file." #. type: Content of: <article><section><section><example> -#: English/Version_control.xml:80 English/Version_control.xml:127 -#: English/Version_control.xml:153 +#: English/Version_control.xml:80 English/Version_control.xml:127 English/Version_control.xml:153 msgid "<placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "<placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:119 msgid "" -"The <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</" -"guimenuitem> </menuchoice> shortcut is available for comparing any two files " -"in your file system, not just files that are managed by Subversion. To " -"illustrate how the WinMerge integration works in this case:" +"The <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</guimenuitem> </menuchoice> shortcut is available for comparing any two files in " +"your file system, not just files that are managed by Subversion. To illustrate how the WinMerge integration works in this case:" msgstr "" -"La scorciatoia <menuchoice> <guimenu >TortoiseSVN</guimenu> <guimenuitem " -">Diff</guimenuitem > </menuchoice > è disponibile per confrontare due file " -"qualsiasi nel tuo file system, non solo i file gestiti da Subversion.Per " -"illustrare come funziona l'integrazione WinMerge in questo caso:" +"La scorciatoia <menuchoice> <guimenu >TortoiseSVN</guimenu> <guimenuitem >Diff</guimenuitem > </menuchoice > è disponibile per confrontare due file " +"qualsiasi nel tuo file system, non solo i file gestiti da Subversion.Per illustrare come funziona l'integrazione WinMerge in questo caso:" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:129 -msgid "" -"In Windows Explorer, hold <keycap>Ctrl</keycap>, select any two files, and " -"right-click." -msgstr "" -"In Esplora risorse, tieni premuto <keycap>Ctrl</keycap>, seleziona due file " -"qualsiasi e fai clic con il pulsante destro del mouse." +msgid "In Windows Explorer, hold <keycap>Ctrl</keycap>, select any two files, and right-click." +msgstr "In Esplora risorse, tieni premuto <keycap>Ctrl</keycap>, seleziona due file qualsiasi e fai clic con il pulsante destro del mouse." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:134 -msgid "" -"Choose <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</" -"guimenuitem> </menuchoice> in the context menu." -msgstr "" -"Scegli <menuchoice> <guimenu >TortoiseSVN</guimenu > <guimenuitem >Diff</" -"guimenuitem > </menuchoice > nel menu contestuale." +msgid "Choose <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</guimenuitem> </menuchoice> in the context menu." +msgstr "Scegli <menuchoice> <guimenu >TortoiseSVN</guimenu > <guimenuitem >Diff</guimenuitem > </menuchoice > nel menu contestuale." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:140 -msgid "" -"The WinMerge window opens, with the selected files loaded in the File " -"Compare window." -msgstr "" -"Si apre la finestra WinMerge, con i file selezionati caricati nella finestra " -"Confronta file." +msgid "The WinMerge window opens, with the selected files loaded in the File Compare window." +msgstr "Si apre la finestra WinMerge, con i file selezionati caricati nella finestra Confronta file." #. type: Content of: <article><section><section><example><title> #: English/Version_control.xml:147 @@ -26671,41 +20463,30 @@ msgstr "Integrazione di Visual Studio Team Foundation Server" #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:149 msgid "" -"You can manually set up WinMerge as the default tool to use for in Visual " -"Studio to show differences in Team Foundation Server (TFS). Other version " +"You can manually set up WinMerge as the default tool to use for in Visual Studio to show differences in Team Foundation Server (TFS). Other version " "control systems can be set up in very similar ways." msgstr "" -"È possibile impostare manualmente WinMerge come strumento predefinito da " -"utilizzare in Visual Studio per mostrare le differenze in Team Foundation " -"Server (TFS).Altri sistemi di controllo della versione possono essere " -"impostati in modi molto simili." +"È possibile impostare manualmente WinMerge come strumento predefinito da utilizzare in Visual Studio per mostrare le differenze in Team Foundation " +"Server (TFS).Altri sistemi di controllo della versione possono essere impostati in modi molto simili." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:155 -msgid "" -"In Visual Studio, navigate to the <menuchoice> <guimenu>Tools</guimenu> " -"<guimenuitem>Options...</guimenuitem> </menuchoice> menu." -msgstr "" -"In Visual Studio, vai al menu <menuchoice> <guimenu >Strumenti</guimenu > " -"<guimenuitem >Opzioni...</guimenuitem > </menuchoice >." +msgid "In Visual Studio, navigate to the <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Options...</guimenuitem> </menuchoice> menu." +msgstr "In Visual Studio, vai al menu <menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Opzioni...</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:164 msgid "" -"Under <menuchoice> <guimenu>Source Control</guimenu> </menuchoice>, find " -"the<menuchoice> <guimenu> Visual Studio Team Foundation Server</guimenu> </" +"Under <menuchoice> <guimenu>Source Control</guimenu> </menuchoice>, find the<menuchoice> <guimenu> Visual Studio Team Foundation Server</guimenu> </" "menuchoice> options." msgstr "" -"In <menuchoice> <guimenu >Controllo del codice sorgente</guimenu > </" -"menuchoice >, trova le opzioni <menuchoice> <guimenu >Visual Studio Team " +"In <menuchoice> <guimenu >Controllo del codice sorgente</guimenu > </menuchoice >, trova le opzioni <menuchoice> <guimenu >Visual Studio Team " "Foundation Server</guimenu > </menuchoice >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:172 msgid "Click the <guimenuitem>Configure User Tools...</guimenuitem> button." -msgstr "" -"Fai clic sul pulsante <guimenuitem >Configura strumenti utente...</" -"guimenuitem >." +msgstr "Fai clic sul pulsante <guimenuitem >Configura strumenti utente...</guimenuitem >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:176 @@ -26714,12 +20495,8 @@ msgstr "Fai clic sul pulsante <guimenuitem >Aggiungi...</guimenuitem >." #. type: Content of: <article><section><section><example><orderedlist><listitem><mediaobject> #: English/Version_control.xml:181 -msgid "" -"<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" " -"format=\"PNG\" /> </imageobject>" -msgstr "" -"<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" " -"format=\"PNG\" /> </imageobject>" +msgid "<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" format=\"PNG\" /> </imageobject>" +msgstr "<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:185 @@ -26749,12 +20526,10 @@ msgstr "Argomenti: /e /u /dl %6 /dr %7 %1 %2" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:203 msgid "" -"Where {Path to WinMerge} is the path were WinMerge is installed. In the " -"above screenshot it is installed to the default installation path C:" +"Where {Path to WinMerge} is the path were WinMerge is installed. In the above screenshot it is installed to the default installation path C:" "\\Program Files (x86)\\WinMerge\\WinMergeU.exe" msgstr "" -"Dove {Percorso WinMerge} è il percorso in cui è installato WinMerge.Nello " -"screenshot sopra è installato nel percorso di installazione predefinito C:" +"Dove {Percorso WinMerge} è il percorso in cui è installato WinMerge.Nello screenshot sopra è installato nel percorso di installazione predefinito C:" "\\Program Files (x86)\\WinMerge\\WinMerge.exe" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> @@ -26765,8 +20540,7 @@ msgstr "Gli argomenti sono descritti in <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:210 msgid "Every time you tell TFS to compare two files, it will now use WinMerge." -msgstr "" -"Ogni volta che dici a TFS di confrontare due file, ora utilizzerà WinMerge." +msgstr "Ogni volta che dici a TFS di confrontare due file, ora utilizzerà WinMerge." #. type: Content of: <section><title> #: English/select_unpacker.xml:4 @@ -26776,54 +20550,40 @@ msgstr "Utilizzando la finestra di dialogo Seleziona Unpacker" #. type: Content of: <section><orderedlist><listitem><para> #: English/select_unpacker.xml:8 msgid "Configure automatic plugin selection or choose a plugin manually:" -msgstr "" -"Configura la selezione automatica del plugin o scegli un plugin manualmente:" +msgstr "Configura la selezione automatica del plugin o scegli un plugin manualmente:" #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:13 msgid "" -"To use automatic mode (which applies the first available plugin), verify " -"that <guilabel><Automatic></guilabel> is displayed in the " +"To use automatic mode (which applies the first available plugin), verify that <guilabel><Automatic></guilabel> is displayed in the " "<guilabel>File unpacker</guilabel> control." msgstr "" -"Per utilizzare la modalità automatica (che applica il primo plugin " -"disponibile), verifica che <guilabel ><Automatico></guilabel > sia " +"Per utilizzare la modalità automatica (che applica il primo plugin disponibile), verifica che <guilabel ><Automatico></guilabel > sia " "visualizzato nel controllo <guilabel >Unpacker file</guilabel >." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:19 -msgid "" -"To choose a different plugin (if available), use the <guilabel>File " -"unpacker</guilabel> control to choose the plugin." -msgstr "" -"Per scegliere un plugin diverso (se disponibile), usa il controllo <guilabel " -">Unpacker file</guilabel > per scegliere il plugin." +msgid "To choose a different plugin (if available), use the <guilabel>File unpacker</guilabel> control to choose the plugin." +msgstr "Per scegliere un plugin diverso (se disponibile), usa il controllo <guilabel >Unpacker file</guilabel > per scegliere il plugin." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:23 msgid "" -"By default, this control lists only suggested plugins for the file type you " -"selected to compare. To see all available plugins, enable the option, " +"By default, this control lists only suggested plugins for the file type you selected to compare. To see all available plugins, enable the option, " "<guilabel>Display all packers, don't check the extension</guilabel>." msgstr "" -"Per impostazione predefinita, questo controllo elenca solo i plug-in " -"suggeriti per il tipo di file selezionato per il confronto.Per vedere tutti " -"i plugin disponibili, abilita l'opzione <guilabel >Visualizza tutti i " -"packer, non selezionare l'estensione</guilabel >." +"Per impostazione predefinita, questo controllo elenca solo i plug-in suggeriti per il tipo di file selezionato per il confronto.Per vedere tutti i " +"plugin disponibili, abilita l'opzione <guilabel >Visualizza tutti i packer, non selezionare l'estensione</guilabel >." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:30 msgid "" -"To launch the compare without using any plugin, choose <guimenuitem><" -"None></guimenuitem> in the <guilabel>File unpacker</guilabel> control." +"To launch the compare without using any plugin, choose <guimenuitem><None></guimenuitem> in the <guilabel>File unpacker</guilabel> control." msgstr "" -"Per avviare il confronto senza utilizzare alcun plugin, scegli <guimenuitem " -"><Nessuno></guimenuitem > nel controllo <guilabel >Unpacker file</" +"Per avviare il confronto senza utilizzare alcun plugin, scegli <guimenuitem ><Nessuno></guimenuitem > nel controllo <guilabel >Unpacker file</" "guilabel >." #. type: Content of: <section><orderedlist><listitem><para> #: English/select_unpacker.xml:38 msgid "Click <guibutton>OK</guibutton> to close the Select Unpacker dialog." -msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " -"Seleziona Unpacker." +msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Seleziona Unpacker." From f5379180b383e8133ad84a90cd6db724bcf7b3b2 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka <sdottaka@users.sourceforge.net> Date: Sun, 19 Apr 2026 13:32:56 +0900 Subject: [PATCH 06/10] Update Manual/Italian.po --- Docs/Manual/Italian/Command_line.xml | 4 +- Translations/Docs/Manual/Italian.po | 16711 +++++++++++++++++-------- 2 files changed, 11478 insertions(+), 5237 deletions(-) diff --git a/Docs/Manual/Italian/Command_line.xml b/Docs/Manual/Italian/Command_line.xml index 0f6844562aa..3c5e6f528ca 100644 --- a/Docs/Manual/Italian/Command_line.xml +++ b/Docs/Manual/Italian/Command_line.xml @@ -186,10 +186,10 @@ delle parole chiave <userinput>Full</userinput>, <term><option>/t <replaceable>tipo di finestra</replaceable></option></term> <listitem> - <para>Specifica il tipo di finestra in cui visualizzare i file.Può essere una + <para>Specifica il tipo di finestra in cui visualizzare i file. Può essere una delle parole chiave <userinput>Text</userinput>, <userinput>Table</userinput>, <userinput>Binary</userinput>, -<userinput>Image</userinput> , <userinput>Webpage</userinput> o +<userinput>Image</userinput>, <userinput>Webpage</userinput> o <userinput>Folder</userinput>.</para> </listitem> </varlistentry> diff --git a/Translations/Docs/Manual/Italian.po b/Translations/Docs/Manual/Italian.po index 8b169cc8e1b..c730c6b0ccd 100644 --- a/Translations/Docs/Manual/Italian.po +++ b/Translations/Docs/Manual/Italian.po @@ -35,9 +35,12 @@ msgstr "Pubblico e ambito" #. type: Content of: <article><section><para> #: English/About_Doc.xml:10 -msgid "WinMerge Help is intended for both new and experienced users. It explains how to use WinMerge, and documents its capabilities and limitations." +msgid "" +"WinMerge Help is intended for both new and experienced users. It explains " +"how to use WinMerge, and documents its capabilities and limitations." msgstr "" -"La Guida di WinMerge è destinata sia agli utenti nuovi che a quelli esperti.Spiega come utilizzare WinMerge e ne documenta le capacità e i limiti." +"La Guida di WinMerge è destinata sia agli utenti nuovi che a quelli esperti." +"Spiega come utilizzare WinMerge e ne documenta le capacità e i limiti." #. type: Content of: <article><section><title> #: English/About_Doc.xml:16 @@ -51,8 +54,12 @@ msgstr "Gli argomenti della Guida di WinMerge vengono forniti in due forme:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/About_Doc.xml:22 -msgid "Microsoft HTML Help (<filename>WinMerge.chm</filename>), located in your WinMerge\\Docs installation directory." -msgstr "Guida Microsoft HTML (<filename>WinMerge.chm</filename>), situata nella cartella di installazione di WinMerge\\Docs." +msgid "" +"Microsoft HTML Help (<filename>WinMerge.chm</filename>), located in your " +"WinMerge\\Docs installation directory." +msgstr "" +"Guida Microsoft HTML (<filename>WinMerge.chm</filename>), situata nella " +"cartella di installazione di WinMerge\\Docs." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/About_Doc.xml:27 @@ -72,10 +79,12 @@ msgstr "Menu Guida di WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:38 msgid "" -"While using WinMerge, click <menuchoice> <guimenu>Help</guimenu> <guimenuitem>WinMerge Help</guimenuitem> </menuchoice>. HTML Help opens at the " -"beginning (this topic)." +"While using WinMerge, click <menuchoice> <guimenu>Help</guimenu> " +"<guimenuitem>WinMerge Help</guimenuitem> </menuchoice>. HTML Help opens at " +"the beginning (this topic)." msgstr "" -"Mentre usi WinMerge, fai clic su <menuchoice> <guimenu >Aiuto</guimenu > <guimenuitem >Aiuto WinMerge</guimenuitem > </menuchoice >.La Guida HTML si " +"Mentre usi WinMerge, fai clic su <menuchoice> <guimenu >Aiuto</guimenu > " +"<guimenuitem >Aiuto WinMerge</guimenuitem > </menuchoice >.La Guida HTML si " "apre all'inizio (questo argomento)." #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -86,11 +95,14 @@ msgstr "Aiuto sensibile al contesto" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:50 msgid "" -"While using any WinMerge window, press <keycap>F1</keycap>. If a specific topic is available for your current window, Help opens at that topic. If " +"While using any WinMerge window, press <keycap>F1</keycap>. If a specific " +"topic is available for your current window, Help opens at that topic. If " "not, Help opens at the beginning." msgstr "" -"Mentre usi una qualsiasi finestra WinMerge, premi <keycap>F1</keycap>.Se un argomento specifico è disponibile per la finestra corrente, la Guida si " -"apre in corrispondenza di quell'argomento.In caso contrario, la Guida si aprirà all'inizio." +"Mentre usi una qualsiasi finestra WinMerge, premi <keycap>F1</keycap>.Se un " +"argomento specifico è disponibile per la finestra corrente, la Guida si apre " +"in corrispondenza di quell'argomento.In caso contrario, la Guida si aprirà " +"all'inizio." #. type: Content of: <article><title><indexterm><primary> #: English/About_Doc.xml:57 English/Command_line.xml:6 @@ -99,8 +111,12 @@ msgstr "Riga di comando di WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:60 -msgid "Use the /? or -? switch when running WinMerge from the command line. HTML Help opens at the beginning." -msgstr "Usa il /?O -?passare quando si esegue WinMerge dalla riga di comando.La Guida HTML si apre all'inizio." +msgid "" +"Use the /? or -? switch when running WinMerge from the command line. HTML " +"Help opens at the beginning." +msgstr "" +"Usa il /?O -?passare quando si esegue WinMerge dalla riga di comando.La " +"Guida HTML si apre all'inizio." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:66 @@ -110,11 +126,15 @@ msgstr "Sito Web WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:69 msgid "" -"Open your Web browser to <ulink url=\"https://winmerge.org/\">winmerge.org</ulink>. Under <ulink url=\"https://winmerge.org/docs/\">Documentation</" -"ulink>, follow the <ulink url=\"https://manual.winmerge.org/\">Manual</ulink> link to the latest Help version." +"Open your Web browser to <ulink url=\"https://winmerge.org/\">winmerge.org</" +"ulink>. Under <ulink url=\"https://winmerge.org/docs/\">Documentation</" +"ulink>, follow the <ulink url=\"https://manual.winmerge.org/\">Manual</" +"ulink> link to the latest Help version." msgstr "" -"Apri il tuo browser Web su <ulink url=\"https://winmerge.org/\">winmerge.org</ulink>.In <ulink url=\"https://winmerge.org/docs/\">Documentazione</" -"ulink>, segui il collegamento <ulink url=\"https://manual.winmerge.org/\">Manuale</ulink> alla versione più recente della Guida." +"Apri il tuo browser Web su <ulink url=\"https://winmerge.org/\">winmerge." +"org</ulink>.In <ulink url=\"https://winmerge.org/docs/\">Documentazione</" +"ulink>, segui il collegamento <ulink url=\"https://manual.winmerge.org/" +"\">Manuale</ulink> alla versione più recente della Guida." #. type: Content of: <article><section><title> #: English/About_Doc.xml:80 @@ -124,7 +144,9 @@ msgstr "Come utilizzare la Guida" #. type: Content of: <article><section><para> #: English/About_Doc.xml:82 msgid "Please read the following topics to learn essential WinMerge basics," -msgstr "Si prega di leggere i seguenti argomenti per apprendere le basi essenziali di WinMerge," +msgstr "" +"Si prega di leggere i seguenti argomenti per apprendere le basi essenziali " +"di WinMerge," #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:87 @@ -134,7 +156,9 @@ msgstr "<xref linkend=\"Quick_start\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:90 msgid "Gets you quickly started with WinMerge and shows its basic usage." -msgstr "Ti consente di iniziare rapidamente con WinMerge e ne mostra l'utilizzo di base." +msgstr "" +"Ti consente di iniziare rapidamente con WinMerge e ne mostra l'utilizzo di " +"base." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:96 @@ -143,8 +167,12 @@ msgstr "<xref linkend=\"Compare_dirs\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:99 -msgid "Explains the folder comparison window, available operations, and customizing the results display." -msgstr "Spiega la finestra di confronto delle cartelle, le operazioni disponibili e la personalizzazione della visualizzazione dei risultati." +msgid "" +"Explains the folder comparison window, available operations, and customizing " +"the results display." +msgstr "" +"Spiega la finestra di confronto delle cartelle, le operazioni disponibili e " +"la personalizzazione della visualizzazione dei risultati." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:105 @@ -153,8 +181,12 @@ msgstr "<xref linkend=\"Compare_files\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:108 -msgid "Explains the file comparison/merge window, available operations, methods of navigation, and modes." -msgstr "Spiega la finestra di confronto/unione dei file, le operazioni disponibili, i metodi di navigazione e le modalità." +msgid "" +"Explains the file comparison/merge window, available operations, methods of " +"navigation, and modes." +msgstr "" +"Spiega la finestra di confronto/unione dei file, le operazioni disponibili, " +"i metodi di navigazione e le modalità." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:114 @@ -203,13 +235,18 @@ msgstr "<xref linkend=\"Configuration\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:149 -msgid "Explains how to customize WinMerge, including handling whitespace, colours, and text encoding." -msgstr "Spiega come personalizzare WinMerge, inclusa la gestione degli spazi bianchi, dei colori e della codifica del testo." +msgid "" +"Explains how to customize WinMerge, including handling whitespace, colours, " +"and text encoding." +msgstr "" +"Spiega come personalizzare WinMerge, inclusa la gestione degli spazi " +"bianchi, dei colori e della codifica del testo." #. type: Content of: <article><section><para> #: English/About_Doc.xml:155 msgid "To learn about WinMerge in more detail, read these topics:" -msgstr "Per conoscere WinMerge in modo più dettagliato, leggi questi argomenti:" +msgstr "" +"Per conoscere WinMerge in modo più dettagliato, leggi questi argomenti:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:159 @@ -219,10 +256,12 @@ msgstr "<xref linkend=\"Open_paths\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:162 msgid "" -"Introduces several ways to open files and folders in WinMerge - there are many! For example, do you know how to use the Shell Extension context menu " +"Introduces several ways to open files and folders in WinMerge - there are " +"many! For example, do you know how to use the Shell Extension context menu " "in advanced mode?" msgstr "" -"Presenta diversi modi per aprire file e cartelle in WinMerge: ce ne sono molti!Ad esempio, sai come utilizzare il menu contestuale dell'estensione " +"Presenta diversi modi per aprire file e cartelle in WinMerge: ce ne sono " +"molti!Ad esempio, sai come utilizzare il menu contestuale dell'estensione " "della shell in modalità avanzata?" #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -232,8 +271,12 @@ msgstr "<xref linkend=\"Plugins\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:172 -msgid "Describes the optional, extra features that you can add to WinMerge using its plugin mechanism." -msgstr "Descrive le funzionalità extra opzionali che puoi aggiungere a WinMerge utilizzando il suo meccanismo di plug-in." +msgid "" +"Describes the optional, extra features that you can add to WinMerge using " +"its plugin mechanism." +msgstr "" +"Descrive le funzionalità extra opzionali che puoi aggiungere a WinMerge " +"utilizzando il suo meccanismo di plug-in." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:178 @@ -242,8 +285,12 @@ msgstr "<xref linkend=\"Filters\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:181 -msgid "Explains how to control what is compared in the folder or file comparison window." -msgstr "Spiega come controllare cosa viene confrontato nella finestra di confronto di cartelle o file." +msgid "" +"Explains how to control what is compared in the folder or file comparison " +"window." +msgstr "" +"Spiega come controllare cosa viene confrontato nella finestra di confronto " +"di cartelle o file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:187 @@ -252,8 +299,12 @@ msgstr "<xref linkend=\"Command_line\" />" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:190 -msgid "Lists command-line parameters for using WinMerge with other tools or from a script." -msgstr "Elenca i parametri della riga di comando per l'utilizzo di WinMerge con altri strumenti o da uno script." +msgid "" +"Lists command-line parameters for using WinMerge with other tools or from a " +"script." +msgstr "" +"Elenca i parametri della riga di comando per l'utilizzo di WinMerge con " +"altri strumenti o da uno script." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/About_Doc.xml:196 @@ -268,11 +319,13 @@ msgstr "Contiene le risposte a molte domande comuni poste agli sviluppatori." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/About_Doc.xml:202 msgid "" -"Before submitting questions to <ulink url=\"https://github.com/WinMerge/winmerge/\">GitHub</ulink>, please check the <xref linkend=\"Faq\" /> topic " +"Before submitting questions to <ulink url=\"https://github.com/WinMerge/" +"winmerge/\">GitHub</ulink>, please check the <xref linkend=\"Faq\" /> topic " "first to see if your question is answered there." msgstr "" -"Prima di inviare domande a <ulink url=\"https://github.com/WinMerge/winmerge/\">GitHub</ulink>, controlla prima l'argomento <xref linkend=\"Faq\" /> " -"per vedere se la tua domanda trova la risposta lì." +"Prima di inviare domande a <ulink url=\"https://github.com/WinMerge/winmerge/" +"\">GitHub</ulink>, controlla prima l'argomento <xref linkend=\"Faq\" /> per " +"vedere se la tua domanda trova la risposta lì." #. type: Content of: <article><section><title><indexterm><primary> #: English/About_Doc.xml:213 @@ -282,7 +335,8 @@ msgstr "convenzioni, documentazione" #. type: Content of: <article><section><title> #: English/About_Doc.xml:212 msgid "Documentation conventions<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Convenzioni sulla documentazione<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Convenzioni sulla documentazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><section><section><example><title> #: English/About_Doc.xml:220 English/Filters.xml:737 @@ -302,7 +356,9 @@ msgstr "Inserisci <userinput>UTF-8</userinput> nel campo." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:228 msgid "Click the <guibutton>Browse</guibutton> button to navigate to the path." -msgstr "Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il percorso." +msgstr "" +"Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il " +"percorso." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:230 @@ -332,10 +388,12 @@ msgstr "Premi <keycombo> <keycap>Ctrl</keycap> <keycap>O</keycap> </keycombo>" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:252 msgid "" -"<wordasword>Press</wordasword> indicates a keyboard action. In this example, press the <keycap>Ctrl</keycap> and <keycap>O</keycap> keys in " +"<wordasword>Press</wordasword> indicates a keyboard action. In this " +"example, press the <keycap>Ctrl</keycap> and <keycap>O</keycap> keys in " "combination." msgstr "" -"<wordasword>Premere</wordasword> indica un'azione da tastiera.In questo esempio, premi i tasti <keycap>Ctrl</keycap> e <keycap>O</keycap> in " +"<wordasword>Premere</wordasword> indica un'azione da tastiera.In questo " +"esempio, premi i tasti <keycap>Ctrl</keycap> e <keycap>O</keycap> in " "combinazione." #. type: Content of: <article><section><section><orderedlist><listitem><para> @@ -345,35 +403,51 @@ msgstr "Fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:260 -msgid "Click indicates a left mouse click on an object, such as a menu item or button." -msgstr "Fare clic indica un clic con il tasto sinistro del mouse su un oggetto, ad esempio una voce di menu o un pulsante." +msgid "" +"Click indicates a left mouse click on an object, such as a menu item or " +"button." +msgstr "" +"Fare clic indica un clic con il tasto sinistro del mouse su un oggetto, ad " +"esempio una voce di menu o un pulsante." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:265 -msgid "Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>." -msgstr "Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >." +msgid "" +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" +"menuchoice>." +msgstr "" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:271 msgid "" -"The arrow indicates menu navigation. In the example, you choose the <guimenuitem>Open</guimenuitem> item in the WinMerge <guimenu>File</guimenu> " +"The arrow indicates menu navigation. In the example, you choose the " +"<guimenuitem>Open</guimenuitem> item in the WinMerge <guimenu>File</guimenu> " "menu ." msgstr "" -"La freccia indica la navigazione nel menu.Nell'esempio, scegli la voce <guimenuitem >Apri</guimenuitem > nel menu <guimenu >File</guimenu > di " +"La freccia indica la navigazione nel menu.Nell'esempio, scegli la voce " +"<guimenuitem >Apri</guimenuitem > nel menu <guimenu >File</guimenu > di " "WinMerge." #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/About_Doc.xml:277 English/Quick_start.xml:293 -msgid "Right-click the row and choose the <guimenuitem>Compare</guimenuitem> shortcut." -msgstr "Fai clic con il tasto destro sulla riga e scegli la scorciatoia <guimenuitem >Confronta</guimenuitem >." +msgid "" +"Right-click the row and choose the <guimenuitem>Compare</guimenuitem> " +"shortcut." +msgstr "" +"Fai clic con il tasto destro sulla riga e scegli la scorciatoia <guimenuitem " +">Confronta</guimenuitem >." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:280 msgid "" -"Click the right mouse button on an object to open its context menu, and then either left-click or right-click the indicated item in the context menu." +"Click the right mouse button on an object to open its context menu, and then " +"either left-click or right-click the indicated item in the context menu." msgstr "" -"Fare clic con il pulsante destro del mouse su un oggetto per aprire il relativo menu contestuale, quindi fare clic con il pulsante sinistro o destro " -"del mouse sull'elemento indicato nel menu contestuale." +"Fare clic con il pulsante destro del mouse su un oggetto per aprire il " +"relativo menu contestuale, quindi fare clic con il pulsante sinistro o " +"destro del mouse sull'elemento indicato nel menu contestuale." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:286 @@ -382,13 +456,21 @@ msgstr "Inserisci <replaceable>file di opzioni</replaceable>.ini" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:286 -msgid "Use the <guilabel>Filter</guilabel> field to eliminate files from the operation." -msgstr "Usa il campo <guilabel >Filtro</guilabel > per eliminare i file dall'operazione." +msgid "" +"Use the <guilabel>Filter</guilabel> field to eliminate files from the " +"operation." +msgstr "" +"Usa il campo <guilabel >Filtro</guilabel > per eliminare i file " +"dall'operazione." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><para> #: English/About_Doc.xml:288 -msgid "One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>)." -msgstr "Una o più linee diverse consecutive formano una differenza (o <glossterm>diff</glossterm>)." +msgid "" +"One or more consecutive different lines form one difference (or " +"<glossterm>diff</glossterm>)." +msgstr "" +"Una o più linee diverse consecutive formano una differenza (o " +"<glossterm>diff</glossterm>)." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:291 @@ -398,10 +480,12 @@ msgstr "Il testo in corsivo può rappresentare:" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><itemizedlist><listitem><para> #: English/About_Doc.xml:293 msgid "" -"A replaceable value or string. In the first example, you would substitute a real file name for the italicized term, but enter the <filename>ini</" +"A replaceable value or string. In the first example, you would substitute a " +"real file name for the italicized term, but enter the <filename>ini</" "filename> file extension, which is not italicized, as written." msgstr "" -"Un valore o una stringa sostituibile.Nel primo esempio, sostituiresti il ​​termine in corsivo con un nome file reale, ma inseriresti l'estensione file " +"Un valore o una stringa sostituibile.Nel primo esempio, sostituiresti il ​​" +"termine in corsivo con un nome file reale, ma inseriresti l'estensione file " "<filename>ini</filename>, che non è in corsivo, come scritto." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><itemizedlist><listitem><para> @@ -416,8 +500,12 @@ msgstr "Una parola o frase significativa che viene introdotta." #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:311 -msgid "The path <envar>%WORKDIR%\\project1</envar> is expanded to <filename class=\"directory\">C:\\workfiles\\project1</filename>." -msgstr "Il percorso <envar>%WORKDIR%\\project1</envar> viene espanso in <filename class=\"directory\">C:\\workfiles\\project1</filename>." +msgid "" +"The path <envar>%WORKDIR%\\project1</envar> is expanded to <filename " +"class=\"directory\">C:\\workfiles\\project1</filename>." +msgstr "" +"Il percorso <envar>%WORKDIR%\\project1</envar> viene espanso in <filename " +"class=\"directory\">C:\\workfiles\\project1</filename>." #. type: Content of: <article><section><section><example><para><screen> #: English/About_Doc.xml:314 English/Configuration.xml:619 @@ -426,10 +514,12 @@ msgid "TwoWords" msgstr "Due parole" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para> -#: English/About_Doc.xml:313 English/Filters.xml:1606 English/Filters.xml:1617 English/Filters.xml:1766 English/Filters.xml:1772 -#: English/Filters.xml:1788 English/Filters.xml:1795 English/Filters.xml:1814 English/Filters.xml:1818 English/Filters.xml:1822 English/Filters.xml:1828 -#: English/Filters.xml:1839 English/Filters.xml:1843 English/Filters.xml:1851 English/Filters.xml:1855 English/Intro_diffs.xml:62 -#: English/Intro_diffs.xml:71 +#: English/About_Doc.xml:313 English/Filters.xml:1606 English/Filters.xml:1617 +#: English/Filters.xml:1766 English/Filters.xml:1772 English/Filters.xml:1788 +#: English/Filters.xml:1795 English/Filters.xml:1814 English/Filters.xml:1818 +#: English/Filters.xml:1822 English/Filters.xml:1828 English/Filters.xml:1839 +#: English/Filters.xml:1843 English/Filters.xml:1851 English/Filters.xml:1855 +#: English/Intro_diffs.xml:62 English/Intro_diffs.xml:71 msgid "<placeholder type=\"screen\" id=\"0\"/>" msgstr "<placeholder type=\"screen\" id=\"0\"/>" @@ -461,45 +551,60 @@ msgstr "Informazioni immesse in un modulo o nella riga di comando" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry><cmdsynopsis> #: English/About_Doc.xml:338 msgid "" -"<command moreinfo=\"none\">command</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>inputpath</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><replaceable>outputpath</replaceable></arg>" +"<command moreinfo=\"none\">command</command> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>inputpath</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><replaceable>outputpath</replaceable></arg>" msgstr "" -"<command moreinfo=\"none\">comando</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>percorso di input</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><replaceable>percorso di output</replaceable></arg>" +"<command moreinfo=\"none\">comando</command> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>percorso di input</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><replaceable>percorso di output</" +"replaceable></arg>" #. type: Content of: <article><para> -#: English/About_Doc.xml:337 English/Command_line.xml:18 English/Command_line.xml:24 +#: English/About_Doc.xml:337 English/Command_line.xml:18 +#: English/Command_line.xml:24 msgid "<placeholder type=\"cmdsynopsis\" id=\"0\"/>" msgstr "<placeholder type=\"cmdsynopsis\" id=\"0\"/>" #. type: Content of: <article><section><informaltable><tgroup><tbody><row><entry> #: English/About_Doc.xml:347 msgid "" -"In syntax lines, brackets indicate optional elements. In this example, you must enter an input path with the command; you can enter an output path, " -"but the command is valid without it." +"In syntax lines, brackets indicate optional elements. In this example, you " +"must enter an input path with the command; you can enter an output path, but " +"the command is valid without it." msgstr "" -"Nelle righe di sintassi, le parentesi indicano elementi opzionali.In questo esempio è necessario inserire un percorso di input con il comando;puoi " +"Nelle righe di sintassi, le parentesi indicano elementi opzionali.In questo " +"esempio è necessario inserire un percorso di input con il comando;puoi " "inserire un percorso di output, ma il comando è valido senza di esso." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:4 English/Command_line.xml:8 English/Filters.xml:102 English/Filters.xml:1443 English/Open_paths.xml:369 +#: English/Command_line.xml:4 English/Command_line.xml:8 +#: English/Filters.xml:102 English/Filters.xml:1443 English/Open_paths.xml:369 #: English/Quick_start.xml:205 msgid "command line" msgstr "riga di comando" #. type: Content of: <article><title> #: English/Command_line.xml:3 -msgid "Command line<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Riga di comando<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Command line<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Riga di comando<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><para> #: English/Command_line.xml:11 msgid "" -"The WinMerge command line accepts several parameters in addition to the paths to compare. Most of these parameters are intended for using WinMerge as " -"an external compare application or starting a compare operation from a batch file." +"The WinMerge command line accepts several parameters in addition to the " +"paths to compare. Most of these parameters are intended for using WinMerge " +"as an external compare application or starting a compare operation from a " +"batch file." msgstr "" -"La riga di comando WinMerge accetta diversi parametri oltre ai percorsi da confrontare.La maggior parte di questi parametri sono destinati " -"all'utilizzo di WinMerge come applicazione di confronto esterna o all'avvio di un'operazione di confronto da un file batch." +"La riga di comando WinMerge accetta diversi parametri oltre ai percorsi da " +"confrontare.La maggior parte di questi parametri sono destinati all'utilizzo " +"di WinMerge come applicazione di confronto esterna o all'avvio di " +"un'operazione di confronto da un file batch." #. type: Content of: <article><para> #: English/Command_line.xml:16 @@ -508,87 +613,161 @@ msgstr "Utilizza uno di questi formati per il comando WinMerge:" #. type: Content of: <article><para><cmdsynopsis> #: English/Command_line.xml:19 -msgid "<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?</option></arg>" -msgstr "<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?</option></arg>" +msgid "" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?" +"</option></arg>" +msgstr "" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/?" +"</option></arg>" #. type: Content of: <article><para><cmdsynopsis> #: English/Command_line.xml:25 msgid "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</" -"option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/f</option> " -"<replaceable>filter</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> <replaceable>compare-method</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/t</option> <replaceable>window-type</replaceable></arg> <arg><option>/x</option></arg> <arg><option>/xq</" -"option></arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/s-</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" -"minimize</option></arg> <arg><option>/maximize</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/fm</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/l</option> <replaceable>linenumber</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " -"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimiter</replaceable></" -"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</option> " -"<replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option> <replaceable>unpacker-name</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/prediffer</option> <replaceable>prediffer-name</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" -"option> <replaceable>file-extension</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</option> <replaceable>name=value</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</option> <replaceable>inifile</replaceable></arg> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> <arg " -"choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " -"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/or</option> <replaceable>reportpath</replaceable></arg>" -msgstr "" -"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</" -"option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/f</option> " -"<replaceable>filtro</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> <replaceable>metodo di confronto</replaceable></arg> " -"<arg choice=\"opt\" rep=\"norepeat\"><option>/t</option><replaceable>tipo finestra</replaceable></arg> <arg><option>/x</option></arg> <arg><option>/" -"xq</option></arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/s-</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" -"minimize</option></arg> <arg><option>/maximize</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/fm</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/l</option><replaceable>numero di linea</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " -"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimitatore</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</" -"option><replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg choice=\"opt\" " -"rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option><replaceable>nome-unpacker</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/prediffer</option> <replaceable>nome-prediffer</replaceable></arg> <arg " -"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" -"option> <replaceable>estensione file</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</option> <replaceable>nome=valore</" -"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</option><replaceable>fileini</replaceable></arg> <arg choice=\"plain\" " -"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> <arg " -"choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " -"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> <replaceable>reportpath</replaceable></arg>" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/" +"r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</option></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/f</option> <replaceable>filter</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> " +"<replaceable>compare-method</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/t</option> <replaceable>window-type</replaceable></" +"arg> <arg><option>/x</option></arg> <arg><option>/xq</option></arg> " +"<arg><option>/s</option></arg> <arg><option>/sw</option></arg> <arg><option>/" +"s-</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/ul</option></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/um</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ur</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/u</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/wl</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/wm</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/wr</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/new</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/self-compare</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/clipboard-compare</option></arg> " +"<arg><option>/minimize</option></arg> <arg><option>/maximize</option></arg> " +"<arg choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/fm</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/l</option> <replaceable>linenumber</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</option> " +"<replaceable>charpos</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/table-delimiter</option> <replaceable>delimiter</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dl</option> " +"<replaceable>leftdesc</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/dm</option> <replaceable>middledesc</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dr</option> " +"<replaceable>rightdesc</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/al</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/am</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ar</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/noninteractive</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/noprefs</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignorews</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ignoreblanklines</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option> " +"<replaceable>unpacker-name</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/prediffer</option> <replaceable>prediffer-name</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cp</option> " +"<replaceable>codepage</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/fileext</option> <replaceable>file-extension</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/cfg</" +"option> <replaceable>name=value</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/inifile</option> <replaceable>inifile</" +"replaceable></arg> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg " +"cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> " +"<arg choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " +"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/or</option> <replaceable>reportpath</replaceable></" +"arg>" +msgstr "" +"<command>WinMergeU</command> <arg choice=\"opt\" rep=\"norepeat\"><option>/" +"r</option></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/r-</option></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/e</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/f</option> <replaceable>filtro</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/m</option> " +"<replaceable>metodo di confronto</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/t</option><replaceable>tipo finestra</" +"replaceable></arg> <arg><option>/x</option></arg> <arg><option>/xq</option></" +"arg> <arg><option>/s</option></arg> <arg><option>/sw</option></arg> " +"<arg><option>/s-</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ul</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/um</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/ur</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/u</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wl</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wm</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/wr</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/new</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/self-compare</option></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/clipboard-compare</option></arg> <arg><option>/" +"minimize</option></arg> <arg><option>/maximize</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/fl</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/fm</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/fr</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/l</option><replaceable>numero di " +"linea</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/c</" +"option> <replaceable>charpos</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/table-delimiter</option> " +"<replaceable>delimitatore</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/dl</option> <replaceable>leftdesc</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/dm</option> " +"<replaceable>middledesc</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/dr</option><replaceable>rightdesc</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/al</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/am</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ar</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/noninteractive</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/noprefs</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/enableexitcode</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorews</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignoreblanklines</option></arg> " +"<arg choice=\"opt\" rep=\"norepeat\"><option>/ignorecase</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignoreeol</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorecodepage</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/ignorecomments</option></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/unpacker</option><replaceable>nome-" +"unpacker</replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/" +"prediffer</option> <replaceable>nome-prediffer</replaceable></arg> <arg " +"choice=\"opt\" rep=\"norepeat\"><option>/cp</option> <replaceable>codepage</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/fileext</" +"option> <replaceable>estensione file</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/cfg</option> <replaceable>nome=valore</" +"replaceable></arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/inifile</" +"option><replaceable>fileini</replaceable></arg> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>leftpath</replaceable></arg> <arg " +"cchoice=\"opt\" rep=\"norepeat\"><replaceable>middlepath</replaceable></arg> " +"<arg choice=\"plain\" rep=\"norepeat\"><replaceable>rightpath</replaceable></" +"arg> <arg choice=\"opt\" rep=\"norepeat\"><option>/o</option> " +"<replaceable>outputpath</replaceable></arg> <arg choice=\"opt\" " +"rep=\"norepeat\"><option>/o</option> <replaceable>reportpath</replaceable></" +"arg>" #. type: Content of: <article><cmdsynopsis> #: English/Command_line.xml:162 -msgid "<command>WinMergeU</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>conflictfile</replaceable></arg>" -msgstr "<command>WinMergeU</command> <arg choice=\"plain\" rep=\"norepeat\"><replaceable>conflittofile</replaceable></arg>" +msgid "" +"<command>WinMergeU</command> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>conflictfile</replaceable></arg>" +msgstr "" +"<command>WinMergeU</command> <arg choice=\"plain\" " +"rep=\"norepeat\"><replaceable>conflittofile</replaceable></arg>" #. type: Content of: <article><para> #: English/Command_line.xml:168 msgid "" -"Entering the command with no parameters or pathnames simply opens the WinMerge window. Parameters are prefixed with either a forward slash " -"( <literal>/</literal> ) or dash ( <literal>-</literal> ) character. Pathnames have no prefix character." +"Entering the command with no parameters or pathnames simply opens the " +"WinMerge window. Parameters are prefixed with either a forward slash " +"( <literal>/</literal> ) or dash ( <literal>-</literal> ) character. " +"Pathnames have no prefix character." msgstr "" -"L'immissione del comando senza parametri o nomi di percorso apre semplicemente la finestra WinMerge.I parametri sono preceduti da una barra " -"( <literal>/</literal> ) o da un trattino ( <literal>-</literal> ).I nomi dei percorsi non hanno caratteri di prefisso." +"L'immissione del comando senza parametri o nomi di percorso apre " +"semplicemente la finestra WinMerge.I parametri sono preceduti da una barra " +"( <literal>/</literal> ) o da un trattino ( <literal>-</literal> ).I nomi " +"dei percorsi non hanno caratteri di prefisso." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:175 @@ -601,7 +780,9 @@ msgid "Opens WinMerge Help at this topic." msgstr "Apre la Guida di WinMerge in questo argomento." #. type: Content of: <article><section><section><title><indexterm><seealso> -#: English/Command_line.xml:183 English/Compare_dirs.xml:54 English/Compare_dirs.xml:254 English/Open_paths.xml:288 English/Open_paths.xml:294 +#: English/Command_line.xml:183 English/Compare_dirs.xml:54 +#: English/Compare_dirs.xml:254 English/Open_paths.xml:288 +#: English/Open_paths.xml:294 msgid "recursive folder compare" msgstr "confronto ricorsivo di cartelle" @@ -613,14 +794,19 @@ msgstr "<option>/r</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:187 msgid "" -"Compares all files in all subfolders (recursive compare). Unique folders (occurring only on one side) are listed in the compare result as separate " -"items. Note that including subfolders can increase compare time significantly. Without this parameter, WinMerge lists only files and subfolders at " -"the top level of the two target folders. It does not compare the subfolders." +"Compares all files in all subfolders (recursive compare). Unique folders " +"(occurring only on one side) are listed in the compare result as separate " +"items. Note that including subfolders can increase compare time " +"significantly. Without this parameter, WinMerge lists only files and " +"subfolders at the top level of the two target folders. It does not compare " +"the subfolders." msgstr "" -"Confronta tutti i file in tutte le sottocartelle (confronto ricorsivo).Le cartelle univoche (presenti solo su un lato) sono elencate nel risultato " -"del confronto come elementi separati.Tieni presente che l'inclusione di sottocartelle può aumentare significativamente il tempo di confronto.Senza " -"questo parametro, WinMerge elenca solo i file e le sottocartelle al livello superiore delle due cartelle di destinazione.Non confronta le " -"sottocartelle." +"Confronta tutti i file in tutte le sottocartelle (confronto ricorsivo).Le " +"cartelle univoche (presenti solo su un lato) sono elencate nel risultato del " +"confronto come elementi separati.Tieni presente che l'inclusione di " +"sottocartelle può aumentare significativamente il tempo di confronto.Senza " +"questo parametro, WinMerge elenca solo i file e le sottocartelle al livello " +"superiore delle due cartelle di destinazione.Non confronta le sottocartelle." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> #: English/Command_line.xml:198 @@ -635,14 +821,17 @@ msgstr "<option>/r-</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:202 msgid "" -"Compares all files within the specified folders but excludes the files and subfolders within its subfolders. This allows for a shorter comparison " -"time." +"Compares all files within the specified folders but excludes the files and " +"subfolders within its subfolders. This allows for a shorter comparison time." msgstr "" -"Confronta tutti i file all'interno delle cartelle specificate ma esclude i file e le sottocartelle all'interno delle relative sottocartelle.Ciò " +"Confronta tutti i file all'interno delle cartelle specificate ma esclude i " +"file e le sottocartelle all'interno delle relative sottocartelle.Ciò " "consente un tempo di confronto più breve." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:210 English/Command_line.xml:294 English/Command_line.xml:417 English/Configuration.xml:277 English/Quick_start.xml:22 +#: English/Command_line.xml:210 English/Command_line.xml:294 +#: English/Command_line.xml:417 English/Configuration.xml:277 +#: English/Quick_start.xml:22 msgid "WinMerge window" msgstr "Finestra WinMerge" @@ -659,24 +848,31 @@ msgstr "<option>/e</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:216 msgid "" -"Enables you to close WinMerge with a single <keycap>Esc</keycap> key press. This is useful when you use WinMerge as an external compare application: " -"you can close WinMerge quickly, like a dialog. Without this parameter, you might have to press <keycap>Esc</keycap> multiple times to close all its " -"windows." +"Enables you to close WinMerge with a single <keycap>Esc</keycap> key press. " +"This is useful when you use WinMerge as an external compare application: you " +"can close WinMerge quickly, like a dialog. Without this parameter, you might " +"have to press <keycap>Esc</keycap> multiple times to close all its windows." msgstr "" -"Ti consente di chiudere WinMerge con la semplice pressione del tasto <keycap>Esc</keycap>.Ciò è utile quando usi WinMerge come applicazione di " -"confronto esterna: puoi chiudere WinMerge rapidamente, come una finestra di dialogo.Senza questo parametro, potresti dover premere <keycap>Esc</" -"keycap> più volte per chiudere tutte le finestre." +"Ti consente di chiudere WinMerge con la semplice pressione del tasto " +"<keycap>Esc</keycap>.Ciò è utile quando usi WinMerge come applicazione di " +"confronto esterna: puoi chiudere WinMerge rapidamente, come una finestra di " +"dialogo.Senza questo parametro, potresti dover premere <keycap>Esc</keycap> " +"più volte per chiudere tutte le finestre." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:226 English/Configuration.xml:820 English/Configuration.xml:848 English/Configuration.xml:871 English/Filters.xml:4 -#: English/Filters.xml:87 English/Filters.xml:91 English/Filters.xml:133 English/Filters.xml:1297 English/Filters.xml:1301 English/Filters.xml:1628 -#: English/Filters.xml:1632 English/Filters.xml:1735 English/Filters.xml:1862 English/Filters.xml:1866 English/Filters.xml:1878 +#: English/Command_line.xml:226 English/Configuration.xml:820 +#: English/Configuration.xml:848 English/Configuration.xml:871 +#: English/Filters.xml:4 English/Filters.xml:87 English/Filters.xml:91 +#: English/Filters.xml:133 English/Filters.xml:1297 English/Filters.xml:1301 +#: English/Filters.xml:1628 English/Filters.xml:1632 English/Filters.xml:1735 +#: English/Filters.xml:1862 English/Filters.xml:1866 English/Filters.xml:1878 #: English/Open_paths.xml:91 msgid "filters" msgstr "filtri" #. type: Content of: <article><variablelist><varlistentry><indexterm><secondary> -#: English/Command_line.xml:227 English/Command_line.xml:243 English/Command_line.xml:259 +#: English/Command_line.xml:227 English/Command_line.xml:243 +#: English/Command_line.xml:259 msgid "applying in command line" msgstr "applicandolo nella riga di comando" @@ -688,11 +884,15 @@ msgstr "<option>/f</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:232 msgid "" -"Applies a specified filter to restrict the comparison. The filter can be a filemask like <filename><userinput>*.h *.cpp</userinput></filename>, or " -"the name of a file filter like <userinput>XML/HTML Devel</userinput>. Add quotation marks around a filter mask or name that contains spaces." +"Applies a specified filter to restrict the comparison. The filter can be a " +"filemask like <filename><userinput>*.h *.cpp</userinput></filename>, or the " +"name of a file filter like <userinput>XML/HTML Devel</userinput>. Add " +"quotation marks around a filter mask or name that contains spaces." msgstr "" -"Applica un filtro specificato per limitare il confronto.Il filtro può essere una maschera di file come <filename><userinput>*.h *.cpp</userinput></" -"filename>, o il nome di un filtro di file come <userinput>XML/HTML Devel</userinput>.Aggiungi virgolette attorno a una maschera di filtro o a un nome " +"Applica un filtro specificato per limitare il confronto.Il filtro può essere " +"una maschera di file come <filename><userinput>*.h *.cpp</userinput></" +"filename>, o il nome di un filtro di file come <userinput>XML/HTML Devel</" +"userinput>.Aggiungi virgolette attorno a una maschera di filtro o a un nome " "che contiene spazi." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> @@ -708,12 +908,16 @@ msgstr "<option>/m <replaceable>metodo di confronto</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:248 msgid "" -"Sets the compare method to use for the comparison. This can be one of the keywords <userinput>Full</userinput>, <userinput>Quick</userinput>, " -"<userinput>Binary</userinput>, <userinput>Date</userinput>, <userinput>SizeDate</userinput>, <userinput>Size</userinput> or <userinput>Existence</" -"userinput>." +"Sets the compare method to use for the comparison. This can be one of the " +"keywords <userinput>Full</userinput>, <userinput>Quick</userinput>, " +"<userinput>Binary</userinput>, <userinput>Date</userinput>, " +"<userinput>SizeDate</userinput>, <userinput>Size</userinput> or " +"<userinput>Existence</userinput>." msgstr "" -"Imposta il metodo di confronto da utilizzare per il confronto.Può essere una delle parole chiave <userinput>Full</userinput>, <userinput>Quick</" -"userinput>, <userinput>Binary</userinput>, <userinput>Date</userinput>, <userinput>SizeDate</userinput>, <userinput>Size</userinput> o " +"Imposta il metodo di confronto da utilizzare per il confronto.Può essere una " +"delle parole chiave <userinput>Full</userinput>, <userinput>Quick</" +"userinput>, <userinput>Binary</userinput>, <userinput>Date</userinput>, " +"<userinput>SizeDate</userinput>, <userinput>Size</userinput> o " "<userinput>Existence</userinput>." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> @@ -729,11 +933,15 @@ msgstr "<option>/t <replaceable>tipo di finestra</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:264 msgid "" -"Specifies the type of window in which to display files. This can be one of the keywords <userinput>Text</userinput>, <userinput>Table</userinput>, " -"<userinput>Binary</userinput>, <userinput>Image</userinput>, <userinput>Webpage</userinput> or <userinput>Folder</userinput>." +"Specifies the type of window in which to display files. This can be one of " +"the keywords <userinput>Text</userinput>, <userinput>Table</userinput>, " +"<userinput>Binary</userinput>, <userinput>Image</userinput>, " +"<userinput>Webpage</userinput> or <userinput>Folder</userinput>." msgstr "" -"Specifica il tipo di finestra in cui visualizzare i file. Può essere una delle parole chiave <userinput>Text</userinput>, <userinput>Table</" -"userinput>, <userinput>Binary</userinput>, <userinput>Image</userinput>, <userinput>Webpage</userinput> o <userinput>Folder</userinput>." +"Specifica il tipo di finestra in cui visualizzare i file. Può essere una " +"delle parole chiave <userinput>Text</userinput>, <userinput>Table</" +"userinput>, <userinput>Binary</userinput>, <userinput>Image</userinput>, " +"<userinput>Webpage</userinput> o <userinput>Folder</userinput>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:272 @@ -743,13 +951,19 @@ msgstr "<option>/x</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:274 msgid "" -"Closes WinMerge (after displaying an information dialog) when you start a comparison of identical files. The parameter has no effect after the " -"comparison, for example if the files become identical as a result of merging or editing. This parameter is useful when you use WinMerge as an " -"external compare application, or when you want to eliminate unnecessary steps by ignoring files that don't have any differences." -msgstr "" -"Chiude WinMerge (dopo aver visualizzato una finestra di dialogo informativa) quando si avvia un confronto di file identici.Dopo il confronto il " -"parametro non ha alcun effetto, ad esempio se i file diventano identici in seguito alla fusione o alla modifica.Questo parametro è utile quando si " -"utilizza WinMerge come applicazione di confronto esterna o quando si desidera eliminare passaggi non necessari ignorando i file che non presentano " +"Closes WinMerge (after displaying an information dialog) when you start a " +"comparison of identical files. The parameter has no effect after the " +"comparison, for example if the files become identical as a result of merging " +"or editing. This parameter is useful when you use WinMerge as an external " +"compare application, or when you want to eliminate unnecessary steps by " +"ignoring files that don't have any differences." +msgstr "" +"Chiude WinMerge (dopo aver visualizzato una finestra di dialogo informativa) " +"quando si avvia un confronto di file identici.Dopo il confronto il parametro " +"non ha alcun effetto, ad esempio se i file diventano identici in seguito " +"alla fusione o alla modifica.Questo parametro è utile quando si utilizza " +"WinMerge come applicazione di confronto esterna o quando si desidera " +"eliminare passaggi non necessari ignorando i file che non presentano " "differenze." #. type: Content of: <article><variablelist><varlistentry><term> @@ -759,8 +973,11 @@ msgstr "<option>/xq</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:287 -msgid "Is similar to <option>/x</option> but does not show the message about identical files." -msgstr "È simile a <option>/x</option> ma non mostra il messaggio sui file identici." +msgid "" +"Is similar to <option>/x</option> but does not show the message about " +"identical files." +msgstr "" +"È simile a <option>/x</option> ma non mostra il messaggio sui file identici." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Command_line.xml:295 English/Configuration.xml:279 @@ -775,12 +992,16 @@ msgstr "<option>/s</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:300 msgid "" -"Limits WinMerge windows to a single instance. For example, if WinMerge is already running, a new compare opens in the same instance. Without this " -"parameter, multiple windows are allowed: depending on other settings, a new compare might open in the existing window or in a new window." +"Limits WinMerge windows to a single instance. For example, if WinMerge is " +"already running, a new compare opens in the same instance. Without this " +"parameter, multiple windows are allowed: depending on other settings, a new " +"compare might open in the existing window or in a new window." msgstr "" -"Limita le finestre WinMerge a una singola istanza.Ad esempio, se WinMerge è già in esecuzione, nella stessa istanza si apre un nuovo confronto.Senza " -"questo parametro sono consentite più finestre: a seconda delle altre impostazioni, un nuovo confronto potrebbe aprirsi nella finestra esistente o in " -"una nuova finestra." +"Limita le finestre WinMerge a una singola istanza.Ad esempio, se WinMerge è " +"già in esecuzione, nella stessa istanza si apre un nuovo confronto.Senza " +"questo parametro sono consentite più finestre: a seconda delle altre " +"impostazioni, un nuovo confronto potrebbe aprirsi nella finestra esistente o " +"in una nuova finestra." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:309 @@ -789,8 +1010,12 @@ msgstr "<option>/sw</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:311 -msgid "Limit the WinMerge window to one instance as well as the option /s. However, it waits for the instance displaying the window to terminate." -msgstr "Limita la finestra WinMerge a un'istanza e all'opzione /s.Tuttavia, attende che l'istanza che visualizza la finestra termini." +msgid "" +"Limit the WinMerge window to one instance as well as the option /s. " +"However, it waits for the instance displaying the window to terminate." +msgstr "" +"Limita la finestra WinMerge a un'istanza e all'opzione /s.Tuttavia, attende " +"che l'istanza che visualizza la finestra termini." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:318 @@ -799,11 +1024,16 @@ msgstr "<option>/s-</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:320 -msgid "Ensure that another instance is always executed, ignoring the value of the \"Allow only one instance to run\" option." -msgstr "Assicurati che venga sempre eseguita un'altra istanza, ignorando il valore dell'opzione \"Consenti l'esecuzione di una sola istanza\"." +msgid "" +"Ensure that another instance is always executed, ignoring the value of the " +"\"Allow only one instance to run\" option." +msgstr "" +"Assicurati che venga sempre eseguita un'altra istanza, ignorando il valore " +"dell'opzione \"Consenti l'esecuzione di una sola istanza\"." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> -#: English/Command_line.xml:327 English/Configuration.xml:430 English/Faq.xml:114 +#: English/Command_line.xml:327 English/Configuration.xml:430 +#: English/Faq.xml:114 msgid "MRU list" msgstr "Elenco MRU" @@ -815,11 +1045,14 @@ msgstr "<option>/ul</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:332 msgid "" -"Prevents WinMerge from adding the left path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " +"Prevents WinMerge from adding the left path to the Most Recently Used (MRU) " +"list. External applications should not add paths to the MRU list in the " "Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso sinistro all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." +"Impedisce a WinMerge di aggiungere il percorso sinistro all'elenco dei " +"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " +"o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:339 @@ -829,11 +1062,14 @@ msgstr "<option>/um</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:341 msgid "" -"Prevents WinMerge from adding the middle path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " -"Select Files or Folders dialog." +"Prevents WinMerge from adding the middle path to the Most Recently Used " +"(MRU) list. External applications should not add paths to the MRU list in " +"the Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso intermedio all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." +"Impedisce a WinMerge di aggiungere il percorso intermedio all'elenco dei " +"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " +"o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:348 @@ -843,11 +1079,14 @@ msgstr "<option>/ur</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:350 msgid "" -"Prevents WinMerge from adding the right path to the Most Recently Used (MRU) list. External applications should not add paths to the MRU list in the " +"Prevents WinMerge from adding the right path to the Most Recently Used (MRU) " +"list. External applications should not add paths to the MRU list in the " "Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso corretto all'elenco dei prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." +"Impedisce a WinMerge di aggiungere il percorso corretto all'elenco dei " +"prodotti più utilizzati di recente (MRU).Le applicazioni esterne non devono " +"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file " +"o cartelle." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:357 @@ -857,14 +1096,18 @@ msgstr "<option>/u</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:359 msgid "" -"Prevents WinMerge from adding either path (left or right) to the Most Recently Used (MRU) list. External applications should not add paths to the MRU " -"list in the Select Files or Folders dialog." +"Prevents WinMerge from adding either path (left or right) to the Most " +"Recently Used (MRU) list. External applications should not add paths to the " +"MRU list in the Select Files or Folders dialog." msgstr "" -"Impedisce a WinMerge di aggiungere il percorso (sinistro o destro) all'elenco Utilizzati più di recente (MRU).Le applicazioni esterne non devono " -"aggiungere percorsi all'elenco MRU nella finestra di dialogo Seleziona file o cartelle." +"Impedisce a WinMerge di aggiungere il percorso (sinistro o destro) " +"all'elenco Utilizzati più di recente (MRU).Le applicazioni esterne non " +"devono aggiungere percorsi all'elenco MRU nella finestra di dialogo " +"Seleziona file o cartelle." #. type: Content of: <article><section><section><title><indexterm><see> -#: English/Command_line.xml:368 English/Compare_dirs.xml:741 English/Compare_dirs.xml:745 +#: English/Command_line.xml:368 English/Compare_dirs.xml:741 +#: English/Compare_dirs.xml:745 msgid "protecting files" msgstr "proteggere i file" @@ -875,8 +1118,12 @@ msgstr "<option>/wl</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:373 -msgid "Opens the left side as read-only. Use this when you don't want to change left side items in the compare." -msgstr "Apre il lato sinistro in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato sinistro nel confronto." +msgid "" +"Opens the left side as read-only. Use this when you don't want to change " +"left side items in the compare." +msgstr "" +"Apre il lato sinistro in sola lettura.Utilizzalo quando non desideri " +"modificare gli elementi sul lato sinistro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:379 @@ -885,8 +1132,12 @@ msgstr "<option>/wm</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:381 -msgid "Opens the middle side as read-only. Use this when you don't want to change right side items in the compare." -msgstr "Apre il lato centrale in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato destro nel confronto." +msgid "" +"Opens the middle side as read-only. Use this when you don't want to change " +"right side items in the compare." +msgstr "" +"Apre il lato centrale in sola lettura.Utilizzalo quando non desideri " +"modificare gli elementi sul lato destro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:387 @@ -895,8 +1146,12 @@ msgstr "<option>/wr</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:389 -msgid "Opens the right side as read-only. Use this when you don't want to change right side items in the compare." -msgstr "Apre il lato destro in sola lettura.Utilizzalo quando non desideri modificare gli elementi sul lato destro nel confronto." +msgid "" +"Opens the right side as read-only. Use this when you don't want to change " +"right side items in the compare." +msgstr "" +"Apre il lato destro in sola lettura.Utilizzalo quando non desideri " +"modificare gli elementi sul lato destro nel confronto." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:395 @@ -940,8 +1195,12 @@ msgstr "<option>/minimizza</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:423 -msgid "Starts WinMerge as a minimized window. This option can be useful during lengthy compares." -msgstr "Avvia WinMerge come finestra ridotta a icona.Questa opzione può essere utile durante lunghi confronti." +msgid "" +"Starts WinMerge as a minimized window. This option can be useful during " +"lengthy compares." +msgstr "" +"Avvia WinMerge come finestra ridotta a icona.Questa opzione può essere utile " +"durante lunghi confronti." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:429 @@ -1001,18 +1260,23 @@ msgstr "<option>/c <replaceable>charpos</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:467 msgid "Specifies a character position to jump to after loading the files." -msgstr "Specifica la posizione del carattere a cui passare dopo aver caricato i file." +msgstr "" +"Specifica la posizione del carattere a cui passare dopo aver caricato i file." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:472 msgid "<option>/table-delimiter <replaceable>delimiter</replaceable></option>" -msgstr "<option>/table-delimiter <replaceable>delimitatore</replaceable></option>" +msgstr "" +"<option>/table-delimiter <replaceable>delimitatore</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:474 -msgid "Specifies a delimiter character for table editing. To specify a tab character, specify \"tab\", \"\\t\", or \"\\x09\"." +msgid "" +"Specifies a delimiter character for table editing. To specify a tab " +"character, specify \"tab\", \"\\t\", or \"\\x09\"." msgstr "" -"Specifica un carattere delimitatore per la modifica della tabella.Per specificare un carattere di tabulazione, specificare \"tab\", \"\\t\" o " +"Specifica un carattere delimitatore per la modifica della tabella.Per " +"specificare un carattere di tabulazione, specificare \"tab\", \"\\t\" o " "\"\\x09\"." #. type: Content of: <article><variablelist><varlistentry><term> @@ -1023,12 +1287,16 @@ msgstr "<option>/dl</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:481 msgid "" -"Specifies a description in the left side title bar, overriding the default folder or filename text. For example: <userinput>/dl \"Version 1.0</" -"userinput>\" or <userinput>/dl WorkingCopy</userinput>. Use quotation marks around descriptions that contain spaces." +"Specifies a description in the left side title bar, overriding the default " +"folder or filename text. For example: <userinput>/dl \"Version 1.0</" +"userinput>\" or <userinput>/dl WorkingCopy</userinput>. Use quotation marks " +"around descriptions that contain spaces." msgstr "" -"Specifica una descrizione nella barra del titolo sul lato sinistro, sovrascrivendo il testo della cartella o del nome file predefinito.Ad esempio: " -"<userinput>/dl \"Versione 1.0</userinput>\" o <userinput>/dl WorkingCopy</userinput>.Utilizzare le virgolette attorno alle descrizioni che contengono " -"spazi." +"Specifica una descrizione nella barra del titolo sul lato sinistro, " +"sovrascrivendo il testo della cartella o del nome file predefinito.Ad " +"esempio: <userinput>/dl \"Versione 1.0</userinput>\" o <userinput>/dl " +"WorkingCopy</userinput>.Utilizzare le virgolette attorno alle descrizioni " +"che contengono spazi." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:490 @@ -1037,8 +1305,12 @@ msgstr "<option>/dm</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:492 -msgid "Specifies a description in the middle side title bar, just like <option>/dl</option>." -msgstr "Specifica una descrizione nella barra del titolo centrale, proprio come <option>/dl</option>." +msgid "" +"Specifies a description in the middle side title bar, just like <option>/dl</" +"option>." +msgstr "" +"Specifica una descrizione nella barra del titolo centrale, proprio come " +"<option>/dl</option>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:498 @@ -1047,8 +1319,12 @@ msgstr "<option>/dr</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:500 -msgid "Specifies a description in the right side title bar, just like <option>/dl</option>." -msgstr "Specifica una descrizione nella barra del titolo sul lato destro, proprio come <option>/dl</option>." +msgid "" +"Specifies a description in the right side title bar, just like <option>/dl</" +"option>." +msgstr "" +"Specifica una descrizione nella barra del titolo sul lato destro, proprio " +"come <option>/dl</option>." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:506 @@ -1088,11 +1364,14 @@ msgstr "<option>/non interattivo</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:530 msgid "" -"Runs WinMerge without displaying message boxes during comparison or report generation. The process terminates automatically when the operation is " +"Runs WinMerge without displaying message boxes during comparison or report " +"generation. The process terminates automatically when the operation is " "complete, making it suitable for batch or scripted execution." msgstr "" -"Esegue WinMerge senza visualizzare finestre di messaggio durante il confronto o la generazione di report.Il processo termina automaticamente al " -"termine dell'operazione, rendendolo adatto all'esecuzione batch o tramite script." +"Esegue WinMerge senza visualizzare finestre di messaggio durante il " +"confronto o la generazione di report.Il processo termina automaticamente al " +"termine dell'operazione, rendendolo adatto all'esecuzione batch o tramite " +"script." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:538 @@ -1101,8 +1380,12 @@ msgstr "<option>/noprefs</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:541 -msgid "Runs WinMerge without loading or saving settings from the registry. All comparisons use default preferences only." -msgstr "Esegue WinMerge senza caricare o salvare le impostazioni dal registro.Tutti i confronti utilizzano solo le preferenze predefinite." +msgid "" +"Runs WinMerge without loading or saving settings from the registry. All " +"comparisons use default preferences only." +msgstr "" +"Esegue WinMerge senza caricare o salvare le impostazioni dal registro.Tutti " +"i confronti utilizzano solo le preferenze predefinite." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:548 @@ -1111,8 +1394,12 @@ msgstr "<option>/enableexitcode</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:550 -msgid "Sets the comparison result to the process exit code. 0: identical, 1: different, 2: error" -msgstr "Imposta il risultato del confronto sul codice di uscita del processo.0: identico, 1: diverso, 2: errore" +msgid "" +"Sets the comparison result to the process exit code. 0: identical, 1: " +"different, 2: error" +msgstr "" +"Imposta il risultato del confronto sul codice di uscita del processo.0: " +"identico, 1: diverso, 2: errore" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:555 @@ -1121,23 +1408,33 @@ msgstr "<option>/ignora</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:557 -msgid "Controls the \"Whitespaces\" option (whitespace comparison settings) persistently:" -msgstr "Controlla l'opzione \"Spazi bianchi\" (impostazioni di confronto degli spazi bianchi) in modo persistente:" +msgid "" +"Controls the \"Whitespaces\" option (whitespace comparison settings) " +"persistently:" +msgstr "" +"Controlla l'opzione \"Spazi bianchi\" (impostazioni di confronto degli spazi " +"bianchi) in modo persistente:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:559 msgid "<option>/ignorews:0</option> - do not ignore whitespace differences." -msgstr "<option>/ignorews:0</option> - non ignora le differenze di spazi bianchi." +msgstr "" +"<option>/ignorews:0</option> - non ignora le differenze di spazi bianchi." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:560 -msgid "<option>/ignorews</option> or <option>/ignorews:1</option> - ignore differences in the amount of whitespace." -msgstr "<option>/ignorews</option> o <option>/ignorews:1</option>: ignora le differenze nella quantità di spazi bianchi." +msgid "" +"<option>/ignorews</option> or <option>/ignorews:1</option> - ignore " +"differences in the amount of whitespace." +msgstr "" +"<option>/ignorews</option> o <option>/ignorews:1</option>: ignora le " +"differenze nella quantità di spazi bianchi." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:561 msgid "<option>/ignorews:2</option> - ignore all whitespace characters." -msgstr "<option>/ignorews:2</option> - ignora tutti i caratteri di spazio bianco." +msgstr "" +"<option>/ignorews:2</option> - ignora tutti i caratteri di spazio bianco." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:567 @@ -1152,12 +1449,18 @@ msgstr "Controlla in modo persistente l'opzione \"Ignora righe vuote\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:571 msgid "<option>/ignoreblanklines:0</option> - disables ignoring blank lines." -msgstr "<option>/ignoreblanklines:0</option> - disabilita l'ignoranza delle righe vuote." +msgstr "" +"<option>/ignoreblanklines:0</option> - disabilita l'ignoranza delle righe " +"vuote." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:572 -msgid "<option>/ignoreblanklines</option> or <option>/ignoreblanklines:1</option> - enables ignoring blank lines." -msgstr "<option>/ignoreblanklines</option> o <option>/ignoreblanklines:1</option> - consente di ignorare le righe vuote." +msgid "" +"<option>/ignoreblanklines</option> or <option>/ignoreblanklines:1</option> - " +"enables ignoring blank lines." +msgstr "" +"<option>/ignoreblanklines</option> o <option>/ignoreblanklines:1</option> - " +"consente di ignorare le righe vuote." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:578 @@ -1167,17 +1470,24 @@ msgstr "<option>/ignorecase</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:580 msgid "Controls the \"Ignore case\" option persistently:" -msgstr "Controlla l'opzione \"Ignora maiuscole e minuscole\" in modo persistente:" +msgstr "" +"Controlla l'opzione \"Ignora maiuscole e minuscole\" in modo persistente:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:582 msgid "<option>/ignorecase:0</option> - disables ignoring case differences." -msgstr "<option>/ignorecase:0</option> - disabilita l'ignoranza delle differenze tra maiuscole e minuscole." +msgstr "" +"<option>/ignorecase:0</option> - disabilita l'ignoranza delle differenze tra " +"maiuscole e minuscole." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:583 -msgid "<option>/ignorecase</option> or <option>/ignorecase:1</option> - enables ignoring case differences." -msgstr "<option>/ignorecase</option> o <option>/ignorecase:1</option> - consente di ignorare le differenze tra maiuscole e minuscole." +msgid "" +"<option>/ignorecase</option> or <option>/ignorecase:1</option> - enables " +"ignoring case differences." +msgstr "" +"<option>/ignorecase</option> o <option>/ignorecase:1</option> - consente di " +"ignorare le differenze tra maiuscole e minuscole." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:589 @@ -1192,12 +1502,17 @@ msgstr "Controlla in modo persistente l'opzione \"Ignora differenze EOL\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:593 msgid "<option>/ignoreeol:0</option> - disables ignoring EOL differences." -msgstr "<option>/ignoreeol:0</option> - disabilita l'ignoranza delle differenze EOL." +msgstr "" +"<option>/ignoreeol:0</option> - disabilita l'ignoranza delle differenze EOL." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:594 -msgid "<option>/ignoreeol</option> or <option>/ignoreeol:1</option> - enables ignoring EOL differences." -msgstr "<option>/ignoreeol</option> o <option>/ignoreeol:1</option> - consente di ignorare le differenze EOL." +msgid "" +"<option>/ignoreeol</option> or <option>/ignoreeol:1</option> - enables " +"ignoring EOL differences." +msgstr "" +"<option>/ignoreeol</option> o <option>/ignoreeol:1</option> - consente di " +"ignorare le differenze EOL." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:600 @@ -1207,17 +1522,25 @@ msgstr "<option>/ignorecodepage</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:602 msgid "Controls the \"Ignore codepage differences\" option persistently:" -msgstr "Controlla in modo persistente l'opzione \"Ignora differenze tabella codici\":" +msgstr "" +"Controlla in modo persistente l'opzione \"Ignora differenze tabella codici\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:604 -msgid "<option>/ignorecodepage:0</option> - disables ignoring codepage differences." -msgstr "<option>/ignorecodepage:0</option> - disabilita l'ignoranza delle differenze nella tabella codici." +msgid "" +"<option>/ignorecodepage:0</option> - disables ignoring codepage differences." +msgstr "" +"<option>/ignorecodepage:0</option> - disabilita l'ignoranza delle differenze " +"nella tabella codici." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:605 -msgid "<option>/ignorecodepage</option> or <option>/ignorecodepage:1</option> - enables ignoring codepage differences." -msgstr "<option>/ignorecodepage</option> o <option>/ignorecodepage:1</option>: consente di ignorare le differenze nella tabella codici." +msgid "" +"<option>/ignorecodepage</option> or <option>/ignorecodepage:1</option> - " +"enables ignoring codepage differences." +msgstr "" +"<option>/ignorecodepage</option> o <option>/ignorecodepage:1</option>: " +"consente di ignorare le differenze nella tabella codici." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:611 @@ -1227,37 +1550,53 @@ msgstr "<option>/ignorecomments</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:613 msgid "Controls the \"Ignore comment differences\" option persistently:" -msgstr "Controlla in modo persistente l'opzione \"Ignora differenze commenti\":" +msgstr "" +"Controlla in modo persistente l'opzione \"Ignora differenze commenti\":" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:615 msgid "<option>/ignorecomments:0</option> - disables ignoring comments." -msgstr "<option>/ignorecomments:0</option> - disabilita l'ignoranza dei commenti." +msgstr "" +"<option>/ignorecomments:0</option> - disabilita l'ignoranza dei commenti." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:616 -msgid "<option>/ignorecomments</option> or <option>/ignorecomments:1</option> - enables ignoring comments." -msgstr "<option>/ignorecomments</option> o <option>/ignorecomments:1</option> - consente di ignorare i commenti." +msgid "" +"<option>/ignorecomments</option> or <option>/ignorecomments:1</option> - " +"enables ignoring comments." +msgstr "" +"<option>/ignorecomments</option> o <option>/ignorecomments:1</option> - " +"consente di ignorare i commenti." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:622 msgid "<option>/unpacker <replaceable>plugin pipeline</replaceable></option>" -msgstr "<option>/unpacker <replaceable>pipeline di plugin</replaceable></option>" +msgstr "" +"<option>/unpacker <replaceable>pipeline di plugin</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:625 -msgid "Specifies the plugin pipeline for the Unpacker plugin. Example: <option>/unpacker \"SortAscending|SelectLines 1-10\"</option>" -msgstr "Specifica la pipeline del plugin per il plugin Unpacker.Esempio: <option>/unpacker \"SortAscending|SelectLines 1-10\"</option>" +msgid "" +"Specifies the plugin pipeline for the Unpacker plugin. Example: <option>/" +"unpacker \"SortAscending|SelectLines 1-10\"</option>" +msgstr "" +"Specifica la pipeline del plugin per il plugin Unpacker.Esempio: <option>/" +"unpacker \"SortAscending|SelectLines 1-10\"</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:632 msgid "<option>/prediffer <replaceable>plugin pipeline</replaceable></option>" -msgstr "<option>/prediffer <replaceable>pipeline di plug-in</replaceable></option>" +msgstr "" +"<option>/prediffer <replaceable>pipeline di plug-in</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:635 -msgid "Specifies the plugin pipeline for the Prediffer plugin. Example: <option>/prediffer \"IgnoreColumns 1-10\"</option>" -msgstr "Specifica la pipeline del plug-in per il plug-in Prediffer.Esempio: <option>/prediffer \"IgnoraColonne 1-10\"</option>" +msgid "" +"Specifies the plugin pipeline for the Prediffer plugin. Example: <option>/" +"prediffer \"IgnoreColumns 1-10\"</option>" +msgstr "" +"Specifica la pipeline del plug-in per il plug-in Prediffer.Esempio: <option>/" +"prediffer \"IgnoraColonne 1-10\"</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:642 @@ -1266,8 +1605,12 @@ msgstr "<option>/cp <replaceable>codepage</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:645 -msgid "Specifies the codepage to use for file comparison. Example: <option>/cp 65001</option>" -msgstr "Specifica la tabella codici da utilizzare per il confronto dei file.Esempio: <option>/cp 65001</option>" +msgid "" +"Specifies the codepage to use for file comparison. Example: <option>/cp " +"65001</option>" +msgstr "" +"Specifica la tabella codici da utilizzare per il confronto dei file.Esempio: " +"<option>/cp 65001</option>" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:652 @@ -1277,7 +1620,9 @@ msgstr "<option>/fileext <replaceable>estensione file</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:654 msgid "Specifies a file extension for determining syntax hightliting." -msgstr "Specifica un'estensione di file per determinare l'evidenziazione della sintassi." +msgstr "" +"Specifica un'estensione di file per determinare l'evidenziazione della " +"sintassi." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:659 @@ -1287,7 +1632,8 @@ msgstr "<option>/cfg <replaceable>nome=valore</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:662 msgid "Sets a configuration value in the WinMerge registry or INI file." -msgstr "Imposta un valore di configurazione nel registro WinMerge o nel file INI." +msgstr "" +"Imposta un valore di configurazione nel registro WinMerge o nel file INI." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:665 @@ -1296,8 +1642,12 @@ msgstr "Esempio: <option>/cfg Impostazioni/DiffAlgorithm=3</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:668 -msgid "If the section name is unambiguous and does not conflict with other setting names, it can be omitted:" -msgstr "Se il nome della sezione non è ambiguo e non è in conflitto con altri nomi di impostazioni, può essere omesso:" +msgid "" +"If the section name is unambiguous and does not conflict with other setting " +"names, it can be omitted:" +msgstr "" +"Se il nome della sezione non è ambiguo e non è in conflitto con altri nomi " +"di impostazioni, può essere omesso:" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:671 @@ -1307,11 +1657,15 @@ msgstr "<option>/cfg DiffAlgo=3</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:674 msgid "" -"Note: This entry does not explain which configuration names are available. For a list of settings, refer to " -"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> in regedit." +"Note: This entry does not explain which configuration names are available. " +"For a list of settings, refer to " +"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> " +"in regedit." msgstr "" -"Nota: questa voce non spiega quali nomi di configurazione sono disponibili.Per un elenco delle impostazioni, fare riferimento a " -"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> in regedit." +"Nota: questa voce non spiega quali nomi di configurazione sono disponibili." +"Per un elenco delle impostazioni, fare riferimento a " +"<filename>HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge</filename> " +"in regedit." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:681 @@ -1321,7 +1675,9 @@ msgstr "<option><replaceable>percorso a sinistra</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:683 msgid "Specifies the folder, file or project file to open on the left side." -msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato sinistro." +msgstr "" +"Specifica la cartella, il file o il file di progetto da aprire sul lato " +"sinistro." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:688 @@ -1331,7 +1687,9 @@ msgstr "<option><replaceable>percorso intermedio</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:690 msgid "Specifies the folder, file or project file to open on the middle side." -msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato centrale." +msgstr "" +"Specifica la cartella, il file o il file di progetto da aprire sul lato " +"centrale." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:695 @@ -1341,28 +1699,38 @@ msgstr "<option><replaceable>rightpath</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:697 msgid "Specifies the folder, file or project file to open on the right side." -msgstr "Specifica la cartella, il file o il file di progetto da aprire sul lato destro." +msgstr "" +"Specifica la cartella, il file o il file di progetto da aprire sul lato " +"destro." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:699 msgid "" -"WinMerge cannot compare files to folders, so the path parameters (<option><replaceable>leftpath</replaceable></option>, " -"<option><replaceable>middlepath</replaceable></option> and <option><replaceable>rightpath</replaceable></option>) must point to the same target type " -"(either folders or files). If WinMerge cannot find either of the specified paths, it opens the Select Files or Folders dialog, where you can browse " -"for the correct paths." -msgstr "" -"WinMerge non può confrontare file con cartelle, quindi i parametri del percorso (<option ><replaceable>leftpath</replaceable></option>, " -"<option><replaceable>middlepath</replaceable></option> e <option><replaceable>rightpath</replaceable></option>) devono puntare allo stesso tipo di " -"destinazione (cartelle o file).Se WinMerge non riesce a trovare nessuno dei percorsi specificati, apre la finestra di dialogo Seleziona file o " -"cartelle, dove è possibile cercare i percorsi corretti." +"WinMerge cannot compare files to folders, so the path parameters " +"(<option><replaceable>leftpath</replaceable></option>, " +"<option><replaceable>middlepath</replaceable></option> and " +"<option><replaceable>rightpath</replaceable></option>) must point to the " +"same target type (either folders or files). If WinMerge cannot find either " +"of the specified paths, it opens the Select Files or Folders dialog, where " +"you can browse for the correct paths." +msgstr "" +"WinMerge non può confrontare file con cartelle, quindi i parametri del " +"percorso (<option ><replaceable>leftpath</replaceable></option>, " +"<option><replaceable>middlepath</replaceable></option> e " +"<option><replaceable>rightpath</replaceable></option>) devono puntare allo " +"stesso tipo di destinazione (cartelle o file).Se WinMerge non riesce a " +"trovare nessuno dei percorsi specificati, apre la finestra di dialogo " +"Seleziona file o cartelle, dove è possibile cercare i percorsi corretti." #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:708 msgid "" -"In file comparisons, you can specify a folder name in one of the path parameters, as long as the folder contains a file with the same name as the one " -"specified in the other, file path." +"In file comparisons, you can specify a folder name in one of the path " +"parameters, as long as the folder contains a file with the same name as the " +"one specified in the other, file path." msgstr "" -"Nei confronti di file, è possibile specificare il nome di una cartella in uno dei parametri del percorso, purché la cartella contenga un file con lo " +"Nei confronti di file, è possibile specificare il nome di una cartella in " +"uno dei parametri del percorso, purché la cartella contenga un file con lo " "stesso nome di quello specificato nell'altro percorso file." #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> @@ -1372,22 +1740,33 @@ msgstr "Ad esempio, considera questo comando:" #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:714 -msgid "<userinput>WinMergeU <filename>C:\\Folder\\File.txt</filename> <filename class=\"directory\">C:\\Folder2</filename> </userinput>" -msgstr "<userinput>WinMergeU <filename>C:\\Cartella\\File.txt</filename> <filename class=\"directory\">C:\\Cartella2</filename> </userinput>" +msgid "" +"<userinput>WinMergeU <filename>C:\\Folder\\File.txt</filename> <filename " +"class=\"directory\">C:\\Folder2</filename> </userinput>" +msgstr "" +"<userinput>WinMergeU <filename>C:\\Cartella\\File.txt</filename> <filename " +"class=\"directory\">C:\\Cartella2</filename> </userinput>" #. type: Content of: <article><variablelist><varlistentry><listitem><tip><para> #: English/Command_line.xml:717 msgid "" -"If <filename class=\"directory\">C:\\Folder2</filename> contains a file named <filename>File.txt</filename>: WinMerge implicitly resolves the second " -"path as a file specification, and compares the two files. Of course, the command is invalid if <filename class=\"directory\">C:\\Folder2</filename> " -"does <emphasis>not</emphasis> contain a file named <filename>File.txt</filename>." +"If <filename class=\"directory\">C:\\Folder2</filename> contains a file " +"named <filename>File.txt</filename>: WinMerge implicitly resolves the second " +"path as a file specification, and compares the two files. Of course, the " +"command is invalid if <filename class=\"directory\">C:\\Folder2</filename> " +"does <emphasis>not</emphasis> contain a file named <filename>File.txt</" +"filename>." msgstr "" -"Se <filename class=\"directory\">C:\\Folder2</filename> contiene un file denominato <filename>File.txt</filename>: WinMerge risolve implicitamente il " -"secondo percorso come specifica di file e confronta i due file. Naturalmente, il comando non è valido se <filename class=\"directory\">C:\\Folder2</" -"filename> <emphasis>non</emphasis> contiene un file chiamato <filename>File.txt</filename>." +"Se <filename class=\"directory\">C:\\Folder2</filename> contiene un file " +"denominato <filename>File.txt</filename>: WinMerge risolve implicitamente il " +"secondo percorso come specifica di file e confronta i due file. " +"Naturalmente, il comando non è valido se <filename class=\"directory\">C:" +"\\Folder2</filename> <emphasis>non</emphasis> contiene un file chiamato " +"<filename>File.txt</filename>." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:730 English/Compare_files.xml:1481 English/Intro_diffs.xml:253 English/Intro_diffs.xml:407 +#: English/Command_line.xml:730 English/Compare_files.xml:1481 +#: English/Intro_diffs.xml:253 English/Intro_diffs.xml:407 msgid "merging differences" msgstr "fondere le differenze" @@ -1403,32 +1782,47 @@ msgstr "<option>/o <replaceable>percorso di output</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:736 -msgid "Specifies an optional output file path where you want merged result files to be saved." -msgstr "Specifica un percorso file di output facoltativo in cui si desidera salvare i file dei risultati uniti." +msgid "" +"Specifies an optional output file path where you want merged result files to " +"be saved." +msgstr "" +"Specifica un percorso file di output facoltativo in cui si desidera salvare " +"i file dei risultati uniti." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:739 msgid "" -"The output path is rarely needed when you start WinMerge from the command line. It is meant to be used with version control tools, where you might " -"need to specify a output path for the <wordasword>result</wordasword> file. If you specify a output path, WinMerge still shows only two or three " -"files in the File Compare window. However, if you save either of these files, it is written to the output path, leaving the two or three source files " -"intact." -msgstr "" -"Il percorso di output è raramente necessario quando si avvia WinMerge dalla riga di comando.È pensato per essere utilizzato con strumenti di " -"controllo della versione, dove potrebbe essere necessario specificare un percorso di output per il file <wordasword>risultato</wordasword>.Se " -"specifichi un percorso di output, WinMerge mostra comunque solo due o tre file nella finestra Confronta file.Tuttavia, se si salva uno di questi " -"file, verrà scritto nel percorso di output, lasciando intatti i due o tre file di origine." +"The output path is rarely needed when you start WinMerge from the command " +"line. It is meant to be used with version control tools, where you might " +"need to specify a output path for the <wordasword>result</wordasword> file. " +"If you specify a output path, WinMerge still shows only two or three files " +"in the File Compare window. However, if you save either of these files, it " +"is written to the output path, leaving the two or three source files intact." +msgstr "" +"Il percorso di output è raramente necessario quando si avvia WinMerge dalla " +"riga di comando.È pensato per essere utilizzato con strumenti di controllo " +"della versione, dove potrebbe essere necessario specificare un percorso di " +"output per il file <wordasword>risultato</wordasword>.Se specifichi un " +"percorso di output, WinMerge mostra comunque solo due o tre file nella " +"finestra Confronta file.Tuttavia, se si salva uno di questi file, verrà " +"scritto nel percorso di output, lasciando intatti i due o tre file di " +"origine." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:747 msgid "" -"Version control systems typically refer to the source and result files using terms like <glossterm>theirs</glossterm>, <glossterm>mine</glossterm>, " -"and either <glossterm>merged</glossterm> or <glossterm>resolved</glossterm>. If you specify a output path on the WinMerge command line, and are " -"working with a version control system, you should list the files in that order." +"Version control systems typically refer to the source and result files using " +"terms like <glossterm>theirs</glossterm>, <glossterm>mine</glossterm>, and " +"either <glossterm>merged</glossterm> or <glossterm>resolved</glossterm>. If " +"you specify a output path on the WinMerge command line, and are working with " +"a version control system, you should list the files in that order." msgstr "" -"I sistemi di controllo della versione in genere si riferiscono ai file sorgente e di risultato utilizzando termini come <glossterm>loro</glossterm>, " -"<glossterm>mio</glossterm> e <glossterm>unito</glossterm> o <glossterm>risolto</glossterm>.Se specifichi un percorso di output sulla riga di comando " -"di WinMerge e stai lavorando con un sistema di controllo della versione, dovresti elencare i file in quest'ordine." +"I sistemi di controllo della versione in genere si riferiscono ai file " +"sorgente e di risultato utilizzando termini come <glossterm>loro</" +"glossterm>, <glossterm>mio</glossterm> e <glossterm>unito</glossterm> o " +"<glossterm>risolto</glossterm>.Se specifichi un percorso di output sulla " +"riga di comando di WinMerge e stai lavorando con un sistema di controllo " +"della versione, dovresti elencare i file in quest'ordine." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Command_line.xml:757 @@ -1437,8 +1831,12 @@ msgstr "<option>/o <replaceable>percorso di output</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:760 -msgid "Outputs a comparison report for files or folders. Example: <option>WinMergeU path1 path2 /or c:\\tmp\\report.html</option>" -msgstr "Genera un rapporto di confronto per file o cartelle.Esempio: <option>WinMergeU percorso1 percorso2 /o c:\\tmp\\report.html</option>" +msgid "" +"Outputs a comparison report for files or folders. Example: " +"<option>WinMergeU path1 path2 /or c:\\tmp\\report.html</option>" +msgstr "" +"Genera un rapporto di confronto per file o cartelle.Esempio: " +"<option>WinMergeU percorso1 percorso2 /o c:\\tmp\\report.html</option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:763 @@ -1447,8 +1845,11 @@ msgstr "Spesso è utile combinare questa opzione con:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:765 -msgid "<option>/noninteractive</option> - exits WinMerge after producing the report." -msgstr "<option>/noninteractive</option> - esce da WinMerge dopo aver prodotto il report." +msgid "" +"<option>/noninteractive</option> - exits WinMerge after producing the report." +msgstr "" +"<option>/noninteractive</option> - esce da WinMerge dopo aver prodotto il " +"report." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:766 @@ -1458,16 +1859,22 @@ msgstr "<option>/minimize</option> - avvia WinMerge in stato ridotto a icona." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:767 msgid "" -"<option>/noprefs</option> - ignores the current preferences and uses default settings. Any changes made with <option>/cfg</option> will then be " +"<option>/noprefs</option> - ignores the current preferences and uses default " +"settings. Any changes made with <option>/cfg</option> will then be " "temporary and not saved." msgstr "" -"<option>/noprefs</option> - ignora le preferenze correnti e utilizza le impostazioni predefinite.Qualsiasi modifica apportata con <option>/cfg</" +"<option>/noprefs</option> - ignora le preferenze correnti e utilizza le " +"impostazioni predefinite.Qualsiasi modifica apportata con <option>/cfg</" "option> sarà quindi temporanea e non verrà salvata." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:771 -msgid "The following <option>/cfg</option> settings can also be useful (parameter names may change in the future):" -msgstr "Possono essere utili anche le seguenti impostazioni <option>/cfg</option> (i nomi dei parametri potrebbero cambiare in futuro):" +msgid "" +"The following <option>/cfg</option> settings can also be useful (parameter " +"names may change in the future):" +msgstr "" +"Possono essere utili anche le seguenti impostazioni <option>/cfg</option> (i " +"nomi dei parametri potrebbero cambiare in futuro):" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:773 @@ -1476,14 +1883,22 @@ msgstr "Per i confronti dei file:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:775 -msgid "<option>/cfg Settings/DiffContextV2=0</option> - hides matching lines in the report (equivalent to View -> Diff Context -> 0 Lines)." +msgid "" +"<option>/cfg Settings/DiffContextV2=0</option> - hides matching lines in the " +"report (equivalent to View -> Diff Context -> 0 Lines)." msgstr "" -"<option>/cfg Settings/DiffContextV2=0</option> - nasconde le righe corrispondenti nel report (equivalente a Visualizza -> Contesto diff -> 0 righe)." +"<option>/cfg Settings/DiffContextV2=0</option> - nasconde le righe " +"corrispondenti nel report (equivalente a Visualizza -> Contesto diff -> 0 " +"righe)." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:776 -msgid "<option>/cfg Settings/ViewLineNumbers=1</option> - outputs line numbers (set to 0 to disable)." -msgstr "<option>/cfg Settings/ViewLineNumbers=1</option> - restituisce i numeri di riga (impostato su 0 per disabilitare)." +msgid "" +"<option>/cfg Settings/ViewLineNumbers=1</option> - outputs line numbers (set " +"to 0 to disable)." +msgstr "" +"<option>/cfg Settings/ViewLineNumbers=1</option> - restituisce i numeri di " +"riga (impostato su 0 per disabilitare)." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:778 @@ -1492,18 +1907,29 @@ msgstr "Per i confronti delle cartelle:" #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:780 -msgid "<option>/cfg Settings/DirViewExpandSubdirs=1</option> - automatically expand all subfolders." -msgstr "<option>/cfg Settings/DirViewExpandSubdirs=1</option> - espande automaticamente tutte le sottocartelle." +msgid "" +"<option>/cfg Settings/DirViewExpandSubdirs=1</option> - automatically expand " +"all subfolders." +msgstr "" +"<option>/cfg Settings/DirViewExpandSubdirs=1</option> - espande " +"automaticamente tutte le sottocartelle." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:781 -msgid "<option>/cfg ReportFiles/ReportType=2</option> - report style: Simple HTML." -msgstr "<option>/cfg ReportFiles/ReportType=2</option> - stile del report: HTML semplice." +msgid "" +"<option>/cfg ReportFiles/ReportType=2</option> - report style: Simple HTML." +msgstr "" +"<option>/cfg ReportFiles/ReportType=2</option> - stile del report: HTML " +"semplice." #. type: Content of: <article><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Command_line.xml:782 -msgid "<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include file comparison reports." -msgstr "<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include report di confronto file." +msgid "" +"<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include file " +"comparison reports." +msgstr "" +"<option>/cfg ReportFiles/IncludeFileCmpReport=1</option> - include report di " +"confronto file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Command_line.xml:789 English/Compare_files.xml:1805 @@ -1523,12 +1949,16 @@ msgstr "<option><replaceable>file di conflitto</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:795 msgid "" -"Specifies a conflict file, typically generated by a Version control system. The conflict file opens in the File Compare window, where you can merge " -"and resolve conflicts, as described in <xref linkend=\"ResolveConflictFiles\" />. Note that no other paths can be used with a conflict file." +"Specifies a conflict file, typically generated by a Version control system. " +"The conflict file opens in the File Compare window, where you can merge and " +"resolve conflicts, as described in <xref linkend=\"ResolveConflictFiles\" /" +">. Note that no other paths can be used with a conflict file." msgstr "" -"Specifica un file di conflitto, generalmente generato da un sistema di controllo della versione.Il file di conflitto si apre nella finestra Confronto " -"file, dove è possibile unire e risolvere i conflitti, come descritto in <xref linkend=\"ResolveConflictFiles\" />.Tieni presente che non è possibile " -"utilizzare altri percorsi con un file in conflitto." +"Specifica un file di conflitto, generalmente generato da un sistema di " +"controllo della versione.Il file di conflitto si apre nella finestra " +"Confronto file, dove è possibile unire e risolvere i conflitti, come " +"descritto in <xref linkend=\"ResolveConflictFiles\" />.Tieni presente che " +"non è possibile utilizzare altri percorsi con un file in conflitto." #. type: Content of: <article><variablelist><varlistentry><indexterm><primary> #: English/Command_line.xml:805 @@ -1542,8 +1972,11 @@ msgstr "<option>/file ini <replaceable>file ini</replaceable></option>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Command_line.xml:811 -msgid "specifies an INI file used to load and save settings instead of the registry." -msgstr "specifica un file INI utilizzato per caricare e salvare le impostazioni al posto del registro." +msgid "" +"specifies an INI file used to load and save settings instead of the registry." +msgstr "" +"specifica un file INI utilizzato per caricare e salvare le impostazioni al " +"posto del registro." #. type: Content of: <article><title> #: English/Compare_bin.xml:5 @@ -1551,8 +1984,11 @@ msgid "Comparing in hexadecimal format" msgstr "Confronto in formato esadecimale" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_bin.xml:8 English/Compare_files.xml:6 English/Compare_images.xml:8 English/Compare_table.xml:8 English/Compare_webpages.xml:8 -#: English/Configuration.xml:1072 English/Configuration.xml:1198 English/Filters.xml:66 English/Intro_diffs.xml:12 English/Quick_start.xml:325 +#: English/Compare_bin.xml:8 English/Compare_files.xml:6 +#: English/Compare_images.xml:8 English/Compare_table.xml:8 +#: English/Compare_webpages.xml:8 English/Configuration.xml:1072 +#: English/Configuration.xml:1198 English/Filters.xml:66 +#: English/Intro_diffs.xml:12 English/Quick_start.xml:325 msgid "comparing files" msgstr "confronto dei file" @@ -1564,12 +2000,17 @@ msgstr "binario" #. type: Content of: <article><para> #: English/Compare_bin.xml:13 msgid "WinMerge can view and edit your files in hexadecimal format." -msgstr "WinMerge può visualizzare e modificare i tuoi file in formato esadecimale." +msgstr "" +"WinMerge può visualizzare e modificare i tuoi file in formato esadecimale." #. type: Content of: <article><mediaobject> #: English/Compare_bin.xml:17 -msgid "<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /" +"> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/hexcmp1.png\" format=\"PNG\" /" +"> </imageobject>" #. type: Content of: <article><mediaobject><textobject><phrase> #: English/Compare_bin.xml:22 @@ -1579,27 +2020,37 @@ msgstr "Finestra di confronto HEX" #. type: Content of: <article><para> #: English/Compare_bin.xml:27 msgid "" -"Whether files are opened in hexadecimal format depends on whether the file name matches defined patterns. By default, if the file extension is .bin " -"or .frx, it will be opened in hexadecimal format. If you want to change the patterns, specify it on the Compare/Binary page in the Options dialog." +"Whether files are opened in hexadecimal format depends on whether the file " +"name matches defined patterns. By default, if the file extension is .bin or ." +"frx, it will be opened in hexadecimal format. If you want to change the " +"patterns, specify it on the Compare/Binary page in the Options dialog." msgstr "" -"L'apertura dei file in formato esadecimale dipende dal fatto che il nome del file corrisponda ai modelli definiti.Per impostazione predefinita, se " -"l'estensione del file è .bin o .frx, verrà aperto in formato esadecimale.Se desideri modificare i modelli, specificalo nella pagina Confronta/Binario " +"L'apertura dei file in formato esadecimale dipende dal fatto che il nome del " +"file corrisponda ai modelli definiti.Per impostazione predefinita, se " +"l'estensione del file è .bin o .frx, verrà aperto in formato esadecimale.Se " +"desideri modificare i modelli, specificalo nella pagina Confronta/Binario " "nella finestra di dialogo Opzioni." #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:4 English/Configuration.xml:1202 English/Filters.xml:43 English/Quick_start.xml:239 +#: English/Compare_dirs.xml:4 English/Configuration.xml:1202 +#: English/Filters.xml:43 English/Quick_start.xml:239 msgid "comparing folders" msgstr "confronto delle cartelle" #. type: Content of: <article><title> #: English/Compare_dirs.xml:3 msgid "Comparing and merging folders<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronto e unione di cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronto e unione di cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Compare_dirs.xml:7 -msgid "This topic describes how to compare and merge folders using the Folder Compare window." -msgstr "In questo argomento viene descritto come confrontare e unire le cartelle utilizzando la finestra Confronto cartelle." +msgid "" +"This topic describes how to compare and merge folders using the Folder " +"Compare window." +msgstr "" +"In questo argomento viene descritto come confrontare e unire le cartelle " +"utilizzando la finestra Confronto cartelle." #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:11 @@ -1608,41 +2059,58 @@ msgstr "Avvio di un'operazione di confronto delle cartelle" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:13 -msgid "You can begin a folder compare operation from either the WinMerge window or a Command Prompt window." -msgstr "È possibile avviare un'operazione di confronto delle cartelle dalla finestra WinMerge o dalla finestra del prompt dei comandi." +msgid "" +"You can begin a folder compare operation from either the WinMerge window or " +"a Command Prompt window." +msgstr "" +"È possibile avviare un'operazione di confronto delle cartelle dalla finestra " +"WinMerge o dalla finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Compare_dirs.xml:18 English/Compare_files.xml:23 English/Compare_images.xml:23 English/Compare_webpages.xml:30 +#: English/Compare_dirs.xml:18 English/Compare_files.xml:23 +#: English/Compare_images.xml:23 English/Compare_webpages.xml:30 msgid "From the WinMerge window" msgstr "Dalla finestra WinMerge" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:21 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " -"and right folders to compare. By default, the compare includes all files in the folders, and is recursive (does include subfolders). To change any of " -"these options and for more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." -msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " -"o cartelle per specificare le cartelle sinistra e destra da confrontare.Per impostazione predefinita, il confronto include tutti i file nelle " -"cartelle ed è ricorsivo (include le sottocartelle).Per modificare una qualsiasi di queste opzioni e per ulteriori dettagli sulla finestra di dialogo " -"Seleziona file o cartella, vedi <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" +"menuchoice>. Use the Select Files or Folders dialog to specify the left and " +"right folders to compare. By default, the compare includes all files in the " +"folders, and is recursive (does include subfolders). To change any of these " +"options and for more details about the Select Files or Folder dialog, see " +"<xref linkend=\"Open_paths\" />." +msgstr "" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" +"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " +"file o cartelle per specificare le cartelle sinistra e destra da confrontare." +"Per impostazione predefinita, il confronto include tutti i file nelle " +"cartelle ed è ricorsivo (include le sottocartelle).Per modificare una " +"qualsiasi di queste opzioni e per ulteriori dettagli sulla finestra di " +"dialogo Seleziona file o cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Compare_dirs.xml:35 English/Compare_files.xml:38 English/Compare_images.xml:38 English/Compare_webpages.xml:57 +#: English/Compare_dirs.xml:35 English/Compare_files.xml:38 +#: English/Compare_images.xml:38 English/Compare_webpages.xml:57 msgid "From a Command Prompt window" msgstr "Da una finestra del prompt dei comandi" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:38 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right folders to " -"compare. By default, the compare includes all files in the folders, and is nonrecursive. To change any of these options and for information about " -"other command options, see <xref linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " +"directory. In your command arguments, include the left and right folders to " +"compare. By default, the compare includes all files in the folders, and is " +"nonrecursive. To change any of these options and for information about other " +"command options, see <xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi le cartelle " -"sinistra e destra da confrontare. Per impostazione predefinita, il confronto include tutti i file nelle cartelle e non è ricorsivo. Per modificare " -"una qualsiasi di queste opzioni e per informazioni su altre opzioni di comando, vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " +"installazione di WinMerge. Negli argomenti del comando, includi le cartelle " +"sinistra e destra da confrontare. Per impostazione predefinita, il confronto " +"include tutti i file nelle cartelle e non è ricorsivo. Per modificare una " +"qualsiasi di queste opzioni e per informazioni su altre opzioni di comando, " +"vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><tip><title> #: English/Compare_dirs.xml:49 @@ -1657,22 +2125,30 @@ msgstr "Modalità ricorsiva<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:58 msgid "" -"Recursive mode is useful for detecting and manipulating different files in an entire folder structure. However, it can be slow if there are many " -"subfolders and files. For deeply nested directory structures, consider enabling the <xref linkend=\"Compare_dirs_treeview\" /> for easier navigation " -"of the Compare window." +"Recursive mode is useful for detecting and manipulating different files in " +"an entire folder structure. However, it can be slow if there are many " +"subfolders and files. For deeply nested directory structures, consider " +"enabling the <xref linkend=\"Compare_dirs_treeview\" /> for easier " +"navigation of the Compare window." msgstr "" -"La modalità ricorsiva è utile per rilevare e manipolare file diversi in un'intera struttura di cartelle. Tuttavia, può essere lento se sono presenti " -"molte sottocartelle e file. Per strutture di cartelle profondamente annidate, valuta la possibilità di abilitare <xref " -"linkend=\"Compare_dirs_treeview\" /> per una navigazione più semplice nella finestra Confronta." +"La modalità ricorsiva è utile per rilevare e manipolare file diversi in " +"un'intera struttura di cartelle. Tuttavia, può essere lento se sono presenti " +"molte sottocartelle e file. Per strutture di cartelle profondamente " +"annidate, valuta la possibilità di abilitare <xref " +"linkend=\"Compare_dirs_treeview\" /> per una navigazione più semplice nella " +"finestra Confronta." #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:65 msgid "" -"Nonrecursive mode has the advantage of speed when there are many subfolders that need not be examined. Also, the display can be easier to manage " -"because it shows items in only selected folders." +"Nonrecursive mode has the advantage of speed when there are many subfolders " +"that need not be examined. Also, the display can be easier to manage because " +"it shows items in only selected folders." msgstr "" -"La modalità non ricorsiva presenta il vantaggio della velocità quando sono presenti molte sottocartelle che non necessitano di essere " -"esaminate.Inoltre, la visualizzazione può essere più semplice da gestire perché mostra gli elementi solo nelle cartelle selezionate." +"La modalità non ricorsiva presenta il vantaggio della velocità quando sono " +"presenti molte sottocartelle che non necessitano di essere esaminate." +"Inoltre, la visualizzazione può essere più semplice da gestire perché mostra " +"gli elementi solo nelle cartelle selezionate." #. type: Content of: <article><section><tip><variablelist><varlistentry><term> #: English/Compare_dirs.xml:73 @@ -1682,23 +2158,35 @@ msgstr "Confronti rapidi dei contenuti" #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:76 msgid "" -"The <guilabel>Quick Contents</guilabel> method for file comparison, described in <xref linkend=\"Configuration\" />, can be useful when you compare " -"big binary files; and it is automatically used to compare files bigger than 4 MB. Possible disadvantages are that line filters do not work, and there " -"is no difference counts information in the Folder Compare window. This should not matter In most cases, because such large files are usually binary." -msgstr "" -"Il metodo <guilabel >Contenuti rapidi</guilabel > per il confronto dei file, descritto in <xref linkend=\"Configuration\" />, può essere utile quando " -"confronti file binari di grandi dimensioni;e viene utilizzato automaticamente per confrontare file più grandi di 4 MB.I possibili svantaggi sono che " -"i filtri di riga non funzionano e non vi sono informazioni sui conteggi delle differenze nella finestra Confronto cartelle.Nella maggior parte dei " -"casi questo non dovrebbe avere importanza, perché file di grandi dimensioni sono solitamente binari." +"The <guilabel>Quick Contents</guilabel> method for file comparison, " +"described in <xref linkend=\"Configuration\" />, can be useful when you " +"compare big binary files; and it is automatically used to compare files " +"bigger than 4 MB. Possible disadvantages are that line filters do not work, " +"and there is no difference counts information in the Folder Compare window. " +"This should not matter In most cases, because such large files are usually " +"binary." +msgstr "" +"Il metodo <guilabel >Contenuti rapidi</guilabel > per il confronto dei file, " +"descritto in <xref linkend=\"Configuration\" />, può essere utile quando " +"confronti file binari di grandi dimensioni;e viene utilizzato " +"automaticamente per confrontare file più grandi di 4 MB.I possibili " +"svantaggi sono che i filtri di riga non funzionano e non vi sono " +"informazioni sui conteggi delle differenze nella finestra Confronto cartelle." +"Nella maggior parte dei casi questo non dovrebbe avere importanza, perché " +"file di grandi dimensioni sono solitamente binari." #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:84 msgid "" -"To use this method, configure it before your compare operation: in the Compare page of the WinMerge options, click the <guilabel>File Compare method</" -"guilabel> drop-down menu and choose <guimenuitem>Quick Contents</guimenuitem>." +"To use this method, configure it before your compare operation: in the " +"Compare page of the WinMerge options, click the <guilabel>File Compare " +"method</guilabel> drop-down menu and choose <guimenuitem>Quick Contents</" +"guimenuitem>." msgstr "" -"Per utilizzare questo metodo, configuralo prima dell'operazione di confronto: nella pagina Confronta delle opzioni di WinMerge, fai clic sul menu a " -"discesa <guilabel >Metodo di confronto file</guilabel > e scegli <guimenuitem >Contenuti rapidi</guimenuitem >." +"Per utilizzare questo metodo, configuralo prima dell'operazione di " +"confronto: nella pagina Confronta delle opzioni di WinMerge, fai clic sul " +"menu a discesa <guilabel >Metodo di confronto file</guilabel > e scegli " +"<guimenuitem >Contenuti rapidi</guimenuitem >." #. type: Content of: <article><section><tip><variablelist><varlistentry><term> #: English/Compare_dirs.xml:92 @@ -1714,13 +2202,18 @@ msgstr "HKEY_CURRENT_USER\\Software\\Thingamahoochie\\WinMerge\\Settings\\QuickM #. type: Content of: <article><section><tip><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:95 msgid "" -"You can change the 4 MB file size limit of the <guilabel>Compare by Quick Contents</guilabel>, for example if you have a lot of very big text files. " -"To do so, run the Windows <command>regedit</command> command, navigate to this keyword, and modify its value: <placeholder type=\"screen\" id=\"0\"/" +"You can change the 4 MB file size limit of the <guilabel>Compare by Quick " +"Contents</guilabel>, for example if you have a lot of very big text files. " +"To do so, run the Windows <command>regedit</command> command, navigate to " +"this keyword, and modify its value: <placeholder type=\"screen\" id=\"0\"/" ">As usual, be careful when editing the registry!" msgstr "" -"Puoi modificare il limite di dimensione del file di 4 MB del <guilabel >Confronta per contenuto rapido</guilabel >, ad esempio se hai molti file di " -"testo molto grandi.Per fare ciò, esegui il comando <command>regedit</command> di Windows, vai a questa parola chiave e modifica il suo valore: " -"<placeholder type=\"screen\" id=\"0\"/>Come al solito, fai attenzione quando modifichi il registro!" +"Puoi modificare il limite di dimensione del file di 4 MB del <guilabel " +">Confronta per contenuto rapido</guilabel >, ad esempio se hai molti file di " +"testo molto grandi.Per fare ciò, esegui il comando <command>regedit</" +"command> di Windows, vai a questa parola chiave e modifica il suo valore: " +"<placeholder type=\"screen\" id=\"0\"/>Come al solito, fai attenzione quando " +"modifichi il registro!" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:108 English/Compare_dirs.xml:120 @@ -1729,58 +2222,83 @@ msgstr "Finestra di avanzamento del confronto delle cartelle" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:107 -msgid "Folder Compare Progress window<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Finestra di avanzamento del confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Folder Compare Progress window<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Finestra di avanzamento del confronto delle cartelle<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:111 -msgid "When you start a folder compare operation, WinMerge displays this status window:" -msgstr "Quando si avvia un'operazione di confronto delle cartelle, WinMerge visualizza questa finestra di stato:" +msgid "" +"When you start a folder compare operation, WinMerge displays this status " +"window:" +msgstr "" +"Quando si avvia un'operazione di confronto delle cartelle, WinMerge " +"visualizza questa finestra di stato:" #. type: Content of: <article><section><section><mediaobject> #: English/Compare_dirs.xml:115 -msgid "<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/foldercmp_progress.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:124 msgid "" -"If the compare operation is quick, you might not notice the Progress window, which closes as soon as WinMerge displays the Folder Compare result. The " -"Progress window shows the number of files and folders to be included in the operation, and the number compared so far. The progress bar graphically " +"If the compare operation is quick, you might not notice the Progress window, " +"which closes as soon as WinMerge displays the Folder Compare result. The " +"Progress window shows the number of files and folders to be included in the " +"operation, and the number compared so far. The progress bar graphically " "represents the Items compared." msgstr "" -"Se l'operazione di confronto è rapida, potresti non notare la finestra di avanzamento, che si chiude non appena WinMerge visualizza il risultato del " -"confronto delle cartelle.La finestra di avanzamento mostra il numero di file e cartelle da includere nell'operazione e il numero confrontato " -"finora.La barra di avanzamento rappresenta graficamente gli Articoli confrontati." +"Se l'operazione di confronto è rapida, potresti non notare la finestra di " +"avanzamento, che si chiude non appena WinMerge visualizza il risultato del " +"confronto delle cartelle.La finestra di avanzamento mostra il numero di file " +"e cartelle da includere nell'operazione e il numero confrontato finora.La " +"barra di avanzamento rappresenta graficamente gli Articoli confrontati." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:131 msgid "" -"Because the files compares are usually of different sizes, the status data does not indicate the time used or remaining. For example, a 50/100 ratio " +"Because the files compares are usually of different sizes, the status data " +"does not indicate the time used or remaining. For example, a 50/100 ratio " "does not necessarily mean that half of the compare operation time is expired." msgstr "" -"Poiché i file confrontati sono generalmente di dimensioni diverse, i dati sullo stato non indicano il tempo utilizzato o rimanente.Ad esempio, un " -"rapporto 50/100 non significa necessariamente che la metà del tempo dell'operazione di confronto è scaduta." +"Poiché i file confrontati sono generalmente di dimensioni diverse, i dati " +"sullo stato non indicano il tempo utilizzato o rimanente.Ad esempio, un " +"rapporto 50/100 non significa necessariamente che la metà del tempo " +"dell'operazione di confronto è scaduta." -#. I'm not able to reproduce the behavior documented in the earlier version of this topic: +#. I'm not able to reproduce the behavior documented in the earlier version of this topic: #. I get the partial list, but no Abort indicator. #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:137 msgid "" -"You can click <guibutton>Stop</guibutton> to terminate the operation at any time before the compare operation finishes. The Folder Compare window is " -"displayed with the results calculated at that time, omitting any uncompleted results." +"You can click <guibutton>Stop</guibutton> to terminate the operation at any " +"time before the compare operation finishes. The Folder Compare window is " +"displayed with the results calculated at that time, omitting any uncompleted " +"results." msgstr "" -"Puoi fare clic su <guibutton >Interrompi</guibutton > per terminare l'operazione in qualsiasi momento prima che termini l'operazione di " -"confronto.Viene visualizzata la finestra Confronto cartelle con i risultati calcolati in quel momento, omettendo eventuali risultati incompleti." +"Puoi fare clic su <guibutton >Interrompi</guibutton > per terminare " +"l'operazione in qualsiasi momento prima che termini l'operazione di " +"confronto.Viene visualizzata la finestra Confronto cartelle con i risultati " +"calcolati in quel momento, omettendo eventuali risultati incompleti." #. type: Content of: <article><section><mediaobject><textobject><phrase> -#: English/Compare_dirs.xml:147 English/Compare_dirs.xml:301 English/Compare_dirs.xml:485 English/Compare_dirs.xml:737 English/Compare_dirs.xml:1118 -#: English/Compare_dirs.xml:1131 English/Quick_start.xml:243 English/Quick_start.xml:261 +#: English/Compare_dirs.xml:147 English/Compare_dirs.xml:301 +#: English/Compare_dirs.xml:485 English/Compare_dirs.xml:737 +#: English/Compare_dirs.xml:1118 English/Compare_dirs.xml:1131 +#: English/Quick_start.xml:243 English/Quick_start.xml:261 msgid "Folder Compare window" msgstr "Finestra Confronta cartelle" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:149 English/Compare_dirs.xml:151 English/Compare_files.xml:54 English/Compare_files.xml:56 +#: English/Compare_dirs.xml:149 English/Compare_dirs.xml:151 +#: English/Compare_files.xml:54 English/Compare_files.xml:56 msgid "Compare window" msgstr "Finestra Confronta" @@ -1795,23 +2313,31 @@ msgid "subfolders" msgstr "sottocartelle" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Compare_dirs.xml:157 English/Compare_dirs.xml:483 English/Compare_dirs.xml:504 English/Compare_dirs.xml:616 English/Compare_dirs.xml:642 -#: English/Compare_dirs.xml:657 English/Compare_dirs.xml:800 +#: English/Compare_dirs.xml:157 English/Compare_dirs.xml:483 +#: English/Compare_dirs.xml:504 English/Compare_dirs.xml:616 +#: English/Compare_dirs.xml:642 English/Compare_dirs.xml:657 +#: English/Compare_dirs.xml:800 msgid "in Folder Compare window" msgstr "nella finestra Confronto cartelle" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:146 msgid "" -"Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +"Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder " -"type=\"indexterm\" id=\"2\"/>" +"Finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " +"id=\"2\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:160 -msgid "The Folder Compare window shows the result of a folder compare. Two different views are available:" -msgstr "La finestra Confronto cartelle mostra il risultato di un confronto cartelle.Sono disponibili due diverse visualizzazioni:" +msgid "" +"The Folder Compare window shows the result of a folder compare. Two " +"different views are available:" +msgstr "" +"La finestra Confronto cartelle mostra il risultato di un confronto cartelle." +"Sono disponibili due diverse visualizzazioni:" #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_dirs.xml:166 @@ -1825,13 +2351,21 @@ msgstr "Visualizzazione tabellare<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:170 -msgid "In tabular view, each file or folder in the result is listed in a row. This is the default view. Here's an example:" -msgstr "In tabular view, each file or folder in the result is listed in a row.Questa è la visualizzazione predefinita.Ecco un esempio:" +msgid "" +"In tabular view, each file or folder in the result is listed in a row. This " +"is the default view. Here's an example:" +msgstr "" +"In tabular view, each file or folder in the result is listed in a row.Questa " +"è la visualizzazione predefinita.Ecco un esempio:" #. type: Content of: <article><section><mediaobject> #: English/Compare_dirs.xml:174 English/Quick_start.xml:255 -msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/foldercomp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/foldercomp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"foldercomp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"foldercomp1.png\" format=\"PNG\" /> </imageobject>" #. type: Attribute 'xreflabel' of: <article><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:184 @@ -1851,56 +2385,80 @@ msgstr "Visualizzazione ad albero<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:189 msgid "" -"In the tree view, folders are expandable and collapsible, containing files and subfolders. The tree view is available only in recursive compares. For " +"In the tree view, folders are expandable and collapsible, containing files " +"and subfolders. The tree view is available only in recursive compares. For " "example:" msgstr "" -"Nella visualizzazione ad albero, le cartelle sono espandibili e comprimibili e contengono file e sottocartelle.La visualizzazione ad albero è " -"disponibile solo nei confronti ricorsivi.Per esempio:" +"Nella visualizzazione ad albero, le cartelle sono espandibili e comprimibili " +"e contengono file e sottocartelle.La visualizzazione ad albero è disponibile " +"solo nei confronti ricorsivi.Per esempio:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_dirs.xml:194 -msgid "<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/treeview-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/treeview-01.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/" +"treeview-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"599\" fileref=\"screenshots/" +"treeview-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:203 -msgid "To expand or collapse a single folder, click the plus or minus control beside the folder icon, or double-click anywhere in the row." +msgid "" +"To expand or collapse a single folder, click the plus or minus control " +"beside the folder icon, or double-click anywhere in the row." msgstr "" -"Per espandere o comprimere una singola cartella, fai clic sul controllo più o meno accanto all'icona della cartella oppure fai doppio clic in un " -"punto qualsiasi della riga." +"Per espandere o comprimere una singola cartella, fai clic sul controllo più " +"o meno accanto all'icona della cartella oppure fai doppio clic in un punto " +"qualsiasi della riga." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:209 msgid "" -"To expand or collapse all folders in the view, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Expand Subfolders</guimenuitem> " -"<guimenuitem>All Subfolders</guimenuitem> </menuchoice> or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Collapse All Subfolders</guimenuitem> </" +"To expand or collapse all folders in the view, click <menuchoice> " +"<guimenu>View</guimenu> <guimenuitem>Expand Subfolders</guimenuitem> " +"<guimenuitem>All Subfolders</guimenuitem> </menuchoice> or <menuchoice> " +"<guimenu>View</guimenu> <guimenuitem>Collapse All Subfolders</guimenuitem> </" "menuchoice> in the menu." msgstr "" -"Per espandere o comprimere tutte le cartelle nella vista, fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Espandi " -"sottocartelle</guimenuitem > <guimenuitem >Tutte le sottocartelle</guimenuitem > </menuchoice > o <menuchoice> <guimenu >Visualizza</guimenu > " -"<guimenuitem >Comprimi tutte le sottocartelle</guimenuitem > </menuchoice > nel menu." +"Per espandere o comprimere tutte le cartelle nella vista, fai clic su " +"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Espandi " +"sottocartelle</guimenuitem > <guimenuitem >Tutte le sottocartelle</" +"guimenuitem > </menuchoice > o <menuchoice> <guimenu >Visualizza</guimenu > " +"<guimenuitem >Comprimi tutte le sottocartelle</guimenuitem > </menuchoice > " +"nel menu." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:226 msgid "" -"During a recursive compare (that is, if you enabled the <option>Include subfolders</option> option in the Select Files or Folders dialog when you " -"launched the compare), you can click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree Mode</guimenuitem> </menuchoice> command to switch " -"between the two views. The <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree Mode</guimenuitem> </menuchoice> command is disabled for non-" -"recursive compares." -msgstr "" -"Durante un confronto ricorsivo (ovvero, se hai abilitato l'opzione <option >Includi sottocartelle</option > nella finestra di dialogo Seleziona file " -"o cartelle quando hai avviato il confronto), puoi fare clic sul comando <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Modalità albero</" -"guimenuitem > </menuchoice > per passare da una visualizzazione all'altra.Il comando <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " -">Modalità albero</guimenuitem > </menuchoice > è disabilitato per i confronti non ricorsivi." +"During a recursive compare (that is, if you enabled the <option>Include " +"subfolders</option> option in the Select Files or Folders dialog when you " +"launched the compare), you can click <menuchoice> <guimenu>View</guimenu> " +"<guimenuitem>Tree Mode</guimenuitem> </menuchoice> command to switch between " +"the two views. The <menuchoice> <guimenu>View</guimenu> <guimenuitem>Tree " +"Mode</guimenuitem> </menuchoice> command is disabled for non-recursive " +"compares." +msgstr "" +"Durante un confronto ricorsivo (ovvero, se hai abilitato l'opzione <option " +">Includi sottocartelle</option > nella finestra di dialogo Seleziona file o " +"cartelle quando hai avviato il confronto), puoi fare clic sul comando " +"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Modalità albero</" +"guimenuitem > </menuchoice > per passare da una visualizzazione all'altra.Il " +"comando <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Modalità " +"albero</guimenuitem > </menuchoice > è disabilitato per i confronti non " +"ricorsivi." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:238 msgid "" -"In both views, the columns show different types of data for each result item. You can control the sorting of items in the view by clicking a column " +"In both views, the columns show different types of data for each result " +"item. You can control the sorting of items in the view by clicking a column " "heading. This changes the sorting in two ways:" msgstr "" -"In entrambe le visualizzazioni, le colonne mostrano diversi tipi di dati per ciascun elemento risultato.Puoi controllare l'ordinamento degli elementi " -"nella vista facendo clic sull'intestazione di una colonna.Ciò modifica l'ordinamento in due modi:" +"In entrambe le visualizzazioni, le colonne mostrano diversi tipi di dati per " +"ciascun elemento risultato.Puoi controllare l'ordinamento degli elementi " +"nella vista facendo clic sull'intestazione di una colonna.Ciò modifica " +"l'ordinamento in due modi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:244 @@ -1924,13 +2482,21 @@ msgstr "confronto cartelle non ricorsivo" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:253 -msgid "Recursive and nonrecursive compare results<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Risultati di confronto ricorsivo e non ricorsivo<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Recursive and nonrecursive compare results<placeholder type=\"indexterm\" " +"id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Risultati di confronto ricorsivo e non ricorsivo<placeholder " +"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:263 -msgid "The Folder Compare window looks and behaves slightly differently for recursive and nonrecursive compares:" -msgstr "La finestra Confronto cartelle appare e si comporta in modo leggermente diverso per i confronti ricorsivi e non ricorsivi:" +msgid "" +"The Folder Compare window looks and behaves slightly differently for " +"recursive and nonrecursive compares:" +msgstr "" +"La finestra Confronto cartelle appare e si comporta in modo leggermente " +"diverso per i confronti ricorsivi e non ricorsivi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:268 @@ -1940,17 +2506,27 @@ msgstr "Confronto ricorsivo di cartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:271 msgid "" -"The compare result includes all subfolders. You can control the types of items displayed within the folders by choosing the options in the " -"<guimenu>View</guimenu> menu (for example, <guimenuitem>Show Identical Items</guimenuitem>). The Folder column is always empty: only the files within " -"the folders are displayed. To see an item's subfolder, look at its path in the Compare result column. Folders that exist on only one side are " -"displayed if one of the <guimenu>View</guimenu> menu options, <guimenuitem>Show Left Unique Files</guimenuitem>, <guimenuitem>Show Middle Unique " -"Files </guimenuitem> or <guimenuitem>Show Right Unique Files</guimenuitem>, is enabled." -msgstr "" -"Il risultato del confronto include tutte le sottocartelle. Puoi controllare i tipi di elementi visualizzati all'interno delle cartelle scegliendo le " -"opzioni nel menu <guimenu >Visualizza</guimenu > (ad esempio, <guimenuitem >Visualizza elementi identici</guimenuitem >).La colonna Cartella è sempre " -"vuota: vengono visualizzati solo i file all'interno delle cartelle. Per visualizzare la sottocartella di un elemento, osserva il suo percorso nella " -"colonna dei risultati Confronta.Le cartelle che esistono su un solo lato vengono visualizzate se una delle opzioni del menu <guimenu >Visualizza</" -"guimenu >, <guimenuitem >Visualizza file univoci a sinistra</guimenuitem >, <guimenuitem >Visualizza file univoci centrali </guimenuitem > o " +"The compare result includes all subfolders. You can control the types of " +"items displayed within the folders by choosing the options in the " +"<guimenu>View</guimenu> menu (for example, <guimenuitem>Show Identical " +"Items</guimenuitem>). The Folder column is always empty: only the files " +"within the folders are displayed. To see an item's subfolder, look at its " +"path in the Compare result column. Folders that exist on only one side are " +"displayed if one of the <guimenu>View</guimenu> menu options, " +"<guimenuitem>Show Left Unique Files</guimenuitem>, <guimenuitem>Show Middle " +"Unique Files </guimenuitem> or <guimenuitem>Show Right Unique Files</" +"guimenuitem>, is enabled." +msgstr "" +"Il risultato del confronto include tutte le sottocartelle. Puoi controllare " +"i tipi di elementi visualizzati all'interno delle cartelle scegliendo le " +"opzioni nel menu <guimenu >Visualizza</guimenu > (ad esempio, <guimenuitem " +">Visualizza elementi identici</guimenuitem >).La colonna Cartella è sempre " +"vuota: vengono visualizzati solo i file all'interno delle cartelle. Per " +"visualizzare la sottocartella di un elemento, osserva il suo percorso nella " +"colonna dei risultati Confronta.Le cartelle che esistono su un solo lato " +"vengono visualizzate se una delle opzioni del menu <guimenu >Visualizza</" +"guimenu >, <guimenuitem >Visualizza file univoci a sinistra</guimenuitem >, " +"<guimenuitem >Visualizza file univoci centrali </guimenuitem > o " "<guimenuitem >Visualizza file univoci a destra</guimenuitem >, è abilitata." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -1961,10 +2537,12 @@ msgstr "Confronto cartelle non ricorsivo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:289 msgid "" -"The result includes only the files and subfolders at the top level of the selected folders. However, you can browse to any subfolder that you want to " +"The result includes only the files and subfolders at the top level of the " +"selected folders. However, you can browse to any subfolder that you want to " "compare." msgstr "" -"Il risultato include solo i file e le sottocartelle al livello superiore delle cartelle selezionate.Tuttavia, puoi accedere a qualsiasi sottocartella " +"Il risultato include solo i file e le sottocartelle al livello superiore " +"delle cartelle selezionate.Tuttavia, puoi accedere a qualsiasi sottocartella " "che desideri confrontare." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -1980,136 +2558,215 @@ msgstr "Icone di file e cartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:304 msgid "" -"In the Folder Compare window, files and folders are compared and divided into several categories. In each row, the category is clearly identified in " +"In the Folder Compare window, files and folders are compared and divided " +"into several categories. In each row, the category is clearly identified in " "the left column with one of these icons:" msgstr "" -"Nella finestra Confronto cartelle, file e cartelle vengono confrontati e divisi in diverse categorie.In ogni riga la categoria è chiaramente " +"Nella finestra Confronto cartelle, file e cartelle vengono confrontati e " +"divisi in diverse categorie.In ogni riga la categoria è chiaramente " "identificata nella colonna di sinistra con una di queste icone:" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:310 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equaltextfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"equaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"equaltextfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:309 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical text files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo identici" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo identici" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:317 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binary." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:316 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical binary files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari identici" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical binary files" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari identici" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:324 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/equal." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:323 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical files (type undetermined)" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File identici (tipo indeterminato)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical files (type " +"undetermined)" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File identici (tipo " +"indeterminato)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:331 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequaltextfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"notequaltextfile.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"notequaltextfile.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:330 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different text files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo diversi" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di testo diversi" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:338 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binarydiff.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/binarydiff.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"binarydiff.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"binarydiff.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:337 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different binary files" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different binary files" msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File binari diversi" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:345 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/notequal." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:344 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different files (type undetermined)" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File diversi (tipo indeterminato)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different files (type " +"undetermined)" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File diversi (tipo " +"indeterminato)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:352 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/foldersame.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/foldersame.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"foldersame.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"foldersame.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:351 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical folders (in tree view only)" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle identiche (solo nella visualizzazione ad albero)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Identical folders (in " +"tree view only)" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle identiche (solo " +"nella visualizzazione ad albero)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:359 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderdiff.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderdiff.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"folderdiff.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"folderdiff.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:358 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different folders (in tree view only)" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle diverse (solo nella visualizzazione ad albero)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Different folders (in " +"tree view only)" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle diverse (solo " +"nella visualizzazione ad albero)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:366 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfolder." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:365 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Left-only folders" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle di sola sinistra" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle di sola sinistra" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:373 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfolder." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:372 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Middle-only folders" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle solo centrali" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle solo centrali" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:380 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfolder." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:379 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Right-only folders" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle con soli diritti" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle con soli diritti" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:387 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/lfile." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:386 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Left-only files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di sola sinistra" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File di sola sinistra" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:394 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/mfile." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:393 @@ -2118,59 +2775,90 @@ msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File solo centrali" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:401 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/rfile." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:400 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Right-only files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File con soli diritti" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File con soli diritti" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:408 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderskip.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/folderskip.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"folderskip.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"folderskip.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:407 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) directories" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle saltate (filtrate)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) " +"directories" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Cartelle saltate " +"(filtrate)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:415 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/fileskip." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:414 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) files" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> File saltati (filtrati)" +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Skipped (filtered) files" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> File saltati (filtrati)" #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:422 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/error." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:421 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Items that can't be compared; for example when another program has locked the file." +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Items that can't be " +"compared; for example when another program has locked the file." msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elementi che non possono essere confrontati;ad esempio quando un altro programma ha bloccato il " -"file." +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elementi che non possono " +"essere confrontati;ad esempio quando un altro programma ha bloccato il file." #. type: Content of: <article><section><section><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:430 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/aborted." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><simplelist><member> #: English/Compare_dirs.xml:429 msgid "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Aborted item. WinMerge did not finish comparing this item when the compare was stopped. The result " +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Aborted item. WinMerge " +"did not finish comparing this item when the compare was stopped. The result " "is unknown." msgstr "" -"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elemento interrotto.WinMerge non ha terminato il confronto di questo elemento quando il confronto " -"è stato interrotto.Il risultato è sconosciuto." +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Elemento interrotto." +"WinMerge non ha terminato il confronto di questo elemento quando il " +"confronto è stato interrotto.Il risultato è sconosciuto." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:440 @@ -2188,47 +2876,67 @@ msgid "folder compare" msgstr "confronto cartelle" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:452 English/Compare_files.xml:1207 English/Intro_diffs.xml:225 English/Intro_diffs.xml:344 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/nextdiff_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/nextdiff_btn.png\" /> </imageobject>" +#: English/Compare_dirs.xml:452 English/Compare_files.xml:1207 +#: English/Intro_diffs.xml:225 English/Intro_diffs.xml:344 +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"nextdiff_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"nextdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:457 English/Compare_files.xml:1213 English/Intro_diffs.xml:231 English/Intro_diffs.xml:350 +#: English/Compare_dirs.xml:457 English/Compare_files.xml:1213 +#: English/Intro_diffs.xml:231 English/Intro_diffs.xml:350 msgid "Next Difference button" msgstr "Pulsante Differenza successiva" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:448 msgid "" -"You can use the mouse as well as <link linkend=\"Shortcut_keys\">keyboard</link> and context menu shortcuts to navigate the Folder Compare window. " -"You can also use the toolbar buttons. For example, the <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guimenuitem>Next Difference</guimenuitem> " -"button finds the next different file or folder and selects it." +"You can use the mouse as well as <link linkend=\"Shortcut_keys\">keyboard</" +"link> and context menu shortcuts to navigate the Folder Compare window. You " +"can also use the toolbar buttons. For example, the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guimenuitem>Next Difference</" +"guimenuitem> button finds the next different file or folder and selects it." msgstr "" -"Puoi utilizzare il mouse, la <link linkend=\"Shortcut_keys\">tastiera</link> e le scorciatoie del menu contestuale per navigare nella finestra " -"Confronto cartelle.Puoi anche utilizzare i pulsanti della barra degli strumenti.Ad esempio, il pulsante <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> <guimenuitem >Differenza successiva</guimenuitem > trova il successivo file o cartella diversa e la seleziona." +"Puoi utilizzare il mouse, la <link linkend=\"Shortcut_keys\">tastiera</link> " +"e le scorciatoie del menu contestuale per navigare nella finestra Confronto " +"cartelle.Puoi anche utilizzare i pulsanti della barra degli strumenti.Ad " +"esempio, il pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " +"<guimenuitem >Differenza successiva</guimenuitem > trova il successivo file " +"o cartella diversa e la seleziona." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:463 -msgid "Unique files and folders are navigated in the same way as different ones." -msgstr "I file e le cartelle univoci vengono esplorati allo stesso modo di quelli diversi." +msgid "" +"Unique files and folders are navigated in the same way as different ones." +msgstr "" +"I file e le cartelle univoci vengono esplorati allo stesso modo di quelli " +"diversi." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:467 -msgid "You can select multiple files and folders. However, some operations (like <command>Rename</command>) are not available with multiple selections." +msgid "" +"You can select multiple files and folders. However, some operations (like " +"<command>Rename</command>) are not available with multiple selections." msgstr "" -"È possibile selezionare più file e cartelle.Tuttavia, alcune operazioni (come <command>Rinomina</command>) non sono disponibili con selezioni " +"È possibile selezionare più file e cartelle.Tuttavia, alcune operazioni " +"(come <command>Rinomina</command>) non sono disponibili con selezioni " "multiple." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:471 msgid "" -"Use the navigation buttons (<guibutton>Next Difference</guibutton>, <guibutton>Previous Difference</guibutton>, and so on) to step through " -"differences in the compared files. Use WinMerge functions to merge contents by copying, moving, or delete one or more files or subfolders." +"Use the navigation buttons (<guibutton>Next Difference</guibutton>, " +"<guibutton>Previous Difference</guibutton>, and so on) to step through " +"differences in the compared files. Use WinMerge functions to merge contents " +"by copying, moving, or delete one or more files or subfolders." msgstr "" -"Usa i pulsanti di navigazione (<guibutton >Differenza successiva</guibutton >, <guibutton >Differenza precedente</guibutton > e così via) per " -"scorrere le differenze nei file confrontati.Utilizza le funzioni WinMerge per unire i contenuti copiando, spostando o eliminando uno o più file o " -"sottocartelle." +"Usa i pulsanti di navigazione (<guibutton >Differenza successiva</guibutton " +">, <guibutton >Differenza precedente</guibutton > e così via) per scorrere " +"le differenze nei file confrontati.Utilizza le funzioni WinMerge per unire i " +"contenuti copiando, spostando o eliminando uno o più file o sottocartelle." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Compare_dirs.xml:481 English/Compare_dirs.xml:487 @@ -2237,28 +2945,40 @@ msgstr "operazioni sui file" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:480 -msgid "File operations in Folder Compare<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Operazioni sui file nel confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"File operations in Folder Compare<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Operazioni sui file nel confronto delle cartelle<placeholder " +"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:490 msgid "" -"The Folder Compare window supports common operations on files, like editing, copying, deleting, moving, and renaming (moving is equivalent to a copy " -"operation followed by a delete). You can use these file operations and some special WinMerge functions to merge the contents of folders. You can also " +"The Folder Compare window supports common operations on files, like editing, " +"copying, deleting, moving, and renaming (moving is equivalent to a copy " +"operation followed by a delete). You can use these file operations and some " +"special WinMerge functions to merge the contents of folders. You can also " "open files using associated programs or external editors." msgstr "" -"La finestra Confronto cartelle supporta operazioni comuni sui file, come modifica, copia, eliminazione, spostamento e ridenominazione (lo spostamento " -"equivale a un'operazione di copia seguita da un'eliminazione).È possibile utilizzare queste operazioni sui file e alcune funzioni speciali di " -"WinMerge per unire il contenuto delle cartelle.Puoi anche aprire file utilizzando programmi associati o editor esterni." +"La finestra Confronto cartelle supporta operazioni comuni sui file, come " +"modifica, copia, eliminazione, spostamento e ridenominazione (lo spostamento " +"equivale a un'operazione di copia seguita da un'eliminazione).È possibile " +"utilizzare queste operazioni sui file e alcune funzioni speciali di WinMerge " +"per unire il contenuto delle cartelle.Puoi anche aprire file utilizzando " +"programmi associati o editor esterni." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:496 msgid "" -"The most convenient way to perform most of these tasks is to right-click one or more items and use the context menu, where all file operations are " +"The most convenient way to perform most of these tasks is to right-click one " +"or more items and use the context menu, where all file operations are " "available." msgstr "" -"Il modo più conveniente per eseguire la maggior parte di queste attività è fare clic con il pulsante destro del mouse su uno o più elementi e " -"utilizzare il menu contestuale, dove sono disponibili tutte le operazioni sui file." +"Il modo più conveniente per eseguire la maggior parte di queste attività è " +"fare clic con il pulsante destro del mouse su uno o più elementi e " +"utilizzare il menu contestuale, dove sono disponibili tutte le operazioni " +"sui file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:502 @@ -2273,12 +2993,16 @@ msgstr "Copia dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:507 msgid "" -"The most common file operation in the Folder Compare window is copying files from side to side. There are several forms of the WinMerge copy " -"function: all of them copy only files that are different, because copying identical files is of no use in merging. The copy functions are available " -"in the context menu, in the WinMerge menu, and in the toolbar:" +"The most common file operation in the Folder Compare window is copying files " +"from side to side. There are several forms of the WinMerge copy function: " +"all of them copy only files that are different, because copying identical " +"files is of no use in merging. The copy functions are available in the " +"context menu, in the WinMerge menu, and in the toolbar:" msgstr "" -"L'operazione di file più comune nella finestra Confronto cartelle è la copia di file da un lato all'altro.Esistono diverse forme della funzione di " -"copia di WinMerge: tutte copiano solo file diversi, perché copiare file identici non serve a unire.Le funzioni di copia sono disponibili nel menu " +"L'operazione di file più comune nella finestra Confronto cartelle è la copia " +"di file da un lato all'altro.Esistono diverse forme della funzione di copia " +"di WinMerge: tutte copiano solo file diversi, perché copiare file identici " +"non serve a unire.Le funzioni di copia sono disponibili nel menu " "contestuale, nel menu WinMerge e nella barra degli strumenti:" #. type: Content of: <article><section><section><section><title> @@ -2288,13 +3012,21 @@ msgstr "Menu contestuale Copia collegamenti" #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:517 -msgid "In the Folder Compare window's context menu, the <guimenuitem>Copy</guimenuitem> item has a submenu with four shortcuts:" -msgstr "Nel menu contestuale della finestra Confronta cartelle, la voce <guimenuitem >Copia</guimenuitem > ha un sottomenu con quattro scorciatoie:" +msgid "" +"In the Folder Compare window's context menu, the <guimenuitem>Copy</" +"guimenuitem> item has a submenu with four shortcuts:" +msgstr "" +"Nel menu contestuale della finestra Confronta cartelle, la voce <guimenuitem " +">Copia</guimenuitem > ha un sottomenu con quattro scorciatoie:" #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_dirs.xml:522 -msgid "<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/" +"ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"526\" fileref=\"screenshots/" +"ctx_menu_copy1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:528 English/Compare_dirs.xml:564 @@ -2304,36 +3036,55 @@ msgstr "Finestra Confronta cartelle Copia menu contestuale" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:534 msgid "" -"<guimenuitem>Left to Right</guimenuitem> and <guimenuitem>Right to Left</guimenuitem> copy the selection (or just the items in the selection that can " -"be copied) from one side to the other. In the example, the suffix <guilabel>(2 of 4)</guilabel> indicates that only the two files that are different " -"will be copied; the identical files will not. These shortcuts available only if any of the files you select is different: if you select only " -"identical files, the shortcuts are unavailable." -msgstr "" -"<guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra a sinistra</guimenuitem > copiano la selezione (o solo gli elementi della " -"selezione che possono essere copiati) da un lato all'altro.Nell'esempio, il suffisso <guilabel >(2 di 4)</guilabel > indica che verranno copiati solo " -"i due file diversi;i file identici no.Queste scorciatoie sono disponibili solo se uno qualsiasi dei file selezionati è diverso: se selezioni solo " -"file identici, le scorciatoie non saranno disponibili." +"<guimenuitem>Left to Right</guimenuitem> and <guimenuitem>Right to Left</" +"guimenuitem> copy the selection (or just the items in the selection that can " +"be copied) from one side to the other. In the example, the suffix " +"<guilabel>(2 of 4)</guilabel> indicates that only the two files that are " +"different will be copied; the identical files will not. These shortcuts " +"available only if any of the files you select is different: if you select " +"only identical files, the shortcuts are unavailable." +msgstr "" +"<guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra " +"a sinistra</guimenuitem > copiano la selezione (o solo gli elementi della " +"selezione che possono essere copiati) da un lato all'altro.Nell'esempio, il " +"suffisso <guilabel >(2 di 4)</guilabel > indica che verranno copiati solo i " +"due file diversi;i file identici no.Queste scorciatoie sono disponibili solo " +"se uno qualsiasi dei file selezionati è diverso: se selezioni solo file " +"identici, le scorciatoie non saranno disponibili." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:545 msgid "" -"<guimenuitem>Left to...</guimenuitem> and <guimenuitem>Right to...</guimenuitem> enable you to specify a copy target directory in your system, " -"instead of a compared folder. When the Browse for Folder dialog opens, navigate to the target directory on your system (or create a new target " +"<guimenuitem>Left to...</guimenuitem> and <guimenuitem>Right to...</" +"guimenuitem> enable you to specify a copy target directory in your system, " +"instead of a compared folder. When the Browse for Folder dialog opens, " +"navigate to the target directory on your system (or create a new target " "folder) and click <guibutton>OK</guibutton>." msgstr "" -"<guimenuitem >Da sinistra a...</guimenuitem > e <guimenuitem >Diritto da...</guimenuitem > ti permettono di specificare una cartella di destinazione " -"della copia nel tuo sistema, invece di una cartella confrontata. Quando si apre la finestra di dialogo Sfoglia per cartelle, vai alla cartella di " -"destinazione sul tuo sistema (o crea una nuova cartella di destinazione) e fai clic su <guibutton >OK</guibutton >." +"<guimenuitem >Da sinistra a...</guimenuitem > e <guimenuitem >Diritto da...</" +"guimenuitem > ti permettono di specificare una cartella di destinazione " +"della copia nel tuo sistema, invece di una cartella confrontata. Quando si " +"apre la finestra di dialogo Sfoglia per cartelle, vai alla cartella di " +"destinazione sul tuo sistema (o crea una nuova cartella di destinazione) e " +"fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:553 -msgid "In the Folder Compare window with three folders, the <guimenuitem>Copy</guimenuitem> item has a submenu with nine shortcuts:" -msgstr "Nella finestra Confronto cartelle con tre cartelle, la voce <guimenuitem >Copia</guimenuitem > ha un sottomenu con nove scorciatoie:" +msgid "" +"In the Folder Compare window with three folders, the <guimenuitem>Copy</" +"guimenuitem> item has a submenu with nine shortcuts:" +msgstr "" +"Nella finestra Confronto cartelle con tre cartelle, la voce <guimenuitem " +">Copia</guimenuitem > ha un sottomenu con nove scorciatoie:" #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_dirs.xml:558 -msgid "<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/" +"ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"410\" fileref=\"screenshots/" +"ctx_menu_copy2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><title> #: English/Compare_dirs.xml:571 @@ -2341,49 +3092,74 @@ msgid "Toolbar and menu Copy commands" msgstr "Barra degli strumenti e menu Copia comandi" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:574 English/Compare_files.xml:1576 English/Intro_diffs.xml:326 -msgid "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyr_button.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyr_button.png\" /> </imageobject>" +#: English/Compare_dirs.xml:574 English/Compare_files.xml:1576 +#: English/Intro_diffs.xml:326 +msgid "" +"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" +"copyr_button.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" +"copyr_button.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:580 English/Compare_files.xml:1582 English/Intro_diffs.xml:332 +#: English/Compare_dirs.xml:580 English/Compare_files.xml:1582 +#: English/Intro_diffs.xml:332 msgid "Copy Right button" msgstr "Copia pulsante destro" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_dirs.xml:584 English/Compare_files.xml:1608 English/Intro_diffs.xml:360 -msgid "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyl_button.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/copyl_button.png\" /> </imageobject>" +#: English/Compare_dirs.xml:584 English/Compare_files.xml:1608 +#: English/Intro_diffs.xml:360 +msgid "" +"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" +"copyl_button.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"17\" fileref=\"screenshots/" +"copyl_button.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_dirs.xml:590 English/Compare_files.xml:1614 English/Intro_diffs.xml:366 +#: English/Compare_dirs.xml:590 English/Compare_files.xml:1614 +#: English/Intro_diffs.xml:366 msgid "Copy Left button" msgstr "Copia pulsante sinistro" #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:573 msgid "" -"In the Folder Compare toolbar, <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Right</guibutton> and <placeholder " -"type=\"inlinemediaobject\" id=\"1\"/> <guibutton>Copy Left</guibutton> accomplish the same task as the <guimenuitem>Left to Right</guimenuitem> and " -"<guimenuitem>Right to Left</guimenuitem> context menu shortcuts: they copy from side to side only files that are valid to copy. However, these " -"commands do not directly display the number of files to be copied; instead, they display a confirmation dialog where you can check a list of source " -"and target file paths." -msgstr "" -"Nella barra degli strumenti Confronto cartelle, <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton > e " -"<placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton >Copia a sinistra</guibutton > svolgono lo stesso compito delle scorciatoie del menu " -"contestuale <guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem >Da destra a sinistra</guimenuitem >: copiano da lato a lato solo i file " -"che sonovalido per la copia.Tuttavia questi comandi non visualizzano direttamente il numero di file da copiare;invece, visualizzano una finestra di " -"dialogo di conferma in cui è possibile controllare un elenco di percorsi di file di origine e di destinazione." +"In the Folder Compare toolbar, <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> <guibutton>Copy Right</guibutton> and <placeholder " +"type=\"inlinemediaobject\" id=\"1\"/> <guibutton>Copy Left</guibutton> " +"accomplish the same task as the <guimenuitem>Left to Right</guimenuitem> and " +"<guimenuitem>Right to Left</guimenuitem> context menu shortcuts: they copy " +"from side to side only files that are valid to copy. However, these commands " +"do not directly display the number of files to be copied; instead, they " +"display a confirmation dialog where you can check a list of source and " +"target file paths." +msgstr "" +"Nella barra degli strumenti Confronto cartelle, <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton " +"> e <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton >Copia a " +"sinistra</guibutton > svolgono lo stesso compito delle scorciatoie del menu " +"contestuale <guimenuitem >Da sinistra a destra</guimenuitem > e <guimenuitem " +">Da destra a sinistra</guimenuitem >: copiano da lato a lato solo i file che " +"sonovalido per la copia.Tuttavia questi comandi non visualizzano " +"direttamente il numero di file da copiare;invece, visualizzano una finestra " +"di dialogo di conferma in cui è possibile controllare un elenco di percorsi " +"di file di origine e di destinazione." #. type: Content of: <article><section><section><section><para> #: English/Compare_dirs.xml:600 msgid "" -"In the WinMerge menu, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</guimenuitem> </menuchoice> and <menuchoice> <guimenu>Merge</" -"guimenu> <guimenuitem>Copy to Left</guimenuitem> </menuchoice> behave the same way as the toolbar Copy commands." +"In the WinMerge menu, <menuchoice> <guimenu>Merge</guimenu> " +"<guimenuitem>Copy to Right</guimenuitem> </menuchoice> and <menuchoice> " +"<guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" +"menuchoice> behave the same way as the toolbar Copy commands." msgstr "" -"Nel menu WinMerge, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a destra</guimenuitem > </menuchoice > e <menuchoice> <guimenu " -">Unisci</guimenu > <guimenuitem >Copia a sinistra</guimenuitem > </menuchoice > si comportano allo stesso modo dei comandi Copia della barra degli " -"strumenti." +"Nel menu WinMerge, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem " +">Copia a destra</guimenuitem > </menuchoice > e <menuchoice> <guimenu " +">Unisci</guimenu > <guimenuitem >Copia a sinistra</guimenuitem > </" +"menuchoice > si comportano allo stesso modo dei comandi Copia della barra " +"degli strumenti." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:614 English/Configuration.xml:2853 @@ -2398,26 +3174,38 @@ msgstr "Eliminazione di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:619 msgid "" -"You can use the <guimenuitem>Delete</guimenuitem> context menu item to delete selected items in either or all sides. Like other file operations, " -"<guimenuitem>Delete</guimenuitem> has a submenu with <guimenuitem>Left</guimenuitem>, <guimenuitem>Middle</guimenuitem>, <guimenuitem>Right</" +"You can use the <guimenuitem>Delete</guimenuitem> context menu item to " +"delete selected items in either or all sides. Like other file operations, " +"<guimenuitem>Delete</guimenuitem> has a submenu with <guimenuitem>Left</" +"guimenuitem>, <guimenuitem>Middle</guimenuitem>, <guimenuitem>Right</" "guimenuitem>, and <guimenuitem>All</guimenuitem> shortcuts." msgstr "" -"Puoi usare la voce del menu contestuale <guimenuitem >Elimina</guimenuitem > per eliminare gli elementi selezionati su uno o tutti i lati.Come altre " -"operazioni sui file, <guimenuitem >Elimina</guimenuitem > ha un sottomenu con le scorciatoie <guimenuitem >Sinistra</guimenuitem >, <guimenuitem " -">Centro</guimenuitem >, <guimenuitem >Destra</guimenuitem > e <guimenuitem >Tutto</guimenuitem >." +"Puoi usare la voce del menu contestuale <guimenuitem >Elimina</guimenuitem > " +"per eliminare gli elementi selezionati su uno o tutti i lati.Come altre " +"operazioni sui file, <guimenuitem >Elimina</guimenuitem > ha un sottomenu " +"con le scorciatoie <guimenuitem >Sinistra</guimenuitem >, <guimenuitem " +">Centro</guimenuitem >, <guimenuitem >Destra</guimenuitem > e <guimenuitem " +">Tutto</guimenuitem >." #. type: Content of: <article><section><section><warning><para> #: English/Compare_dirs.xml:627 msgid "" -"We highly recommend that you keep the <guilabel>Send deleted files into Recycle Bin</guilabel> option enabled See <xref linkend=\"Configuration\" /" -">), so that you can undo deletions in case of accidents. In addition, you should keep Recycle Bin enabled: the WinMerge option does not work if you " -"disable the Recycle Bin in Windows. Again, you cannot undo file or folder deletion unless you use both the WinMerge <guilabel>Send deleted files " -"into Recycle Bin</guilabel> option and the Windows Recycle Bin!" -msgstr "" -"Ti consigliamo vivamente di mantenere abilitata l'opzione <guilabel >Invia i file eliminati nel cestino</guilabel > (Vedi <xref " -"linkend=\"Configuration\" />), in modo da poter annullare le eliminazioni in caso di incidenti.Inoltre, dovresti mantenere abilitato il Cestino: " -"l'opzione WinMerge non funziona se disabiliti il ​​Cestino in Windows.Ancora una volta, non puoi annullare l'eliminazione di file o cartelle a meno che " -"non utilizzi sia l'opzione <guilabel >Invia i file eliminati nel Cestino</guilabel > di WinMerge sia il Cestino di Windows!" +"We highly recommend that you keep the <guilabel>Send deleted files into " +"Recycle Bin</guilabel> option enabled See <xref linkend=\"Configuration\" /" +">), so that you can undo deletions in case of accidents. In addition, you " +"should keep Recycle Bin enabled: the WinMerge option does not work if you " +"disable the Recycle Bin in Windows. Again, you cannot undo file or folder " +"deletion unless you use both the WinMerge <guilabel>Send deleted files into " +"Recycle Bin</guilabel> option and the Windows Recycle Bin!" +msgstr "" +"Ti consigliamo vivamente di mantenere abilitata l'opzione <guilabel >Invia i " +"file eliminati nel cestino</guilabel > (Vedi <xref " +"linkend=\"Configuration\" />), in modo da poter annullare le eliminazioni in " +"caso di incidenti.Inoltre, dovresti mantenere abilitato il Cestino: " +"l'opzione WinMerge non funziona se disabiliti il ​​Cestino in Windows.Ancora " +"una volta, non puoi annullare l'eliminazione di file o cartelle a meno che " +"non utilizzi sia l'opzione <guilabel >Invia i file eliminati nel Cestino</" +"guilabel > di WinMerge sia il Cestino di Windows!" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:640 @@ -2432,13 +3220,19 @@ msgstr "Rinominazione dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:645 msgid "" -"To rename a file or folder, choose <guimenuitem>Rename</guimenuitem> in its context menu or press <keycap>F2</keycap>. Then change the name in the " -"edit box and press <keycap>Enter</keycap>, or press <keycap>Esc</keycap> to cancel. You can only rename a single file or folder. Note that renaming " -"changes items in both or all three sides: it is not currently possible to rename an item on just one side." -msgstr "" -"Per rinominare un file o una cartella, scegli <guimenuitem >Rinomina</guimenuitem > nel suo menu contestuale o premi <keycap >F2</keycap >.Quindi " -"cambia il nome nella casella di modifica e premi <keycap>Invio</keycap>, oppure premi <keycap>Esc</keycap> per annullare.Puoi rinominare solo un " -"singolo file o cartella.Tieni presente che la ridenominazione modifica gli elementi su entrambi o su tutti e tre i lati: al momento non è possibile " +"To rename a file or folder, choose <guimenuitem>Rename</guimenuitem> in its " +"context menu or press <keycap>F2</keycap>. Then change the name in the edit " +"box and press <keycap>Enter</keycap>, or press <keycap>Esc</keycap> to " +"cancel. You can only rename a single file or folder. Note that renaming " +"changes items in both or all three sides: it is not currently possible to " +"rename an item on just one side." +msgstr "" +"Per rinominare un file o una cartella, scegli <guimenuitem >Rinomina</" +"guimenuitem > nel suo menu contestuale o premi <keycap >F2</keycap >.Quindi " +"cambia il nome nella casella di modifica e premi <keycap>Invio</keycap>, " +"oppure premi <keycap>Esc</keycap> per annullare.Puoi rinominare solo un " +"singolo file o cartella.Tieni presente che la ridenominazione modifica gli " +"elementi su entrambi o su tutti e tre i lati: al momento non è possibile " "rinominare un elemento solo su un lato." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -2454,11 +3248,15 @@ msgstr "Apertura dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:660 msgid "" -"In the context menu, you can use <guimenuitem>Open Left</guimenuitem>, <guimenuitem>Open Middle</guimenuitem> or <guimenuitem>Open Right</" -"guimenuitem>, depending on which side you want to operate on. Each <guimenuitem>Open</guimenuitem> menu item has a submenu with these shortcuts:" +"In the context menu, you can use <guimenuitem>Open Left</guimenuitem>, " +"<guimenuitem>Open Middle</guimenuitem> or <guimenuitem>Open Right</" +"guimenuitem>, depending on which side you want to operate on. Each " +"<guimenuitem>Open</guimenuitem> menu item has a submenu with these shortcuts:" msgstr "" -"Nel menu contestuale, puoi usare <guimenuitem >Apri a sinistra</guimenuitem >, <guimenuitem >Apri al centro</guimenuitem > o <guimenuitem >Apri a " -"destra</guimenuitem >, a seconda del lato su cui vuoi operare.Ogni voce del menu <guimenuitem >Apri</guimenuitem > ha un sottomenu con queste " +"Nel menu contestuale, puoi usare <guimenuitem >Apri a sinistra</guimenuitem " +">, <guimenuitem >Apri al centro</guimenuitem > o <guimenuitem >Apri a " +"destra</guimenuitem >, a seconda del lato su cui vuoi operare.Ogni voce del " +"menu <guimenuitem >Apri</guimenuitem > ha un sottomenu con queste " "scorciatoie:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2468,13 +3266,18 @@ msgstr "Con domanda registrata" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:671 -msgid "Opens the file with the application (if any) that is registered in Windows for the file's type." -msgstr "Apre il file con l'applicazione (se presente) registrata in Windows per il tipo di file." +msgid "" +"Opens the file with the application (if any) that is registered in Windows " +"for the file's type." +msgstr "" +"Apre il file con l'applicazione (se presente) registrata in Windows per il " +"tipo di file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_dirs.xml:675 msgid "This shortcut usually opens a folder in a new Windows Explorer." -msgstr "Questo collegamento di solito apre una cartella in un nuovo Esplora risorse." +msgstr "" +"Questo collegamento di solito apre una cartella in un nuovo Esplora risorse." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:683 @@ -2483,8 +3286,12 @@ msgstr "Con editor esterno" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:686 -msgid "Opens the file with an external editor. The default editor is Notepad, but you can configure a different one in WinMerge options." -msgstr "Apre il file con un editor esterno.L'editor predefinito è Blocco note, ma puoi configurarne uno diverso nelle opzioni WinMerge." +msgid "" +"Opens the file with an external editor. The default editor is Notepad, but " +"you can configure a different one in WinMerge options." +msgstr "" +"Apre il file con un editor esterno.L'editor predefinito è Blocco note, ma " +"puoi configurarne uno diverso nelle opzioni WinMerge." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:693 @@ -2493,8 +3300,12 @@ msgstr "Con..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:696 -msgid "Opens the <guilabel>Open With</guilabel> dialog, where you can specify an application to open your file with." -msgstr "Apre la finestra di dialogo <guilabel >Apri con</guilabel >, dove puoi specificare un'applicazione con cui aprire il file." +msgid "" +"Opens the <guilabel>Open With</guilabel> dialog, where you can specify an " +"application to open your file with." +msgstr "" +"Apre la finestra di dialogo <guilabel >Apri con</guilabel >, dove puoi " +"specificare un'applicazione con cui aprire il file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:705 @@ -2513,33 +3324,48 @@ msgstr "nomi di file" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:704 -msgid "Copying pathnames or filenames<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Copia di percorsi o nomi di file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Copying pathnames or filenames<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Copia di percorsi o nomi di file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:714 msgid "" -"The context menu <guimenuitem>Copy Pathname</guimenuitem> and <guimenuitem>Copy Filenames</guimenuitem> shortcuts copy the pathname or filename of " -"selected items to the Windows clipboard. You can then paste the copied information into a file or application, for example to create a list of " -"changed files or a change log." +"The context menu <guimenuitem>Copy Pathname</guimenuitem> and " +"<guimenuitem>Copy Filenames</guimenuitem> shortcuts copy the pathname or " +"filename of selected items to the Windows clipboard. You can then paste the " +"copied information into a file or application, for example to create a list " +"of changed files or a change log." msgstr "" -"Le scorciatoie <guimenuitem >Copia percorso</guimenuitem > e <guimenuitem >Copia nomi file</guimenuitem > del menu contestuale copiano il percorso o " -"il nome file degli elementi selezionati negli appunti di Windows.È quindi possibile incollare le informazioni copiate in un file o in " -"un'applicazione, ad esempio per creare un elenco di file modificati o un registro delle modifiche." +"Le scorciatoie <guimenuitem >Copia percorso</guimenuitem > e <guimenuitem " +">Copia nomi file</guimenuitem > del menu contestuale copiano il percorso o " +"il nome file degli elementi selezionati negli appunti di Windows.È quindi " +"possibile incollare le informazioni copiate in un file o in un'applicazione, " +"ad esempio per creare un elenco di file modificati o un registro delle " +"modifiche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:722 msgid "" -"<guimenuitem>Copy Pathnames</guimenuitem> has a menu with three shortcuts, similar to other file operations. It copies the full pathnames of one or " +"<guimenuitem>Copy Pathnames</guimenuitem> has a menu with three shortcuts, " +"similar to other file operations. It copies the full pathnames of one or " "more selected items to the clipboard, one per line." msgstr "" -"<guimenuitem >Copia nomi di percorso</guimenuitem > ha un menu con tre scorciatoie, simili ad altre operazioni sui file.Copia i percorsi completi di " -"uno o più elementi selezionati negli appunti, uno per riga." +"<guimenuitem >Copia nomi di percorso</guimenuitem > ha un menu con tre " +"scorciatoie, simili ad altre operazioni sui file.Copia i percorsi completi " +"di uno o più elementi selezionati negli appunti, uno per riga." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:729 -msgid "<guimenuitem>Copy Filenames</guimenuitem> copies only filenames without paths." -msgstr "<guimenuitem >Copia nomi di file</guimenuitem > copia solo i nomi di file senza percorsi." +msgid "" +"<guimenuitem>Copy Filenames</guimenuitem> copies only filenames without " +"paths." +msgstr "" +"<guimenuitem >Copia nomi di file</guimenuitem > copia solo i nomi di file " +"senza percorsi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Compare_dirs.xml:739 @@ -2553,46 +3379,64 @@ msgstr "file di sola lettura" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:736 -msgid "Protecting files<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "" +"Protecting files<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Protezione dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" id=\"2\"/>" +"Protezione dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:748 msgid "" -"To protect the files and folders on either side of a compare from changes, enable the <menuchoice> <guimenu>File</guimenu> <guimenuitem>Left Read-" -"only</guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Middle Read-only</guimenuitem> </menuchoice> or <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Right Read-only</guimenuitem> </menuchoice> check box." +"To protect the files and folders on either side of a compare from changes, " +"enable the <menuchoice> <guimenu>File</guimenu> <guimenuitem>Left Read-only</" +"guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Middle Read-only</guimenuitem> </menuchoice> or <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Right Read-only</guimenuitem> </" +"menuchoice> check box." msgstr "" -"Per proteggere i file e le cartelle su entrambi i lati di un confronto dalle modifiche, attiva <menuchoice> <guimenu >File</guimenu > <guimenuitem " -">Sola lettura sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu >File</guimenu > <guimenuitem >Sola lettura centrale</guimenuitem > </" -"menuchoice > o <menuchoice > <guimenu >File</guimenu >Casella di controllo <guimenuitem >Sola lettura destra</guimenuitem > </menuchoice >." +"Per proteggere i file e le cartelle su entrambi i lati di un confronto dalle " +"modifiche, attiva <menuchoice> <guimenu >File</guimenu > <guimenuitem >Sola " +"lettura sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu " +">File</guimenu > <guimenuitem >Sola lettura centrale</guimenuitem > </" +"menuchoice > o <menuchoice > <guimenu >File</guimenu >Casella di controllo " +"<guimenuitem >Sola lettura destra</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><important><para> #: English/Compare_dirs.xml:764 -msgid "Setting the read-only option protects files and folders only in the current compare view; it does not affect their Windows file attributes." +msgid "" +"Setting the read-only option protects files and folders only in the current " +"compare view; it does not affect their Windows file attributes." msgstr "" -"L'impostazione dell'opzione di sola lettura protegge file e cartelle solo nella visualizzazione di confronto corrente;non influisce sugli attributi " +"L'impostazione dell'opzione di sola lettura protegge file e cartelle solo " +"nella visualizzazione di confronto corrente;non influisce sugli attributi " "dei file Windows." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:769 msgid "" -"This protected status is inherited by files that you open in the folder compare. For example, if you compare two folders, set one side read-only, and " -"open two files for comparing, the open file on the protected side is write-protected. Similarly, you cannot copy a file from the unprotected side to " -"the protected side." +"This protected status is inherited by files that you open in the folder " +"compare. For example, if you compare two folders, set one side read-only, " +"and open two files for comparing, the open file on the protected side is " +"write-protected. Similarly, you cannot copy a file from the unprotected side " +"to the protected side." msgstr "" -"Questo stato protetto viene ereditato dai file aperti nel confronto cartelle.Ad esempio, se si confrontano due cartelle, si imposta un lato in sola " -"lettura e si aprono due file per il confronto, il file aperto sul lato protetto sarà protetto da scrittura.Allo stesso modo, non è possibile copiare " -"un file dal lato non protetto a quello protetto." +"Questo stato protetto viene ereditato dai file aperti nel confronto cartelle." +"Ad esempio, se si confrontano due cartelle, si imposta un lato in sola " +"lettura e si aprono due file per il confronto, il file aperto sul lato " +"protetto sarà protetto da scrittura.Allo stesso modo, non è possibile " +"copiare un file dal lato non protetto a quello protetto." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:775 msgid "" -"The <guilabel>RO</guilabel> code in the left side's, middle or right side's pane in the status bar (near the bottom right of the window) indicates " -"that the side is currently read-only." +"The <guilabel>RO</guilabel> code in the left side's, middle or right side's " +"pane in the status bar (near the bottom right of the window) indicates that " +"the side is currently read-only." msgstr "" -"Il codice <guilabel >RO</guilabel > nel riquadro sinistro, centrale o destro della barra di stato (vicino all'angolo inferiore destro della finestra) " +"Il codice <guilabel >RO</guilabel > nel riquadro sinistro, centrale o destro " +"della barra di stato (vicino all'angolo inferiore destro della finestra) " "indica che il lato è attualmente di sola lettura." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -2602,20 +3446,31 @@ msgstr "vista rinfrescante" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:781 -msgid "Refreshing selected items in the view<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Aggiornamento degli elementi selezionati nella vista<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Refreshing selected items in the view<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Aggiornamento degli elementi selezionati nella vista<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:785 msgid "" -"A full refresh of large folders can take a long time. In WinMerge 2.2 and earlier, you always had to do a full refresh to update files after editing " -"them outside WinMerge. Starting in Version 2.4, WinMerge can refresh just selected items: choose <guimenuitem>Refresh</guimenuitem> from the context " -"menu or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh Selected</guimenuitem> </menuchoice> from the main menu." -msgstr "" -"Un aggiornamento completo di cartelle di grandi dimensioni può richiedere molto tempo.In WinMerge 2.2 e versioni precedenti, dovevi sempre eseguire " -"un aggiornamento completo per aggiornare i file dopo averli modificati all'esterno di WinMerge.A partire dalla versione 2.4, WinMerge può aggiornare " -"solo gli elementi selezionati: scegli <guimenuitem >Aggiorna</guimenuitem > dal menu contestuale o <menuchoice > <guimenu >Visualizza</guimenu > " -"<guimenuitem >Aggiorna selezionati</guimenuitem > </menuchoice > dal menu principale." +"A full refresh of large folders can take a long time. In WinMerge 2.2 and " +"earlier, you always had to do a full refresh to update files after editing " +"them outside WinMerge. Starting in Version 2.4, WinMerge can refresh just " +"selected items: choose <guimenuitem>Refresh</guimenuitem> from the context " +"menu or <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh Selected</" +"guimenuitem> </menuchoice> from the main menu." +msgstr "" +"Un aggiornamento completo di cartelle di grandi dimensioni può richiedere " +"molto tempo.In WinMerge 2.2 e versioni precedenti, dovevi sempre eseguire un " +"aggiornamento completo per aggiornare i file dopo averli modificati " +"all'esterno di WinMerge.A partire dalla versione 2.4, WinMerge può " +"aggiornare solo gli elementi selezionati: scegli <guimenuitem >Aggiorna</" +"guimenuitem > dal menu contestuale o <menuchoice > <guimenu >Visualizza</" +"guimenu > <guimenuitem >Aggiorna selezionati</guimenuitem > </menuchoice > " +"dal menu principale." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_dirs.xml:798 English/Configuration.xml:2758 @@ -2629,18 +3484,27 @@ msgstr "Archiviazione file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:803 -msgid "Use the context menu <guimenu>Zip</guimenu> menu item to create a new archive file containing the items you select." -msgstr "Usa la voce del menu <guimenu >Zip</guimenu > del menu contestuale per creare un nuovo file di archivio contenente gli elementi selezionati." +msgid "" +"Use the context menu <guimenu>Zip</guimenu> menu item to create a new " +"archive file containing the items you select." +msgstr "" +"Usa la voce del menu <guimenu >Zip</guimenu > del menu contestuale per " +"creare un nuovo file di archivio contenente gli elementi selezionati." #. type: Content of: <article><section><section><note><para> #: English/Compare_dirs.xml:807 -msgid "Archive support requires that you have installed the WinMerge 7-Zip plugin." -msgstr "Il supporto dell'archivio richiede l'installazione del plug-in WinMerge 7-Zip." +msgid "" +"Archive support requires that you have installed the WinMerge 7-Zip plugin." +msgstr "" +"Il supporto dell'archivio richiede l'installazione del plug-in WinMerge 7-" +"Zip." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:811 msgid "The <guimenu>Zip</guimenu> menu item has a submenu with five shortcuts:" -msgstr "La voce di menu <guimenu >Zip</guimenu > ha un sottomenu con cinque scorciatoie:" +msgstr "" +"La voce di menu <guimenu >Zip</guimenu > ha un sottomenu con cinque " +"scorciatoie:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:815 @@ -2650,7 +3514,9 @@ msgstr "Sinistra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:818 msgid "Adds left-side files and folders recursively to the archive file" -msgstr "Aggiunge in modo ricorsivo i file e le cartelle del lato sinistro al file di archivio" +msgstr "" +"Aggiunge in modo ricorsivo i file e le cartelle del lato sinistro al file di " +"archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:824 @@ -2660,7 +3526,8 @@ msgstr "In mezzo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:827 msgid "Adds middle files and folders recursively to the archive file" -msgstr "Aggiunge file e cartelle centrali in modo ricorsivo al file di archivio" +msgstr "" +"Aggiunge file e cartelle centrali in modo ricorsivo al file di archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:833 @@ -2670,7 +3537,9 @@ msgstr "Destra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:836 msgid "Adds right-side files and folders recursively to the archive file" -msgstr "Aggiunge file e cartelle sul lato destro in modo ricorsivo al file di archivio" +msgstr "" +"Aggiunge file e cartelle sul lato destro in modo ricorsivo al file di " +"archivio" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:842 @@ -2680,13 +3549,19 @@ msgstr "Entrambi" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:845 msgid "" -"Adds files and folders recursively from both sides to the archive file. Because the filenames are same, they are added to different subfolders, named " -"<filename class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename>, inside the archive: left-side files are put " -"to <filename class=\"directory\">Original</filename>, and right-side files are put into <filename class=\"directory\">Altered</filename>." -msgstr "" -"Aggiunge file e cartelle in modo ricorsivo da entrambi i lati al file di archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " -"sottocartelle diverse, denominate <filename class=\"directory\">Original</filename> e <filename class=\"directory\">Altered</filename>, all'interno " -"dell'archivio: i file sul lato sinistro vengono inseriti in <filename class=\"directory\">Original</filename>, e i file sul lato destro vengono " +"Adds files and folders recursively from both sides to the archive file. " +"Because the filenames are same, they are added to different subfolders, " +"named <filename class=\"directory\">Original</filename> and <filename " +"class=\"directory\">Altered</filename>, inside the archive: left-side files " +"are put to <filename class=\"directory\">Original</filename>, and right-side " +"files are put into <filename class=\"directory\">Altered</filename>." +msgstr "" +"Aggiunge file e cartelle in modo ricorsivo da entrambi i lati al file di " +"archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " +"sottocartelle diverse, denominate <filename class=\"directory\">Original</" +"filename> e <filename class=\"directory\">Altered</filename>, all'interno " +"dell'archivio: i file sul lato sinistro vengono inseriti in <filename " +"class=\"directory\">Original</filename>, e i file sul lato destro vengono " "inseriti in <filename class=\"directory\">Altered</filename>." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2697,13 +3572,19 @@ msgstr "Tutto" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:860 msgid "" -"Adds files and folders recursively from all sides to the archive file. Because the filenames are same, they are added to different subfolders, named " -"<filename class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename>, inside the archive: left-side files are put " -"to <filename class=\"directory\">Original</filename>, and right-side files are put into <filename class=\"directory\">Altered</filename>." -msgstr "" -"Aggiunge file e cartelle in modo ricorsivo da tutti i lati al file di archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " -"sottocartelle diverse, denominate <filename class=\"directory\">Original</filename> e <filename class=\"directory\">Altered</filename>, all'interno " -"dell'archivio: i file sul lato sinistro vengono inseriti in <filename class=\"directory\">Original</filename>, e i file sul lato destro vengono " +"Adds files and folders recursively from all sides to the archive file. " +"Because the filenames are same, they are added to different subfolders, " +"named <filename class=\"directory\">Original</filename> and <filename " +"class=\"directory\">Altered</filename>, inside the archive: left-side files " +"are put to <filename class=\"directory\">Original</filename>, and right-side " +"files are put into <filename class=\"directory\">Altered</filename>." +msgstr "" +"Aggiunge file e cartelle in modo ricorsivo da tutti i lati al file di " +"archivio.Poiché i nomi dei file sono gli stessi, vengono aggiunti a " +"sottocartelle diverse, denominate <filename class=\"directory\">Original</" +"filename> e <filename class=\"directory\">Altered</filename>, all'interno " +"dell'archivio: i file sul lato sinistro vengono inseriti in <filename " +"class=\"directory\">Original</filename>, e i file sul lato destro vengono " "inseriti in <filename class=\"directory\">Altered</filename>." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2713,40 +3594,59 @@ msgstr "Differenze" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:875 -msgid "Like <guimenuitem>Both</guimenuitem>, but adds only different files (including unique files) from both sides." -msgstr "Come <guimenuitem >Entrambi</guimenuitem >, ma aggiunge solo file diversi (inclusi file univoci) da entrambi i lati." +msgid "" +"Like <guimenuitem>Both</guimenuitem>, but adds only different files " +"(including unique files) from both sides." +msgstr "" +"Come <guimenuitem >Entrambi</guimenuitem >, ma aggiunge solo file diversi " +"(inclusi file univoci) da entrambi i lati." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:881 msgid "" -"When you select one of the <guimenu>Zip</guimenu> shortcuts, the Save As dialog prompts you for the archive filename and type. WinMerge cannot add " +"When you select one of the <guimenu>Zip</guimenu> shortcuts, the Save As " +"dialog prompts you for the archive filename and type. WinMerge cannot add " "files to existing archive files: it always creates a new archive file." msgstr "" -"Quando selezioni una delle scorciatoie <guimenu >Zip</guimenu >, la finestra di dialogo Salva con nome ti chiederà il nome e il tipo del file di " -"archivio.WinMerge non può aggiungere file a file di archivio esistenti: crea sempre un nuovo file di archivio." +"Quando selezioni una delle scorciatoie <guimenu >Zip</guimenu >, la finestra " +"di dialogo Salva con nome ti chiederà il nome e il tipo del file di archivio." +"WinMerge non può aggiungere file a file di archivio esistenti: crea sempre " +"un nuovo file di archivio." #. type: Content of: <article><section><section><tip><para> #: English/Compare_dirs.xml:896 msgid "" -"WinMerge can compare the contents of archive files that have the same name on both sides: WinMerge looks for the <filename " -"class=\"directory\">Original</filename> and <filename class=\"directory\">Altered</filename> subfolders, and compares the contents of those two " -"folders." +"WinMerge can compare the contents of archive files that have the same name " +"on both sides: WinMerge looks for the <filename " +"class=\"directory\">Original</filename> and <filename " +"class=\"directory\">Altered</filename> subfolders, and compares the contents " +"of those two folders." msgstr "" -"WinMerge può confrontare il contenuto dei file di archivio che hanno lo stesso nome su entrambi i lati: WinMerge cerca le sottocartelle <filename " -"class=\"directory\">Originale</filename> e <filename class=\"directory\">Altered</filename> e confronta il contenuto di queste due cartelle." +"WinMerge può confrontare il contenuto dei file di archivio che hanno lo " +"stesso nome su entrambi i lati: WinMerge cerca le sottocartelle <filename " +"class=\"directory\">Originale</filename> e <filename " +"class=\"directory\">Altered</filename> e confronta il contenuto di queste " +"due cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:903 msgid "" -"If a folder compare includes the contents of an archive file, any changes made to the included files in WinMerge (for example, using an " -"<guimenuitem>Open</guimenuitem> file operation to edit the file) are saved in the archive file. But you cannot update archive contents by using the " -"WinMerge <guimenuitem>Copy</guimenuitem>, <guimenuitem>Move</guimenuitem>, or <guimenuitem>Delete</guimenuitem> file operations. Instead, create a " -"new archive file using one of the <guimenuitem>Zip</guimenuitem> shortcuts." -msgstr "" -"Se un confronto di cartelle include il contenuto di un file di archivio, qualsiasi modifica apportata ai file inclusi in WinMerge (ad esempio, " -"utilizzando un'operazione <guimenuitem >Apri</guimenuitem > per modificare il file) viene salvata nel file di archivio.Ma non puoi aggiornare il " -"contenuto dell'archivio utilizzando le operazioni sui file <guimenuitem >Copia</guimenuitem >, <guimenuitem >Sposta</guimenuitem > o <guimenuitem " -">Elimina</guimenuitem > di WinMerge.Crea invece un nuovo file di archivio utilizzando una delle scorciatoie <guimenuitem >Zip</guimenuitem >." +"If a folder compare includes the contents of an archive file, any changes " +"made to the included files in WinMerge (for example, using an " +"<guimenuitem>Open</guimenuitem> file operation to edit the file) are saved " +"in the archive file. But you cannot update archive contents by using the " +"WinMerge <guimenuitem>Copy</guimenuitem>, <guimenuitem>Move</guimenuitem>, " +"or <guimenuitem>Delete</guimenuitem> file operations. Instead, create a new " +"archive file using one of the <guimenuitem>Zip</guimenuitem> shortcuts." +msgstr "" +"Se un confronto di cartelle include il contenuto di un file di archivio, " +"qualsiasi modifica apportata ai file inclusi in WinMerge (ad esempio, " +"utilizzando un'operazione <guimenuitem >Apri</guimenuitem > per modificare " +"il file) viene salvata nel file di archivio.Ma non puoi aggiornare il " +"contenuto dell'archivio utilizzando le operazioni sui file <guimenuitem " +">Copia</guimenuitem >, <guimenuitem >Sposta</guimenuitem > o <guimenuitem " +">Elimina</guimenuitem > di WinMerge.Crea invece un nuovo file di archivio " +"utilizzando una delle scorciatoie <guimenuitem >Zip</guimenuitem >." #. type: Content of: <article><para><indexterm><primary> #: English/Compare_dirs.xml:916 English/Faq.xml:56 English/Open_paths.xml:9 @@ -2760,17 +3660,24 @@ msgstr "navigando nella finestra Confronto cartelle" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:915 -msgid "Browsing folders in the Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Esplorazione delle cartelle nella finestra Confronto cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Browsing folders in the Folder Compare window<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Esplorazione delle cartelle nella finestra Confronto cartelle<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:921 msgid "" -"This section discusses ways to browse folders that are listed in a Folder Compare window. When you browse a folder, you perform a completely new " +"This section discusses ways to browse folders that are listed in a Folder " +"Compare window. When you browse a folder, you perform a completely new " "compare operation. Its result overwrites the current result in the window." msgstr "" -"In questa sezione vengono illustrate le modalità per sfogliare le cartelle elencate in una finestra Confronto cartelle.Quando sfogli una cartella, " -"esegui un'operazione di confronto completamente nuova.Il suo risultato sovrascrive il risultato corrente nella finestra." +"In questa sezione vengono illustrate le modalità per sfogliare le cartelle " +"elencate in una finestra Confronto cartelle.Quando sfogli una cartella, " +"esegui un'operazione di confronto completamente nuova.Il suo risultato " +"sovrascrive il risultato corrente nella finestra." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:927 @@ -2780,15 +3687,22 @@ msgstr "Esplorazione delle cartelle in un confronto non ricorsivo" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:929 msgid "" -"Even though a nonrecursive folder compare does not include the contents of subfolders, the subfolders themselves are listed as files in the result. " -"Similarly, the compared folder's parent folder is listed as a file at the top of the table. By opening these folders directly in the Folder Compare " -"window, you can selectively browse a directory tree. This approach — comparing just the subdirectories you are interested in — can be more efficient " -"than performing a recursive compare on the entire directory tree." -msgstr "" -"Anche se un confronto di cartelle non ricorsivo non include il contenuto delle sottocartelle, le sottocartelle stesse vengono elencate come file nel " -"risultato. Allo stesso modo, la cartella principale della cartella confrontata è elencata come file nella parte superiore della tabella. Aprendo " -"queste cartelle direttamente nella finestra Confronto cartelle, è possibile sfogliare selettivamente una struttura di cartelle. Questo approccio, " -"ovvero il confronto solo delle sottodirectory che ti interessano, può essere più efficiente rispetto all'esecuzione di un confronto ricorsivo " +"Even though a nonrecursive folder compare does not include the contents of " +"subfolders, the subfolders themselves are listed as files in the result. " +"Similarly, the compared folder's parent folder is listed as a file at the " +"top of the table. By opening these folders directly in the Folder Compare " +"window, you can selectively browse a directory tree. This approach — " +"comparing just the subdirectories you are interested in — can be more " +"efficient than performing a recursive compare on the entire directory tree." +msgstr "" +"Anche se un confronto di cartelle non ricorsivo non include il contenuto " +"delle sottocartelle, le sottocartelle stesse vengono elencate come file nel " +"risultato. Allo stesso modo, la cartella principale della cartella " +"confrontata è elencata come file nella parte superiore della tabella. " +"Aprendo queste cartelle direttamente nella finestra Confronto cartelle, è " +"possibile sfogliare selettivamente una struttura di cartelle. Questo " +"approccio, ovvero il confronto solo delle sottodirectory che ti interessano, " +"può essere più efficiente rispetto all'esecuzione di un confronto ricorsivo " "sull'intera struttura di cartelle." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2798,52 +3712,78 @@ msgstr "Esplorazione della cartella principale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:944 English/Compare_dirs.xml:957 -msgid "<imageobject> <imagedata fileref=\"screenshots/folderup.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/folderup.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/folderup.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/folderup.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:943 msgid "" -"To compare the <placeholder type=\"inlinemediaobject\" id=\"0\"/> parent folder (the <guilabel>..</guilabel> path at the top), double-click its row, " +"To compare the <placeholder type=\"inlinemediaobject\" id=\"0\"/> parent " +"folder (the <guilabel>..</guilabel> path at the top), double-click its row, " "or select the row and press <keycap>Enter</keycap>." msgstr "" -"Per confrontare la cartella principale <placeholder type=\"inlinemediaobject\" id=\"0\"/> (il percorso <guilabel>..</guilabel> in alto), fai doppio " -"clic sulla sua riga o seleziona la riga e premi <keycap >Invio</keycap >." +"Per confrontare la cartella principale <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> (il percorso <guilabel>..</guilabel> " +"in alto), fai doppio clic sulla sua riga o seleziona la riga e premi <keycap " +">Invio</keycap >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:951 msgid "" -"Sometimes the parent folder cannot be opened (for example if you do not have permissions to access it). These two icons indicate whether a parent " -"folder can be opened:" +"Sometimes the parent folder cannot be opened (for example if you do not have " +"permissions to access it). These two icons indicate whether a parent folder " +"can be opened:" msgstr "" -"A volte non è possibile aprire la cartella principale (ad esempio se non si dispone dei permessi per accedervi).Queste due icone indicano se è " -"possibile aprire una cartella principale:" +"A volte non è possibile aprire la cartella principale (ad esempio se non si " +"dispone dei permessi per accedervi).Queste due icone indicano se è possibile " +"aprire una cartella principale:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_dirs.xml:956 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder can be opened." -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> È possibile aprire la cartella principale." +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder can be " +"opened." +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> È possibile aprire la " +"cartella principale." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_dirs.xml:963 -msgid "<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/folderup_disable.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_dirs.xml:962 -msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder cannot be opened." -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Impossibile aprire la cartella principale." +msgid "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Parent folder cannot be " +"opened." +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Impossibile aprire la " +"cartella principale." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:975 msgid "Browsing a single subfolder that exists on both or all three sides" -msgstr "Esplorazione di una singola sottocartella esistente su entrambi o su tutti e tre i lati" +msgstr "" +"Esplorazione di una singola sottocartella esistente su entrambi o su tutti e " +"tre i lati" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:979 -msgid "To compare a single subfolder that exists on both or all three sides, double-click the folder in the folder compare window." +msgid "" +"To compare a single subfolder that exists on both or all three sides, double-" +"click the folder in the folder compare window." msgstr "" -"Per confrontare una singola sottocartella esistente su entrambi o su tutti e tre i lati, fare doppio clic sulla cartella nella finestra di confronto " +"Per confrontare una singola sottocartella esistente su entrambi o su tutti e " +"tre i lati, fare doppio clic sulla cartella nella finestra di confronto " "cartelle." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -2854,11 +3794,14 @@ msgstr "Navigazione in una singola sottocartella che esiste solo su un lato" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:990 msgid "" -"If you browse to a subfolder that exists only one side, WinMerge can create a new, matching folder on the other side respective both other sides. See " +"If you browse to a subfolder that exists only one side, WinMerge can create " +"a new, matching folder on the other side respective both other sides. See " "<xref linkend=\"CompareDirs_browse_unique\" /> for details." msgstr "" -"Se si accede a una sottocartella che esiste solo su un lato, WinMerge può creare una nuova cartella corrispondente sull'altro lato, rispettivamente " -"su entrambi gli altri lati.Vedi <xref linkend=\"CompareDirs_browse_unique\" /> per i dettagli." +"Se si accede a una sottocartella che esiste solo su un lato, WinMerge può " +"creare una nuova cartella corrispondente sull'altro lato, rispettivamente su " +"entrambi gli altri lati.Vedi <xref linkend=\"CompareDirs_browse_unique\" /> " +"per i dettagli." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_dirs.xml:1000 @@ -2868,18 +3811,27 @@ msgstr "Navigazione in due diverse sottocartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1003 msgid "" -"You cannot compare two subfolders (that is, selecting two rows) where the subfolders on each side are different. Only if you have previously compared " -"identical folders (for example, by browsing a single subfolder in a compare result) can you compare two subfolders. First select the two folders in " -"the Folder Compare window, as shown in the following figure:" +"You cannot compare two subfolders (that is, selecting two rows) where the " +"subfolders on each side are different. Only if you have previously compared " +"identical folders (for example, by browsing a single subfolder in a compare " +"result) can you compare two subfolders. First select the two folders in the " +"Folder Compare window, as shown in the following figure:" msgstr "" -"Non è possibile confrontare due sottocartelle (ovvero selezionando due righe) in cui le sottocartelle su ciascun lato sono diverse.Solo se hai " -"precedentemente confrontato cartelle identiche (ad esempio, esplorando una singola sottocartella in un risultato di confronto) puoi confrontare due " -"sottocartelle.Selezionare innanzitutto le due cartelle nella finestra Confronto cartelle, come mostrato nella figura seguente:" +"Non è possibile confrontare due sottocartelle (ovvero selezionando due " +"righe) in cui le sottocartelle su ciascun lato sono diverse.Solo se hai " +"precedentemente confrontato cartelle identiche (ad esempio, esplorando una " +"singola sottocartella in un risultato di confronto) puoi confrontare due " +"sottocartelle.Selezionare innanzitutto le due cartelle nella finestra " +"Confronto cartelle, come mostrato nella figura seguente:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_dirs.xml:1011 -msgid "<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/" +"foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"572\" fileref=\"screenshots/" +"foldercomp_2same.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1018 @@ -2889,29 +3841,38 @@ msgstr "Finestra Confronta cartelle, due cartelle selezionate" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1023 msgid "" -"The order of selection is significant: the folder you select first is the left folder in the result; the second selected folder becomes the right " +"The order of selection is significant: the folder you select first is the " +"left folder in the result; the second selected folder becomes the right " "folder in the result." msgstr "" -"L'ordine di selezione è significativo: la cartella selezionata per prima è la cartella a sinistra nel risultato;la seconda cartella selezionata " -"diventa la cartella giusta nel risultato." +"L'ordine di selezione è significativo: la cartella selezionata per prima è " +"la cartella a sinistra nel risultato;la seconda cartella selezionata diventa " +"la cartella giusta nel risultato." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_dirs.xml:1027 msgid "" -"With the two folders selected, right-click and choose <guimenuitem>Compare</guimenuitem> (or click <menuchoice> <guimenu>Merge</guimenu> " +"With the two folders selected, right-click and choose <guimenuitem>Compare</" +"guimenuitem> (or click <menuchoice> <guimenu>Merge</guimenu> " "<guimenuitem>Compare</guimenuitem> </menuchoice> in the menu)." msgstr "" -"Con le due cartelle selezionate, fai clic con il pulsante destro del mouse e scegli <guimenuitem >Confronta</guimenuitem > (o fai clic su " -"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Confronta</guimenuitem > </menuchoice > nel menu)." +"Con le due cartelle selezionate, fai clic con il pulsante destro del mouse e " +"scegli <guimenuitem >Confronta</guimenuitem > (o fai clic su <menuchoice> " +"<guimenu >Unisci</guimenu > <guimenuitem >Confronta</guimenuitem > </" +"menuchoice > nel menu)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_dirs.xml:1035 msgid "" -"Again, the <guimenuitem>Compare</guimenuitem> operation is available only when the current left and right folder paths are identical in the Folder " -"Compare window, as shown in the preceding screenshot. For example, it is not available if the current window compares two different folders." +"Again, the <guimenuitem>Compare</guimenuitem> operation is available only " +"when the current left and right folder paths are identical in the Folder " +"Compare window, as shown in the preceding screenshot. For example, it is not " +"available if the current window compares two different folders." msgstr "" -"Ancora una volta, l'operazione <guimenuitem >Confronta</guimenuitem > è disponibile solo quando i percorsi correnti delle cartelle sinistra e destra " -"sono identici nella finestra Confronta cartelle, come mostrato nello screenshot precedente.Ad esempio, non è disponibile se la finestra corrente " +"Ancora una volta, l'operazione <guimenuitem >Confronta</guimenuitem > è " +"disponibile solo quando i percorsi correnti delle cartelle sinistra e destra " +"sono identici nella finestra Confronta cartelle, come mostrato nello " +"screenshot precedente.Ad esempio, non è disponibile se la finestra corrente " "confronta due cartelle diverse." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -2920,50 +3881,68 @@ msgid "unique folders" msgstr "cartelle uniche" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: English/Compare_dirs.xml:1050 English/Configuration.xml:1140 English/Configuration.xml:1169 +#: English/Compare_dirs.xml:1050 English/Configuration.xml:1140 +#: English/Configuration.xml:1169 msgid "comparing" msgstr "confrontando" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1047 msgid "Browsing unique folders<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Esplorazione di cartelle univoche<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Esplorazione di cartelle univoche<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1053 msgid "" -"In WinMerge 2.6 and earlier, you could not browse to unique folders (folders that exist only in one side of a compare result), because WinMerge " -"cannot compare an existing folder to a non-existing folder. To copy anything from a unique folder in WinMerge, you had to first create a copy of the " -"entire folder structure." -msgstr "" -"In WinMerge 2.6 e versioni precedenti non era possibile esplorare cartelle univoche (cartelle che esistono solo in un lato del risultato del " -"confronto), perché WinMerge non può confrontare una cartella esistente con una cartella inesistente.Per copiare qualsiasi cosa da una cartella " -"univoca in WinMerge, dovevi prima creare una copia dell'intera struttura delle cartelle." +"In WinMerge 2.6 and earlier, you could not browse to unique folders (folders " +"that exist only in one side of a compare result), because WinMerge cannot " +"compare an existing folder to a non-existing folder. To copy anything from a " +"unique folder in WinMerge, you had to first create a copy of the entire " +"folder structure." +msgstr "" +"In WinMerge 2.6 e versioni precedenti non era possibile esplorare cartelle " +"univoche (cartelle che esistono solo in un lato del risultato del " +"confronto), perché WinMerge non può confrontare una cartella esistente con " +"una cartella inesistente.Per copiare qualsiasi cosa da una cartella univoca " +"in WinMerge, dovevi prima creare una copia dell'intera struttura delle " +"cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1059 msgid "" -"However, you might prefer not to copy the whole folder structure. Starting in Version 2.8, WinMerge provides an alternate way to create a new, empty " -"folder instead. This enables you to copy just the elements you want from the original, unique folder to the created empty folder. This procedure " +"However, you might prefer not to copy the whole folder structure. Starting " +"in Version 2.8, WinMerge provides an alternate way to create a new, empty " +"folder instead. This enables you to copy just the elements you want from the " +"original, unique folder to the created empty folder. This procedure " "demonstrates:" msgstr "" -"Tuttavia, potresti preferire non copiare l'intera struttura delle cartelle.A partire dalla versione 2.8, WinMerge fornisce invece un modo alternativo " -"per creare una nuova cartella vuota.Ciò ti consente di copiare solo gli elementi desiderati dalla cartella originale e univoca alla cartella vuota " -"creata.Questa procedura dimostra:" +"Tuttavia, potresti preferire non copiare l'intera struttura delle cartelle.A " +"partire dalla versione 2.8, WinMerge fornisce invece un modo alternativo per " +"creare una nuova cartella vuota.Ciò ti consente di copiare solo gli elementi " +"desiderati dalla cartella originale e univoca alla cartella vuota creata." +"Questa procedura dimostra:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1067 msgid "" -"Browse to the unique folder (select the folder and press <keycap>Enter,</keycap> double-click it, or right-click it and choose <guimenuitem>Compare</" +"Browse to the unique folder (select the folder and press <keycap>Enter,</" +"keycap> double-click it, or right-click it and choose <guimenuitem>Compare</" "guimenuitem>). For example:" msgstr "" -"Sfoglia fino alla cartella univoca (seleziona la cartella e premi <keycap >Invio,</keycap> fai doppio clic su di essa o fai clic con il pulsante " -"destro del mouse e scegli <guimenuitem >Confronta</guimenuitem >).Per esempio:" +"Sfoglia fino alla cartella univoca (seleziona la cartella e premi <keycap " +">Invio,</keycap> fai doppio clic su di essa o fai clic con il pulsante " +"destro del mouse e scegli <guimenuitem >Confronta</guimenuitem >).Per " +"esempio:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Compare_dirs.xml:1072 -msgid "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" +"foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" +"foldercmp_unique1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1079 @@ -2973,37 +3952,51 @@ msgstr "Finestra Confronta cartelle, confrontando cartelle univoche" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1083 msgid "" -"A WinMerge message informs you that the folder exists on only one side and cannot be opened. The message then prompts you to confirm whether you want " -"to create a matching folder and open it as the other side of the compare result." +"A WinMerge message informs you that the folder exists on only one side and " +"cannot be opened. The message then prompts you to confirm whether you want " +"to create a matching folder and open it as the other side of the compare " +"result." msgstr "" -"Un messaggio WinMerge informa che la cartella esiste solo su un lato e non può essere aperta.Il messaggio richiede quindi di confermare se si " -"desidera creare una cartella corrispondente e aprirla come l'altro lato del risultato del confronto." +"Un messaggio WinMerge informa che la cartella esiste solo su un lato e non " +"può essere aperta.Il messaggio richiede quindi di confermare se si desidera " +"creare una cartella corrispondente e aprirla come l'altro lato del risultato " +"del confronto." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1090 msgid "" -"Click <guibutton>Yes</guibutton> to confirm (<guibutton>No</guibutton> cancels the compare). In the new compare result, the unique folder is opened " +"Click <guibutton>Yes</guibutton> to confirm (<guibutton>No</guibutton> " +"cancels the compare). In the new compare result, the unique folder is opened " "on the left side, and the new empty created folder is on the right:" msgstr "" -"Fai clic su <guibutton >Sì</guibutton > per confermare (<guibutton >No</guibutton > annulla il confronto).Nel nuovo risultato del confronto, la " -"cartella univoca viene aperta sul lato sinistro e la nuova cartella creata vuota è sulla destra:" +"Fai clic su <guibutton >Sì</guibutton > per confermare (<guibutton >No</" +"guibutton > annulla il confronto).Nel nuovo risultato del confronto, la " +"cartella univoca viene aperta sul lato sinistro e la nuova cartella creata " +"vuota è sulla destra:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Compare_dirs.xml:1096 -msgid "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" +"foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"590\" fileref=\"screenshots/" +"foldercmp_unique2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Compare_dirs.xml:1103 msgid "Folder Compare window after browsing to unique and created folders" -msgstr "Finestra Confronta cartelle dopo aver sfogliato le cartelle univoche e create" +msgstr "" +"Finestra Confronta cartelle dopo aver sfogliato le cartelle univoche e create" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1108 msgid "" -"In the compare result, you can copy or move items (for example, using the right-click context menu) from the unique folder to the created folder." +"In the compare result, you can copy or move items (for example, using the " +"right-click context menu) from the unique folder to the created folder." msgstr "" -"Nel risultato del confronto, puoi copiare o spostare elementi (ad esempio, utilizzando il menu contestuale del tasto destro) dalla cartella univoca " +"Nel risultato del confronto, puoi copiare o spostare elementi (ad esempio, " +"utilizzando il menu contestuale del tasto destro) dalla cartella univoca " "alla cartella creata." #. type: Content of: <article><section><title><indexterm><secondary> @@ -3013,17 +4006,24 @@ msgstr "personalizzazione" #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:1117 -msgid "Customizing the Folder Compare window<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Personalizzazione della finestra di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Customizing the Folder Compare window<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Personalizzazione della finestra di confronto delle cartelle<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1123 msgid "" -"This section describes how to control the way Folder Compare window displays results. You can customize the view by showing, hiding, and reordering " -"the table columns." +"This section describes how to control the way Folder Compare window displays " +"results. You can customize the view by showing, hiding, and reordering the " +"table columns." msgstr "" -"Questa sezione descrive come controllare il modo in cui la finestra Confronto cartelle visualizza i risultati.Puoi personalizzare la visualizzazione " -"mostrando, nascondendo e riordinando le colonne della tabella." +"Questa sezione descrive come controllare il modo in cui la finestra " +"Confronto cartelle visualizza i risultati.Puoi personalizzare la " +"visualizzazione mostrando, nascondendo e riordinando le colonne della " +"tabella." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_dirs.xml:1129 @@ -3032,52 +4032,82 @@ msgstr "Visualizza il menu" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1128 -msgid "Showing and hiding types of files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Mostrare e nascondere i tipi di file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Showing and hiding types of files<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Mostrare e nascondere i tipi di file<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1134 msgid "" -"The <guimenu>View</guimenu> menu contains these shortcuts to show or hide types of items. Enable (check) a menu option to show the item; disable it " -"to hide the item." +"The <guimenu>View</guimenu> menu contains these shortcuts to show or hide " +"types of items. Enable (check) a menu option to show the item; disable it to " +"hide the item." msgstr "" -"Il menu <guimenu >Visualizza</guimenu > contiene queste scorciatoie per mostrare o nascondere tipi di elementi.Abilita (seleziona) un'opzione di menu " -"per mostrare l'elemento;disabilitarlo per nascondere l'elemento." +"Il menu <guimenu >Visualizza</guimenu > contiene queste scorciatoie per " +"mostrare o nascondere tipi di elementi.Abilita (seleziona) un'opzione di " +"menu per mostrare l'elemento;disabilitarlo per nascondere l'elemento." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1140 -msgid "<guimenuitem>Show Identical Items</guimenuitem>: Files detected as identical" -msgstr "<guimenuitem >Visualizza elementi identici</guimenuitem >: file rilevati come identici" +msgid "" +"<guimenuitem>Show Identical Items</guimenuitem>: Files detected as identical" +msgstr "" +"<guimenuitem >Visualizza elementi identici</guimenuitem >: file rilevati " +"come identici" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1145 -msgid "<guimenuitem>Show Different Items</guimenuitem>: Files detected as different" -msgstr "<guimenuitem >Visualizza elementi diversi</guimenuitem >: file rilevati come diversi" +msgid "" +"<guimenuitem>Show Different Items</guimenuitem>: Files detected as different" +msgstr "" +"<guimenuitem >Visualizza elementi diversi</guimenuitem >: file rilevati come " +"diversi" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1150 -msgid "<guimenuitem>Show Left Unique Items</guimenuitem>: Files and directories present only in left side" -msgstr "<guimenuitem >Visualizza elementi univoci a sinistra</guimenuitem >: file e cartelle presenti solo sul lato sinistro" +msgid "" +"<guimenuitem>Show Left Unique Items</guimenuitem>: Files and directories " +"present only in left side" +msgstr "" +"<guimenuitem >Visualizza elementi univoci a sinistra</guimenuitem >: file e " +"cartelle presenti solo sul lato sinistro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1155 -msgid "<guimenuitem>Show Middle Unique Items</guimenuitem>: Files and directories present only in the middle" -msgstr "<guimenuitem >Visualizza elementi univoci al centro</guimenuitem >: file e cartelle presenti solo al centro" +msgid "" +"<guimenuitem>Show Middle Unique Items</guimenuitem>: Files and directories " +"present only in the middle" +msgstr "" +"<guimenuitem >Visualizza elementi univoci al centro</guimenuitem >: file e " +"cartelle presenti solo al centro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1160 -msgid "<guimenuitem>Show Right Unique Items</guimenuitem>: Files and directories present only in right side" -msgstr "<guimenuitem >Visualizza elementi univoci a destra</guimenuitem >: file e cartelle presenti solo sul lato destro" +msgid "" +"<guimenuitem>Show Right Unique Items</guimenuitem>: Files and directories " +"present only in right side" +msgstr "" +"<guimenuitem >Visualizza elementi univoci a destra</guimenuitem >: file e " +"cartelle presenti solo sul lato destro" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1165 -msgid "<guimenuitem>Show Skipped Items</guimenuitem>: Files and directories omitted by file filters" -msgstr "<guimenuitem >Visualizza elementi saltati</guimenuitem >: file e cartelle omessi dai filtri dei file" +msgid "" +"<guimenuitem>Show Skipped Items</guimenuitem>: Files and directories omitted " +"by file filters" +msgstr "" +"<guimenuitem >Visualizza elementi saltati</guimenuitem >: file e cartelle " +"omessi dai filtri dei file" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1170 -msgid "<guimenuitem>Show Binary Files</guimenuitem>: Files detected as binaries" -msgstr "<guimenuitem >Visualizza file binari</guimenuitem >: file rilevati come binari" +msgid "" +"<guimenuitem>Show Binary Files</guimenuitem>: Files detected as binaries" +msgstr "" +"<guimenuitem >Visualizza file binari</guimenuitem >: file rilevati come " +"binari" #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1177 @@ -3087,32 +4117,43 @@ msgstr "Modifica dell'ordinamento delle colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1179 msgid "" -"The rows in the Folder Compare window are ordered according to the sort order of a particular column. This sort column is indicated by a small arrow " -"in its heading. The arrow points up if the column is sorted in ascending order, down if descending. The Folder Compare example at the top of this " +"The rows in the Folder Compare window are ordered according to the sort " +"order of a particular column. This sort column is indicated by a small arrow " +"in its heading. The arrow points up if the column is sorted in ascending " +"order, down if descending. The Folder Compare example at the top of this " "topic is sorted by the Filename column, in ascending order." msgstr "" -"Le righe nella finestra Confronto cartelle vengono ordinate in base all'ordinamento di una particolare colonna.Questa colonna di ordinamento è " -"indicata da una piccola freccia nella sua intestazione.La freccia punta verso l'alto se la colonna è ordinata in ordine crescente, verso il basso se " -"discendente.L'esempio di confronto delle cartelle nella parte superiore di questo argomento è ordinato in base alla colonna Nome file, in ordine " +"Le righe nella finestra Confronto cartelle vengono ordinate in base " +"all'ordinamento di una particolare colonna.Questa colonna di ordinamento è " +"indicata da una piccola freccia nella sua intestazione.La freccia punta " +"verso l'alto se la colonna è ordinata in ordine crescente, verso il basso se " +"discendente.L'esempio di confronto delle cartelle nella parte superiore di " +"questo argomento è ordinato in base alla colonna Nome file, in ordine " "crescente." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1185 msgid "" -"To choose another order column, simply click in that column's heading. The selected column is set to its default sort order and all the rows are " +"To choose another order column, simply click in that column's heading. The " +"selected column is set to its default sort order and all the rows are " "reordered by that column's sort order." msgstr "" -"Per scegliere un'altra colonna dell'ordine, fai semplicemente clic sull'intestazione di quella colonna.La colonna selezionata viene impostata sul suo " -"ordinamento predefinito e tutte le righe vengono riordinate in base all'ordinamento di quella colonna." +"Per scegliere un'altra colonna dell'ordine, fai semplicemente clic " +"sull'intestazione di quella colonna.La colonna selezionata viene impostata " +"sul suo ordinamento predefinito e tutte le righe vengono riordinate in base " +"all'ordinamento di quella colonna." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1189 msgid "" -"To change the sort direction of a column that is already the sort column, click in its header again. That is, clicking in a sort column header " +"To change the sort direction of a column that is already the sort column, " +"click in its header again. That is, clicking in a sort column header " "reverses its order (toggling between ascending and descending order)." msgstr "" -"Per modificare la direzione di ordinamento di una colonna che è già la colonna di ordinamento, fare nuovamente clic sulla sua intestazione.Cioè, " -"facendo clic sull'intestazione di una colonna di ordinamento si inverte l'ordine (alternando tra ordine ascendente e discendente)." +"Per modificare la direzione di ordinamento di una colonna che è già la " +"colonna di ordinamento, fare nuovamente clic sulla sua intestazione.Cioè, " +"facendo clic sull'intestazione di una colonna di ordinamento si inverte " +"l'ordine (alternando tra ordine ascendente e discendente)." #. type: Content of: <article><section><section><title> #: English/Compare_dirs.xml:1196 @@ -3122,30 +4163,40 @@ msgstr "Aggiunta, rimozione e riordino delle colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1198 msgid "To modify the columns that are displayed in the Folder Compare window:" -msgstr "Per modificare le colonne visualizzate nella finestra Confronto cartelle:" +msgstr "" +"Per modificare le colonne visualizzate nella finestra Confronto cartelle:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1203 msgid "" -"Right-click any column heading and choose <guimenuitem>Customize Columns</guimenuitem>. Or, click <menuchoice> <guimenu>Tools</guimenu> " +"Right-click any column heading and choose <guimenuitem>Customize Columns</" +"guimenuitem>. Or, click <menuchoice> <guimenu>Tools</guimenu> " "<guimenuitem>Customize Columns</guimenuitem> </menuchoice>" msgstr "" -"Fai clic con il tasto destro su qualsiasi intestazione di colonna e scegli <guimenuitem >Personalizza colonne</guimenuitem >.Oppure fai clic su " -"<menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Personalizza colonne</guimenuitem > </menuchoice >" +"Fai clic con il tasto destro su qualsiasi intestazione di colonna e scegli " +"<guimenuitem >Personalizza colonne</guimenuitem >.Oppure fai clic su " +"<menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Personalizza " +"colonne</guimenuitem > </menuchoice >" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_dirs.xml:1212 msgid "" -"The Display Columns dialog contains a list of all the available column names, each with a check box. Configure the columns using any combination of " +"The Display Columns dialog contains a list of all the available column " +"names, each with a check box. Configure the columns using any combination of " "these actions:" msgstr "" -"La finestra di dialogo Visualizza colonne contiene un elenco di tutti i nomi di colonne disponibili, ciascuna con una casella di controllo.Configura " -"le colonne utilizzando qualsiasi combinazione di queste azioni:" +"La finestra di dialogo Visualizza colonne contiene un elenco di tutti i nomi " +"di colonne disponibili, ciascuna con una casella di controllo.Configura le " +"colonne utilizzando qualsiasi combinazione di queste azioni:" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1218 -msgid "Check the columns you want to display (note that selecting the item in the list is not enough)" -msgstr "Seleziona le colonne che vuoi visualizzare (nota che selezionare la voce nell'elenco non è sufficiente)" +msgid "" +"Check the columns you want to display (note that selecting the item in the " +"list is not enough)" +msgstr "" +"Seleziona le colonne che vuoi visualizzare (nota che selezionare la voce " +"nell'elenco non è sufficiente)" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1223 @@ -3154,16 +4205,21 @@ msgstr "Deseleziona le colonne che desideri nascondere." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1227 -msgid "To change the order of columns, select one or more items and click <guibutton>Move Up</guibutton> or <guibutton>Move Down</guibutton>." +msgid "" +"To change the order of columns, select one or more items and click " +"<guibutton>Move Up</guibutton> or <guibutton>Move Down</guibutton>." msgstr "" -"Per cambiare l'ordine delle colonne, seleziona uno o più elementi e fai clic su <guibutton >Sposta su</guibutton > o <guibutton >Sposta giù</" -"guibutton >." +"Per cambiare l'ordine delle colonne, seleziona uno o più elementi e fai clic " +"su <guibutton >Sposta su</guibutton > o <guibutton >Sposta giù</guibutton >." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1233 -msgid "Click <guibutton>Defaults</guibutton> if you want to restore the default WinMerge column configuration, overriding your custom configuration." +msgid "" +"Click <guibutton>Defaults</guibutton> if you want to restore the default " +"WinMerge column configuration, overriding your custom configuration." msgstr "" -"Fai clic su <guibutton >Predefiniti</guibutton > se vuoi ripristinare la configurazione predefinita delle colonne WinMerge, sovrascrivendo la tua " +"Fai clic su <guibutton >Predefiniti</guibutton > se vuoi ripristinare la " +"configurazione predefinita delle colonne WinMerge, sovrascrivendo la tua " "configurazione personalizzata." #. type: Content of: <article><section><section><para><indexterm><primary> @@ -3174,138 +4230,194 @@ msgstr "Finestra di dialogo Visualizza colonne" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1245 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>The following columns in the Display Columns dialog are displayed by default in the Folder Compare window:" +"<placeholder type=\"indexterm\" id=\"0\"/>The following columns in the " +"Display Columns dialog are displayed by default in the Folder Compare window:" msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Le seguenti colonne nella finestra di dialogo Visualizza colonne vengono visualizzate per impostazione " +"<placeholder type=\"indexterm\" id=\"0\"/>Le seguenti colonne nella finestra " +"di dialogo Visualizza colonne vengono visualizzate per impostazione " "predefinita nella finestra Confronto cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1252 msgid "" -"<guilabel>Filename</guilabel>: Name of compared item. In a nonrecursive compare, this column includes both files and folders; in a recursive " -"compare, it does not include folders: instead, folders are listed in the Folder column." +"<guilabel>Filename</guilabel>: Name of compared item. In a nonrecursive " +"compare, this column includes both files and folders; in a recursive " +"compare, it does not include folders: instead, folders are listed in the " +"Folder column." msgstr "" -"<guilabel >Nome file</guilabel >: nome dell'elemento confrontato.In un confronto non ricorsivo, questa colonna include sia file che cartelle;in un " -"confronto ricorsivo, non include le cartelle: le cartelle sono invece elencate nella colonna Cartella." +"<guilabel >Nome file</guilabel >: nome dell'elemento confrontato.In un " +"confronto non ricorsivo, questa colonna include sia file che cartelle;in un " +"confronto ricorsivo, non include le cartelle: le cartelle sono invece " +"elencate nella colonna Cartella." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1259 msgid "" -"<guilabel>Folder</guilabel>: Path of compared subfolder, relative to the compared folder. For a nonrecursive compare this column is always empty: " +"<guilabel>Folder</guilabel>: Path of compared subfolder, relative to the " +"compared folder. For a nonrecursive compare this column is always empty: " "folders are listed in the <guilabel>Filename</guilabel> column instead." msgstr "" -"<guilabel >Cartella</guilabel >: percorso della sottocartella confrontata, relativa alla cartella confrontata.Per un confronto non ricorsivo questa " -"colonna è sempre vuota: le cartelle sono invece elencate nella colonna <guilabel >Nome file</guilabel >." +"<guilabel >Cartella</guilabel >: percorso della sottocartella confrontata, " +"relativa alla cartella confrontata.Per un confronto non ricorsivo questa " +"colonna è sempre vuota: le cartelle sono invece elencate nella colonna " +"<guilabel >Nome file</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1266 -msgid "<guilabel>Comparison Result</guilabel>: Verbose comparison result (see also <guilabel>Short Result</guilabel>)." -msgstr "<guilabel >Risultato del confronto</guilabel >: risultato del confronto dettagliato (vedi anche <guilabel >Risultato breve</guilabel >)." +msgid "" +"<guilabel>Comparison Result</guilabel>: Verbose comparison result (see also " +"<guilabel>Short Result</guilabel>)." +msgstr "" +"<guilabel >Risultato del confronto</guilabel >: risultato del confronto " +"dettagliato (vedi anche <guilabel >Risultato breve</guilabel >)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1271 msgid "" -"<guilabel>Left Date</guilabel>, <guilabel>Middle Date</guilabel>, <guilabel>Right Date</guilabel>: Modification dates of item in each side. The newer " -"of the two dates (or the date for any unique item) is prefixed with an asterisk ( * )." +"<guilabel>Left Date</guilabel>, <guilabel>Middle Date</guilabel>, " +"<guilabel>Right Date</guilabel>: Modification dates of item in each side. " +"The newer of the two dates (or the date for any unique item) is prefixed " +"with an asterisk ( * )." msgstr "" -"<guilabel >Data sinistra</guilabel >, <guilabel >Data centrale</guilabel >, <guilabel >Data destra</guilabel >: date di modifica dell'elemento su " -"ciascun lato.La più recente delle due date (o la data per qualsiasi elemento univoco) è preceduta da un asterisco ( * )." +"<guilabel >Data sinistra</guilabel >, <guilabel >Data centrale</guilabel >, " +"<guilabel >Data destra</guilabel >: date di modifica dell'elemento su " +"ciascun lato.La più recente delle due date (o la data per qualsiasi elemento " +"univoco) è preceduta da un asterisco ( * )." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1278 msgid "<guilabel>Extension</guilabel>: File extension, handy for sorting." -msgstr "<guilabel >Estensione</guilabel >: estensione del file, comoda per l'ordinamento." +msgstr "" +"<guilabel >Estensione</guilabel >: estensione del file, comoda per " +"l'ordinamento." #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1283 -msgid "The following additional columns are available in the Display Columns dialog:" -msgstr "Nella finestra di dialogo Visualizza colonne sono disponibili le seguenti colonne aggiuntive:" +msgid "" +"The following additional columns are available in the Display Columns dialog:" +msgstr "" +"Nella finestra di dialogo Visualizza colonne sono disponibili le seguenti " +"colonne aggiuntive:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1288 -msgid "<guilabel>Short Result</guilabel>: Displays the <guilabel>Comparison Result</guilabel> column in a brief (Right only) form." -msgstr "<guilabel >Risultato breve</guilabel >: mostra la colonna <guilabel >Risultato del confronto</guilabel > in una forma breve (solo a destra)." +msgid "" +"<guilabel>Short Result</guilabel>: Displays the <guilabel>Comparison Result</" +"guilabel> column in a brief (Right only) form." +msgstr "" +"<guilabel >Risultato breve</guilabel >: mostra la colonna <guilabel " +">Risultato del confronto</guilabel > in una forma breve (solo a destra)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1294 msgid "" -"<guilabel>Binary</guilabel>: Column contains an asterisk ( * ) when the file is a binary file. This is handy for sorting and for use with the " +"<guilabel>Binary</guilabel>: Column contains an asterisk ( * ) when the " +"file is a binary file. This is handy for sorting and for use with the " "<guilabel>Short Result</guilabel> column." msgstr "" -"<guilabel >Binario</guilabel >: la colonna contiene un asterisco (*) quando il file è un file binario.Questo è utile per l'ordinamento e per l'uso " -"con la colonna <guilabel >Risultato breve</guilabel >." +"<guilabel >Binario</guilabel >: la colonna contiene un asterisco (*) quando " +"il file è un file binario.Questo è utile per l'ordinamento e per l'uso con " +"la colonna <guilabel >Risultato breve</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1300 -msgid "<guilabel>Left Attributes</guilabel>, <guilabel>Middle Attributes</guilabel>, <guilabel>Right Attributes</guilabel>: Shows file attributes." +msgid "" +"<guilabel>Left Attributes</guilabel>, <guilabel>Middle Attributes</" +"guilabel>, <guilabel>Right Attributes</guilabel>: Shows file attributes." msgstr "" -"<guilabel >Attributi sinistra</guilabel >, <guilabel >Attributi centrali</guilabel >, <guilabel >Attributi destra</guilabel >: mostra gli attributi " +"<guilabel >Attributi sinistra</guilabel >, <guilabel >Attributi centrali</" +"guilabel >, <guilabel >Attributi destra</guilabel >: mostra gli attributi " "del file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1306 msgid "" -"<guilabel>Left Creation Time</guilabel>, <guilabel>Middle Creation Time</guilabel>, <guilabel>Right Creation Time</guilabel>: Item creation time." +"<guilabel>Left Creation Time</guilabel>, <guilabel>Middle Creation Time</" +"guilabel>, <guilabel>Right Creation Time</guilabel>: Item creation time." msgstr "" -"<guilabel >Ora di creazione sinistra</guilabel >, <guilabel >Ora di creazione centrale</guilabel >, <guilabel >Ora di creazione destra</guilabel >: " -"ora di creazione dell'oggetto." +"<guilabel >Ora di creazione sinistra</guilabel >, <guilabel >Ora di " +"creazione centrale</guilabel >, <guilabel >Ora di creazione destra</guilabel " +">: ora di creazione dell'oggetto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1312 msgid "" -"<guilabel>Left Encoding</guilabel>, <guilabel>Middle Encoding</guilabel>, <guilabel>Right Encoding</guilabel>: File encoding. Shows the codepage " +"<guilabel>Left Encoding</guilabel>, <guilabel>Middle Encoding</guilabel>, " +"<guilabel>Right Encoding</guilabel>: File encoding. Shows the codepage " "number for ANSI files and Unicode encoding for Unicode files." msgstr "" -"<guilabel >Codifica sinistra</guilabel >, <guilabel >Codifica centrale</guilabel >, <guilabel >Codifica destra</guilabel >: codifica del file. " -"Visualizza il numero di tabella codici per i file ANSI e la codifica Unicode per i file Unicode." +"<guilabel >Codifica sinistra</guilabel >, <guilabel >Codifica centrale</" +"guilabel >, <guilabel >Codifica destra</guilabel >: codifica del file. " +"Visualizza il numero di tabella codici per i file ANSI e la codifica Unicode " +"per i file Unicode." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1319 msgid "" -"<guilabel>Left File Version</guilabel>, <guilabel>Middle File Version</guilabel>, <guilabel>Right File Version</guilabel>: Version number from the " -"file, if present. Note that the version is read only for some binary file types known to usually have a version resource." +"<guilabel>Left File Version</guilabel>, <guilabel>Middle File Version</" +"guilabel>, <guilabel>Right File Version</guilabel>: Version number from the " +"file, if present. Note that the version is read only for some binary file " +"types known to usually have a version resource." msgstr "" -"<guilabel >Versione del file a sinistra</guilabel >, <guilabel >Versione del file centrale</guilabel >, <guilabel >Versione del file a destra</" -"guilabel >: numero di versione del file, se presente.Tieni presente che la versione viene letta solo per alcuni tipi di file binari noti per avere " -"solitamente una risorsa di versione." +"<guilabel >Versione del file a sinistra</guilabel >, <guilabel >Versione del " +"file centrale</guilabel >, <guilabel >Versione del file a destra</guilabel " +">: numero di versione del file, se presente.Tieni presente che la versione " +"viene letta solo per alcuni tipi di file binari noti per avere solitamente " +"una risorsa di versione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1327 -msgid "<guilabel>Left Size</guilabel>, <guilabel>Middle Size</guilabel>, <guilabel>Right Size</guilabel>: File size in bytes." +msgid "" +"<guilabel>Left Size</guilabel>, <guilabel>Middle Size</guilabel>, " +"<guilabel>Right Size</guilabel>: File size in bytes." msgstr "" -"<guilabel >dimensione sinistra</guilabel >, <guilabel >dimensione media</guilabel >, <guilabel >dimensione destra</guilabel >: dimensione del file in " +"<guilabel >dimensione sinistra</guilabel >, <guilabel >dimensione media</" +"guilabel >, <guilabel >dimensione destra</guilabel >: dimensione del file in " "byte." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1333 msgid "" -"<guilabel>Left Size (Short)</guilabel>, <guilabel>Middle Size (Short)</guilabel>, <guilabel>Right Size (Short)</guilabel>: Shorter versions of file " +"<guilabel>Left Size (Short)</guilabel>, <guilabel>Middle Size (Short)</" +"guilabel>, <guilabel>Right Size (Short)</guilabel>: Shorter versions of file " "sizes, rounded to KB, MB, or GB." msgstr "" -"<guilabel >Dimensione sinistra (corta)</guilabel >, <guilabel >Dimensione media (corta)</guilabel >, <guilabel >Dimensione destra (corta)</guilabel " -">: versioni più brevi delle dimensioni dei file, arrotondate a KB, MB o GB." +"<guilabel >Dimensione sinistra (corta)</guilabel >, <guilabel >Dimensione " +"media (corta)</guilabel >, <guilabel >Dimensione destra (corta)</guilabel >: " +"versioni più brevi delle dimensioni dei file, arrotondate a KB, MB o GB." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1339 msgid "<guilabel>Newer File</guilabel>: Shows which side is newer." -msgstr "<guilabel >File più recente</guilabel >: mostra quale lato è più recente." +msgstr "" +"<guilabel >File più recente</guilabel >: mostra quale lato è più recente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1344 -msgid "<guilabel>Differences</guilabel>: Number of differences found between files, excluding possibly ignored differences." -msgstr "<guilabel >Differenze</guilabel >: numero di differenze trovate tra i file, escluse le differenze eventualmente ignorate." +msgid "" +"<guilabel>Differences</guilabel>: Number of differences found between files, " +"excluding possibly ignored differences." +msgstr "" +"<guilabel >Differenze</guilabel >: numero di differenze trovate tra i file, " +"escluse le differenze eventualmente ignorate." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1349 -msgid "<guilabel>Ignored Diff</guilabel>: Number of ignored differences within files. These are differences ignored by line filters." +msgid "" +"<guilabel>Ignored Diff</guilabel>: Number of ignored differences within " +"files. These are differences ignored by line filters." msgstr "" -"<guilabel >Differenze ignorate</guilabel >: numero di differenze ignorate all'interno dei file.Queste sono differenze ignorate dai filtri di linea." +"<guilabel >Differenze ignorate</guilabel >: numero di differenze ignorate " +"all'interno dei file.Queste sono differenze ignorate dai filtri di linea." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_dirs.xml:1354 -msgid "<guilabel>Left EOL</guilabel>, <guilabel>Middle EOL</guilabel>, <guilabel>Right EOL</guilabel>: Shows the EOL (linefeed) style of files." +msgid "" +"<guilabel>Left EOL</guilabel>, <guilabel>Middle EOL</guilabel>, " +"<guilabel>Right EOL</guilabel>: Shows the EOL (linefeed) style of files." msgstr "" -"<guilabel >EOL sinistro</guilabel >, <guilabel >EOL centrale</guilabel >, <guilabel >EOL destro</guilabel >: mostra lo stile EOL (avanzamento riga) " +"<guilabel >EOL sinistro</guilabel >, <guilabel >EOL centrale</guilabel >, " +"<guilabel >EOL destro</guilabel >: mostra lo stile EOL (avanzamento riga) " "dei file." #. type: Content of: <article><section><section><title> @@ -3316,75 +4428,106 @@ msgstr "Nascondere oggetti" #. type: Content of: <article><section><section><para> #: English/Compare_dirs.xml:1364 msgid "" -"You can quickly hide one or more selected items by using the <guimenuitem>Hide Items</guimenuitem> context menu shortcut. The items remain hidden " -"until you refresh the view (press <keycap>F5</keycap>) or click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Hidden Items</guimenuitem> </" -"menuchoice>." +"You can quickly hide one or more selected items by using the " +"<guimenuitem>Hide Items</guimenuitem> context menu shortcut. The items " +"remain hidden until you refresh the view (press <keycap>F5</keycap>) or " +"click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Hidden Items</" +"guimenuitem> </menuchoice>." msgstr "" -"Puoi nascondere rapidamente uno o più elementi selezionati utilizzando la scorciatoia del menu contestuale <guimenuitem >Nascondi elementi</" -"guimenuitem >.Gli elementi rimangono nascosti finché non aggiorni la vista (premi <keycap >F5</keycap >) o fai clic su <menuchoice > <guimenu " -">Visualizza</guimenu > <guimenuitem >Visualizza elementi nascosti</guimenuitem > </menuchoice >." +"Puoi nascondere rapidamente uno o più elementi selezionati utilizzando la " +"scorciatoia del menu contestuale <guimenuitem >Nascondi elementi</" +"guimenuitem >.Gli elementi rimangono nascosti finché non aggiorni la vista " +"(premi <keycap >F5</keycap >) o fai clic su <menuchoice > <guimenu " +">Visualizza</guimenu > <guimenuitem >Visualizza elementi nascosti</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><tip><para> #: English/Compare_dirs.xml:1374 msgid "" -"Get to know <guimenuitem>Hide Items</guimenuitem>: it can save you a lot of time by eliminating items that you already handled, or that are not " -"currently of interest, from the view. For example, you might hide files after merging them, making it easier to see what items are left to merge." +"Get to know <guimenuitem>Hide Items</guimenuitem>: it can save you a lot of " +"time by eliminating items that you already handled, or that are not " +"currently of interest, from the view. For example, you might hide files " +"after merging them, making it easier to see what items are left to merge." msgstr "" -"Impara a conoscere <guimenuitem >Nascondi elementi</guimenuitem >: può farti risparmiare molto tempo eliminando dalla vista gli elementi che hai già " -"gestito o che al momento non ti interessano.Ad esempio, potresti nascondere i file dopo averli uniti, rendendo più semplice vedere quali elementi " +"Impara a conoscere <guimenuitem >Nascondi elementi</guimenuitem >: può farti " +"risparmiare molto tempo eliminando dalla vista gli elementi che hai già " +"gestito o che al momento non ti interessano.Ad esempio, potresti nascondere " +"i file dopo averli uniti, rendendo più semplice vedere quali elementi " "restano da unire." #. type: Content of: <article><section><title> #: English/Compare_dirs.xml:1384 msgid "Using Windows shell commands from the Folder Compare window" -msgstr "Utilizzando i comandi della shell di Windows dalla finestra Confronto cartelle" +msgstr "" +"Utilizzando i comandi della shell di Windows dalla finestra Confronto " +"cartelle" #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1386 -msgid "You can right-click a selection in the Folder Compare window and launch Windows shell commands directly from the context menu." +msgid "" +"You can right-click a selection in the Folder Compare window and launch " +"Windows shell commands directly from the context menu." msgstr "" -"È possibile fare clic con il pulsante destro del mouse su una selezione nella finestra Confronto cartelle e avviare i comandi della shell di Windows " +"È possibile fare clic con il pulsante destro del mouse su una selezione " +"nella finestra Confronto cartelle e avviare i comandi della shell di Windows " "direttamente dal menu contestuale." #. type: Content of: <article><section><para> #: English/Compare_dirs.xml:1390 msgid "" -"If the selection occurs on both sides, you can choose either the <guimenu>Left Shell Menu</guimenu> or <guimenu>Right Shell Menu</guimenu>. If the " -"selection occurs on all sides, you can choose the <guimenu>Left Shell Menu</guimenu>, <guimenu>Middle Shell Menu</guimenu> or <guimenu>Right Shell " -"Menu</guimenu>. If the item occurs only on one side, only that side's shell menu is available." -msgstr "" -"Se la selezione avviene su entrambi i lati, puoi scegliere il <guimenu >menu della shell sinistra</guimenu > o il <guimenu >menu della shell destra</" -"guimenu >.Se la selezione avviene su tutti i lati, puoi scegliere il <guimenu >menu della conchiglia sinistra</guimenu >, <guimenu >menu della " -"conchiglia centrale</guimenu > o <guimenu >menu della conchiglia destra</guimenu >.Se l'elemento è presente solo su un lato, sarà disponibile solo il " +"If the selection occurs on both sides, you can choose either the " +"<guimenu>Left Shell Menu</guimenu> or <guimenu>Right Shell Menu</guimenu>. " +"If the selection occurs on all sides, you can choose the <guimenu>Left Shell " +"Menu</guimenu>, <guimenu>Middle Shell Menu</guimenu> or <guimenu>Right Shell " +"Menu</guimenu>. If the item occurs only on one side, only that side's shell " +"menu is available." +msgstr "" +"Se la selezione avviene su entrambi i lati, puoi scegliere il <guimenu >menu " +"della shell sinistra</guimenu > o il <guimenu >menu della shell destra</" +"guimenu >.Se la selezione avviene su tutti i lati, puoi scegliere il " +"<guimenu >menu della conchiglia sinistra</guimenu >, <guimenu >menu della " +"conchiglia centrale</guimenu > o <guimenu >menu della conchiglia destra</" +"guimenu >.Se l'elemento è presente solo su un lato, sarà disponibile solo il " "menu della shell di quel lato." #. type: Content of: <article><section><caution><para> #: English/Compare_dirs.xml:1398 msgid "" -"Please consider that shell menu commands run entirely outside of WinMerge. Consequently, WinMerge might not respond to some operations in the same " -"way as operations performed inside WinMerge. For example, if you delete a file through this integration instead of using the WinMerge " -"<command>Delete</command> command, the change is not automatically shown in the Folder Compare window (you have to manually refresh the window to see " -"the change)." -msgstr "" -"Tieni presente che i comandi del menu della shell vengono eseguiti interamente al di fuori di WinMerge.Di conseguenza, WinMerge potrebbe non " -"rispondere ad alcune operazioni nello stesso modo delle operazioni eseguite all'interno di WinMerge.Ad esempio, se elimini un file tramite questa " -"integrazione invece di utilizzare il comando WinMerge <command>Delete</command>, la modifica non viene mostrata automaticamente nella finestra " -"Confronto cartelle (devi aggiornare manualmente la finestra per vedere la modifica)." +"Please consider that shell menu commands run entirely outside of WinMerge. " +"Consequently, WinMerge might not respond to some operations in the same way " +"as operations performed inside WinMerge. For example, if you delete a file " +"through this integration instead of using the WinMerge <command>Delete</" +"command> command, the change is not automatically shown in the Folder " +"Compare window (you have to manually refresh the window to see the change)." +msgstr "" +"Tieni presente che i comandi del menu della shell vengono eseguiti " +"interamente al di fuori di WinMerge.Di conseguenza, WinMerge potrebbe non " +"rispondere ad alcune operazioni nello stesso modo delle operazioni eseguite " +"all'interno di WinMerge.Ad esempio, se elimini un file tramite questa " +"integrazione invece di utilizzare il comando WinMerge <command>Delete</" +"command>, la modifica non viene mostrata automaticamente nella finestra " +"Confronto cartelle (devi aggiornare manualmente la finestra per vedere la " +"modifica)." #. type: Content of: <article><title> #: English/Compare_files.xml:5 -msgid "Comparing and merging text files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronto e unione di file di testo<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Comparing and merging text files<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronto e unione di file di testo<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Compare_files.xml:9 msgid "" -"This topic describes how to use the WinMerge File Compare window to compare and merge text files. To understand the basic concepts about differences " -"discussed here, we suggest you read <xref linkend=\"Intro_diffs\" /> first. See <xref linkend=\"Compare_bin\" /> for related information about hex " -"files." +"This topic describes how to use the WinMerge File Compare window to compare " +"and merge text files. To understand the basic concepts about differences " +"discussed here, we suggest you read <xref linkend=\"Intro_diffs\" /> first. " +"See <xref linkend=\"Compare_bin\" /> for related information about hex files." msgstr "" -"In questo argomento viene descritto come utilizzare la finestra Confronta file WinMerge per confrontare e unire file di testo.Per comprendere i " -"concetti di base sulle differenze discussi qui, ti suggeriamo di leggere prima <xref linkend=\"Intro_diffs\" />.Vedi <xref linkend=\"Compare_bin\" /> " +"In questo argomento viene descritto come utilizzare la finestra Confronta " +"file WinMerge per confrontare e unire file di testo.Per comprendere i " +"concetti di base sulle differenze discussi qui, ti suggeriamo di leggere " +"prima <xref linkend=\"Intro_diffs\" />.Vedi <xref linkend=\"Compare_bin\" /> " "per informazioni correlate sui file esadecimali." #. type: Content of: <article><section><title> @@ -3394,30 +4537,43 @@ msgstr "Avvio di un'operazione di confronto di file" #. type: Content of: <article><section><para> #: English/Compare_files.xml:18 -msgid "You can start a file compare operation from either the WinMerge window or a Command Prompt window." -msgstr "È possibile avviare un'operazione di confronto dei file dalla finestra WinMerge o da una finestra del prompt dei comandi." +msgid "" +"You can start a file compare operation from either the WinMerge window or a " +"Command Prompt window." +msgstr "" +"È possibile avviare un'operazione di confronto dei file dalla finestra " +"WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:26 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " -"and right source files to compare. For more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" +"menuchoice>. Use the Select Files or Folders dialog to specify the left and " +"right source files to compare. For more details about the Select Files or " +"Folder dialog, see <xref linkend=\"Open_paths\" />." msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " -"o cartelle per specificare i file di origine sinistro e destro da confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file o " -"cartella, vedi <xref linkend=\"Open_paths\" />." +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" +"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " +"file o cartelle per specificare i file di origine sinistro e destro da " +"confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file " +"o cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:41 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right files to " -"compare. For more information about using the command line, see <xref linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " +"directory. In your command arguments, include the left and right files to " +"compare. For more information about using the command line, see <xref " +"linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi i file " -"sinistro e destro da confrontare. Per ulteriori informazioni sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " +"installazione di WinMerge. Negli argomenti del comando, includi i file " +"sinistro e destro da confrontare. Per ulteriori informazioni sull'utilizzo " +"della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><mediaobject><textobject><phrase> -#: English/Compare_files.xml:52 English/Compare_files.xml:1118 English/Quick_start.xml:329 English/Quick_start.xml:341 +#: English/Compare_files.xml:52 English/Compare_files.xml:1118 +#: English/Quick_start.xml:329 English/Quick_start.xml:341 msgid "File Compare window" msgstr "Finestra Confronta file" @@ -3428,22 +4584,34 @@ msgstr "File" #. type: Content of: <article><section><title> #: English/Compare_files.xml:51 -msgid "File Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Finestra di confronto file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"File Compare window<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Finestra di confronto file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:61 msgid "" -"The File Compare window displays compared files in two File panes, side by side. The WinMerge toolbar and context menu provides functions for " -"viewing, navigating, and merging differences. The screenshot below shows a comparison of two versions of a file." +"The File Compare window displays compared files in two File panes, side by " +"side. The WinMerge toolbar and context menu provides functions for viewing, " +"navigating, and merging differences. The screenshot below shows a comparison " +"of two versions of a file." msgstr "" -"La finestra Confronto file visualizza i file confrontati in due riquadri File, affiancati.La barra degli strumenti e il menu contestuale di WinMerge " -"forniscono funzioni per visualizzare, navigare e unire le differenze.Lo screenshot seguente mostra un confronto tra due versioni di un file." +"La finestra Confronto file visualizza i file confrontati in due riquadri " +"File, affiancati.La barra degli strumenti e il menu contestuale di WinMerge " +"forniscono funzioni per visualizzare, navigare e unire le differenze.Lo " +"screenshot seguente mostra un confronto tra due versioni di un file." #. type: Content of: <article><section><mediaobject> #: English/Compare_files.xml:67 English/Quick_start.xml:335 -msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filecomp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filecomp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"filecomp1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"filecomp1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:73 @@ -3463,13 +4631,18 @@ msgstr "Riquadri file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:82 msgid "" -"The left and right File panes show the text contents and differences of the two files being compared. The File panes are the main area for navigating " -"and merging differences, and also allow you to edit the text directly. This section describes the features that support these actions, and ways that " -"you can customize the File panes." +"The left and right File panes show the text contents and differences of the " +"two files being compared. The File panes are the main area for navigating " +"and merging differences, and also allow you to edit the text directly. This " +"section describes the features that support these actions, and ways that you " +"can customize the File panes." msgstr "" -"I riquadri File sinistro e destro mostrano il contenuto del testo e le differenze dei due file confrontati.I riquadri File sono l'area principale per " -"la navigazione e l'unione delle differenze e consentono anche di modificare direttamente il testo.In questa sezione vengono descritte le funzionalità " -"che supportano queste azioni e le modalità con cui è possibile personalizzare i riquadri File." +"I riquadri File sinistro e destro mostrano il contenuto del testo e le " +"differenze dei due file confrontati.I riquadri File sono l'area principale " +"per la navigazione e l'unione delle differenze e consentono anche di " +"modificare direttamente il testo.In questa sezione vengono descritte le " +"funzionalità che supportano queste azioni e le modalità con cui è possibile " +"personalizzare i riquadri File." #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:89 @@ -3479,32 +4652,47 @@ msgstr "Intestazione del riquadro file" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:91 msgid "" -"The header at the top of each File pane shows the full path of the source file. The left and right file names are also identified in the header of " -"the Compare Window, above the File panes." +"The header at the top of each File pane shows the full path of the source " +"file. The left and right file names are also identified in the header of the " +"Compare Window, above the File panes." msgstr "" -"L'intestazione nella parte superiore di ciascun riquadro File mostra il percorso completo del file di origine.I nomi dei file sinistro e destro sono " -"identificati anche nell'intestazione della finestra Confronta, sopra i riquadri File." +"L'intestazione nella parte superiore di ciascun riquadro File mostra il " +"percorso completo del file di origine.I nomi dei file sinistro e destro sono " +"identificati anche nell'intestazione della finestra Confronta, sopra i " +"riquadri File." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:95 msgid "" -"One of the File panes is always active (indicated by the dark header background); the other is inactive and has a lighter header bar. You can edit " -"only in the active pane (as described in <xref linkend=\"CompareFiles_editing\" />). Click in either side to make it active and make the other side " -"inactive." +"One of the File panes is always active (indicated by the dark header " +"background); the other is inactive and has a lighter header bar. You can " +"edit only in the active pane (as described in <xref " +"linkend=\"CompareFiles_editing\" />). Click in either side to make it active " +"and make the other side inactive." msgstr "" -"Uno dei riquadri File è sempre attivo (indicato dallo sfondo scuro dell'intestazione);l'altro è inattivo e ha una barra dell'intestazione più " -"chiara.Puoi modificare solo nel riquadro attivo (come descritto in <xref linkend=\"CompareFiles_editing\" />).Fare clic su uno dei lati per renderlo " +"Uno dei riquadri File è sempre attivo (indicato dallo sfondo scuro " +"dell'intestazione);l'altro è inattivo e ha una barra dell'intestazione più " +"chiara.Puoi modificare solo nel riquadro attivo (come descritto in <xref " +"linkend=\"CompareFiles_editing\" />).Fare clic su uno dei lati per renderlo " "attivo e rendere inattivo l'altro lato." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:101 -msgid "An asterisk (*) before the filename in the header indicates that there are unsaved changes in the file." -msgstr "Un asterisco (*) prima del nome file nell'intestazione indica che nel file sono presenti modifiche non salvate." +msgid "" +"An asterisk (*) before the filename in the header indicates that there are " +"unsaved changes in the file." +msgstr "" +"Un asterisco (*) prima del nome file nell'intestazione indica che nel file " +"sono presenti modifiche non salvate." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:104 -msgid "The header bar's context menu has shortcuts that are useful for copying and pasting file information:" -msgstr "Il menu contestuale della barra dell'intestazione dispone di scorciatoie utili per copiare e incollare le informazioni sul file:" +msgid "" +"The header bar's context menu has shortcuts that are useful for copying and " +"pasting file information:" +msgstr "" +"Il menu contestuale della barra dell'intestazione dispone di scorciatoie " +"utili per copiare e incollare le informazioni sul file:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:110 @@ -3542,25 +4730,32 @@ msgid "difference colors" msgstr "colori diversi" #. type: Content of: <article><section><section><section><indexterm><secondary> -#: English/Compare_files.xml:136 English/Compare_files.xml:592 English/Compare_files.xml:607 English/Compare_files.xml:617 +#: English/Compare_files.xml:136 English/Compare_files.xml:592 +#: English/Compare_files.xml:607 English/Compare_files.xml:617 msgid "in File panes" msgstr "nei riquadri File" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:133 msgid "Difference highlighting<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Evidenziazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Evidenziazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:139 msgid "" -"WinMerge highlights several types of differences in the File panes. The Colors page in the Options dialog defines a set of background and text colors " -"for most difference types, with variations indicating their state: unselected, selected, or deleted. This section describes how each of the basic " -"difference types is detected and displayed." +"WinMerge highlights several types of differences in the File panes. The " +"Colors page in the Options dialog defines a set of background and text " +"colors for most difference types, with variations indicating their state: " +"unselected, selected, or deleted. This section describes how each of the " +"basic difference types is detected and displayed." msgstr "" -"WinMerge evidenzia diversi tipi di differenze nei riquadri File.La pagina Colori nella finestra di dialogo Opzioni definisce un insieme di colori di " -"sfondo e testo per la maggior parte dei tipi di differenza, con variazioni che ne indicano lo stato: non selezionato, selezionato o eliminato.Questa " -"sezione descrive come viene rilevato e visualizzato ciascuno dei tipi di differenza di base." +"WinMerge evidenzia diversi tipi di differenze nei riquadri File.La pagina " +"Colori nella finestra di dialogo Opzioni definisce un insieme di colori di " +"sfondo e testo per la maggior parte dei tipi di differenza, con variazioni " +"che ne indicano lo stato: non selezionato, selezionato o eliminato.Questa " +"sezione descrive come viene rilevato e visualizzato ciascuno dei tipi di " +"differenza di base." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:147 @@ -3570,23 +4765,32 @@ msgstr "Differenza" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:150 msgid "" -"A difference block contains one or more contiguous lines that are different. The default difference background color is gold, but blank lines are " -"marked with the deleted color." +"A difference block contains one or more contiguous lines that are different. " +"The default difference background color is gold, but blank lines are marked " +"with the deleted color." msgstr "" -"Un blocco differenza contiene una o più linee contigue diverse.Il colore di sfondo diverso predefinito è oro, ma le righe vuote sono contrassegnate " -"con il colore eliminato." +"Un blocco differenza contiene una o più linee contigue diverse.Il colore di " +"sfondo diverso predefinito è oro, ma le righe vuote sono contrassegnate con " +"il colore eliminato." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:154 -msgid "For this and other screens in this section, we enabled <option>View line numbers</option> to show which lines in the source files are compared." +msgid "" +"For this and other screens in this section, we enabled <option>View line " +"numbers</option> to show which lines in the source files are compared." msgstr "" -"Per questa e altre schermate in questa sezione, abbiamo abilitato <option>Visualizza numeri di riga</option> per mostrare quali righe nei file " +"Per questa e altre schermate in questa sezione, abbiamo abilitato " +"<option>Visualizza numeri di riga</option> per mostrare quali righe nei file " "sorgente vengono confrontate." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:159 -msgid "<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-blocks-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-blocks-01.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-" +"blocks-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"489\" fileref=\"screenshots/diff-" +"blocks-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:166 @@ -3606,11 +4810,14 @@ msgstr "La prima differenza è una singola riga." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><orderedlist><listitem><para> #: English/Compare_files.xml:179 msgid "" -"The blank line in <filename>file2</filename> has no corresponding blank line in <filename>file1</filename>. WinMerge treats the missing blank line " -"as a deleted difference, marked here with the default gray color." +"The blank line in <filename>file2</filename> has no corresponding blank line " +"in <filename>file1</filename>. WinMerge treats the missing blank line as a " +"deleted difference, marked here with the default gray color." msgstr "" -"La riga vuota in <filename>file2</filename> non ha una riga vuota corrispondente in <filename>file1</filename>.WinMerge tratta la riga vuota mancante " -"come una differenza cancellata, contrassegnata qui con il colore grigio predefinito." +"La riga vuota in <filename>file2</filename> non ha una riga vuota " +"corrispondente in <filename>file1</filename>.WinMerge tratta la riga vuota " +"mancante come una differenza cancellata, contrassegnata qui con il colore " +"grigio predefinito." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><orderedlist><listitem><para> #: English/Compare_files.xml:186 @@ -3630,35 +4837,55 @@ msgstr "Differenza ignorata<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:198 msgid "" -"This color marks content that you have configured WinMerge to ignore. In contrast to difference blocks, ignored content is not compared, it is simply " -"highlighted to help you see what has been ignored. Ignored differences include:" +"This color marks content that you have configured WinMerge to ignore. In " +"contrast to difference blocks, ignored content is not compared, it is simply " +"highlighted to help you see what has been ignored. Ignored differences " +"include:" msgstr "" -"Questo colore contrassegna il contenuto che hai configurato WinMerge per ignorare.A differenza dei blocchi di differenza, il contenuto ignorato non " -"viene confrontato, viene semplicemente evidenziato per aiutarti a vedere cosa è stato ignorato.Le differenze ignorate includono:" +"Questo colore contrassegna il contenuto che hai configurato WinMerge per " +"ignorare.A differenza dei blocchi di differenza, il contenuto ignorato non " +"viene confrontato, viene semplicemente evidenziato per aiutarti a vedere " +"cosa è stato ignorato.Le differenze ignorate includono:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:205 -msgid "Blank lines, if you have enabled <option>Ignore blank lines</option> in the Options dialog Compare page." -msgstr "Righe vuote, se hai abilitato <option>Ignora righe vuote</option> nella pagina Confronta della finestra di dialogo Opzioni." +msgid "" +"Blank lines, if you have enabled <option>Ignore blank lines</option> in the " +"Options dialog Compare page." +msgstr "" +"Righe vuote, se hai abilitato <option>Ignora righe vuote</option> nella " +"pagina Confronta della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:210 -msgid "Differences that match patterns in line filters that you have defined (see <xref linkend=\"Filters\" /> to learn how)." -msgstr "Differenze che corrispondono ai modelli nei filtri di linea che hai definito (vedi <xref linkend=\"Filters\" /> per sapere come)." +msgid "" +"Differences that match patterns in line filters that you have defined (see " +"<xref linkend=\"Filters\" /> to learn how)." +msgstr "" +"Differenze che corrispondono ai modelli nei filtri di linea che hai definito " +"(vedi <xref linkend=\"Filters\" /> per sapere come)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:216 msgid "" -"The next example repeats the previous comparison, this time with <option>Ignore blank lines</option> enabled. There are now only two differences. The " -"blank line on the right side is marked with the Ignored Differences color." +"The next example repeats the previous comparison, this time with " +"<option>Ignore blank lines</option> enabled. There are now only two " +"differences. The blank line on the right side is marked with the Ignored " +"Differences color." msgstr "" -"L'esempio successivo ripete il confronto precedente, questa volta con <option>Ignora righe vuote</option> abilitata.Ora ci sono solo due " -"differenze.La riga vuota sul lato destro è contrassegnata con il colore Differenze ignorate." +"L'esempio successivo ripete il confronto precedente, questa volta con " +"<option>Ignora righe vuote</option> abilitata.Ora ci sono solo due " +"differenze.La riga vuota sul lato destro è contrassegnata con il colore " +"Differenze ignorate." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:222 -msgid "<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-blank-lines.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-blank-lines.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-" +"blank-lines.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"492\" fileref=\"screenshots/ignore-" +"blank-lines.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:229 @@ -3666,7 +4893,8 @@ msgid "Difference block colors with ignored diff" msgstr "Colori dei blocchi di differenza con differenza ignorata" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:238 English/Compare_files.xml:917 English/Configuration.xml:906 +#: English/Compare_files.xml:238 English/Compare_files.xml:917 +#: English/Configuration.xml:906 msgid "moved differences" msgstr "spostato le differenze" @@ -3678,17 +4906,25 @@ msgstr "Spostato<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:242 msgid "" -"Moved differences are identical lines found in different locations in the compared files, if <option>Moved block detection</option> is enabled in the " -"Options dialog Compare page. The next screenshot repeats the previous comparison, this time with moved block detection enabled." +"Moved differences are identical lines found in different locations in the " +"compared files, if <option>Moved block detection</option> is enabled in the " +"Options dialog Compare page. The next screenshot repeats the previous " +"comparison, this time with moved block detection enabled." msgstr "" -"Le differenze spostate sono linee identiche trovate in posizioni diverse nei file confrontati, se <option>Rilevamento blocchi spostati</option> è " -"abilitato nella pagina Confronta della finestra di dialogo Opzioni.Lo screenshot successivo ripete il confronto precedente, questa volta con il " +"Le differenze spostate sono linee identiche trovate in posizioni diverse nei " +"file confrontati, se <option>Rilevamento blocchi spostati</option> è " +"abilitato nella pagina Confronta della finestra di dialogo Opzioni.Lo " +"screenshot successivo ripete il confronto precedente, questa volta con il " "rilevamento dei blocchi spostati abilitato." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:249 -msgid "<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"490\" fileref=\"screenshots/moved-01." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:255 @@ -3698,22 +4934,30 @@ msgstr "Differenza colori blocco con rilevamento blocco spostato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:261 msgid "" -"Notice that the two identical lines (containing <literal>a</literal> and <literal>c</literal>) that are in different locations are marked with the " -"default orange moved color. Another effect of moved block detection in this case is that the last two lines are now two separate differences instead " -"of a single difference block." -msgstr "" -"Nota che le due righe identiche (contenenti <literal>a</literal> e <literal>c</literal>) che si trovano in posizioni diverse sono contrassegnate con " -"il colore spostato arancione predefinito.Un altro effetto del rilevamento dei blocchi spostati in questo caso è che le ultime due righe ora " -"rappresentano due differenze separate anziché un singolo blocco di differenze." +"Notice that the two identical lines (containing <literal>a</literal> and " +"<literal>c</literal>) that are in different locations are marked with the " +"default orange moved color. Another effect of moved block detection in this " +"case is that the last two lines are now two separate differences instead of " +"a single difference block." +msgstr "" +"Nota che le due righe identiche (contenenti <literal>a</literal> e " +"<literal>c</literal>) che si trovano in posizioni diverse sono " +"contrassegnate con il colore spostato arancione predefinito.Un altro effetto " +"del rilevamento dei blocchi spostati in questo caso è che le ultime due " +"righe ora rappresentano due differenze separate anziché un singolo blocco di " +"differenze." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:268 msgid "" -"In some cases, showing moved differences can make it easier to visualize changes in files. However, too many moved lines might make your comparison " +"In some cases, showing moved differences can make it easier to visualize " +"changes in files. However, too many moved lines might make your comparison " "hard to navigate. Use your own judgement!" msgstr "" -"In alcuni casi, mostrare le differenze spostate può rendere più semplice la visualizzazione delle modifiche nei file.Tuttavia, troppe linee spostate " -"potrebbero rendere difficile la navigazione nel confronto.Usa il tuo giudizio!" +"In alcuni casi, mostrare le differenze spostate può rendere più semplice la " +"visualizzazione delle modifiche nei file.Tuttavia, troppe linee spostate " +"potrebbero rendere difficile la navigazione nel confronto.Usa il tuo " +"giudizio!" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:276 @@ -3723,11 +4967,13 @@ msgstr "Differenza di parole" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:279 msgid "" -"WinMerge can mark the text that is changed with difference blocks. Line differences are marked with the word difference color. See <xref " +"WinMerge can mark the text that is changed with difference blocks. Line " +"differences are marked with the word difference color. See <xref " "linkend=\"CompareFiles_linediff-highlight\" /> for details." msgstr "" -"WinMerge può contrassegnare il testo modificato con blocchi di differenza.Le differenze di linea sono contrassegnate dalla parola colore " -"differenza.Vedi <xref linkend=\"CompareFiles_linediff-highlight\" /> per i dettagli." +"WinMerge può contrassegnare il testo modificato con blocchi di differenza.Le " +"differenze di linea sono contrassegnate dalla parola colore differenza.Vedi " +"<xref linkend=\"CompareFiles_linediff-highlight\" /> per i dettagli." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:288 @@ -3742,20 +4988,31 @@ msgstr "Righe simili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:292 msgid "" -"WinMerge tries to align similar lines within difference blocks when you enable <option>Align similar lines</option> in the Options dialog Compare " -"page. What does <quote>similar</quote> mean? Generally, this feature works best in simple cases, for example where lines that have strong " -"similarities. When detected, similar lines are adjusted to align in the File pane. The next figure shows comparisons of the same two files, before " -"and after enabling the <option>Align similar lines</option> option:" -msgstr "" -"WinMerge tenta di allineare linee simili all'interno di blocchi di differenza quando abiliti <option>Allinea linee simili</option> nella pagina " -"Confronta della finestra di dialogo Opzioni.Cosa significa <quote>simile</quote>?In genere, questa funzionalità funziona meglio nei casi semplici, ad " -"esempio nel caso di linee che presentano forti somiglianze.Quando vengono rilevate, linee simili vengono regolate per allinearsi nel riquadro File.La " -"figura successiva mostra i confronti degli stessi due file, prima e dopo aver abilitato l'opzione <option>Allinea linee simili</option>:" +"WinMerge tries to align similar lines within difference blocks when you " +"enable <option>Align similar lines</option> in the Options dialog Compare " +"page. What does <quote>similar</quote> mean? Generally, this feature works " +"best in simple cases, for example where lines that have strong similarities. " +"When detected, similar lines are adjusted to align in the File pane. The " +"next figure shows comparisons of the same two files, before and after " +"enabling the <option>Align similar lines</option> option:" +msgstr "" +"WinMerge tenta di allineare linee simili all'interno di blocchi di " +"differenza quando abiliti <option>Allinea linee simili</option> nella pagina " +"Confronta della finestra di dialogo Opzioni.Cosa significa <quote>simile</" +"quote>?In genere, questa funzionalità funziona meglio nei casi semplici, ad " +"esempio nel caso di linee che presentano forti somiglianze.Quando vengono " +"rilevate, linee simili vengono regolate per allinearsi nel riquadro File.La " +"figura successiva mostra i confronti degli stessi due file, prima e dopo " +"aver abilitato l'opzione <option>Allinea linee simili</option>:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_files.xml:304 -msgid "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-off.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-off.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" +"diffs-off.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" +"diffs-off.png\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:310 @@ -3764,13 +5021,21 @@ msgstr "Confronta senza abbinare linee simili" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_files.xml:302 -msgid "<emphasis role=\"strong\">Disabled</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" -msgstr "<emphasis role=\"strong\">Disabilitato</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" +msgid "" +"<emphasis role=\"strong\">Disabled</emphasis>: <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/>" +msgstr "" +"<emphasis role=\"strong\">Disabilitato</emphasis>: <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject> #: English/Compare_files.xml:316 -msgid "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-on.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-diffs-on.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" +"diffs-on.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"273\" fileref=\"screenshots/simlines-" +"diffs-on.png\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:322 @@ -3779,17 +5044,24 @@ msgstr "Confronta linee simili corrispondenti" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><simplelist><member> #: English/Compare_files.xml:314 -msgid "<emphasis role=\"strong\">Enabled</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" -msgstr "<emphasis role=\"strong\">Abilitato</emphasis>: <placeholder type=\"inlinemediaobject\" id=\"0\"/>" +msgid "" +"<emphasis role=\"strong\">Enabled</emphasis>: <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/>" +msgstr "" +"<emphasis role=\"strong\">Abilitato</emphasis>: <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:327 msgid "" -"In the second comparison, the lines <quote>mice</quote> and <quote>mice and a</quote> are detected as similar. WinMerge adds blank lines in the " -"display to make these lines appear at the same level within the difference block." +"In the second comparison, the lines <quote>mice</quote> and <quote>mice and " +"a</quote> are detected as similar. WinMerge adds blank lines in the display " +"to make these lines appear at the same level within the difference block." msgstr "" -"Nel secondo confronto, le righe <quote>mice</quote> e <quote>mice e a</quote> vengono rilevate come simili.WinMerge aggiunge righe vuote sul display " -"per farle apparire allo stesso livello all'interno del blocco differenza." +"Nel secondo confronto, le righe <quote>mice</quote> e <quote>mice e a</" +"quote> vengono rilevate come simili.WinMerge aggiunge righe vuote sul " +"display per farle apparire allo stesso livello all'interno del blocco " +"differenza." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:338 English/Configuration.xml:2436 @@ -3813,47 +5085,63 @@ msgstr "nelle differenze di linea" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:337 -msgid "Line difference highlighting<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Evidenziazione della differenza di linea<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Line difference highlighting<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Evidenziazione della differenza di linea<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:347 msgid "" -"Sometimes it's useful to highlight not just difference blocks, but also the text within them that is changed. You can disable or enable them in two " -"ways:" +"Sometimes it's useful to highlight not just difference blocks, but also the " +"text within them that is changed. You can disable or enable them in two ways:" msgstr "" -"A volte è utile evidenziare non solo i blocchi di differenza, ma anche il testo modificato al loro interno.Puoi disabilitarli o abilitarli in due " -"modi:" +"A volte è utile evidenziare non solo i blocchi di differenza, ma anche il " +"testo modificato al loro interno.Puoi disabilitarli o abilitarli in due modi:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:353 -msgid "Set all <option>View line differences</option> options in the Options dialog Editor page." -msgstr "Imposta tutte le opzioni <option>Visualizza differenze di linea</option> nella pagina Editor della finestra di dialogo Opzioni." +msgid "" +"Set all <option>View line differences</option> options in the Options dialog " +"Editor page." +msgstr "" +"Imposta tutte le opzioni <option>Visualizza differenze di linea</option> " +"nella pagina Editor della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:358 -msgid "Click <menuchoice> <guimenu>View</guimenu> <guimenuitem>View line differences</guimenuitem> </menuchoice> to toggle line differences on or off." +msgid "" +"Click <menuchoice> <guimenu>View</guimenu> <guimenuitem>View line " +"differences</guimenuitem> </menuchoice> to toggle line differences on or off." msgstr "" -"Fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di linea</guimenuitem > </menuchoice > per attivare o " +"Fai clic su <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " +">Visualizza differenze di linea</guimenuitem > </menuchoice > per attivare o " "disattivare le differenze di linea." #. type: Content of: <article><section><section><section><note><para> #: English/Compare_files.xml:367 msgid "" -"Remember that WinMerge navigation and merging functions (like Next Difference or Copy Left) work on difference blocks, not on line differences within " -"them." +"Remember that WinMerge navigation and merging functions (like Next " +"Difference or Copy Left) work on difference blocks, not on line differences " +"within them." msgstr "" -"Ricorda che le funzioni di navigazione e unione di WinMerge (come Differenza successiva o Copia a sinistra) funzionano sui blocchi di differenze, non " +"Ricorda che le funzioni di navigazione e unione di WinMerge (come Differenza " +"successiva o Copia a sinistra) funzionano sui blocchi di differenze, non " "sulle differenze in linea al loro interno." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:372 msgid "" -"This section describes how line differences are detected and marked. Note that the effect of these options is also affected by your current " -"whitespace settings in the Options dialog Compare page." +"This section describes how line differences are detected and marked. Note " +"that the effect of these options is also affected by your current whitespace " +"settings in the Options dialog Compare page." msgstr "" -"Questa sezione descrive come vengono rilevate e contrassegnate le differenze di linea.Tieni presente che l'effetto di queste opzioni è influenzato " -"anche dalle impostazioni attuali degli spazi bianchi nella pagina Confronta della finestra di dialogo Opzioni." +"Questa sezione descrive come vengono rilevate e contrassegnate le differenze " +"di linea.Tieni presente che l'effetto di queste opzioni è influenzato anche " +"dalle impostazioni attuali degli spazi bianchi nella pagina Confronta della " +"finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:379 @@ -3863,13 +5151,18 @@ msgstr "differenze di parole" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:378 msgid "Word-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Differenze di riga a livello di parola<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Differenze di riga a livello di parola<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:383 -msgid "The following examples show how word-level line differences are displayed with each of the whitespace settings:" +msgid "" +"The following examples show how word-level line differences are displayed " +"with each of the whitespace settings:" msgstr "" -"I seguenti esempi mostrano come vengono visualizzate le differenze di riga a livello di parola con ciascuna delle impostazioni degli spazi bianchi:" +"I seguenti esempi mostrano come vengono visualizzate le differenze di riga a " +"livello di parola con ciascuna delle impostazioni degli spazi bianchi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><title> #: English/Compare_files.xml:387 @@ -3883,8 +5176,12 @@ msgstr "WinMerge rileva tutte le parole e gli spazi diversi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:392 -msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-allwhite.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-allwhite.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-allwhite.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-allwhite.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:399 @@ -3892,7 +5189,8 @@ msgid "Word-level line diff comparing whitespace" msgstr "Differenza di riga a livello di parola che confronta gli spazi bianchi" #. type: Content of: <article><section><section><para> -#: English/Compare_files.xml:391 English/Compare_files.xml:411 English/Compare_files.xml:431 English/Quick_start.xml:79 +#: English/Compare_files.xml:391 English/Compare_files.xml:411 +#: English/Compare_files.xml:431 English/Quick_start.xml:79 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>" @@ -3903,18 +5201,28 @@ msgstr "Differenze di linea con spazi bianchi: ignora la modifica" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_files.xml:407 -msgid "Multiple spaces and tabs are treated the same as a single space. In the example, the extra space between the last two words is not marked:" -msgstr "Spazi e tabulazioni multipli vengono trattati come un unico spazio.Nell'esempio, lo spazio extra tra le ultime due parole non è contrassegnato:" +msgid "" +"Multiple spaces and tabs are treated the same as a single space. In the " +"example, the extra space between the last two words is not marked:" +msgstr "" +"Spazi e tabulazioni multipli vengono trattati come un unico spazio." +"Nell'esempio, lo spazio extra tra le ultime due parole non è contrassegnato:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:412 -msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nochange.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nochange.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-nochange.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-nochange.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:419 msgid "Word-level line diff comparing no whitespace changes" -msgstr "Differenza di riga a livello di parola che confronta senza modifiche agli spazi bianchi" +msgstr "" +"Differenza di riga a livello di parola che confronta senza modifiche agli " +"spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><title> #: English/Compare_files.xml:426 @@ -3923,18 +5231,27 @@ msgstr "Differenze di linea con gli spazi bianchi: ignorare tutto" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_files.xml:428 -msgid "No spaces between words are compared, so these lines are treated as identical:" -msgstr "Non vengono confrontati spazi tra le parole, quindi queste righe vengono trattate come identiche:" +msgid "" +"No spaces between words are compared, so these lines are treated as " +"identical:" +msgstr "" +"Non vengono confrontati spazi tra le parole, quindi queste righe vengono " +"trattate come identiche:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject> #: English/Compare_files.xml:432 -msgid "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nowhite.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-diff-nowhite.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-nowhite.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"530\" fileref=\"screenshots/word-" +"diff-nowhite.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><example><mediaobject><textobject><phrase> #: English/Compare_files.xml:439 msgid "Word-level line diff comparing no whitespace" -msgstr "Differenza di riga a livello di parola che confronta senza spazi bianchi" +msgstr "" +"Differenza di riga a livello di parola che confronta senza spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:449 @@ -3943,37 +5260,53 @@ msgstr "differenza di linea a livello di carattere" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:448 -msgid "Character-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Differenze di riga a livello di carattere<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Character-level line differences<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Differenze di riga a livello di carattere<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:453 msgid "" -"A character-level line difference includes the first and last different characters in a word, and all the characters between them. A single character-" -"level difference can span adjacent words. The following example illustrates:" +"A character-level line difference includes the first and last different " +"characters in a word, and all the characters between them. A single " +"character-level difference can span adjacent words. The following example " +"illustrates:" msgstr "" -"Una differenza di riga a livello di carattere include il primo e l'ultimo carattere diverso in una parola e tutti i caratteri tra di essi.Una singola " -"differenza a livello di carattere può estendersi a parole adiacenti.L'esempio seguente illustra:" +"Una differenza di riga a livello di carattere include il primo e l'ultimo " +"carattere diverso in una parola e tutti i caratteri tra di essi.Una singola " +"differenza a livello di carattere può estendersi a parole adiacenti." +"L'esempio seguente illustra:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:459 -msgid "<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-diff-01.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-diff-01.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-" +"diff-01.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"485\" fileref=\"screenshots/char-" +"diff-01.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:465 English/Compare_files.xml:509 msgid "Character-level line diff comparing no whitespace" -msgstr "Differenza di riga a livello di carattere che confronta senza spazi bianchi" +msgstr "" +"Differenza di riga a livello di carattere che confronta senza spazi bianchi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><note><para> #: English/Compare_files.xml:472 msgid "" -"As with word-level line differences, character highlighting varies according to how WinMerge is configured to detect word breaks. In the example, the " -"extra space after the word <literal>cure</literal> in <filename>file2</filename> is highlighted only if whitespace is compared." +"As with word-level line differences, character highlighting varies according " +"to how WinMerge is configured to detect word breaks. In the example, the " +"extra space after the word <literal>cure</literal> in <filename>file2</" +"filename> is highlighted only if whitespace is compared." msgstr "" -"Come per le differenze di riga a livello di parola, l'evidenziazione dei caratteri varia a seconda di come WinMerge è configurato per rilevare le " -"interruzioni di parola.Nell'esempio, lo spazio extra dopo la parola <literal>cure</literal> in <filename>file2</filename> viene evidenziato solo se " -"viene confrontato lo spazio bianco." +"Come per le differenze di riga a livello di parola, l'evidenziazione dei " +"caratteri varia a seconda di come WinMerge è configurato per rilevare le " +"interruzioni di parola.Nell'esempio, lo spazio extra dopo la parola " +"<literal>cure</literal> in <filename>file2</filename> viene evidenziato solo " +"se viene confrontato lo spazio bianco." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:485 @@ -3983,35 +5316,49 @@ msgstr "interruzioni di parole nelle differenze di riga" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:484 msgid "Breaks for words or character<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Interruzioni per parole o caratteri<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Interruzioni per parole o caratteri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:489 msgid "" -"Words and characters in line differences can be separated by whitespace, or by a combination of whitespace and punctuation. Whitespace (the default) " -"is the typical choice for comparing most text files. All the preceding line difference examples use whitespace to break words and characters." +"Words and characters in line differences can be separated by whitespace, or " +"by a combination of whitespace and punctuation. Whitespace (the default) is " +"the typical choice for comparing most text files. All the preceding line " +"difference examples use whitespace to break words and characters." msgstr "" -"Le parole e i caratteri nelle differenze di riga possono essere separati da spazi o da una combinazione di spazi e punteggiatura.Lo spazio bianco " -"(l'impostazione predefinita) è la scelta tipica per confrontare la maggior parte dei file di testo.Tutti gli esempi di differenze di riga precedenti " +"Le parole e i caratteri nelle differenze di riga possono essere separati da " +"spazi o da una combinazione di spazi e punteggiatura.Lo spazio bianco " +"(l'impostazione predefinita) è la scelta tipica per confrontare la maggior " +"parte dei file di testo.Tutti gli esempi di differenze di riga precedenti " "utilizzano spazi bianchi per separare parole e caratteri." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:495 msgid "" -"In some cases it's useful to break at punctuation. For example, the next screenshot compares a comma-separated list. To highlight meaningful line " -"differences, we have enabled <option>Break at whitespace or punctuation</option> in the Options dialog Editor page." +"In some cases it's useful to break at punctuation. For example, the next " +"screenshot compares a comma-separated list. To highlight meaningful line " +"differences, we have enabled <option>Break at whitespace or punctuation</" +"option> in the Options dialog Editor page." msgstr "" -"In alcuni casi è utile interrompere la punteggiatura.Ad esempio, lo screenshot successivo confronta un elenco separato da virgole.Per evidenziare " -"differenze di riga significative, abbiamo abilitato <option>Interrompi in corrispondenza di spazi bianchi o punteggiatura</option> nella pagina " -"Editor della finestra di dialogo Opzioni." +"In alcuni casi è utile interrompere la punteggiatura.Ad esempio, lo " +"screenshot successivo confronta un elenco separato da virgole.Per " +"evidenziare differenze di riga significative, abbiamo abilitato " +"<option>Interrompi in corrispondenza di spazi bianchi o punteggiatura</" +"option> nella pagina Editor della finestra di dialogo Opzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:502 -msgid "<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-diff-punctuation.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-diff-punctuation.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-" +"diff-punctuation.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line-" +"diff-punctuation.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_files.xml:520 English/Configuration.xml:2175 English/Configuration.xml:2346 English/Configuration.xml:2551 +#: English/Compare_files.xml:520 English/Configuration.xml:2175 +#: English/Configuration.xml:2346 English/Configuration.xml:2551 msgid "editing" msgstr "modifica" @@ -4023,41 +5370,58 @@ msgstr "funzionalità nella finestra Confronta file" #. type: Content of: <article><section><section><section><title> #: English/Compare_files.xml:519 msgid "File pane editing features<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Funzionalità di modifica del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Funzionalità di modifica del riquadro file<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:525 msgid "" -"Although WinMerge is a not a full-featured editor or IDE, it does provide basic editing functions, like <guilabel>Undo</guilabel> and <guilabel>Redo</" -"guilabel>, <guilabel>Find</guilabel> and <guilabel>Replace</guilabel>, and <guilabel>Go to</guilabel>. These basic editing tasks are often needed " -"during merging (for example, to change text within differences). You can edit in the active File pane (remember, click in a pane to make it active). " +"Although WinMerge is a not a full-featured editor or IDE, it does provide " +"basic editing functions, like <guilabel>Undo</guilabel> and <guilabel>Redo</" +"guilabel>, <guilabel>Find</guilabel> and <guilabel>Replace</guilabel>, and " +"<guilabel>Go to</guilabel>. These basic editing tasks are often needed " +"during merging (for example, to change text within differences). You can " +"edit in the active File pane (remember, click in a pane to make it active). " "Changes are not written to a file until you save a pane to a result file." msgstr "" -"Sebbene WinMerge non sia un editor o IDE completo, fornisce funzioni di modifica di base, come <guilabel >Annulla</guilabel > e <guilabel >Ripeti</" -"guilabel >, <guilabel >Trova</guilabel > e <guilabel >Sostituisci</guilabel > e <guilabel >Vai a</guilabel >.Queste attività di modifica di base sono " -"spesso necessarie durante l'unione (ad esempio, per modificare il testo all'interno delle differenze).Puoi apportare modifiche nel riquadro File " -"attivo (ricorda di fare clic in un riquadro per renderlo attivo).Le modifiche non vengono scritte in un file finché non si salva un riquadro in un " -"file di risultati." +"Sebbene WinMerge non sia un editor o IDE completo, fornisce funzioni di " +"modifica di base, come <guilabel >Annulla</guilabel > e <guilabel >Ripeti</" +"guilabel >, <guilabel >Trova</guilabel > e <guilabel >Sostituisci</guilabel " +"> e <guilabel >Vai a</guilabel >.Queste attività di modifica di base sono " +"spesso necessarie durante l'unione (ad esempio, per modificare il testo " +"all'interno delle differenze).Puoi apportare modifiche nel riquadro File " +"attivo (ricorda di fare clic in un riquadro per renderlo attivo).Le " +"modifiche non vengono scritte in un file finché non si salva un riquadro in " +"un file di risultati." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:534 msgid "" -"WinMerge editing features also include syntax highlighting. This optional feature supports several file formats, and you can configure the colors " -"used. Note that syntax highlighting is not applied within differences, as the preceding screenshot shows." +"WinMerge editing features also include syntax highlighting. This optional " +"feature supports several file formats, and you can configure the colors " +"used. Note that syntax highlighting is not applied within differences, as " +"the preceding screenshot shows." msgstr "" -"Le funzionalità di modifica di WinMerge includono anche l'evidenziazione della sintassi.Questa funzionalità opzionale supporta diversi formati di " -"file ed è possibile configurare i colori utilizzati.Tieni presente che l'evidenziazione della sintassi non viene applicata all'interno delle " +"Le funzionalità di modifica di WinMerge includono anche l'evidenziazione " +"della sintassi.Questa funzionalità opzionale supporta diversi formati di " +"file ed è possibile configurare i colori utilizzati.Tieni presente che " +"l'evidenziazione della sintassi non viene applicata all'interno delle " "differenze, come mostra lo screenshot precedente." #. type: Content of: <article><section><section><section><tip><para> #: English/Compare_files.xml:540 msgid "" -"Make sure that <guilabel>Automatic rescan</guilabel> is enabled, as described in <xref linkend=\"Compare_files_scan\" />. If it is not, manually " -"refresh your view (press F5) before and after editing a file, to ensure that WinMerge difference detection is up to date." +"Make sure that <guilabel>Automatic rescan</guilabel> is enabled, as " +"described in <xref linkend=\"Compare_files_scan\" />. If it is not, manually " +"refresh your view (press F5) before and after editing a file, to ensure that " +"WinMerge difference detection is up to date." msgstr "" -"Assicurati che la <guilabel >Riscansione automatica</guilabel > sia abilitata, come descritto in <xref linkend=\"Compare_files_scan\" />.In caso " -"contrario, aggiorna manualmente la visualizzazione (premi F5) prima e dopo la modifica di un file, per assicurarti che il rilevamento delle " -"differenze WinMerge sia aggiornato." +"Assicurati che la <guilabel >Riscansione automatica</guilabel > sia " +"abilitata, come descritto in <xref linkend=\"Compare_files_scan\" />.In caso " +"contrario, aggiorna manualmente la visualizzazione (premi F5) prima e dopo " +"la modifica di un file, per assicurarti che il rilevamento delle differenze " +"WinMerge sia aggiornato." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:549 @@ -4077,40 +5441,58 @@ msgstr "Caratteri del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:554 msgid "" -"You can choose fonts for the File pane by clicking <menuchoice> <guimenu>View</guimenu> <guimenuitem>Select Font</guimenuitem> </menuchoice>. " -"WinMerge supports only fixed width fonts." +"You can choose fonts for the File pane by clicking <menuchoice> " +"<guimenu>View</guimenu> <guimenuitem>Select Font</guimenuitem> </" +"menuchoice>. WinMerge supports only fixed width fonts." msgstr "" -"Puoi scegliere i caratteri per il pannello File facendo clic su <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Seleziona carattere</" -"guimenuitem > </menuchoice >.WinMerge supporta solo i caratteri a larghezza fissa." +"Puoi scegliere i caratteri per il pannello File facendo clic su <menuchoice> " +"<guimenu >Visualizza</guimenu > <guimenuitem >Seleziona carattere</" +"guimenuitem > </menuchoice >.WinMerge supporta solo i caratteri a larghezza " +"fissa." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:560 msgid "Here are font suggestions for using WinMerge with East Asian languages:" -msgstr "Ecco alcuni suggerimenti sui caratteri per utilizzare WinMerge con le lingue dell'Asia orientale:" +msgstr "" +"Ecco alcuni suggerimenti sui caratteri per utilizzare WinMerge con le lingue " +"dell'Asia orientale:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:565 -msgid "Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</guilabel> fixed-width fonts" -msgstr "Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</guilabel> fixed-width fonts" +msgid "" +"Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</" +"guilabel> fixed-width fonts" +msgstr "" +"Simplified Chinese: <guilabel>SimSun</guilabel> or <guilabel>SimHei</" +"guilabel> fixed-width fonts" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:570 msgid "Traditional Chinese: <guilabel>MingLiU</guilabel> fixed-width font" -msgstr "Cinese tradizionale: carattere <guilabel >MingLiU</guilabel > a larghezza fissa" +msgstr "" +"Cinese tradizionale: carattere <guilabel >MingLiU</guilabel > a larghezza " +"fissa" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:575 -msgid "Japanese: <guilabel>MS Gothic</guilabel> or <guilabel>MS Mincho</guilabel> fixed-width fonts" -msgstr "Giapponese: caratteri <guilabel >MS Gothic</guilabel > o <guilabel >MS Mincho</guilabel > a larghezza fissa" +msgid "" +"Japanese: <guilabel>MS Gothic</guilabel> or <guilabel>MS Mincho</guilabel> " +"fixed-width fonts" +msgstr "" +"Giapponese: caratteri <guilabel >MS Gothic</guilabel > o <guilabel >MS " +"Mincho</guilabel > a larghezza fissa" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:580 msgid "" -"Korean: <guilabel>GulimChe</guilabel> fixed-width font (not <guilabel>Gulim</guilabel>, because this variant uses proportional-spacing glyphs that " -"are not centered in grid cells and poorly aligned in fixed-width mode)." +"Korean: <guilabel>GulimChe</guilabel> fixed-width font (not <guilabel>Gulim</" +"guilabel>, because this variant uses proportional-spacing glyphs that are " +"not centered in grid cells and poorly aligned in fixed-width mode)." msgstr "" -"Coreano: <guilabel >GulimChe</guilabel > carattere a larghezza fissa (non <guilabel >Gulim</guilabel >, perché questa variante utilizza glifi a " -"spaziatura proporzionale che non sono centrati nelle celle della griglia e scarsamente allineati in modalità a larghezza fissa)." +"Coreano: <guilabel >GulimChe</guilabel > carattere a larghezza fissa (non " +"<guilabel >Gulim</guilabel >, perché questa variante utilizza glifi a " +"spaziatura proporzionale che non sono centrati nelle celle della griglia e " +"scarsamente allineati in modalità a larghezza fissa)." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:590 @@ -4125,13 +5507,18 @@ msgstr "Margini del riquadro file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:595 msgid "" -"The File panes have optional gray margins that show line numbers and some symbols. To show or hide the margins, clicking <menuchoice> <guimenu>View</" -"guimenu> <guimenuitem>View Margins</guimenuitem> </menuchoice>. If you are using multiple File Compare windows, you can control margins for each " -"window independently. The margin can show any or all of these features:" +"The File panes have optional gray margins that show line numbers and some " +"symbols. To show or hide the margins, clicking <menuchoice> <guimenu>View</" +"guimenu> <guimenuitem>View Margins</guimenuitem> </menuchoice>. If you are " +"using multiple File Compare windows, you can control margins for each window " +"independently. The margin can show any or all of these features:" msgstr "" -"I riquadri File hanno margini grigi opzionali che mostrano i numeri di riga e alcuni simboli.Per mostrare o nascondere i margini, fai clic su " -"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Visualizza margini</guimenuitem > </menuchoice >.Se utilizzi più finestre di confronto " -"file, puoi controllare i margini per ciascuna finestra in modo indipendente.Il margine può mostrare alcune o tutte queste funzionalità:" +"I riquadri File hanno margini grigi opzionali che mostrano i numeri di riga " +"e alcuni simboli.Per mostrare o nascondere i margini, fai clic su " +"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Visualizza " +"margini</guimenuitem > </menuchoice >.Se utilizzi più finestre di confronto " +"file, puoi controllare i margini per ciascuna finestra in modo indipendente." +"Il margine può mostrare alcune o tutte queste funzionalità:" #. type: Content of: <article><section><section><section><indexterm><primary> #: English/Compare_files.xml:605 @@ -4150,90 +5537,130 @@ msgstr "avvolgimento delle parole" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:622 -msgid "Line numbers, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Numbers</guimenuitem> </menuchoice> is enabled." +msgid "" +"Line numbers, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line " +"Numbers</guimenuitem> </menuchoice> is enabled." msgstr "" -"Numeri di riga, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza numeri di riga</guimenuitem > </menuchoice > è abilitato." +"Numeri di riga, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem " +">Visualizza numeri di riga</guimenuitem > </menuchoice > è abilitato." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:630 msgid "" -"Bookmarks, if <menuchoice> <guimenu>Edit</guimenu> <guisubmenu>Bookmarks</guisubmenu> </menuchoice> is enabled. A bookmark is a blue circle, in the " +"Bookmarks, if <menuchoice> <guimenu>Edit</guimenu> <guisubmenu>Bookmarks</" +"guisubmenu> </menuchoice> is enabled. A bookmark is a blue circle, in the " "margin next to a line, that you can make WinMerge remember and return to." msgstr "" -"Segnalibri, se <menuchoice> <guimenu >Modifica</guimenu > <guisubmenu >Segnalibri</guisubmenu > </menuchoice > è abilitato.Un segnalibro è un cerchio " -"blu, nel margine accanto a una riga, che puoi far ricordare a WinMerge e a cui tornare." +"Segnalibri, se <menuchoice> <guimenu >Modifica</guimenu > <guisubmenu " +">Segnalibri</guisubmenu > </menuchoice > è abilitato.Un segnalibro è un " +"cerchio blu, nel margine accanto a una riga, che puoi far ricordare a " +"WinMerge e a cui tornare." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:640 msgid "" -"To set a bookmark on a line, double-click in its margin (or press <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>). The same action " +"To set a bookmark on a line, double-click in its margin (or press <keycombo> " +"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>). The same action " "deletes an existing bookmark." msgstr "" -"Per impostare un segnalibro su una riga, fai doppio clic sul suo margine (o premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </" -"keycombo>).La stessa azione elimina un segnalibro esistente." +"Per impostare un segnalibro su una riga, fai doppio clic sul suo margine (o " +"premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>).La " +"stessa azione elimina un segnalibro esistente." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:650 msgid "" -"To navigate bookmarks, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</guimenuitem> </menuchoice> and choose <guimenuitem>Next</" -"guimenuitem> or <guimenuitem>Previous</guimenuitem>." +"To navigate bookmarks, click <menuchoice> <guimenu>Edit</guimenu> " +"<guimenuitem>Bookmarks</guimenuitem> </menuchoice> and choose " +"<guimenuitem>Next</guimenuitem> or <guimenuitem>Previous</guimenuitem>." msgstr "" -"Per navigare tra i segnalibri, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Segnalibri</guimenuitem > </menuchoice > e scegli " -"<guimenuitem >Avanti</guimenuitem > o <guimenuitem >Precedente</guimenuitem >." +"Per navigare tra i segnalibri, fai clic su <menuchoice> <guimenu >Modifica</" +"guimenu > <guimenuitem >Segnalibri</guimenuitem > </menuchoice > e scegli " +"<guimenuitem >Avanti</guimenuitem > o <guimenuitem >Precedente</guimenuitem " +">." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:659 -msgid "Double-click a single bookmark to delete it (or press <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." -msgstr "Fai doppio clic su un singolo segnalibro per eliminarlo (o premi <keycombo> <keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." +msgid "" +"Double-click a single bookmark to delete it (or press <keycombo> " +"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." +msgstr "" +"Fai doppio clic su un singolo segnalibro per eliminarlo (o premi <keycombo> " +"<keycap>Ctrl</keycap> <keycap>F2</keycap> </keycombo>)." #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:668 msgid "" -"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</guimenuitem> <guimenuitem>Clear All Bookmarks</guimenuitem> </menuchoice> to " +"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Bookmarks</" +"guimenuitem> <guimenuitem>Clear All Bookmarks</guimenuitem> </menuchoice> to " "delete all bookmarks." msgstr "" -"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Segnalibri</guimenuitem > <guimenuitem >Cancella tutti i segnalibri</guimenuitem " -"> </menuchoice > per eliminare tutti i segnalibri." +"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem " +">Segnalibri</guimenuitem > <guimenuitem >Cancella tutti i segnalibri</" +"guimenuitem > </menuchoice > per eliminare tutti i segnalibri." #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:680 -msgid "Word wrap arrow symbols, if <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</guimenuitem> </menuchoice> is enabled." -msgstr "Simboli freccia a capo, se <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice > è abilitato." +msgid "" +"Word wrap arrow symbols, if <menuchoice> <guimenu>View</guimenu> " +"<guimenuitem>Wrap Lines</guimenuitem> </menuchoice> is enabled." +msgstr "" +"Simboli freccia a capo, se <menuchoice> <guimenu >Visualizza</guimenu> " +"<guimenuitem >Righe a capo</guimenuitem > </menuchoice > è abilitato." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:688 -msgid "The following screenshot shows a margin with bookmarks and word wrap enabled. Without line numbers, the margin width is minimal." -msgstr "La schermata seguente mostra un margine con i segnalibri e il ritorno a capo abilitati.Senza numeri di riga, la larghezza del margine è minima." +msgid "" +"The following screenshot shows a margin with bookmarks and word wrap " +"enabled. Without line numbers, the margin width is minimal." +msgstr "" +"La schermata seguente mostra un margine con i segnalibri e il ritorno a capo " +"abilitati.Senza numeri di riga, la larghezza del margine è minima." #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_files.xml:692 -msgid "<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/" +"filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"384\" fileref=\"screenshots/" +"filecomp_margin1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:698 msgid "File Compare window margin with bookmark and word wrap" -msgstr "File Confronta il margine della finestra con il segnalibro e il ritorno a capo automatico" +msgstr "" +"File Confronta il margine della finestra con il segnalibro e il ritorno a " +"capo automatico" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:703 msgid "" -"The next screenshot shows a margin with bookmarks and line numbers enabled. Notice that the margin is wider. In fact, the margin is wide enough for " -"the largest line number. Thus, the margins for large files with many lines can be quite wide." +"The next screenshot shows a margin with bookmarks and line numbers enabled. " +"Notice that the margin is wider. In fact, the margin is wide enough for the " +"largest line number. Thus, the margins for large files with many lines can " +"be quite wide." msgstr "" -"Lo screenshot successivo mostra un margine con segnalibri e numeri di riga abilitati.Si noti che il margine è più ampio.In effetti, il margine è " -"sufficientemente ampio per contenere il numero di riga più grande.Pertanto, i margini per file di grandi dimensioni con molte righe possono essere " +"Lo screenshot successivo mostra un margine con segnalibri e numeri di riga " +"abilitati.Si noti che il margine è più ampio.In effetti, il margine è " +"sufficientemente ampio per contenere il numero di riga più grande.Pertanto, " +"i margini per file di grandi dimensioni con molte righe possono essere " "piuttosto ampi." #. type: Content of: <article><section><section><section><mediaobject> #: English/Compare_files.xml:709 -msgid "<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" " +"fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"77\" contentwidth=\"384\" " +"fileref=\"screenshots/filecomp_margin2.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><mediaobject><textobject><phrase> #: English/Compare_files.xml:715 msgid "File Compare window margin with bookmark and line numbers" -msgstr "File Confronta il margine della finestra con i segnalibri e i numeri di riga" +msgstr "" +"File Confronta il margine della finestra con i segnalibri e i numeri di riga" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:724 @@ -4247,42 +5674,65 @@ msgstr "menu, con la finestra Confronta file" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:723 -msgid "Toolbar and menus<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Barra degli strumenti e menu<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Toolbar and menus<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Barra degli strumenti e menu<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:729 -msgid "The WinMerge toolbar and menus provide a range of functions to navigate, select, and merge differences within files." +msgid "" +"The WinMerge toolbar and menus provide a range of functions to navigate, " +"select, and merge differences within files." msgstr "" -"La barra degli strumenti e i menu di WinMerge forniscono una gamma di funzioni per navigare, selezionare e unire le differenze all'interno dei file." +"La barra degli strumenti e i menu di WinMerge forniscono una gamma di " +"funzioni per navigare, selezionare e unire le differenze all'interno dei " +"file." #. type: Content of: <article><section><section><note><para> #: English/Compare_files.xml:733 msgid "" -"WinMerge shortcuts have the same names and buttons whether you open a Folder Compare or File Compare window. However, the functions behave " -"differently: with a File Compare window, the functions operate on differences within files, not on differences within folders." +"WinMerge shortcuts have the same names and buttons whether you open a Folder " +"Compare or File Compare window. However, the functions behave differently: " +"with a File Compare window, the functions operate on differences within " +"files, not on differences within folders." msgstr "" -"Le scorciatoie di WinMerge hanno gli stessi nomi e pulsanti sia che si apra una finestra Confronto cartelle o Confronto file.Tuttavia, le funzioni si " -"comportano diversamente: con una finestra Confronta file, le funzioni operano sulle differenze all'interno dei file, non sulle differenze all'interno " -"delle cartelle." +"Le scorciatoie di WinMerge hanno gli stessi nomi e pulsanti sia che si apra " +"una finestra Confronto cartelle o Confronto file.Tuttavia, le funzioni si " +"comportano diversamente: con una finestra Confronta file, le funzioni " +"operano sulle differenze all'interno dei file, non sulle differenze " +"all'interno delle cartelle." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:739 msgid "" -"The difference functions you can use depend on your context, which often changes as you work. This means that a function is available only when its " -"operation is possible for a given location or other condition in your WinMerge environment. For example, if you click in a line of text within a " -"difference, you might notice several navigation and merge buttons become enabled in the toolbar. If you click in another area of text that is not " +"The difference functions you can use depend on your context, which often " +"changes as you work. This means that a function is available only when its " +"operation is possible for a given location or other condition in your " +"WinMerge environment. For example, if you click in a line of text within a " +"difference, you might notice several navigation and merge buttons become " +"enabled in the toolbar. If you click in another area of text that is not " "within a difference, these functions become unavailable." msgstr "" -"Le diverse funzioni che puoi utilizzare dipendono dal contesto, che spesso cambia mentre lavori.Ciò significa che una funzione è disponibile solo " -"quando il suo funzionamento è possibile per una determinata posizione o altra condizione nell'ambiente WinMerge.Ad esempio, se fai clic su una riga " -"di testo all'interno di una differenza, potresti notare che diversi pulsanti di navigazione e unione vengono abilitati nella barra degli strumenti.Se " -"si fa clic in un'altra area di testo che non si trova all'interno di una differenza, queste funzioni non saranno più disponibili." +"Le diverse funzioni che puoi utilizzare dipendono dal contesto, che spesso " +"cambia mentre lavori.Ciò significa che una funzione è disponibile solo " +"quando il suo funzionamento è possibile per una determinata posizione o " +"altra condizione nell'ambiente WinMerge.Ad esempio, se fai clic su una riga " +"di testo all'interno di una differenza, potresti notare che diversi pulsanti " +"di navigazione e unione vengono abilitati nella barra degli strumenti.Se si " +"fa clic in un'altra area di testo che non si trova all'interno di una " +"differenza, queste funzioni non saranno più disponibili." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:747 -msgid "Difference functions are available in the WinMerge toolbar,and also through these alternate mechanisms:" -msgstr "Le funzioni di differenza sono disponibili nella barra degli strumenti WinMerge e anche attraverso questi meccanismi alternativi:" +msgid "" +"Difference functions are available in the WinMerge toolbar,and also through " +"these alternate mechanisms:" +msgstr "" +"Le funzioni di differenza sono disponibili nella barra degli strumenti " +"WinMerge e anche attraverso questi meccanismi alternativi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:752 @@ -4291,8 +5741,11 @@ msgstr "Menu di WinMerge, in particolare <guimenu >Unisci</guimenu >" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:756 -msgid "Context menus within the File Compare window (when you right-click in text)" -msgstr "Menu contestuali nella finestra Confronta file (quando fai clic con il pulsante destro del mouse sul testo)" +msgid "" +"Context menus within the File Compare window (when you right-click in text)" +msgstr "" +"Menu contestuali nella finestra Confronta file (quando fai clic con il " +"pulsante destro del mouse sul testo)" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:761 @@ -4302,11 +5755,15 @@ msgstr "Scorciatoie da tastiera" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:765 msgid "" -"Difference functions are described in <xref linkend=\"Compare_files_nav\" /> and <xref linkend=\"Compare_files_merge\" />, later in this topic. <xref " -"linkend=\"Quick_start\" /> and <xref linkend=\"Intro_diffs\" /> provide examples of comparing and merging." +"Difference functions are described in <xref linkend=\"Compare_files_nav\" /> " +"and <xref linkend=\"Compare_files_merge\" />, later in this topic. <xref " +"linkend=\"Quick_start\" /> and <xref linkend=\"Intro_diffs\" /> provide " +"examples of comparing and merging." msgstr "" -"Le funzioni di differenza sono descritte in <xref linkend=\"Compare_files_nav\" /> e <xref linkend=\"Compare_files_merge\" />, più avanti in questo " -"argomento.<xref linkend=\"Quick_start\" /> e <xref linkend=\"Intro_diffs\" /> forniscono esempi di confronto e unione." +"Le funzioni di differenza sono descritte in <xref " +"linkend=\"Compare_files_nav\" /> e <xref linkend=\"Compare_files_merge\" />, " +"più avanti in questo argomento.<xref linkend=\"Quick_start\" /> e <xref " +"linkend=\"Intro_diffs\" /> forniscono esempi di confronto e unione." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_files.xml:772 @@ -4321,39 +5778,57 @@ msgstr "Modalità di unione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:775 msgid "" -"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Merge Mode</guimenuitem> </menuchoice> (or press <keycap>F9</keycap>) restores these WinMerge 1.7.1 " +"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Merge Mode</guimenuitem> </" +"menuchoice> (or press <keycap>F9</keycap>) restores these WinMerge 1.7.1 " "single keyboard shortcuts for difference merging and navigating functions:" msgstr "" -"<menuchoice> <guimenu >File</guimenu> <guimenuitem >Modalità unione</guimenuitem> </menuchoice > (o premi <keycap >F9</keycap >) ripristina queste " -"singole scorciatoie da tastiera di WinMerge 1.7.1 per le funzioni di fusione e navigazione delle differenze:" +"<menuchoice> <guimenu >File</guimenu> <guimenuitem >Modalità unione</" +"guimenuitem> </menuchoice > (o premi <keycap >F9</keycap >) ripristina " +"queste singole scorciatoie da tastiera di WinMerge 1.7.1 per le funzioni di " +"fusione e navigazione delle differenze:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:785 msgid "" -"<keycap>Up</keycap> and <keycap>Down</keycap> keys for the <function>Previous Difference</function> and <function>Next Difference</function> " -"functions." +"<keycap>Up</keycap> and <keycap>Down</keycap> keys for the " +"<function>Previous Difference</function> and <function>Next Difference</" +"function> functions." msgstr "" -"Tasti <keycap>Su</keycap> e <keycap>Giù</keycap> per le funzioni <function>Previous Difference</function> e <function>Next Difference</function>." +"Tasti <keycap>Su</keycap> e <keycap>Giù</keycap> per le funzioni " +"<function>Previous Difference</function> e <function>Next Difference</" +"function>." #. type: Content of: <article><section><section><section><itemizedlist><listitem><simpara> #: English/Compare_files.xml:792 -msgid "<keycap>Left</keycap> and <keycap>Right</keycap> keys for the <function>Copy Left</function> and <function>Copy Right</function> functions." -msgstr "Tasti <keycap>Sinistra</keycap> e <keycap>Destra</keycap> per le funzioni <function>Copy Left</function> e <function>>Copy Right</function>." +msgid "" +"<keycap>Left</keycap> and <keycap>Right</keycap> keys for the <function>Copy " +"Left</function> and <function>Copy Right</function> functions." +msgstr "" +"Tasti <keycap>Sinistra</keycap> e <keycap>Destra</keycap> per le funzioni " +"<function>Copy Left</function> e <function>>Copy Right</function>." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:798 msgid "" -"Merge mode omits the <keycap>Alt</keycap> key for these common operations (making them quicker to use than the normal mode). Note that the " -"<keycap>Shift</keycap> and <keycap>Alt</keycap> <keycap>Arrow</keycap> key combinations work in merge mode in the same way as normal mode." +"Merge mode omits the <keycap>Alt</keycap> key for these common operations " +"(making them quicker to use than the normal mode). Note that the " +"<keycap>Shift</keycap> and <keycap>Alt</keycap> <keycap>Arrow</keycap> key " +"combinations work in merge mode in the same way as normal mode." msgstr "" -"La modalità unione omette il tasto <keycap>Alt</keycap> per queste operazioni comuni (rendendole più veloci da usare rispetto alla modalità " -"normale).Tieni presente che le combinazioni di tasti <keycap>Maiusc</keycap> e <keycap>Alt</keycap> <keycap>Freccia</keycap> funzionano in modalità " +"La modalità unione omette il tasto <keycap>Alt</keycap> per queste " +"operazioni comuni (rendendole più veloci da usare rispetto alla modalità " +"normale).Tieni presente che le combinazioni di tasti <keycap>Maiusc</keycap> " +"e <keycap>Alt</keycap> <keycap>Freccia</keycap> funzionano in modalità " "unione allo stesso modo della modalità normale." #. type: Content of: <article><section><section><section><para> #: English/Compare_files.xml:804 -msgid "Merge mode is indicated in the status bar by the text <guilabel>Merge</guilabel>." -msgstr "La modalità di unione è indicata nella barra di stato dal testo <guilabel >Unisci</guilabel >." +msgid "" +"Merge mode is indicated in the status bar by the text <guilabel>Merge</" +"guilabel>." +msgstr "" +"La modalità di unione è indicata nella barra di stato dal testo <guilabel " +">Unisci</guilabel >." #. type: Content of: <article><section><section><para><indexterm><secondary> #: English/Compare_files.xml:810 English/Compare_files.xml:947 @@ -4373,11 +5848,15 @@ msgstr "navigazione differenziale" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:820 msgid "" -"The Location pane, to the left of the File panes, maps the entire length of the compared files into two vertical bars (corresponding to the left and " -"right File panes). It is especially useful for working with files that are too long to easily navigate in the File panes." +"The Location pane, to the left of the File panes, maps the entire length of " +"the compared files into two vertical bars (corresponding to the left and " +"right File panes). It is especially useful for working with files that are " +"too long to easily navigate in the File panes." msgstr "" -"Il riquadro Posizione, a sinistra dei riquadri File, mappa l'intera lunghezza dei file confrontati in due barre verticali (corrispondenti ai riquadri " -"File sinistro e destro).È particolarmente utile per lavorare con file troppo lunghi per essere spostati facilmente nei riquadri File." +"Il riquadro Posizione, a sinistra dei riquadri File, mappa l'intera " +"lunghezza dei file confrontati in due barre verticali (corrispondenti ai " +"riquadri File sinistro e destro).È particolarmente utile per lavorare con " +"file troppo lunghi per essere spostati facilmente nei riquadri File." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:825 @@ -4386,8 +5865,12 @@ msgstr "Il riquadro Posizione mostra diversi tipi di elementi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:830 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_diffs.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_diffs.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_diffs.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_diffs.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:836 @@ -4397,25 +5880,37 @@ msgstr "Linee di differenza del riquadro Posizione" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:829 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Difference blocks" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Blocchi di differenza" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Blocchi di differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:841 msgid "" -"Each difference block in the File panes is indicated in the Location pane by a horizontal line across each vertical bar. The thickness, color , and " -"locations of these lines are clues about of the size (number of lines), types and distribution of all differences in the files. For example, the " -"color of a line is the same as the color of the corresponding difference block. The Location pane in the preceding screenshot shows many basic " +"Each difference block in the File panes is indicated in the Location pane by " +"a horizontal line across each vertical bar. The thickness, color , and " +"locations of these lines are clues about of the size (number of lines), " +"types and distribution of all differences in the files. For example, the " +"color of a line is the same as the color of the corresponding difference " +"block. The Location pane in the preceding screenshot shows many basic " "differences (gold) and some empty difference blocks (gray)." msgstr "" -"Ogni blocco di differenze nei riquadri File è indicato nel riquadro Posizione da una linea orizzontale su ciascuna barra verticale.Lo spessore, il " -"colore e la posizione di queste linee sono indizi sulla dimensione (numero di linee), sui tipi e sulla distribuzione di tutte le differenze nei " -"file.Ad esempio, il colore di una linea è uguale al colore del blocco differenza corrispondente.Il riquadro Posizione nello screenshot precedente " -"mostra molte differenze di base (oro) e alcuni blocchi di differenze vuoti (grigio)." +"Ogni blocco di differenze nei riquadri File è indicato nel riquadro " +"Posizione da una linea orizzontale su ciascuna barra verticale.Lo spessore, " +"il colore e la posizione di queste linee sono indizi sulla dimensione " +"(numero di linee), sui tipi e sulla distribuzione di tutte le differenze nei " +"file.Ad esempio, il colore di una linea è uguale al colore del blocco " +"differenza corrispondente.Il riquadro Posizione nello screenshot precedente " +"mostra molte differenze di base (oro) e alcuni blocchi di differenze vuoti " +"(grigio)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:854 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_currentdiff.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_currentdiff.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_currentdiff.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_currentdiff.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:860 @@ -4430,19 +5925,28 @@ msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Differenza attuale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:865 msgid "" -"If you have selected a difference, the Location pane marks the current difference line with a pair of small triangles on either side of the vertical " -"bars. If you navigate to another difference, the pointer moves up or down with the location. Scrolling the File pane does not change the location of " -"the difference pointer (or any of the difference lines) in the location pane." +"If you have selected a difference, the Location pane marks the current " +"difference line with a pair of small triangles on either side of the " +"vertical bars. If you navigate to another difference, the pointer moves up " +"or down with the location. Scrolling the File pane does not change the " +"location of the difference pointer (or any of the difference lines) in the " +"location pane." msgstr "" -"Se hai selezionato una differenza, il riquadro Posizione contrassegna la linea della differenza corrente con una coppia di piccoli triangoli su " -"entrambi i lati delle barre verticali.Se navighi verso un'altra differenza, il puntatore si sposta verso l'alto o verso il basso insieme alla " -"posizione.Lo scorrimento del riquadro File non modifica la posizione del puntatore di differenza (o delle linee di differenza) nel riquadro della " -"posizione." +"Se hai selezionato una differenza, il riquadro Posizione contrassegna la " +"linea della differenza corrente con una coppia di piccoli triangoli su " +"entrambi i lati delle barre verticali.Se navighi verso un'altra differenza, " +"il puntatore si sposta verso l'alto o verso il basso insieme alla posizione." +"Lo scorrimento del riquadro File non modifica la posizione del puntatore di " +"differenza (o delle linee di differenza) nel riquadro della posizione." #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject> #: English/Compare_files.xml:876 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_viewbar.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/locpane_viewbar.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_viewbar.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"locpane_viewbar.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><term><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:882 @@ -4452,39 +5956,58 @@ msgstr "Barra dell'area di visualizzazione del riquadro posizione" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:875 msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/> View area" -msgstr "<placeholder type=\"inlinemediaobject\" id=\"0\"/> Area di visualizzazione" +msgstr "" +"<placeholder type=\"inlinemediaobject\" id=\"0\"/> Area di visualizzazione" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:887 msgid "" -"The area of the files currently visible in the File panes is indicated by a shaded (translucent) view bar over the Location pane. The area bar's " -"height and location correspond to the portion of the files that is visible in the scroll region. For example, you might see the bar expand or shrink " -"if you change the height of your File panes. This synchronization of the Location pane view bar and File panes enables quick navigation, and some " -"useful actions:" -msgstr "" -"L'area dei file attualmente visibili nei riquadri File è indicata da una barra di visualizzazione ombreggiata (traslucida) sopra il riquadro " -"Posizione.L'altezza e la posizione della barra dell'area corrispondono alla parte dei file visibile nella regione di scorrimento.Ad esempio, potresti " -"vedere la barra espandersi o ridursi se modifichi l'altezza dei riquadri File.Questa sincronizzazione della barra di visualizzazione del riquadro " -"Posizione e dei riquadri File consente una navigazione rapida e alcune azioni utili:" +"The area of the files currently visible in the File panes is indicated by a " +"shaded (translucent) view bar over the Location pane. The area bar's height " +"and location correspond to the portion of the files that is visible in the " +"scroll region. For example, you might see the bar expand or shrink if you " +"change the height of your File panes. This synchronization of the Location " +"pane view bar and File panes enables quick navigation, and some useful " +"actions:" +msgstr "" +"L'area dei file attualmente visibili nei riquadri File è indicata da una " +"barra di visualizzazione ombreggiata (traslucida) sopra il riquadro " +"Posizione.L'altezza e la posizione della barra dell'area corrispondono alla " +"parte dei file visibile nella regione di scorrimento.Ad esempio, potresti " +"vedere la barra espandersi o ridursi se modifichi l'altezza dei riquadri " +"File.Questa sincronizzazione della barra di visualizzazione del riquadro " +"Posizione e dei riquadri File consente una navigazione rapida e alcune " +"azioni utili:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:897 -msgid "When you scroll the File panes, the view area in the Location pane moves with it." -msgstr "Quando scorri i riquadri File, l'area di visualizzazione nel riquadro Posizione si sposta con esso." +msgid "" +"When you scroll the File panes, the view area in the Location pane moves " +"with it." +msgstr "" +"Quando scorri i riquadri File, l'area di visualizzazione nel riquadro " +"Posizione si sposta con esso." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:902 msgid "" -"Conversely, you can drag the view area bar in the Location pane up or down to scroll the File panes. This scrollbar thumb action is very handy for " +"Conversely, you can drag the view area bar in the Location pane up or down " +"to scroll the File panes. This scrollbar thumb action is very handy for " "navigating long files." msgstr "" -"Al contrario, puoi trascinare la barra dell'area di visualizzazione nel riquadro Posizione verso l'alto o verso il basso per scorrere i riquadri " -"File.Questa azione del pollice della barra di scorrimento è molto utile per navigare in file lunghi." +"Al contrario, puoi trascinare la barra dell'area di visualizzazione nel " +"riquadro Posizione verso l'alto o verso il basso per scorrere i riquadri " +"File.Questa azione del pollice della barra di scorrimento è molto utile per " +"navigare in file lunghi." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:908 -msgid "Click anywhere in the Location pane to jump to the corresponding location in the File panes." -msgstr "Fare clic in un punto qualsiasi nel riquadro Posizione per passare alla posizione corrispondente nei riquadri File." +msgid "" +"Click anywhere in the Location pane to jump to the corresponding location in " +"the File panes." +msgstr "" +"Fare clic in un punto qualsiasi nel riquadro Posizione per passare alla " +"posizione corrispondente nei riquadri File." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:916 @@ -4494,19 +6017,29 @@ msgstr "Differenze spostate<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:921 msgid "" -"Moved differences are identical lines in different locations. They are shown only if the Enable moved block detection is checked in the Options " -"dialog Compare page. See <xref linkend=\"CompareFiles_diffcolors\" /> for more details about moved differences in the File pane. The Location pane " -"draws a line connecting moved differences in the left and right location bars. For example:" -msgstr "" -"Le differenze spostate sono linee identiche in posizioni diverse.Vengono visualizzati solo se è selezionata l'opzione Abilita rilevamento blocchi " -"spostati nella pagina Confronta della finestra di dialogo Opzioni.Vedi <xref linkend=\"CompareFiles_diffcolors\" /> per maggiori dettagli sulle " -"differenze spostate nel riquadro File.Il riquadro Posizione disegna una linea che collega le differenze spostate nelle barre di posizione sinistra e " +"Moved differences are identical lines in different locations. They are " +"shown only if the Enable moved block detection is checked in the Options " +"dialog Compare page. See <xref linkend=\"CompareFiles_diffcolors\" /> for " +"more details about moved differences in the File pane. The Location pane " +"draws a line connecting moved differences in the left and right location " +"bars. For example:" +msgstr "" +"Le differenze spostate sono linee identiche in posizioni diverse.Vengono " +"visualizzati solo se è selezionata l'opzione Abilita rilevamento blocchi " +"spostati nella pagina Confronta della finestra di dialogo Opzioni.Vedi <xref " +"linkend=\"CompareFiles_diffcolors\" /> per maggiori dettagli sulle " +"differenze spostate nel riquadro File.Il riquadro Posizione disegna una " +"linea che collega le differenze spostate nelle barre di posizione sinistra e " "destra.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:930 -msgid "<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/" +"locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"576\" fileref=\"screenshots/" +"locpane_moved_diffs.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:937 @@ -4525,36 +6058,58 @@ msgstr "Funzioni Blocchi spostati" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:944 -msgid "The Location pane's context menu contains these shortcuts:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"The Location pane's context menu contains these shortcuts:<placeholder " +"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Il menu contestuale del riquadro Posizione contiene queste scorciatoie:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"Il menu contestuale del riquadro Posizione contiene queste scorciatoie:" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " "id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:954 -msgid "<guimenuitem>Go to Line 1</guimenuitem>: Moves the cursor to the top of the file." -msgstr "<guimenuitem >Vai alla riga 1</guimenuitem >: sposta il cursore all'inizio del file." +msgid "" +"<guimenuitem>Go to Line 1</guimenuitem>: Moves the cursor to the top of the " +"file." +msgstr "" +"<guimenuitem >Vai alla riga 1</guimenuitem >: sposta il cursore all'inizio " +"del file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:959 -msgid "<guimenuitem>Go to</guimenuitem>: Moves the cursor to a line you specify (described in <xref linkend=\"Compare_files_nav_functions\" />)." -msgstr "<guimenuitem >Vai a</guimenuitem >: sposta il cursore su una riga specificata (descritta in <xref linkend=\"Compare_files_nav_functions\" />)." +msgid "" +"<guimenuitem>Go to</guimenuitem>: Moves the cursor to a line you specify " +"(described in <xref linkend=\"Compare_files_nav_functions\" />)." +msgstr "" +"<guimenuitem >Vai a</guimenuitem >: sposta il cursore su una riga " +"specificata (descritta in <xref linkend=\"Compare_files_nav_functions\" />)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:965 -msgid "<guimenuitem>No Moved Blocks</guimenuitem>: Turns off moved difference color for moved blocks." -msgstr "<guimenuitem >Nessun blocco spostato</guimenuitem >: disattiva il colore della differenza spostata per i blocchi spostati." +msgid "" +"<guimenuitem>No Moved Blocks</guimenuitem>: Turns off moved difference color " +"for moved blocks." +msgstr "" +"<guimenuitem >Nessun blocco spostato</guimenuitem >: disattiva il colore " +"della differenza spostata per i blocchi spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:970 -msgid "<guimenuitem>All Moved Blocks</guimenuitem>: Turns on moved difference color for all moved blocks." -msgstr "<guimenuitem >Blox di tutte le mosse</guimenuitem >: attiva le mosse con colori diversi per tutti i blocchi spostati." +msgid "" +"<guimenuitem>All Moved Blocks</guimenuitem>: Turns on moved difference color " +"for all moved blocks." +msgstr "" +"<guimenuitem >Blox di tutte le mosse</guimenuitem >: attiva le mosse con " +"colori diversi per tutti i blocchi spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_files.xml:975 -msgid "<guimenuitem>Moved Block for Current Diff</guimenuitem>: Turns on moved difference color only for current selected moved difference." +msgid "" +"<guimenuitem>Moved Block for Current Diff</guimenuitem>: Turns on moved " +"difference color only for current selected moved difference." msgstr "" -"<guimenuitem >Blocco spostato per differenza attuale</guimenuitem >: attiva il colore della differenza spostata solo per la differenza spostata " +"<guimenuitem >Blocco spostato per differenza attuale</guimenuitem >: attiva " +"il colore della differenza spostata solo per la differenza spostata " "attualmente selezionata." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -4569,26 +6124,36 @@ msgstr "Riquadro differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:987 -msgid "The Diff pane shows the contents of the two sides of a selected difference." -msgstr "Il riquadro Diff mostra il contenuto dei due lati di una differenza selezionata." +msgid "" +"The Diff pane shows the contents of the two sides of a selected difference." +msgstr "" +"Il riquadro Diff mostra il contenuto dei due lati di una differenza " +"selezionata." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:990 msgid "" -"When you select a difference, the two versions are loaded in the upper and lower sides of the Diff pane. In this way, the Diff pane confirms which " -"lines are included in a difference, and lets you examine them in isolation from the rest of the file." +"When you select a difference, the two versions are loaded in the upper and " +"lower sides of the Diff pane. In this way, the Diff pane confirms which " +"lines are included in a difference, and lets you examine them in isolation " +"from the rest of the file." msgstr "" -"Quando selezioni una differenza, le due versioni vengono caricate nei lati superiore e inferiore del riquadro Diff.In questo modo, il riquadro Diff " -"conferma quali righe sono incluse in una differenza e consente di esaminarle separatamente dal resto del file." +"Quando selezioni una differenza, le due versioni vengono caricate nei lati " +"superiore e inferiore del riquadro Diff.In questo modo, il riquadro Diff " +"conferma quali righe sono incluse in una differenza e consente di esaminarle " +"separatamente dal resto del file." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:995 msgid "" -"You can merge differences directly in the Diff pane by right-clicking in either the top or bottom side and choosing <guimenuitem>Copy to Right</" +"You can merge differences directly in the Diff pane by right-clicking in " +"either the top or bottom side and choosing <guimenuitem>Copy to Right</" "guimenuitem> or <guimenuitem>Copy to Left</guimenuitem>." msgstr "" -"Puoi unire le differenze direttamente nel pannello Diff facendo clic con il pulsante destro del mouse sul lato superiore o inferiore e scegliendo " -"<guimenuitem >Copia a destra</guimenuitem > o <guimenuitem >Copia a sinistra</guimenuitem >." +"Puoi unire le differenze direttamente nel pannello Diff facendo clic con il " +"pulsante destro del mouse sul lato superiore o inferiore e scegliendo " +"<guimenuitem >Copia a destra</guimenuitem > o <guimenuitem >Copia a " +"sinistra</guimenuitem >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:1003 @@ -4612,17 +6177,23 @@ msgstr "codifica dei caratteri" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1002 -msgid "Status bars<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Barre di stato<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Status bars<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Barre di stato<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1012 msgid "" -"Each File pane contains a status bar at the bottom. The status bar contains several panes with different types of information about the document and " +"Each File pane contains a status bar at the bottom. The status bar contains " +"several panes with different types of information about the document and " "your location in it:" msgstr "" -"Ogni riquadro File contiene una barra di stato nella parte inferiore.La barra di stato contiene diversi riquadri con diversi tipi di informazioni sul " -"documento e sulla tua posizione al suo interno:" +"Ogni riquadro File contiene una barra di stato nella parte inferiore.La " +"barra di stato contiene diversi riquadri con diversi tipi di informazioni " +"sul documento e sulla tua posizione al suo interno:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1018 @@ -4636,37 +6207,53 @@ msgstr "<guilabel >Ln</guilabel >: numero di riga nel file sorgente." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1028 -msgid "<guilabel>Col</guilabel>: Column location of the cursor and the total number of columns in the line." -msgstr "<guilabel >Col</guilabel >: posizione del cursore nella colonna e numero totale di colonne nella riga." +msgid "" +"<guilabel>Col</guilabel>: Column location of the cursor and the total number " +"of columns in the line." +msgstr "" +"<guilabel >Col</guilabel >: posizione del cursore nella colonna e numero " +"totale di colonne nella riga." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1031 msgid "" -"<guilabel>Col</guilabel> counts tabs as <replaceable>n</replaceable> spaces, where <replaceable>n</replaceable> is the number of characters defined " -"as the <guilabel>Tab size</guilabel> in the Editor page of WinMerge options (4 by default)." +"<guilabel>Col</guilabel> counts tabs as <replaceable>n</replaceable> spaces, " +"where <replaceable>n</replaceable> is the number of characters defined as " +"the <guilabel>Tab size</guilabel> in the Editor page of WinMerge options (4 " +"by default)." msgstr "" -"<guilabel >Col</guilabel > conta le tabulazioni come <replaceable >n</replaceable > spazi, dove <replaceable >n</replaceable > è il numero di " -"caratteri definiti come <guilabel >dimensione delle tabulazioni</guilabel > nella pagina Editor delle opzioni di WinMerge (4 per impostazione " +"<guilabel >Col</guilabel > conta le tabulazioni come <replaceable >n</" +"replaceable > spazi, dove <replaceable >n</replaceable > è il numero di " +"caratteri definiti come <guilabel >dimensione delle tabulazioni</guilabel > " +"nella pagina Editor delle opzioni di WinMerge (4 per impostazione " "predefinita)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1039 -msgid "<guilabel>Ch</guilabel>: Character location of cursor and the total number of chars in the line." -msgstr "<guilabel >Ch</guilabel >: posizione del carattere del cursore e numero totale di caratteri nella riga." +msgid "" +"<guilabel>Ch</guilabel>: Character location of cursor and the total number " +"of chars in the line." +msgstr "" +"<guilabel >Ch</guilabel >: posizione del carattere del cursore e numero " +"totale di caratteri nella riga." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1042 msgid "<guilabel>Ch</guilabel> counts tabs as single tab characters." -msgstr "<guilabel >Ch</guilabel > conta le tabulazioni come singoli caratteri di tabulazione." +msgstr "" +"<guilabel >Ch</guilabel > conta le tabulazioni come singoli caratteri di " +"tabulazione." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1047 msgid "" -"<guilabel>EOL</guilabel>: Linefeed style of the current line (shown only when the <guilabel>Preserve original EOL </guilabel> option is enabled in " +"<guilabel>EOL</guilabel>: Linefeed style of the current line (shown only " +"when the <guilabel>Preserve original EOL </guilabel> option is enabled in " "the Editor page of WinMerge options)." msgstr "" -"<guilabel >EOL</guilabel >: stile di avanzamento riga della riga corrente (mostrato solo quando l'opzione <guilabel >Preserva EOL originale </" -"guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge)." +"<guilabel >EOL</guilabel >: stile di avanzamento riga della riga corrente " +"(mostrato solo quando l'opzione <guilabel >Preserva EOL originale </guilabel " +"> è abilitata nella pagina Editor delle opzioni di WinMerge)." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1057 @@ -4676,11 +6263,13 @@ msgstr "Stato di sola lettura" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1060 msgid "" -"<guilabel>RO</guilabel> is shown in the pane if the file is set to read-only (as described in <xref linkend=\"protectingfiles\" />). Otherwise the " -"pane is empty." +"<guilabel>RO</guilabel> is shown in the pane if the file is set to read-only " +"(as described in <xref linkend=\"protectingfiles\" />). Otherwise the pane " +"is empty." msgstr "" -"<guilabel >RO</guilabel > viene mostrato nel pannello se il file è impostato in sola lettura (come descritto in <xref linkend=\"protectingfiles\" /" -">).Altrimenti il ​​riquadro è vuoto." +"<guilabel >RO</guilabel > viene mostrato nel pannello se il file è impostato " +"in sola lettura (come descritto in <xref linkend=\"protectingfiles\" />)." +"Altrimenti il ​​riquadro è vuoto." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1067 @@ -4689,8 +6278,11 @@ msgstr "Codifica dei file" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1070 -msgid "Codepage number for ANSI files, Unicode encoding type for Unicode files." -msgstr "Numero di tabella codici per file ANSI, tipo di codifica Unicode per file Unicode." +msgid "" +"Codepage number for ANSI files, Unicode encoding type for Unicode files." +msgstr "" +"Numero di tabella codici per file ANSI, tipo di codifica Unicode per file " +"Unicode." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1076 @@ -4700,21 +6292,31 @@ msgstr "Stile EOL" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1079 msgid "" -"EOL style of the file: <guilabel>Win</guilabel> for Windows/DOS files (CRLF), <guilabel>Unix</guilabel> (LF), <guilabel>Mac</guilabel> (CR), or " +"EOL style of the file: <guilabel>Win</guilabel> for Windows/DOS files " +"(CRLF), <guilabel>Unix</guilabel> (LF), <guilabel>Mac</guilabel> (CR), or " "<guilabel>Mixed</guilabel>." msgstr "" -"Stile EOL del file: <guilabel >Win</guilabel > per file Windows/DOS (CRLF), <guilabel >Unix</guilabel > (LF), <guilabel >Mac</guilabel > (CR), o " +"Stile EOL del file: <guilabel >Win</guilabel > per file Windows/DOS (CRLF), " +"<guilabel >Unix</guilabel > (LF), <guilabel >Mac</guilabel > (CR), o " "<guilabel >Misto</guilabel >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><note><para> #: English/Compare_files.xml:1084 -msgid "When the per-line EOL style is used, the file EOL style is not shown (this pane is blank)." -msgstr "Quando viene utilizzato lo stile EOL per riga, lo stile EOL del file non viene visualizzato (questo riquadro è vuoto)." +msgid "" +"When the per-line EOL style is used, the file EOL style is not shown (this " +"pane is blank)." +msgstr "" +"Quando viene utilizzato lo stile EOL per riga, lo stile EOL del file non " +"viene visualizzato (questo riquadro è vuoto)." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1091 -msgid "When a File Compare window is open, the WinMerge window status bar shows one of these messages about the compared files:" -msgstr "Quando una finestra Confronta file è aperta, la barra di stato della finestra WinMerge mostra uno di questi messaggi sui file confrontati:" +msgid "" +"When a File Compare window is open, the WinMerge window status bar shows one " +"of these messages about the compared files:" +msgstr "" +"Quando una finestra Confronta file è aperta, la barra di stato della " +"finestra WinMerge mostra uno di questi messaggi sui file confrontati:" #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1094 @@ -4724,42 +6326,51 @@ msgstr "<guilabel >Identici</guilabel >: i file non contengono differenze" #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1099 msgid "" -"<guilabel><replaceable>n</replaceable> Differences Found</guilabel>: The number of differences detected, displayed only when no difference is " +"<guilabel><replaceable>n</replaceable> Differences Found</guilabel>: The " +"number of differences detected, displayed only when no difference is " "selected." msgstr "" -"<guilabel ><replaceable>n</replaceable>differenze trovate</guilabel>: il numero di differenze rilevate, visualizzato solo quando non è selezionata " +"<guilabel ><replaceable>n</replaceable>differenze trovate</guilabel>: il " +"numero di differenze rilevate, visualizzato solo quando non è selezionata " "alcuna differenza." #. type: Content of: <article><section><section><para><itemizedlist><listitem><para> #: English/Compare_files.xml:1105 msgid "" -"<guilabel>Difference <replaceable>x</replaceable> of <replaceable>n</replaceable></guilabel>: The selected difference's sequence number in the total " -"number of differences, starting with 1." +"<guilabel>Difference <replaceable>x</replaceable> of <replaceable>n</" +"replaceable></guilabel>: The selected difference's sequence number in the " +"total number of differences, starting with 1." msgstr "" -"<guilabel >Differenza <replaceable>x</replaceable> di <replaceable>n</replaceable></guilabel>: il numero di sequenza della differenza selezionata nel " -"numero totale di differenze, a partire da 1." +"<guilabel >Differenza <replaceable>x</replaceable> di <replaceable>n</" +"replaceable></guilabel>: il numero di sequenza della differenza selezionata " +"nel numero totale di differenze, a partire da 1." #. type: Content of: <article><section><title> #: English/Compare_files.xml:1115 msgid "Navigating differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Esplorazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Esplorazione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:1121 msgid "" -"This section describes how to navigate and select differences in the File Compare window. Note that when you select a difference, it is always " +"This section describes how to navigate and select differences in the File " +"Compare window. Note that when you select a difference, it is always " "selected in both or all three File panes." msgstr "" -"Questa sezione descrive come navigare e selezionare le differenze nella finestra Confronto file.Tieni presente che quando selezioni una differenza, " +"Questa sezione descrive come navigare e selezionare le differenze nella " +"finestra Confronto file.Tieni presente che quando selezioni una differenza, " "questa viene sempre selezionata in entrambi o in tutti e tre i riquadri File." #. type: Content of: <article><section><tip><para> #: English/Compare_files.xml:1126 msgid "" -"To save time, enable <guilabel>Automatically scroll to first difference</guilabel> in the General page of WinMerge options. Then you don't have to " +"To save time, enable <guilabel>Automatically scroll to first difference</" +"guilabel> in the General page of WinMerge options. Then you don't have to " "manually navigate to the first difference and select it." msgstr "" -"To save time, enable <guilabel>Automatically scroll to first difference</guilabel> in the General page of WinMerge options.Quindi non è necessario " +"To save time, enable <guilabel>Automatically scroll to first difference</" +"guilabel> in the General page of WinMerge options.Quindi non è necessario " "passare manualmente alla prima differenza e selezionarla." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -4779,13 +6390,21 @@ msgstr "confronto file" #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1133 -msgid "Navigation functions<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Funzioni di navigazione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Navigation functions<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Funzioni di navigazione<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1143 -msgid "Here are the functions for navigating differences in the File Compare window, and their shortcuts in the toolbar and menus:" -msgstr "Ecco le funzioni per esplorare le differenze nella finestra Confronto file e le relative scorciatoie nella barra degli strumenti e nei menu:" +msgid "" +"Here are the functions for navigating differences in the File Compare " +"window, and their shortcuts in the toolbar and menus:" +msgstr "" +"Ecco le funzioni per esplorare le differenze nella finestra Confronto file e " +"le relative scorciatoie nella barra degli strumenti e nei menu:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1149 @@ -4799,20 +6418,31 @@ msgstr "Selezionare la funzione Differenza di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1148 -msgid "Difference in the Current Line/Select Line Difference<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Differenza nella riga corrente/Differenza riga selezionata<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Difference in the Current Line/Select Line Difference<placeholder " +"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Differenza nella riga corrente/Differenza riga selezionata<placeholder " +"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1155 -msgid "Enabled if you have clicked in (or selected) text within a difference in a File pane. Selects the word differences within the line. For example:" +msgid "" +"Enabled if you have clicked in (or selected) text within a difference in a " +"File pane. Selects the word differences within the line. For example:" msgstr "" -"Abilitato se hai fatto clic (o selezionato) il testo all'interno di una differenza in un riquadro File.Seleziona le differenze di parole all'interno " +"Abilitato se hai fatto clic (o selezionato) il testo all'interno di una " +"differenza in un riquadro File.Seleziona le differenze di parole all'interno " "della riga.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject> #: English/Compare_files.xml:1160 -msgid "<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"562\" fileref=\"screenshots/linediff." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><mediaobject><textobject><phrase> #: English/Compare_files.xml:1166 @@ -4821,13 +6451,21 @@ msgstr "Selezionare l'esempio di differenza di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1171 -msgid "If you want to select the difference block itself, use <command>Current Difference</command> instead." -msgstr "Se vuoi selezionare il blocco differenza stesso, usa invece <command>Differenza corrente</command>." +msgid "" +"If you want to select the difference block itself, use <command>Current " +"Difference</command> instead." +msgstr "" +"Se vuoi selezionare il blocco differenza stesso, usa invece " +"<command>Differenza corrente</command>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1175 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/diff_inline_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/diff_inline_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"diff_inline_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"diff_inline_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1181 @@ -4837,11 +6475,15 @@ msgstr "Differenza nel pulsante Linea corrente" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1174 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Select Line Difference</" -"guimenuitem> </menuchoice>, <keycap>F4</keycap>, context menu in File pane within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Select Line Difference</" +"guimenuitem> </menuchoice>, <keycap>F4</keycap>, context menu in File pane " +"within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Seleziona " -"differenza di linea</guimenuitem > </menuchoice >, <keycap >F4</keycap >, menu contestuale nel pannello File all'interno di una differenza." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Seleziona " +"differenza di linea</guimenuitem > </menuchoice >, <keycap >F4</keycap >, " +"menu contestuale nel pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1194 @@ -4849,7 +6491,8 @@ msgid "Next Difference function" msgstr "Funzione Differenza successiva" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: English/Compare_files.xml:1196 English/Compare_files.xml:1231 English/Compare_files.xml:1265 English/Compare_files.xml:1299 +#: English/Compare_files.xml:1196 English/Compare_files.xml:1231 +#: English/Compare_files.xml:1265 English/Compare_files.xml:1299 #: English/Compare_files.xml:1346 msgid "with Compare Files" msgstr "con Confronta file" @@ -4862,22 +6505,28 @@ msgstr "Differenza successiva<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1200 msgid "" -"Selects the next difference below your current cursor location in the document (not necessarily relative to the current difference). Use to step " -"through differences sequentially from any point. Available except when the last difference is currently selected." +"Selects the next difference below your current cursor location in the " +"document (not necessarily relative to the current difference). Use to step " +"through differences sequentially from any point. Available except when the " +"last difference is currently selected." msgstr "" -"Seleziona la differenza successiva sotto la posizione corrente del cursore nel documento (non necessariamente relativa alla differenza " -"corrente).Utilizzare per scorrere le differenze in sequenza da qualsiasi punto.Disponibile tranne quando è attualmente selezionata l'ultima " -"differenza." +"Seleziona la differenza successiva sotto la posizione corrente del cursore " +"nel documento (non necessariamente relativa alla differenza corrente)." +"Utilizzare per scorrere le differenze in sequenza da qualsiasi punto." +"Disponibile tranne quando è attualmente selezionata l'ultima differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1206 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Next Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Down</keycap> </keycombo> (or <keycap>Down</keycap> in merge mode)." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Next Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Down</" +"keycap> </keycombo> (or <keycap>Down</keycap> in merge mode)." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza " -"successiva</guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Giù</keycap> </keycombo > (o <keycap >Giù</keycap> in modalità " -"unione)." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza successiva</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Giù</" +"keycap> </keycombo > (o <keycap >Giù</keycap> in modalità unione)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1229 @@ -4892,16 +6541,24 @@ msgstr "Differenza precedente<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1235 msgid "" -"Selects the previous difference above your current cursor location (not necessarily relative to the current difference). Use to step backwards " -"sequentially through differences. Available except when the first difference is currently selected." +"Selects the previous difference above your current cursor location (not " +"necessarily relative to the current difference). Use to step backwards " +"sequentially through differences. Available except when the first difference " +"is currently selected." msgstr "" -"Seleziona la differenza precedente sopra la posizione corrente del cursore (non necessariamente relativa alla differenza corrente).Utilizzare per " -"tornare indietro in sequenza attraverso le differenze.Disponibile tranne quando è attualmente selezionata la prima differenza." +"Seleziona la differenza precedente sopra la posizione corrente del cursore " +"(non necessariamente relativa alla differenza corrente).Utilizzare per " +"tornare indietro in sequenza attraverso le differenze.Disponibile tranne " +"quando è attualmente selezionata la prima differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1241 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/prevdiff_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/prevdiff_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"prevdiff_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"prevdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1247 @@ -4911,12 +6568,15 @@ msgstr "Pulsante Differenza precedente" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1240 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Previous Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Up</keycap> </keycombo> (or <keycap>Up</keycap> in merge mode)." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Previous Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Up</" +"keycap> </keycombo> (or <keycap>Up</keycap> in merge mode)." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza " -"precedente</guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Su</keycap> </keycombo > (o <keycap >Su</keycap > in modalità " -"unione)." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Differenza precedente</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Su</" +"keycap> </keycombo > (o <keycap >Su</keycap > in modalità unione)." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1263 @@ -4931,30 +6591,44 @@ msgstr "Prima differenza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1269 msgid "" -"Use this to begin comparing or merging differences, or to locate the first difference from any other location. Available except when the first " -"difference is currently selected. You can also select a difference by double-clicking its text." +"Use this to begin comparing or merging differences, or to locate the first " +"difference from any other location. Available except when the first " +"difference is currently selected. You can also select a difference by double-" +"clicking its text." msgstr "" -"Utilizzalo per iniziare a confrontare o unire le differenze o per individuare la prima differenza da qualsiasi altra posizione.Disponibile tranne " -"quando è attualmente selezionata la prima differenza.Puoi anche selezionare una differenza facendo doppio clic sul suo testo." +"Utilizzalo per iniziare a confrontare o unire le differenze o per " +"individuare la prima differenza da qualsiasi altra posizione.Disponibile " +"tranne quando è attualmente selezionata la prima differenza.Puoi anche " +"selezionare una differenza facendo doppio clic sul suo testo." #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_files.xml:1275 English/Intro_diffs.xml:191 English/Intro_diffs.xml:312 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/firstdiff_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/firstdiff_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1275 English/Intro_diffs.xml:191 +#: English/Intro_diffs.xml:312 +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"firstdiff_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"firstdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1281 English/Intro_diffs.xml:197 English/Intro_diffs.xml:318 +#: English/Compare_files.xml:1281 English/Intro_diffs.xml:197 +#: English/Intro_diffs.xml:318 msgid "First Difference button" msgstr "Pulsante Prima differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1274 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>First Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>First Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Home</" +"keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Prima differenza</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Home</keycap> </keycombo>." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Prima differenza</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Home</" +"keycap> </keycombo>." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1297 @@ -4974,39 +6648,53 @@ msgstr "Questa funzione ha due modalità di azione:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><itemizedlist><listitem><simpara> #: English/Compare_files.xml:1307 msgid "" -"If your cursor is inside a difference but no difference is selected, this function selects the entire difference. This is a very handy way to select " -"a difference using the keyboard." +"If your cursor is inside a difference but no difference is selected, this " +"function selects the entire difference. This is a very handy way to select a " +"difference using the keyboard." msgstr "" -"Se il cursore si trova all'interno di una differenza ma non è selezionata alcuna differenza, questa funzione seleziona l'intera differenza.Questo è " -"un modo molto pratico per selezionare una differenza utilizzando la tastiera." +"Se il cursore si trova all'interno di una differenza ma non è selezionata " +"alcuna differenza, questa funzione seleziona l'intera differenza.Questo è un " +"modo molto pratico per selezionare una differenza utilizzando la tastiera." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><itemizedlist><listitem><simpara> #: English/Compare_files.xml:1314 msgid "" -"When there is a current difference, the function jumps to that location. This is handy if you have scrolled the selected difference out of view, and " +"When there is a current difference, the function jumps to that location. " +"This is handy if you have scrolled the selected difference out of view, and " "want to quickly return to its location." msgstr "" -"Quando c'è una differenza di corrente, la funzione passa a quella posizione.Ciò è utile se hai fatto scorrere la differenza selezionata fuori dalla " +"Quando c'è una differenza di corrente, la funzione passa a quella posizione." +"Ciò è utile se hai fatto scorrere la differenza selezionata fuori dalla " "vista e desideri tornare rapidamente alla sua posizione." #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> -#: English/Compare_files.xml:1322 English/Intro_diffs.xml:176 English/Intro_diffs.xml:301 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/currentdiff_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/currentdiff_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1322 English/Intro_diffs.xml:176 +#: English/Intro_diffs.xml:301 +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"currentdiff_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"currentdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1328 English/Intro_diffs.xml:182 English/Intro_diffs.xml:307 +#: English/Compare_files.xml:1328 English/Intro_diffs.xml:182 +#: English/Intro_diffs.xml:307 msgid "Current Difference button" msgstr "Pulsante Differenza attuale" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1321 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Current Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Enter</keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Current Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Enter</" +"keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Differenza corrente</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Differenza corrente</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " +">Invio</keycap> </keycombo >." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1344 @@ -5025,8 +6713,12 @@ msgstr "Abilitato tranne quando è attualmente selezionata l'ultima differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1354 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/lastdiff_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/lastdiff_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"lastdiff_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"lastdiff_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1360 @@ -5036,14 +6728,19 @@ msgstr "Pulsante Ultima differenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1353 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Last Difference</" -"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>End</keycap> </keycombo>." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Last Difference</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>End</" +"keycap> </keycombo>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Ultima differenza</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Fine</keycap> </keycombo >." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Ultima differenza</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Fine</" +"keycap> </keycombo >." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> -#: English/Compare_files.xml:1376 English/Compare_files.xml:1409 English/Compare_files.xml:1427 English/Compare_files.xml:1445 +#: English/Compare_files.xml:1376 English/Compare_files.xml:1409 +#: English/Compare_files.xml:1427 English/Compare_files.xml:1445 msgid "Go to function" msgstr "Vai alla funzione" @@ -5055,29 +6752,40 @@ msgstr "Vai a<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1380 msgid "" -"Enables you to jump to either a line number or a difference number (for example, difference 2 is the second difference). Opens the Go to dialog, " -"where you specify the number, which file to use (either the left or right), and the type of location (either line or difference)." +"Enables you to jump to either a line number or a difference number (for " +"example, difference 2 is the second difference). Opens the Go to dialog, " +"where you specify the number, which file to use (either the left or right), " +"and the type of location (either line or difference)." msgstr "" -"Consente di passare a un numero di riga o a un numero di differenza (ad esempio, la differenza 2 è la seconda differenza).Apre la finestra di dialogo " -"Vai a, in cui si specifica il numero, quale file utilizzare (sinistro o destro) e il tipo di posizione (riga o differenza)." +"Consente di passare a un numero di riga o a un numero di differenza (ad " +"esempio, la differenza 2 è la seconda differenza).Apre la finestra di " +"dialogo Vai a, in cui si specifica il numero, quale file utilizzare " +"(sinistro o destro) e il tipo di posizione (riga o differenza)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Compare_files.xml:1387 msgid "" -"The Go to line number can be useful when you need to merge the same change from one file to several target files. Jumping to a particular difference " -"can be quicker than using <guimenuitem>Find</guimenuitem> to search text, or stepping through differences." +"The Go to line number can be useful when you need to merge the same change " +"from one file to several target files. Jumping to a particular difference " +"can be quicker than using <guimenuitem>Find</guimenuitem> to search text, or " +"stepping through differences." msgstr "" -"Il numero Vai a riga può essere utile quando è necessario unire la stessa modifica da un file a più file di destinazione.Saltare a una particolare " -"differenza può essere più rapido che usare <guimenuitem >Trova</guimenuitem > per cercare testo o scorrere le differenze." +"Il numero Vai a riga può essere utile quando è necessario unire la stessa " +"modifica da un file a più file di destinazione.Saltare a una particolare " +"differenza può essere più rapido che usare <guimenuitem >Trova</guimenuitem " +"> per cercare testo o scorrere le differenze." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1395 msgid "" -"Shortcuts: <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Go to</guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>G</keycap> </" -"keycombo>, context menu in File pane and Location pane." +"Shortcuts: <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Go to</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>G</" +"keycap> </keycombo>, context menu in File pane and Location pane." msgstr "" -"Scorciatoie: <menuchoice> <guimenu >Modifica</guimenu> <guimenuitem >Vai a</guimenuitem> </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " -">G</keycap> </keycombo >, menu contestuale nel pannello File e nel pannello Posizione." +"Scorciatoie: <menuchoice> <guimenu >Modifica</guimenu> <guimenuitem >Vai a</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >G</" +"keycap> </keycombo >, menu contestuale nel pannello File e nel pannello " +"Posizione." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1408 @@ -5086,37 +6794,59 @@ msgstr "Vai a Linea spostata<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1413 -msgid "Enables to jump to the moved from/to of current diff on the other panel (2 panes)." -msgstr "Consente di passare allo spostamento da/a della differenza corrente sull'altro pannello (2 riquadri)." +msgid "" +"Enables to jump to the moved from/to of current diff on the other panel (2 " +"panes)." +msgstr "" +"Consente di passare allo spostamento da/a della differenza corrente " +"sull'altro pannello (2 riquadri)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1415 English/Compare_files.xml:1433 -msgid "Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." +msgid "" +"Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> " +"<keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." msgstr "" -"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " +"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> " +"<keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " "riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1426 -msgid "Go to Moved Line Between Left and Middle<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Vai a Linea spostata tra sinistra e centro<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Go to Moved Line Between Left and Middle<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Vai a Linea spostata tra sinistra e centro<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1431 English/Compare_files.xml:1449 -msgid "Enables to jump to the moved from/to of current diff on the other panel (3 panes)." -msgstr "Consente di passare allo spostamento da/a della differenza corrente sull'altro pannello (3 riquadri)." +msgid "" +"Enables to jump to the moved from/to of current diff on the other panel (3 " +"panes)." +msgstr "" +"Consente di passare allo spostamento da/a della differenza corrente " +"sull'altro pannello (3 riquadri)." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_files.xml:1444 -msgid "Go to Moved Line Between Middle and Right<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Vai a Linea spostata tra il centro e la destra<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Go to Moved Line Between Middle and Right<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Vai a Linea spostata tra il centro e la destra<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1451 -msgid "Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>, context menu in File pane and Diff pane." +msgid "" +"Shortcuts: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</" +"keycap> </keycombo>, context menu in File pane and Diff pane." msgstr "" -"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel riquadro " -"Diff." +"Scorciatoie: <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> " +"<keycap>G</keycap> </keycombo>, menu contestuale nel riquadro File e nel " +"riquadro Diff." #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Compare_files.xml:1462 English/Shortcut_keys.xml:190 @@ -5139,8 +6869,10 @@ msgid "Synchronization points<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "Punti di sincronizzazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><para> -#: English/Compare_files.xml:1476 English/Compare_images.xml:117 English/Configuration.xml:2558 English/Configuration.xml:2724 -#: English/Configuration.xml:2843 English/Configuration.xml:3272 English/Filters.xml:1871 English/Filters.xml:2302 English/Filters.xml:2307 +#: English/Compare_files.xml:1476 English/Compare_images.xml:117 +#: English/Configuration.xml:2558 English/Configuration.xml:2724 +#: English/Configuration.xml:2843 English/Configuration.xml:3272 +#: English/Filters.xml:1871 English/Filters.xml:2302 English/Filters.xml:2307 #: English/Filters.xml:2318 msgid "TBD" msgstr "Da definire" @@ -5153,14 +6885,18 @@ msgstr "Unione delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_files.xml:1484 msgid "" -"Merging copies differences from one File pane to the other: either left to right, or right to left. This is different from directly editing text " -"using WinMerge's editing functions (described earlier in this topic)." +"Merging copies differences from one File pane to the other: either left to " +"right, or right to left. This is different from directly editing text using " +"WinMerge's editing functions (described earlier in this topic)." msgstr "" -"L'unione copia le differenze da un riquadro File all'altro: da sinistra a destra o da destra a sinistra.Ciò è diverso dalla modifica diretta del " -"testo utilizzando le funzioni di modifica di WinMerge (descritte in precedenza in questo argomento)." +"L'unione copia le differenze da un riquadro File all'altro: da sinistra a " +"destra o da destra a sinistra.Ciò è diverso dalla modifica diretta del testo " +"utilizzando le funzioni di modifica di WinMerge (descritte in precedenza in " +"questo argomento)." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:1491 English/Compare_files.xml:1776 English/Configuration.xml:2355 +#: English/Compare_files.xml:1491 English/Compare_files.xml:1776 +#: English/Configuration.xml:2355 msgid "rescanning files" msgstr "nuova scansione dei file" @@ -5172,65 +6908,92 @@ msgstr "Nuova scansione dei file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1494 msgid "" -"By default, the <guilabel>Automatic rescan</guilabel> option is enabled in the Editor page of WinMerge options. Rescanning keeps your compare and " -"merge operations up to date. Without rescanning, WinMerge differences does not detect changes that might occur to files while you are comparing them, " -"for example in an external editor." +"By default, the <guilabel>Automatic rescan</guilabel> option is enabled in " +"the Editor page of WinMerge options. Rescanning keeps your compare and merge " +"operations up to date. Without rescanning, WinMerge differences does not " +"detect changes that might occur to files while you are comparing them, for " +"example in an external editor." msgstr "" -"Per impostazione predefinita, l'opzione <guilabel >Riscansione automatica</guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge.La " -"nuova scansione mantiene aggiornate le operazioni di confronto e unione.Senza una nuova scansione, le differenze WinMerge non rilevano le modifiche " -"che potrebbero verificarsi nei file mentre li confronti, ad esempio in un editor esterno." +"Per impostazione predefinita, l'opzione <guilabel >Riscansione automatica</" +"guilabel > è abilitata nella pagina Editor delle opzioni di WinMerge.La " +"nuova scansione mantiene aggiornate le operazioni di confronto e unione." +"Senza una nuova scansione, le differenze WinMerge non rilevano le modifiche " +"che potrebbero verificarsi nei file mentre li confronti, ad esempio in un " +"editor esterno." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1500 msgid "" -"Rescanning occurs when you perform certain actions (like merging a difference or editing a file) during a file compare. If a file has changed, " -"WinMerge displays a dialog advising you that another application has updated the file, and asks whether you want to reload the file." +"Rescanning occurs when you perform certain actions (like merging a " +"difference or editing a file) during a file compare. If a file has changed, " +"WinMerge displays a dialog advising you that another application has updated " +"the file, and asks whether you want to reload the file." msgstr "" -"La nuova scansione si verifica quando esegui determinate azioni (come unire una differenza o modificare un file) durante un confronto di file.Se un " -"file è cambiato, WinMerge visualizza una finestra di dialogo che informa che un'altra applicazione ha aggiornato il file e chiede se desideri " -"ricaricare il file." +"La nuova scansione si verifica quando esegui determinate azioni (come unire " +"una differenza o modificare un file) durante un confronto di file.Se un file " +"è cambiato, WinMerge visualizza una finestra di dialogo che informa che " +"un'altra applicazione ha aggiornato il file e chiede se desideri ricaricare " +"il file." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1505 msgid "" -"Click <guibutton>Yes</guibutton> to reload the file before proceeding, or <guibutton>No</guibutton> to ignore the changes and work with the earlier " +"Click <guibutton>Yes</guibutton> to reload the file before proceeding, or " +"<guibutton>No</guibutton> to ignore the changes and work with the earlier " "loaded version of the file." msgstr "" -"Fai clic su <guibutton >Sì</guibutton > per ricaricare il file prima di procedere, oppure su <guibutton >No</guibutton > per ignorare le modifiche e " +"Fai clic su <guibutton >Sì</guibutton > per ricaricare il file prima di " +"procedere, oppure su <guibutton >No</guibutton > per ignorare le modifiche e " "lavorare con la versione del file caricata in precedenza." #. type: Content of: <article><section><para><inlinemediaobject> -#: English/Compare_files.xml:1518 English/Compare_files.xml:1785 English/Quick_start.xml:369 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/refresh_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/refresh_btn.png\" /> </imageobject>" +#: English/Compare_files.xml:1518 English/Compare_files.xml:1785 +#: English/Quick_start.xml:369 +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"refresh_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"refresh_btn.png\" /> </imageobject>" #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase> -#: English/Compare_files.xml:1523 English/Compare_files.xml:1712 English/Compare_files.xml:1791 English/Quick_start.xml:374 +#: English/Compare_files.xml:1523 English/Compare_files.xml:1712 +#: English/Compare_files.xml:1791 English/Quick_start.xml:374 msgid "Refresh button" msgstr "Pulsante Aggiorna" #. type: Content of: <article><section><section><important><para> #: English/Compare_files.xml:1510 msgid "" -"If <guilabel>Automatic rescan</guilabel> is disabled, or if you suspect that a file might have changed, we strongly advise that you run " -"<guimenuitem>Refresh</guimenuitem> <emphasis>before</emphasis> performing any merge operation: click <menuchoice> <guimenu>Edit</guimenu> " -"<guimenuitem>Refresh</guimenuitem> </menuchoice> or the <placeholder type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or press <keycap>F5</" +"If <guilabel>Automatic rescan</guilabel> is disabled, or if you suspect that " +"a file might have changed, we strongly advise that you run " +"<guimenuitem>Refresh</guimenuitem> <emphasis>before</emphasis> performing " +"any merge operation: click <menuchoice> <guimenu>Edit</guimenu> " +"<guimenuitem>Refresh</guimenuitem> </menuchoice> or the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or press <keycap>F5</" "keycap>." msgstr "" -"Se la <guilabel >Riscansione automatica</guilabel > è disabilitata, o se sospetti che un file possa essere cambiato, ti consigliamo vivamente di " -"eseguire <guimenuitem >Aggiorna</guimenuitem > <emphasis >prima</emphasis > di eseguire qualsiasi operazione di unione: fai clic su <menuchoice> " -"<guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </menuchoice > o su <placeholder type=\"inlinemediaobject\" id=\"0\"/> pulsante " -"della barra degli strumenti oppure premi <keycap>F5</keycap>." +"Se la <guilabel >Riscansione automatica</guilabel > è disabilitata, o se " +"sospetti che un file possa essere cambiato, ti consigliamo vivamente di " +"eseguire <guimenuitem >Aggiorna</guimenuitem > <emphasis >prima</emphasis > " +"di eseguire qualsiasi operazione di unione: fai clic su <menuchoice> " +"<guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </" +"menuchoice > o su <placeholder type=\"inlinemediaobject\" id=\"0\"/> " +"pulsante della barra degli strumenti oppure premi <keycap>F5</keycap>." #. type: Content of: <article><section><section><important><para> #: English/Compare_files.xml:1528 msgid "" -"If a merge result looks incorrect, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice> or press <keycombo> " -"<keycap>Ctrl</keycap> <keycap>Z</keycap> </keycombo> to undo the merge. Then rescan the files and try merging again." +"If a merge result looks incorrect, click <menuchoice> <guimenu>Edit</" +"guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice> or press <keycombo> " +"<keycap>Ctrl</keycap> <keycap>Z</keycap> </keycombo> to undo the merge. Then " +"rescan the files and try merging again." msgstr "" -"Se il risultato di un'unione sembra errato, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Annulla</guimenuitem > </menuchoice " -"> o premi <keycombo> <keycap >Ctrl</keycap > <keycap >Z</keycap > </keycombo > per annullare l'unione.Quindi esegui nuovamente la scansione dei file " -"e prova a unirli nuovamente." +"Se il risultato di un'unione sembra errato, fai clic su <menuchoice> " +"<guimenu >Modifica</guimenu > <guimenuitem >Annulla</guimenuitem > </" +"menuchoice > o premi <keycombo> <keycap >Ctrl</keycap > <keycap >Z</keycap > " +"</keycombo > per annullare l'unione.Quindi esegui nuovamente la scansione " +"dei file e prova a unirli nuovamente." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Compare_files.xml:1545 @@ -5245,27 +7008,40 @@ msgstr "Unisci funzioni<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1548 msgid "" -"The merging functions can implicitly select differences based on a cursor location or text selection. For example, if you click anywhere in a " -"difference and then click the <guibutton>Copy Right</guibutton> toolbar button, the entire difference block is merged. This makes it easy to merge " -"many small differences. Similarly, if you select text that spans all or part of multiple differences, all the included differences are merged with a " +"The merging functions can implicitly select differences based on a cursor " +"location or text selection. For example, if you click anywhere in a " +"difference and then click the <guibutton>Copy Right</guibutton> toolbar " +"button, the entire difference block is merged. This makes it easy to merge " +"many small differences. Similarly, if you select text that spans all or part " +"of multiple differences, all the included differences are merged with a " "single merge command." msgstr "" -"Le funzioni di unione possono selezionare implicitamente le differenze in base alla posizione del cursore o alla selezione del testo.Ad esempio, se " -"fai clic in un punto qualsiasi di una differenza e poi fai clic sul pulsante <guibutton >Copia a destra</guibutton > nella barra degli strumenti, " -"l'intero blocco della differenza verrà unito.Ciò rende facile unire molte piccole differenze.Allo stesso modo, se selezioni un testo che si estende " -"su tutte o parte di più differenze, tutte le differenze incluse verranno unite con un unico comando di unione." +"Le funzioni di unione possono selezionare implicitamente le differenze in " +"base alla posizione del cursore o alla selezione del testo.Ad esempio, se " +"fai clic in un punto qualsiasi di una differenza e poi fai clic sul pulsante " +"<guibutton >Copia a destra</guibutton > nella barra degli strumenti, " +"l'intero blocco della differenza verrà unito.Ciò rende facile unire molte " +"piccole differenze.Allo stesso modo, se selezioni un testo che si estende su " +"tutte o parte di più differenze, tutte le differenze incluse verranno unite " +"con un unico comando di unione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1556 -msgid "If the result of a merge operation is not what you expected, you can click <guibutton>Undo</guibutton> to reverse the operation." +msgid "" +"If the result of a merge operation is not what you expected, you can click " +"<guibutton>Undo</guibutton> to reverse the operation." msgstr "" -"Se il risultato di un'operazione di unione non è quello che ti aspettavi, puoi fare clic su <guibutton >Annulla</guibutton > per invertire " +"Se il risultato di un'operazione di unione non è quello che ti aspettavi, " +"puoi fare clic su <guibutton >Annulla</guibutton > per invertire " "l'operazione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1559 -msgid "Here are the merge functions and their shortcuts in the toolbar and menus:" -msgstr "Ecco le funzioni di unione e le relative scorciatoie nella barra degli strumenti e nei menu:" +msgid "" +"Here are the merge functions and their shortcuts in the toolbar and menus:" +msgstr "" +"Ecco le funzioni di unione e le relative scorciatoie nella barra degli " +"strumenti e nei menu:" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1565 @@ -5280,23 +7056,34 @@ msgstr "Copia a destra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1569 msgid "" -"Copies one or more difference from left to right. Note that differences do not need to be fully selected: At its simplest, this means replacing text " -"in the target difference with text in source difference. But because differences can also contain empty lines, new lines may be created or removed." +"Copies one or more difference from left to right. Note that differences do " +"not need to be fully selected: At its simplest, this means replacing text in " +"the target difference with text in source difference. But because " +"differences can also contain empty lines, new lines may be created or " +"removed." msgstr "" -"Copia una o più differenze da sinistra a destra.Tieni presente che non è necessario che le differenze siano completamente selezionate: nella sua " -"forma più semplice, ciò significa sostituire il testo nella differenza di destinazione con il testo nella differenza di origine.Ma poiché le " -"differenze possono contenere anche righe vuote, è possibile che vengano create o rimosse nuove righe." +"Copia una o più differenze da sinistra a destra.Tieni presente che non è " +"necessario che le differenze siano completamente selezionate: nella sua " +"forma più semplice, ciò significa sostituire il testo nella differenza di " +"destinazione con il testo nella differenza di origine.Ma poiché le " +"differenze possono contenere anche righe vuote, è possibile che vengano " +"create o rimosse nuove righe." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1575 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</guimenuitem> " -"</menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Right</keycap> </keycombo> (or <keycap>Right</keycap> in merge mode), context menu in File " -"pane within a difference, and in Diff pane." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Right</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Right</" +"keycap> </keycombo> (or <keycap>Right</keycap> in merge mode), context menu " +"in File pane within a difference, and in Diff pane." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Copia a destra</" -"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Destra</keycap> </keycombo > (o <keycap >Destra</keycap > in modalità unione), " -"menu contestuale nel pannello File all'interno di undifferenza e nel riquadro Diff." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu> <guimenuitem >Copia a destra</" +"guimenuitem> </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " +">Destra</keycap> </keycombo > (o <keycap >Destra</keycap > in modalità " +"unione), menu contestuale nel pannello File all'interno di undifferenza e " +"nel riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1599 @@ -5310,19 +7097,28 @@ msgstr "Copia a sinistra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1603 -msgid "Copies the current difference from the right to the left File pane. See <command>Copy Right</command> description for details." -msgstr "Copia la differenza corrente dal riquadro File di destra a quello di sinistra.Vedi la descrizione <command>Copy Right</command> per i dettagli." +msgid "" +"Copies the current difference from the right to the left File pane. See " +"<command>Copy Right</command> description for details." +msgstr "" +"Copia la differenza corrente dal riquadro File di destra a quello di " +"sinistra.Vedi la descrizione <command>Copy Right</command> per i dettagli." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1607 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" -"menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo> (or <keycap>Left</keycap> in merge mode), context menu in File pane " -"within a difference, and in Diff pane." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</" +"keycap> </keycombo> (or <keycap>Left</keycap> in merge mode), context menu " +"in File pane within a difference, and in Diff pane." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo > (o <keycap >Sinistra</keycap > in modalità " -"unione), menu contestuale nel pannello File all'interno di undifferenza e nel riquadro Diff." +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap " +">Sinistra</keycap> </keycombo > (o <keycap >Sinistra</keycap > in modalità " +"unione), menu contestuale nel pannello File all'interno di undifferenza e " +"nel riquadro Diff." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Compare_files.xml:1631 @@ -5337,16 +7133,23 @@ msgstr "Copia a destra e avanza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1635 msgid "" -"Merges the current difference from the right to the left File pane, then selects the next difference (if one exists). Equivalent to <command>Copy " +"Merges the current difference from the right to the left File pane, then " +"selects the next difference (if one exists). Equivalent to <command>Copy " "Right</command> and <command>Next Difference</command> in one step." msgstr "" -"Unisce la differenza corrente dal riquadro File di destra a quello di sinistra, quindi seleziona la differenza successiva (se ne esiste " -"una).Equivalente a <command>Copia a destra</command> e <command>Differenza successiva</command> in un unico passaggio." +"Unisce la differenza corrente dal riquadro File di destra a quello di " +"sinistra, quindi seleziona la differenza successiva (se ne esiste una)." +"Equivalente a <command>Copia a destra</command> e <command>Differenza " +"successiva</command> in un unico passaggio." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1641 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyr_adv_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyr_adv_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"copyr_adv_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"copyr_adv_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1647 @@ -5356,11 +7159,16 @@ msgstr "Pulsante Copyright e Avanzamento" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1640 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" -"menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right</keycap> </keycombo>, context menu in File pane within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</" +"keycap> <keycap>Right</keycap> </keycombo>, context menu in File pane within " +"a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >Alt</keycap> <keycap >Destra</keycap> </keycombo >, menu contestuale nel " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " +">Alt</keycap> <keycap >Destra</keycap> </keycombo >, menu contestuale nel " "pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -5376,16 +7184,23 @@ msgstr "Copia a sinistra e avanza<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1669 msgid "" -"Merges the current difference from left to right, then selects the next difference (if one exists). Equivalent to <command>Copy Left</command> and " +"Merges the current difference from left to right, then selects the next " +"difference (if one exists). Equivalent to <command>Copy Left</command> and " "<command>Next Difference</command> in one step." msgstr "" -"Unisce la differenza corrente da sinistra a destra, quindi seleziona la differenza successiva (se ne esiste una).Equivalente a <command>Copia a " -"sinistra</command> e <command>Differenza successiva</command> in un unico passaggio." +"Unisce la differenza corrente da sinistra a destra, quindi seleziona la " +"differenza successiva (se ne esiste una).Equivalente a <command>Copia a " +"sinistra</command> e <command>Differenza successiva</command> in un unico " +"passaggio." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1675 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyl_adv_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/copyl_adv_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"copyl_adv_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"copyl_adv_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1681 @@ -5395,11 +7210,16 @@ msgstr "Pulsante Copia sinistra e Avanza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1674 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" -"menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</" +"keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within " +"a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" -"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a sinistra</" +"guimenuitem > </menuchoice >, <keycombo> <keycap >Ctrl</keycap> <keycap " +">Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel " "pannello File all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -5414,24 +7234,36 @@ msgstr "Va bene<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1706 -msgid "<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn." +"png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"11\" fileref=\"screenshots/undo_btn." +"png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1703 msgid "" -"Copies all differences from the left to the right File pane. Use to synchronize two files with one command. Similarly, you can back out the entire " -"merge by clicking the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Undo or pressing <keycombo> <keycap>Ctrl</keycap> <keycap>Z</keycap> </" -"keycombo>." +"Copies all differences from the left to the right File pane. Use to " +"synchronize two files with one command. Similarly, you can back out the " +"entire merge by clicking the <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> Undo or pressing <keycombo> <keycap>Ctrl</keycap> <keycap>Z</" +"keycap> </keycombo>." msgstr "" -"Copia tutte le differenze dal riquadro File da sinistra a destra.Utilizzare per sincronizzare due file con un comando.Allo stesso modo, puoi " -"annullare l'intera unione facendo clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> Annulla o premendo <keycombo> <keycap>Ctrl</keycap> " -"<keycap>Z</keycap> </keycombo>." +"Copia tutte le differenze dal riquadro File da sinistra a destra.Utilizzare " +"per sincronizzare due file con un comando.Allo stesso modo, puoi annullare " +"l'intera unione facendo clic su <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> Annulla o premendo <keycombo> <keycap>Ctrl</keycap> <keycap>Z</" +"keycap> </keycombo>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1721 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allright_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allright_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"allright_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"allright_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1727 @@ -5441,11 +7273,15 @@ msgstr "Pulsante Tutto a destra" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1720 English/Compare_files.xml:1751 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</guimenuitem> </" -"menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</keycap> </keycombo>, context menu in File pane within a difference." +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>Merge</guimenu> <guimenuitem>Copy to Left</" +"guimenuitem> </menuchoice>, <keycombo> <keycap>Alt</keycap> <keycap>Left</" +"keycap> </keycombo>, context menu in File pane within a difference." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, pulsante <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a " -"sinistra</guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> <keycap >Sinistra</keycap> </keycombo >, menu contestuale nel pannello File " +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"pulsante <menuchoice> <guimenu >Unisci</guimenu > <guimenuitem >Copia a " +"sinistra</guimenuitem > </menuchoice >, <keycombo> <keycap >Alt</keycap> " +"<keycap >Sinistra</keycap> </keycombo >, menu contestuale nel pannello File " "all'interno di una differenza." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> @@ -5461,16 +7297,22 @@ msgstr "Tutto a sinistra<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1747 msgid "" -"Copies all differences from the right to the left File pane. Effectively, replaces the content of the left File pane. See similar to <command>All " +"Copies all differences from the right to the left File pane. Effectively, " +"replaces the content of the left File pane. See similar to <command>All " "Right</command>." msgstr "" -"Copia tutte le differenze dal riquadro File da destra a sinistra.Di fatto, sostituisce il contenuto del riquadro File sinistro.Vedi simile a " +"Copia tutte le differenze dal riquadro File da destra a sinistra.Di fatto, " +"sostituisce il contenuto del riquadro File sinistro.Vedi simile a " "<command>Tutto bene</command>." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject> #: English/Compare_files.xml:1752 -msgid "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allleft_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/allleft_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"allleft_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentdepth=\"15\" fileref=\"screenshots/" +"allleft_btn.png\" /> </imageobject>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para><inlinemediaobject><textobject><phrase> #: English/Compare_files.xml:1758 @@ -5490,118 +7332,162 @@ msgstr "Aggiorna<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1780 msgid "" -"Rescans files to update differences. Use after changes are made to files, if automatic scanning is disabled (see <xref " -"linkend=\"Compare_files_scan\" /> for details)." +"Rescans files to update differences. Use after changes are made to files, if " +"automatic scanning is disabled (see <xref linkend=\"Compare_files_scan\" /> " +"for details)." msgstr "" -"Esegue nuovamente la scansione dei file per aggiornare le differenze.Da utilizzare dopo aver apportato modifiche ai file, se la scansione automatica " +"Esegue nuovamente la scansione dei file per aggiornare le differenze.Da " +"utilizzare dopo aver apportato modifiche ai file, se la scansione automatica " "è disabilitata (vedi <xref linkend=\"Compare_files_scan\" /> per i dettagli)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_files.xml:1784 msgid "" -"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, <menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh</guimenuitem> </" +"Shortcuts: <placeholder type=\"inlinemediaobject\" id=\"0\"/> button, " +"<menuchoice> <guimenu>View</guimenu> <guimenuitem>Refresh</guimenuitem> </" "menuchoice>, <keycap>F5</keycap>." msgstr "" -"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Aggiorna</" +"Scorciatoie: pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/>, " +"<menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Aggiorna</" "guimenuitem > </menuchoice >, <keycap >F5</keycap >." #. type: Content of: <article><section><section><title> #: English/Compare_files.xml:1804 msgid "Resolving conflict files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Risoluzione dei file in conflitto<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Risoluzione dei file in conflitto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1808 msgid "" -"You can use WinMerge to resolve conflict files that some version control systems produce during their merge operations. A conflict file is created " -"when a merge encounters differences that cannot be automatically resolved. It is a single file containing the incompletely merged content of the two " -"files. WinMerge separates the conflict file into separate files and opens those files in file Compare window. You can then use WinMerge's compare and " +"You can use WinMerge to resolve conflict files that some version control " +"systems produce during their merge operations. A conflict file is created " +"when a merge encounters differences that cannot be automatically resolved. " +"It is a single file containing the incompletely merged content of the two " +"files. WinMerge separates the conflict file into separate files and opens " +"those files in file Compare window. You can then use WinMerge's compare and " "merge functions to resolve the conflicts and save the merged result file." msgstr "" -"È possibile utilizzare WinMerge per risolvere i file di conflitto che alcuni sistemi di controllo della versione producono durante le operazioni di " -"unione.Viene creato un file di conflitto quando un'unione rileva differenze che non possono essere risolte automaticamente.È un singolo file " -"contenente il contenuto unito in modo incompleto dei due file.WinMerge separa il file in conflitto in file separati e apre tali file nella finestra " -"Confronta file.È quindi possibile utilizzare le funzioni di confronto e unione di WinMerge per risolvere i conflitti e salvare il file dei risultati " -"uniti." +"È possibile utilizzare WinMerge per risolvere i file di conflitto che alcuni " +"sistemi di controllo della versione producono durante le operazioni di " +"unione.Viene creato un file di conflitto quando un'unione rileva differenze " +"che non possono essere risolte automaticamente.È un singolo file contenente " +"il contenuto unito in modo incompleto dei due file.WinMerge separa il file " +"in conflitto in file separati e apre tali file nella finestra Confronta file." +"È quindi possibile utilizzare le funzioni di confronto e unione di WinMerge " +"per risolvere i conflitti e salvare il file dei risultati uniti." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1819 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Conflict File</guimenuitem> </menuchoice>, and use the Open dialog to select the " -"conflict file in your file system. The conflict file opens in the File Compare window:" +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Conflict File</" +"guimenuitem> </menuchoice>, and use the Open dialog to select the conflict " +"file in your file system. The conflict file opens in the File Compare window:" msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri file di conflitto</guimenuitem > </menuchoice > e usa la finestra di dialogo " -"Apri per selezionare il file di conflitto nel tuo file system.Il file in conflitto si apre nella finestra Confronta file:" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri file " +"di conflitto</guimenuitem > </menuchoice > e usa la finestra di dialogo Apri " +"per selezionare il file di conflitto nel tuo file system.Il file in " +"conflitto si apre nella finestra Confronta file:" #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1829 msgid "" -"The left File pane file header is titled, <guilabel>Theirs File</guilabel>. This side represents the file that is usually in the version control " -"system's repository. This file usually cannot be edited, so WinMerge sets the left File pane to be read-only. This means that differences can be " +"The left File pane file header is titled, <guilabel>Theirs File</guilabel>. " +"This side represents the file that is usually in the version control " +"system's repository. This file usually cannot be edited, so WinMerge sets " +"the left File pane to be read-only. This means that differences can be " "merged only from this file to the other file." msgstr "" -"L'intestazione del file nel riquadro File di sinistra è intitolata <guilabel >Il loro file</guilabel >.Questo lato rappresenta il file che di solito " -"si trova nel repository del sistema di controllo della versione.Questo file solitamente non può essere modificato, quindi WinMerge imposta il " -"riquadro File sinistro in sola lettura.Ciò significa che le differenze possono essere unite solo da questo file all'altro file." +"L'intestazione del file nel riquadro File di sinistra è intitolata <guilabel " +">Il loro file</guilabel >.Questo lato rappresenta il file che di solito si " +"trova nel repository del sistema di controllo della versione.Questo file " +"solitamente non può essere modificato, quindi WinMerge imposta il riquadro " +"File sinistro in sola lettura.Ciò significa che le differenze possono essere " +"unite solo da questo file all'altro file." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1838 msgid "" -"The right File pane is titled, <guilabel>Mine File</guilabel>. This side is the working copy of the file. All changes should be done to this file, " -"which is the result file." +"The right File pane is titled, <guilabel>Mine File</guilabel>. This side is " +"the working copy of the file. All changes should be done to this file, which " +"is the result file." msgstr "" -"Il pannello File di destra è intitolato <guilabel >Estrai file</guilabel >.Questo lato è la copia di lavoro del file.Tutte le modifiche dovrebbero " +"Il pannello File di destra è intitolato <guilabel >Estrai file</guilabel >." +"Questo lato è la copia di lavoro del file.Tutte le modifiche dovrebbero " "essere apportate a questo file, che è il file dei risultati." #. type: Content of: <article><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Compare_files.xml:1843 msgid "" -"The <guilabel>Mine File</guilabel> side is set to modified after opening conflict file (you will notice the asterisk in the File pane header). This " -"allows you to save the file quickly if the it does not require any changes. It also ensures that you do not forget to resolve the files. If you " -"choose not to save the file, the original conflict file is not modified." +"The <guilabel>Mine File</guilabel> side is set to modified after opening " +"conflict file (you will notice the asterisk in the File pane header). This " +"allows you to save the file quickly if the it does not require any changes. " +"It also ensures that you do not forget to resolve the files. If you choose " +"not to save the file, the original conflict file is not modified." msgstr "" -"Il lato <guilabel >File estratto</guilabel > viene impostato su modificato dopo l'apertura del file in conflitto (noterai l'asterisco " -"nell'intestazione del riquadro File).Ciò consente di salvare rapidamente il file se non richiede alcuna modifica.Garantisce inoltre che non ti " -"dimentichi di risolvere i file.Se scegli di non salvare il file, il file in conflitto originale non verrà modificato." +"Il lato <guilabel >File estratto</guilabel > viene impostato su modificato " +"dopo l'apertura del file in conflitto (noterai l'asterisco nell'intestazione " +"del riquadro File).Ciò consente di salvare rapidamente il file se non " +"richiede alcuna modifica.Garantisce inoltre che non ti dimentichi di " +"risolvere i file.Se scegli di non salvare il file, il file in conflitto " +"originale non verrà modificato." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1854 -msgid "Use all the normal compare and merge functions described earlier in this topic to resolve the conflicts in the Mine File pane." +msgid "" +"Use all the normal compare and merge functions described earlier in this " +"topic to resolve the conflicts in the Mine File pane." msgstr "" -"Utilizzare tutte le normali funzioni di confronto e unione descritte in precedenza in questo argomento per risolvere i conflitti nel riquadro File di " -"miniera." +"Utilizzare tutte le normali funzioni di confronto e unione descritte in " +"precedenza in questo argomento per risolvere i conflitti nel riquadro File " +"di miniera." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Compare_files.xml:1859 msgid "" -"When you are done, click <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to save the <guilabel>Mine File</guilabel> side as the " -"result file. By default, the new version overwrites the original conflict file. Alternatively, you can click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Save Right</guimenuitem> <guimenuitem>Save As</guimenuitem> </menuchoice>, and choose a different file name." -msgstr "" -"Quando hai finito, fai clic su <keycombo> <keycap >Ctrl</keycap> <keycap >S</keycap> </keycombo > per salvare il lato <guilabel >File estratto</" -"guilabel > come file risultato.Per impostazione predefinita, la nuova versione sovrascrive il file di conflitto originale.In alternativa, puoi fare " -"clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva con destra</guimenuitem > <guimenuitem >Salva con nome</guimenuitem > </menuchoice " -"> e scegliere un nome file diverso." +"When you are done, click <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> " +"</keycombo> to save the <guilabel>Mine File</guilabel> side as the result " +"file. By default, the new version overwrites the original conflict file. " +"Alternatively, you can click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Save Right</guimenuitem> <guimenuitem>Save As</guimenuitem> </" +"menuchoice>, and choose a different file name." +msgstr "" +"Quando hai finito, fai clic su <keycombo> <keycap >Ctrl</keycap> <keycap >S</" +"keycap> </keycombo > per salvare il lato <guilabel >File estratto</guilabel " +"> come file risultato.Per impostazione predefinita, la nuova versione " +"sovrascrive il file di conflitto originale.In alternativa, puoi fare clic su " +"<menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva con destra</" +"guimenuitem > <guimenuitem >Salva con nome</guimenuitem > </menuchoice > e " +"scegliere un nome file diverso." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1875 msgid "" -"Many version control systems allow you to configure an external merge tool. If yours does, you might be able to have your version control system " -"launch WinMerge automatically when a merge conflict occurs." +"Many version control systems allow you to configure an external merge tool. " +"If yours does, you might be able to have your version control system launch " +"WinMerge automatically when a merge conflict occurs." msgstr "" -"Molti sistemi di controllo della versione consentono di configurare uno strumento di unione esterno.Se il tuo lo fa, potresti essere in grado di fare " -"in modo che il tuo sistema di controllo della versione avvii WinMerge automaticamente quando si verifica un conflitto di unione." +"Molti sistemi di controllo della versione consentono di configurare uno " +"strumento di unione esterno.Se il tuo lo fa, potresti essere in grado di " +"fare in modo che il tuo sistema di controllo della versione avvii WinMerge " +"automaticamente quando si verifica un conflitto di unione." #. type: Content of: <article><section><section><para> #: English/Compare_files.xml:1879 msgid "" -"You can also open a conflict file from the WinMerge command line, which accepts three filename parameters: <option>Theirs</option>, <option>Mine</" -"option>, and optionally, <option>Resolved</option> (if you want a different result file from the conflict file). For more information, see <xref " -"linkend=\"Command_line\" />. Single path to the conflict file is also accepted in command line." +"You can also open a conflict file from the WinMerge command line, which " +"accepts three filename parameters: <option>Theirs</option>, <option>Mine</" +"option>, and optionally, <option>Resolved</option> (if you want a different " +"result file from the conflict file). For more information, see <xref " +"linkend=\"Command_line\" />. Single path to the conflict file is also " +"accepted in command line." msgstr "" -"Puoi anche aprire un file di conflitto dalla riga di comando di WinMerge, che accetta tre parametri del nome file: <option>Loro</option>, " -"<option>Mine</option> e, facoltativamente, <option>Resolved</option> (se desideri un file di risultati diverso dal file di conflitto).Per ulteriori " -"informazioni, vedi <xref linkend=\"Command_line\" />.Nella riga di comando è accettato anche il percorso singolo al file in conflitto." +"Puoi anche aprire un file di conflitto dalla riga di comando di WinMerge, " +"che accetta tre parametri del nome file: <option>Loro</option>, " +"<option>Mine</option> e, facoltativamente, <option>Resolved</option> (se " +"desideri un file di risultati diverso dal file di conflitto).Per ulteriori " +"informazioni, vedi <xref linkend=\"Command_line\" />.Nella riga di comando è " +"accettato anche il percorso singolo al file in conflitto." #. type: Content of: <article><title> #: English/Compare_images.xml:5 @@ -5615,8 +7501,11 @@ msgstr "immagini" #. type: Content of: <article><para> #: English/Compare_images.xml:12 -msgid "This topic describes how to compare images using the Image Compare window." -msgstr "Questo argomento descrive come confrontare le immagini utilizzando la finestra Confronto immagini." +msgid "" +"This topic describes how to compare images using the Image Compare window." +msgstr "" +"Questo argomento descrive come confrontare le immagini utilizzando la " +"finestra Confronto immagini." #. type: Content of: <article><section><title> #: English/Compare_images.xml:16 @@ -5625,27 +7514,39 @@ msgstr "Avvio di un'operazione di confronto delle immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:18 -msgid "You can start an image compare operation from either the WinMerge window or a Command Prompt window." -msgstr "È possibile avviare un'operazione di confronto delle immagini dalla finestra WinMerge o da una finestra del prompt dei comandi." +msgid "" +"You can start an image compare operation from either the WinMerge window or " +"a Command Prompt window." +msgstr "" +"È possibile avviare un'operazione di confronto delle immagini dalla finestra " +"WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:26 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Use the Select Files or Folders dialog to specify the left " -"and right source images to compare. For more details about the Select Files or Folder dialog, see <xref linkend=\"Open_paths\" />." +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" +"menuchoice>. Use the Select Files or Folders dialog to specify the left and " +"right source images to compare. For more details about the Select Files or " +"Folder dialog, see <xref linkend=\"Open_paths\" />." msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona file " -"o cartelle per specificare le immagini di origine sinistra e destra da confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file o " -"cartella, vedi <xref linkend=\"Open_paths\" />." +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" +"guimenuitem > </menuchoice >.Utilizzare la finestra di dialogo Seleziona " +"file o cartelle per specificare le immagini di origine sinistra e destra da " +"confrontare.Per ulteriori dettagli sulla finestra di dialogo Seleziona file " +"o cartella, vedi <xref linkend=\"Open_paths\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:41 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and right images to " -"compare. For more information about using the command line, see <xref linkend=\"Command_line\" />." +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " +"directory. In your command arguments, include the left and right images to " +"compare. For more information about using the command line, see <xref " +"linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi le immagini " -"sinistra e destra da confrontare. Per ulteriori informazioni sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " +"installazione di WinMerge. Negli argomenti del comando, includi le immagini " +"sinistra e destra da confrontare. Per ulteriori informazioni sull'utilizzo " +"della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><title> #: English/Compare_images.xml:51 @@ -5654,13 +7555,21 @@ msgstr "Finestra Confronta immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:53 -msgid "WinMerge support many types of images and can highlight the differences with blocks. Overlaying of the pictures is also possible." -msgstr "WinMerge supporta molti tipi di immagini e può evidenziare le differenze con i blocchi.È anche possibile la sovrapposizione delle immagini." +msgid "" +"WinMerge support many types of images and can highlight the differences with " +"blocks. Overlaying of the pictures is also possible." +msgstr "" +"WinMerge supporta molti tipi di immagini e può evidenziare le differenze con " +"i blocchi.È anche possibile la sovrapposizione delle immagini." #. type: Content of: <article><section><mediaobject> #: English/Compare_images.xml:57 -msgid "<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /" +"> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/imgcmp1.png\" format=\"PNG\" /" +"> </imageobject>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_images.xml:62 @@ -5670,7 +7579,9 @@ msgstr "Finestra di confronto delle immagini" #. type: Content of: <article><section><para> #: English/Compare_images.xml:66 msgid "You can set the most options in the <guilabel>Location Pane</guilabel>:" -msgstr "Puoi impostare la maggior parte delle opzioni nel <guilabel >pannello Posizione</guilabel >:" +msgstr "" +"Puoi impostare la maggior parte delle opzioni nel <guilabel >pannello " +"Posizione</guilabel >:" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_images.xml:70 @@ -5689,8 +7600,12 @@ msgstr "Evidenziare" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:77 -msgid "With the check box <guilabel>Highlight</guilabel> you can enable or disable the highlighting of the image differences." -msgstr "Con la casella <guilabel >Evidenzia</guilabel > puoi abilitare o disabilitare l'evidenziazione delle differenze tra le immagini." +msgid "" +"With the check box <guilabel>Highlight</guilabel> you can enable or disable " +"the highlighting of the image differences." +msgstr "" +"Con la casella <guilabel >Evidenzia</guilabel > puoi abilitare o " +"disabilitare l'evidenziazione delle differenze tra le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:83 @@ -5699,8 +7614,12 @@ msgstr "Battito di ciglia" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:85 -msgid "If the highlighting is enabled you can even make it blinking by checking the check box <guilabel>Blink</guilabel>." -msgstr "Se l'evidenziazione è abilitata puoi anche farla lampeggiare selezionando la casella <guilabel >Lampeggia</guilabel >." +msgid "" +"If the highlighting is enabled you can even make it blinking by checking the " +"check box <guilabel>Blink</guilabel>." +msgstr "" +"Se l'evidenziazione è abilitata puoi anche farla lampeggiare selezionando la " +"casella <guilabel >Lampeggia</guilabel >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:91 @@ -5709,8 +7628,12 @@ msgstr "Dimensione del blocco" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:93 -msgid "The slider <guilabel>Block Size</guilabel> defines the size of the blocks which highlighting the image differences." -msgstr "Il cursore <guilabel >Dimensione blocco</guilabel > definisce la dimensione dei blocchi che evidenziano le differenze tra le immagini." +msgid "" +"The slider <guilabel>Block Size</guilabel> defines the size of the blocks " +"which highlighting the image differences." +msgstr "" +"Il cursore <guilabel >Dimensione blocco</guilabel > definisce la dimensione " +"dei blocchi che evidenziano le differenze tra le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:99 @@ -5719,8 +7642,12 @@ msgstr "Blocco Alfa" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:101 -msgid "The <guilabel>Block Alpha</guilabel> slider defines how strong the alpha blending of the blocks is." -msgstr "Il cursore <guilabel >Blocco alfa</guilabel > definisce quanto è forte la fusione alfa dei blocchi." +msgid "" +"The <guilabel>Block Alpha</guilabel> slider defines how strong the alpha " +"blending of the blocks is." +msgstr "" +"Il cursore <guilabel >Blocco alfa</guilabel > definisce quanto è forte la " +"fusione alfa dei blocchi." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:107 @@ -5729,8 +7656,12 @@ msgstr "Soglia distanza colore" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:109 -msgid "The slider <guilabel>CD</guilabel> sets the <emphasis>Color Distance Threshold</emphasis> which helps to ignore color differences." -msgstr "Il cursore <guilabel >CD</guilabel > imposta la <emphasis >Soglia distanza colore</emphasis > che aiuta a ignorare le differenze di colore." +msgid "" +"The slider <guilabel>CD</guilabel> sets the <emphasis>Color Distance " +"Threshold</emphasis> which helps to ignore color differences." +msgstr "" +"Il cursore <guilabel >CD</guilabel > imposta la <emphasis >Soglia distanza " +"colore</emphasis > che aiuta a ignorare le differenze di colore." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:115 @@ -5769,8 +7700,11 @@ msgstr "Modalità" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:139 -msgid "Currently the following <emphasis>Overlay Modes</emphasis> are possible:" -msgstr "Attualmente sono possibili le seguenti <emphasis>Modalità di sovrapposizione</emphasis>:" +msgid "" +"Currently the following <emphasis>Overlay Modes</emphasis> are possible:" +msgstr "" +"Attualmente sono possibili le seguenti <emphasis>Modalità di " +"sovrapposizione</emphasis>:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><guilabel> #: English/Compare_images.xml:142 @@ -5795,14 +7729,17 @@ msgstr "Alfa" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:153 msgid "" -"The <guilabel>Alpha</guilabel> slider defines how strong the alpha blending of the overlay nodes <guilabel>Alpha Blend</guilabel> or <guilabel>Alpha " +"The <guilabel>Alpha</guilabel> slider defines how strong the alpha blending " +"of the overlay nodes <guilabel>Alpha Blend</guilabel> or <guilabel>Alpha " "Blend Animation</guilabel> is." msgstr "" -"Il cursore <guilabel >Alfa</guilabel > definisce quanto è forte la fusione alfa dei nodi di sovrapposizione <guilabel >Miscela alfa</guilabel > o " +"Il cursore <guilabel >Alfa</guilabel > definisce quanto è forte la fusione " +"alfa dei nodi di sovrapposizione <guilabel >Miscela alfa</guilabel > o " "<guilabel >Animazione fusione alfa</guilabel >." #. type: Content of: <appendix><table><title> -#: English/Compare_images.xml:163 English/Compare_images.xml:168 English/Shortcut_keys.xml:735 +#: English/Compare_images.xml:163 English/Compare_images.xml:168 +#: English/Shortcut_keys.xml:735 msgid "Zoom" msgstr "Zoom" @@ -5813,8 +7750,12 @@ msgstr "Zoom<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:170 -msgid "With the <guilabel>Zoom</guilabel> slider you can zoom in or out of the images." -msgstr "Con il cursore <guilabel >Zoom</guilabel > puoi ingrandire o rimpicciolire le immagini." +msgid "" +"With the <guilabel>Zoom</guilabel> slider you can zoom in or out of the " +"images." +msgstr "" +"Con il cursore <guilabel >Zoom</guilabel > puoi ingrandire o rimpicciolire " +"le immagini." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Compare_images.xml:175 @@ -5823,8 +7764,12 @@ msgstr "Pagina" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_images.xml:177 -msgid "If the image format support multiple pages you can select the current page with the <guilabel>Page</guilabel> number box." -msgstr "Se il formato dell'immagine supporta più pagine puoi selezionare la pagina corrente con la casella numerica <guilabel >Pagina</guilabel >." +msgid "" +"If the image format support multiple pages you can select the current page " +"with the <guilabel>Page</guilabel> number box." +msgstr "" +"Se il formato dell'immagine supporta più pagine puoi selezionare la pagina " +"corrente con la casella numerica <guilabel >Pagina</guilabel >." #. type: Content of: <article><mediaobject><textobject><phrase> #: English/Compare_table.xml:5 English/Compare_table.xml:24 @@ -5839,17 +7784,25 @@ msgstr "tavolo" #. type: Content of: <article><para> #: English/Compare_table.xml:13 msgid "" -"In version 2.16.7 or later, it is possible to display and edit delimiter-separated values files such as CSV and TSV in table format like spreadsheet " -"software. Editing operations, moving to differences, and merging operations in this format are the same as in a normal text file window." +"In version 2.16.7 or later, it is possible to display and edit delimiter-" +"separated values files such as CSV and TSV in table format like spreadsheet " +"software. Editing operations, moving to differences, and merging operations " +"in this format are the same as in a normal text file window." msgstr "" -"Nella versione 2.16.7 o successiva, è possibile visualizzare e modificare file con valori separati da delimitatori come CSV e TSV in formato tabella " -"come un software per fogli di calcolo.Le operazioni di modifica, spostamento alle differenze e unione in questo formato sono le stesse di una normale " +"Nella versione 2.16.7 o successiva, è possibile visualizzare e modificare " +"file con valori separati da delimitatori come CSV e TSV in formato tabella " +"come un software per fogli di calcolo.Le operazioni di modifica, spostamento " +"alle differenze e unione in questo formato sono le stesse di una normale " "finestra di file di testo." #. type: Content of: <article><mediaobject> #: English/Compare_table.xml:18 -msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1." +"png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/tblcomp1." +"png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:30 @@ -5864,31 +7817,43 @@ msgstr "Confronto in formato tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_table.xml:33 msgid "" -"Whether files are opened in table format depends on whether the file name matches defined patterns. By default, if the file extension is .csv " -"or .tsv, it will be opened in table format. If you want to change the patterns, specify it on the Compare/Table page in the Options dialog." +"Whether files are opened in table format depends on whether the file name " +"matches defined patterns. By default, if the file extension is .csv or ." +"tsv, it will be opened in table format. If you want to change the patterns, " +"specify it on the Compare/Table page in the Options dialog." msgstr "" -"L'apertura dei file in formato tabella dipende dalla corrispondenza del nome file ai modelli definiti.Per impostazione predefinita, se l'estensione " -"del file è .csv o .tsv, verrà aperto in formato tabella.Se desideri modificare i modelli, specificalo nella pagina Confronta/Tabella nella finestra " -"di dialogo Opzioni." +"L'apertura dei file in formato tabella dipende dalla corrispondenza del nome " +"file ai modelli definiti.Per impostazione predefinita, se l'estensione del " +"file è .csv o .tsv, verrà aperto in formato tabella.Se desideri modificare i " +"modelli, specificalo nella pagina Confronta/Tabella nella finestra di " +"dialogo Opzioni." #. type: Content of: <article><section><para> #: English/Compare_table.xml:38 msgid "" -"If you want to temporarily open it in table format after opening it as plain text, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare " -"As</guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. If the Table dialog appears, select the File type and click <guilabel>OK</guilabel>." +"If you want to temporarily open it in table format after opening it as plain " +"text, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</" +"guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. If the Table " +"dialog appears, select the File type and click <guilabel>OK</guilabel>." msgstr "" -"Se vuoi aprirlo temporaneamente in formato tabella dopo averlo aperto come testo semplice, fai clic su <menuchoice> <guimenu >File</guimenu > " -"<guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Tabella</guimenuitem > </menuchoice >.Se appare la finestra di dialogo Tabella, seleziona " -"il Tipo di file e fai clic su <guilabel >OK</guilabel >." +"Se vuoi aprirlo temporaneamente in formato tabella dopo averlo aperto come " +"testo semplice, fai clic su <menuchoice> <guimenu >File</guimenu > " +"<guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Tabella</" +"guimenuitem > </menuchoice >.Se appare la finestra di dialogo Tabella, " +"seleziona il Tipo di file e fai clic su <guilabel >OK</guilabel >." #. type: Content of: <article><section><para> #: English/Compare_table.xml:48 msgid "" -"If you want to temporarily open files that have been opened in table format as regular text files, click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Recompare As</guimenuitem> <guimenuitem>Text</guimenuitem> </menuchoice>." +"If you want to temporarily open files that have been opened in table format " +"as regular text files, click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Recompare As</guimenuitem> <guimenuitem>Text</guimenuitem> </" +"menuchoice>." msgstr "" -"Se vuoi aprire temporaneamente file che sono stati aperti in formato tabella come normali file di testo, fai clic su <menuchoice > <guimenu >File</" -"guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Testo</guimenuitem > </menuchoice >." +"Se vuoi aprire temporaneamente file che sono stati aperti in formato tabella " +"come normali file di testo, fai clic su <menuchoice > <guimenu >File</" +"guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem >Testo</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:59 @@ -5898,38 +7863,61 @@ msgstr "impostazioni del formato della tabella" #. type: Content of: <article><section><title> #: English/Compare_table.xml:58 msgid "Table format settings<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Impostazioni del formato della tabella<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Impostazioni del formato della tabella<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Compare_table.xml:63 -msgid "By default, data in delimiter-separated values text files are treated as follows" -msgstr "Per impostazione predefinita, i dati nei file di testo con valori separati da delimitatori vengono trattati come segue" +msgid "" +"By default, data in delimiter-separated values text files are treated as " +"follows" +msgstr "" +"Per impostazione predefinita, i dati nei file di testo con valori separati " +"da delimitatori vengono trattati come segue" #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:66 -msgid "CSV files are separated by commas and TSV files are separated by tabs, and values are displayed by columns." -msgstr "I file CSV sono separati da virgole e i file TSV sono separati da tabulazioni e i valori vengono visualizzati in colonne." +msgid "" +"CSV files are separated by commas and TSV files are separated by tabs, and " +"values are displayed by columns." +msgstr "" +"I file CSV sono separati da virgole e i file TSV sono separati da " +"tabulazioni e i valori vengono visualizzati in colonne." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:70 -msgid "However, delimiter characters within the quoted range (double quotes) are treated as values." -msgstr "Tuttavia, i caratteri delimitatori all'interno dell'intervallo tra virgolette (virgolette doppie) vengono trattati come valori." +msgid "" +"However, delimiter characters within the quoted range (double quotes) are " +"treated as values." +msgstr "" +"Tuttavia, i caratteri delimitatori all'interno dell'intervallo tra " +"virgolette (virgolette doppie) vengono trattati come valori." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:74 -msgid "Also, EOL characters (CR or LF) within the quoted range are treated as values." -msgstr "Inoltre, i caratteri EOL (CR o LF) all'interno dell'intervallo tra virgolette vengono trattati come valori." +msgid "" +"Also, EOL characters (CR or LF) within the quoted range are treated as " +"values." +msgstr "" +"Inoltre, i caratteri EOL (CR o LF) all'interno dell'intervallo tra " +"virgolette vengono trattati come valori." #. type: Content of: <article><section><para> #: English/Compare_table.xml:81 msgid "" -"If you want to change the above settings, you can do so in the Compare/Table page in the Options dialog or in the table dialog that appears when " -"clicking <menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</guimenuitem> <guimenuitem>Table</guimenuitem> </menuchoice>. See <xref " +"If you want to change the above settings, you can do so in the Compare/Table " +"page in the Options dialog or in the table dialog that appears when clicking " +"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Recompare As</guimenuitem> " +"<guimenuitem>Table</guimenuitem> </menuchoice>. See <xref " "linkend=\"Configuration_compare_table\" /> for details." msgstr "" -"Se vuoi cambiare le impostazioni di cui sopra, puoi farlo nella pagina Confronta/Tabella della finestra di dialogo Opzioni o nella finestra di " -"dialogo della tabella che appare quando si fa clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Riconfronta come</guimenuitem > " -"<guimenuitem >Tabella</guimenuitem > </menuchoice >.Vedi <xref linkend=\"Configuration_compare_table\" /> per i dettagli." +"Se vuoi cambiare le impostazioni di cui sopra, puoi farlo nella pagina " +"Confronta/Tabella della finestra di dialogo Opzioni o nella finestra di " +"dialogo della tabella che appare quando si fa clic su <menuchoice> <guimenu " +">File</guimenu > <guimenuitem >Riconfronta come</guimenuitem > <guimenuitem " +">Tabella</guimenuitem > </menuchoice >.Vedi <xref " +"linkend=\"Configuration_compare_table\" /> per i dettagli." #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_table.xml:96 @@ -5938,34 +7926,49 @@ msgstr "operazioni specifiche del formato della tabella" #. type: Content of: <article><section><title> #: English/Compare_table.xml:95 -msgid "Table format-specific operations<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Operazioni specifiche del formato tabella<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Table format-specific operations<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Operazioni specifiche del formato tabella<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:102 -msgid "You can change the column width by dragging the column boundary of a column heading." -msgstr "È possibile modificare la larghezza della colonna trascinando il limite della colonna dell'intestazione di colonna." +msgid "" +"You can change the column width by dragging the column boundary of a column " +"heading." +msgstr "" +"È possibile modificare la larghezza della colonna trascinando il limite " +"della colonna dell'intestazione di colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:106 -msgid "Double-clicking on a column boundary in a column heading automatically adjusts the column width according to the content of the column." +msgid "" +"Double-clicking on a column boundary in a column heading automatically " +"adjusts the column width according to the content of the column." msgstr "" -"Facendo doppio clic sul limite di una colonna nell'intestazione di una colonna si regola automaticamente la larghezza della colonna in base al " +"Facendo doppio clic sul limite di una colonna nell'intestazione di una " +"colonna si regola automaticamente la larghezza della colonna in base al " "contenuto della colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:110 msgid "Text is selected vertically by dragging a column in the column heading." -msgstr "Il testo viene selezionato verticalmente trascinando una colonna nell'intestazione della colonna." +msgstr "" +"Il testo viene selezionato verticalmente trascinando una colonna " +"nell'intestazione della colonna." #. type: Content of: <article><section><para><itemizedlist><listitem><para> #: English/Compare_table.xml:115 msgid "" -"When <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</guimenuitem> </menuchoice> menu item is checked, the text will be wrapped in each " -"column. Check this menu item if you want to see multiline field values." +"When <menuchoice> <guimenu>View</guimenu> <guimenuitem>Wrap Lines</" +"guimenuitem> </menuchoice> menu item is checked, the text will be wrapped in " +"each column. Check this menu item if you want to see multiline field values." msgstr "" -"Quando è selezionata la voce di menu <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice >, il testo " -"andrà a capo in ogni colonna.Controlla questa voce di menu se vuoi vedere i valori dei campi multilinea." +"Quando è selezionata la voce di menu <menuchoice> <guimenu >Visualizza</" +"guimenu> <guimenuitem >Righe a capo</guimenuitem > </menuchoice >, il testo " +"andrà a capo in ogni colonna.Controlla questa voce di menu se vuoi vedere i " +"valori dei campi multilinea." #. type: Content of: <article><title> #: English/Compare_webpages.xml:5 @@ -5979,13 +7982,19 @@ msgstr "Pagine Web" #. type: Content of: <article><para><note> #: English/Compare_webpages.xml:13 -msgid "This topic describes how to compare webpages using the Webpage Compare window. <note>" -msgstr "Questo argomento descrive come confrontare le pagine Web utilizzando la finestra Confronto pagine Web.<note>" +msgid "" +"This topic describes how to compare webpages using the Webpage Compare " +"window. <note>" +msgstr "" +"Questo argomento descrive come confrontare le pagine Web utilizzando la " +"finestra Confronto pagine Web.<note>" #. type: Content of: <article><para><note><para> #: English/Compare_webpages.xml:17 msgid "This feature is still experimental and may be unstable and very slow." -msgstr "Questa funzionalità è ancora sperimentale e potrebbe essere instabile e molto lenta." +msgstr "" +"Questa funzionalità è ancora sperimentale e potrebbe essere instabile e " +"molto lenta." #. type: Content of: <article><section><section><section><para> #: English/Compare_webpages.xml:19 English/Quick_start.xml:159 @@ -5999,13 +8008,21 @@ msgstr "Avvio di un'operazione di confronto di pagine Web" #. type: Content of: <article><section><para> #: English/Compare_webpages.xml:25 -msgid "You can start an webpage compare operation from either the WinMerge window or a Command Prompt window." -msgstr "È possibile avviare un'operazione di confronto di pagine Web dalla finestra WinMerge o da una finestra del prompt dei comandi." +msgid "" +"You can start an webpage compare operation from either the WinMerge window " +"or a Command Prompt window." +msgstr "" +"È possibile avviare un'operazione di confronto di pagine Web dalla finestra " +"WinMerge o da una finestra del prompt dei comandi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para><mediaobject> #: English/Compare_webpages.xml:43 -msgid "<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/OpenDlg2.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><para><mediaobject><textobject><phrase> #: English/Compare_webpages.xml:48 English/Quick_start.xml:84 @@ -6015,23 +8032,32 @@ msgstr "Seleziona la finestra File o Cartelle" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:34 msgid "" -"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice>. Specify the two or three URLs you want to compare in the " -"\"Select File or Folder\" dialog and select the <guimenuitem>Webpage</guimenuitem> menu item from the <guibutton>Compare</guibutton> button's drop-" +"Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </" +"menuchoice>. Specify the two or three URLs you want to compare in the " +"\"Select File or Folder\" dialog and select the <guimenuitem>Webpage</" +"guimenuitem> menu item from the <guibutton>Compare</guibutton> button's drop-" "down menu. <placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "" -"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice >.Specifica i due o tre URL che vuoi confrontare " -"nella finestra di dialogo \"Seleziona file o cartella\" e seleziona la voce di menu <guimenuitem >Pagina web</guimenuitem > dal menu a discesa del " -"pulsante <guibutton >Confronta</guibutton >.<placeholder type=\"mediaobject\" id=\"0\"/>" +"Fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri</" +"guimenuitem > </menuchoice >.Specifica i due o tre URL che vuoi confrontare " +"nella finestra di dialogo \"Seleziona file o cartella\" e seleziona la voce " +"di menu <guimenuitem >Pagina web</guimenuitem > dal menu a discesa del " +"pulsante <guibutton >Confronta</guibutton >.<placeholder " +"type=\"mediaobject\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:60 msgid "" -"Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include two or three URLs of the web " -"pages you want to compare and specify the <option>/t webpage</option> command line option. For more information about using the command line, see " +"Run <command>WinMergeU.exe</command>, which is in your WinMerge install " +"directory. In your command arguments, include two or three URLs of the web " +"pages you want to compare and specify the <option>/t webpage</option> " +"command line option. For more information about using the command line, see " "<xref linkend=\"Command_line\" />." msgstr "" -"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di installazione di WinMerge. Negli argomenti del comando, includi due o tre URL " -"delle pagine web che desideri confrontare e specifica l'opzione della riga di comando <option>/t webpage</option>. Per ulteriori informazioni " +"Esegui <command>WinMergeU.exe</command>, che si trova nella cartella di " +"installazione di WinMerge. Negli argomenti del comando, includi due o tre " +"URL delle pagine web che desideri confrontare e specifica l'opzione della " +"riga di comando <option>/t webpage</option>. Per ulteriori informazioni " "sull'utilizzo della riga di comando, vedi <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><variablelist><varlistentry><listitem><example><title> @@ -6041,8 +8067,12 @@ msgstr "Riga di comando" #. type: Content of: <article><section><variablelist><varlistentry><listitem><example><para> #: English/Compare_webpages.xml:71 -msgid "<userinput> \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" /t webpage https://example.net https://example.com </userinput>" -msgstr "<userinput> \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /t pagina web https://example.net https://example.com </userinput>" +msgid "" +"<userinput> \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" /t webpage " +"https://example.net https://example.com </userinput>" +msgstr "" +"<userinput> \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /t pagina web https://" +"example.net https://example.com </userinput>" #. type: Content of: <article><section><mediaobject><textobject><phrase> #: English/Compare_webpages.xml:83 English/Compare_webpages.xml:94 @@ -6051,17 +8081,25 @@ msgstr "Finestra di confronto delle pagine Web" #. type: Content of: <article><section><mediaobject> #: English/Compare_webpages.xml:89 -msgid "<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /" +"> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/webcmp1.png\" format=\"PNG\" /" +"> </imageobject>" #. type: Content of: <article><section><para> #: English/Compare_webpages.xml:99 msgid "" -"When the Webpage comparison window is displayed, the Webpage menu will be added to the menu bar. The menu items in the Webpage menu are as follows. " -"Some of the same functionality as these menu items is available in the Location Pane." +"When the Webpage comparison window is displayed, the Webpage menu will be " +"added to the menu bar. The menu items in the Webpage menu are as follows. " +"Some of the same functionality as these menu items is available in the " +"Location Pane." msgstr "" -"Quando viene visualizzata la finestra di confronto delle pagine Web, il menu della pagina Web verrà aggiunto alla barra dei menu.Le voci di menu nel " -"menu Pagina Web sono le seguenti.Alcune delle stesse funzionalità di queste voci di menu sono disponibili nel riquadro Posizione." +"Quando viene visualizzata la finestra di confronto delle pagine Web, il menu " +"della pagina Web verrà aggiunto alla barra dei menu.Le voci di menu nel menu " +"Pagina Web sono le seguenti.Alcune delle stesse funzionalità di queste voci " +"di menu sono disponibili nel riquadro Posizione." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:109 @@ -6081,7 +8119,9 @@ msgstr "Visualizza differenze" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:118 msgid "Enables or disables text difference coloring for webpages." -msgstr "Abilita o disabilita la colorazione della differenza del testo per le pagine Web." +msgstr "" +"Abilita o disabilita la colorazione della differenza del testo per le pagine " +"Web." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:127 @@ -6100,8 +8140,12 @@ msgstr "Schermate" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:136 -msgid "Converts the currently displayed range of web pages into images and compares them in the image comparison window." -msgstr "Converte l'intervallo di pagine Web attualmente visualizzato in immagini e le confronta nella finestra di confronto delle immagini." +msgid "" +"Converts the currently displayed range of web pages into images and compares " +"them in the image comparison window." +msgstr "" +"Converte l'intervallo di pagine Web attualmente visualizzato in immagini e " +"le confronta nella finestra di confronto delle immagini." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:145 @@ -6110,8 +8154,12 @@ msgstr "Schermate a grandezza naturale" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:148 -msgid "Creates images of the entire area of web pages and compares them in the image comparison window." -msgstr "Crea immagini dell'intera area delle pagine web e le confronta nella finestra di confronto delle immagini." +msgid "" +"Creates images of the entire area of web pages and compares them in the " +"image comparison window." +msgstr "" +"Crea immagini dell'intera area delle pagine web e le confronta nella " +"finestra di confronto delle immagini." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:157 @@ -6121,7 +8169,8 @@ msgstr "HTML" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:160 msgid "Compare the HTML contents of web pages in the file comparison window." -msgstr "Confronta i contenuti HTML delle pagine web nella finestra di confronto file." +msgstr "" +"Confronta i contenuti HTML delle pagine web nella finestra di confronto file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:169 @@ -6130,8 +8179,12 @@ msgstr "Testi" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:172 -msgid "Extracts text parts of web pages and compares them in the file comparison window." -msgstr "Estrae parti di testo delle pagine Web e le confronta nella finestra di confronto dei file." +msgid "" +"Extracts text parts of web pages and compares them in the file comparison " +"window." +msgstr "" +"Estrae parti di testo delle pagine Web e le confronta nella finestra di " +"confronto dei file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:181 @@ -6141,7 +8194,9 @@ msgstr "Alberi delle risorse" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:184 msgid "Compare resource trees of web pages in the folder comparison window." -msgstr "Confronta gli alberi delle risorse delle pagine web nella finestra di confronto delle cartelle." +msgstr "" +"Confronta gli alberi delle risorse delle pagine web nella finestra di " +"confronto delle cartelle." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:196 @@ -6161,7 +8216,9 @@ msgstr "Adatta alla finestra" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:205 msgid "Fits the display size of the web page to the size of each pane." -msgstr "Adatta la dimensione di visualizzazione della pagina Web alla dimensione di ciascun riquadro." +msgstr "" +"Adatta la dimensione di visualizzazione della pagina Web alla dimensione di " +"ciascun riquadro." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:213 @@ -6171,7 +8228,9 @@ msgstr "Larghezza x Altezza" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:216 msgid "Changes the display size of the web page to the specified size." -msgstr "Modifica la dimensione di visualizzazione della pagina Web nella dimensione specificata." +msgstr "" +"Modifica la dimensione di visualizzazione della pagina Web nella dimensione " +"specificata." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:227 @@ -6190,8 +8249,12 @@ msgstr "Abilitato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:236 -msgid "Enable or disable the synchronization function of events such as Scroll and Click." -msgstr "Abilita o disabilita la funzione di sincronizzazione di eventi come Scorrimento e Clic." +msgid "" +"Enable or disable the synchronization function of events such as Scroll and " +"Click." +msgstr "" +"Abilita o disabilita la funzione di sincronizzazione di eventi come " +"Scorrimento e Clic." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:244 @@ -6230,8 +8293,12 @@ msgstr "Vai indietro/Vai avanti" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Compare_webpages.xml:280 -msgid "Enable or disable synchronization of going back to the previous page or forward to the next page." -msgstr "Abilita o disabilita la sincronizzazione per tornare alla pagina precedente o passare alla pagina successiva." +msgid "" +"Enable or disable synchronization of going back to the previous page or " +"forward to the next page." +msgstr "" +"Abilita o disabilita la sincronizzazione per tornare alla pagina precedente " +"o passare alla pagina successiva." #. type: Content of: <article><section><section><section><title><indexterm><primary> #: English/Compare_webpages.xml:293 @@ -6241,7 +8308,9 @@ msgstr "Cancella il menu Dati di navigazione" #. type: Content of: <article><section><section><section><title> #: English/Compare_webpages.xml:292 msgid "Clear Browsing Data menu<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Cancella il menu Dati di navigazione<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Cancella il menu Dati di navigazione<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Compare_webpages.xml:299 @@ -6295,22 +8364,34 @@ msgstr "Limitazioni attuali<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:358 -msgid "Webpages that use the currently deprecated FRAMESET element cannot be compared." -msgstr "Non è possibile confrontare le pagine Web che utilizzano l'elemento FRAMESET attualmente deprecato." +msgid "" +"Webpages that use the currently deprecated FRAMESET element cannot be " +"compared." +msgstr "" +"Non è possibile confrontare le pagine Web che utilizzano l'elemento FRAMESET " +"attualmente deprecato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:365 -msgid "The contents within the IFRAME element may not be compared or events may not be synchronized." -msgstr "I contenuti all'interno dell'elemento IFRAME potrebbero non essere confrontati o gli eventi potrebbero non essere sincronizzati." +msgid "" +"The contents within the IFRAME element may not be compared or events may not " +"be synchronized." +msgstr "" +"I contenuti all'interno dell'elemento IFRAME potrebbero non essere " +"confrontati o gli eventi potrebbero non essere sincronizzati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Compare_webpages.xml:372 msgid "Comparing web pages with very different content may take a lot of time." -msgstr "Il confronto di pagine Web con contenuti molto diversi può richiedere molto tempo." +msgstr "" +"Il confronto di pagine Web con contenuti molto diversi può richiedere molto " +"tempo." #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:5 English/Configuration.xml:2553 English/Configuration.xml:2567 English/Configuration.xml:2651 -#: English/Configuration.xml:2702 English/Configuration.xml:2720 English/Configuration.xml:2732 English/Configuration.xml:2838 +#: English/Configuration.xml:5 English/Configuration.xml:2553 +#: English/Configuration.xml:2567 English/Configuration.xml:2651 +#: English/Configuration.xml:2702 English/Configuration.xml:2720 +#: English/Configuration.xml:2732 English/Configuration.xml:2838 #: English/Configuration.xml:2855 English/Configuration.xml:3126 msgid "options" msgstr "opzioni" @@ -6322,13 +8403,21 @@ msgstr "Opzioni e configurazione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Configuration.xml:10 -msgid "The Options dialog enables you to customize many WinMerge features. To set WinMerge options:" -msgstr "La finestra di dialogo Opzioni consente di personalizzare molte funzionalità di WinMerge.Per impostare le opzioni WinMerge:" +msgid "" +"The Options dialog enables you to customize many WinMerge features. To set " +"WinMerge options:" +msgstr "" +"La finestra di dialogo Opzioni consente di personalizzare molte funzionalità " +"di WinMerge.Per impostare le opzioni WinMerge:" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject> #: English/Configuration.xml:22 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/options_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/options_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"options_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" +"options_btn.png\" /> </imageobject>" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Configuration.xml:27 @@ -6338,25 +8427,35 @@ msgstr "Pulsante Opzioni WinMerge" #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:17 msgid "" -"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice> in the menu or the <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Options</guibutton> button in the toolbar." +"Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" +"guimenuitem> </menuchoice> in the menu or the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Options</guibutton> button " +"in the toolbar." msgstr "" -"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice > nel menu o sul pulsante <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Opzioni</guibutton > nella barra degli strumenti." +"Fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem " +">Opzioni</guimenuitem > </menuchoice > nel menu o sul pulsante <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Opzioni</guibutton > nella " +"barra degli strumenti." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:34 msgid "" -"The Options dialog contains a number of pages, each containing a group of related options. You can open any page by clicking its title in the " +"The Options dialog contains a number of pages, each containing a group of " +"related options. You can open any page by clicking its title in the " "<guilabel>Categories</guilabel> list, on the left side of the dialog." msgstr "" -"La finestra di dialogo Opzioni contiene diverse pagine, ciascuna contenente un gruppo di opzioni correlate.Puoi aprire qualsiasi pagina facendo clic " -"sul suo titolo nell'elenco <guilabel >Categorie</guilabel >, sul lato sinistro della finestra di dialogo." +"La finestra di dialogo Opzioni contiene diverse pagine, ciascuna contenente " +"un gruppo di opzioni correlate.Puoi aprire qualsiasi pagina facendo clic sul " +"suo titolo nell'elenco <guilabel >Categorie</guilabel >, sul lato sinistro " +"della finestra di dialogo." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:43 -msgid "Configure the options you want to change using one or both of these methods:" -msgstr "Configura le opzioni che desideri modificare utilizzando uno o entrambi questi metodi:" +msgid "" +"Configure the options you want to change using one or both of these methods:" +msgstr "" +"Configura le opzioni che desideri modificare utilizzando uno o entrambi " +"questi metodi:" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:49 @@ -6366,20 +8465,30 @@ msgstr "Direttamente nelle pagine delle opzioni." #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:54 msgid "" -"Importing an options <filename>.ini</filename> file that you exported previously (see <xref linkend=\"Configuration_importexport\" /> for details)." +"Importing an options <filename>.ini</filename> file that you exported " +"previously (see <xref linkend=\"Configuration_importexport\" /> for details)." msgstr "" -"Importazione di un file di opzioni <filename>.ini</filename> esportato in precedenza (vedi <xref linkend=\"Configuration_importexport\" /> per i " +"Importazione di un file di opzioni <filename>.ini</filename> esportato in " +"precedenza (vedi <xref linkend=\"Configuration_importexport\" /> per i " "dettagli)." #. type: Content of: <article><orderedlist><listitem><para> #: English/Configuration.xml:64 -msgid "When you have set all your options, click <guibutton>OK</guibutton> to save them and dismiss the dialog." -msgstr "Dopo aver impostato tutte le opzioni, fai clic su <guibutton >OK</guibutton > per salvarle e chiudere la finestra di dialogo." +msgid "" +"When you have set all your options, click <guibutton>OK</guibutton> to save " +"them and dismiss the dialog." +msgstr "" +"Dopo aver impostato tutte le opzioni, fai clic su <guibutton >OK</guibutton " +"> per salvarle e chiudere la finestra di dialogo." #. type: Content of: <article><para> #: English/Configuration.xml:71 -msgid "This topic describes the options in detail. There is a section for each page in the Options dialog." -msgstr "Questo argomento descrive le opzioni in dettaglio.C'è una sezione per ogni pagina nella finestra di dialogo Opzioni." +msgid "" +"This topic describes the options in detail. There is a section for each page " +"in the Options dialog." +msgstr "" +"Questo argomento descrive le opzioni in dettaglio.C'è una sezione per ogni " +"pagina nella finestra di dialogo Opzioni." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:78 @@ -6393,19 +8502,28 @@ msgstr "esportare file di opzioni" #. type: Content of: <article><section><title> #: English/Configuration.xml:77 -msgid "Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Opzioni di importazione ed esportazione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Opzioni di importazione ed esportazione<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:85 msgid "" -"If you change options frequently for different compare or merge scenarios, or if you want to share your settings with other WinMerge users, consider " -"saving your settings by exporting them to an options file. Then, whenever you want to use those settings, you can simply import the options file " +"If you change options frequently for different compare or merge scenarios, " +"or if you want to share your settings with other WinMerge users, consider " +"saving your settings by exporting them to an options file. Then, whenever " +"you want to use those settings, you can simply import the options file " "instead of setting options manually." msgstr "" -"Se modifichi frequentemente le opzioni per diversi scenari di confronto o unione o se desideri condividere le tue impostazioni con altri utenti " -"WinMerge, valuta la possibilità di salvare le impostazioni esportandole in un file di opzioni.Quindi, ogni volta che desideri utilizzare tali " -"impostazioni, puoi semplicemente importare il file delle opzioni invece di impostare le opzioni manualmente." +"Se modifichi frequentemente le opzioni per diversi scenari di confronto o " +"unione o se desideri condividere le tue impostazioni con altri utenti " +"WinMerge, valuta la possibilità di salvare le impostazioni esportandole in " +"un file di opzioni.Quindi, ogni volta che desideri utilizzare tali " +"impostazioni, puoi semplicemente importare il file delle opzioni invece di " +"impostare le opzioni manualmente." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:94 @@ -6415,16 +8533,21 @@ msgstr "Per importare le opzioni" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:98 msgid "" -"When you want to reuse your saved options, click <guibutton>Import</guibutton>. In the Select file for import dialog, navigate to the saved " +"When you want to reuse your saved options, click <guibutton>Import</" +"guibutton>. In the Select file for import dialog, navigate to the saved " "<filename>ini</filename> file and click <guibutton>Open</guibutton>." msgstr "" -"Quando vuoi riutilizzare le opzioni salvate, fai clic su <guibutton >Importa</guibutton >.Nella finestra di dialogo Seleziona file per " -"l'importazione, vai al file <filename>ini</filename> salvato e fai clic su <guibutton >Apri</guibutton >." +"Quando vuoi riutilizzare le opzioni salvate, fai clic su <guibutton " +">Importa</guibutton >.Nella finestra di dialogo Seleziona file per " +"l'importazione, vai al file <filename>ini</filename> salvato e fai clic su " +"<guibutton >Apri</guibutton >." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:105 msgid "The values in your imported options file replace all existing settings." -msgstr "I valori nel file delle opzioni importati sostituiscono tutte le impostazioni esistenti." +msgstr "" +"I valori nel file delle opzioni importati sostituiscono tutte le " +"impostazioni esistenti." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:112 @@ -6434,17 +8557,25 @@ msgstr "Per esportare le opzioni" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:116 msgid "" -"When you have set your options the way you want them, click <guibutton>Export</guibutton>. In the Select file for export dialog, specify a path and " -"name for your options file (the type <filename>ini</filename> is automatically appended), and click <guibutton>Save</guibutton>." +"When you have set your options the way you want them, click " +"<guibutton>Export</guibutton>. In the Select file for export dialog, specify " +"a path and name for your options file (the type <filename>ini</filename> is " +"automatically appended), and click <guibutton>Save</guibutton>." msgstr "" -"Dopo aver impostato le opzioni nel modo desiderato, fai clic su <guibutton >Esporta</guibutton >.Nella finestra di dialogo Seleziona file per " -"l'esportazione, specifica un percorso e un nome per il tuo file di opzioni (il tipo <filename>ini</filename> verrà aggiunto automaticamente) e fai " -"clic su <guibutton >Salva</guibutton >." +"Dopo aver impostato le opzioni nel modo desiderato, fai clic su <guibutton " +">Esporta</guibutton >.Nella finestra di dialogo Seleziona file per " +"l'esportazione, specifica un percorso e un nome per il tuo file di opzioni " +"(il tipo <filename>ini</filename> verrà aggiunto automaticamente) e fai clic " +"su <guibutton >Salva</guibutton >." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:124 -msgid "In the generated text <filename>ini</filename> file, each line contains a name-value pair that defines a single option." -msgstr "Nel file di testo <filename>ini</filename> generato, ogni riga contiene una coppia nome-valore che definisce una singola opzione." +msgid "" +"In the generated text <filename>ini</filename> file, each line contains a " +"name-value pair that defines a single option." +msgstr "" +"Nel file di testo <filename>ini</filename> generato, ogni riga contiene una " +"coppia nome-valore che definisce una singola opzione." #. type: Content of: <article><section><title> #: English/Configuration.xml:133 @@ -6463,31 +8594,44 @@ msgstr "scorrimento automatico fino alla prima differenza" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:139 -msgid "Automatically scroll to first difference<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Scorri automaticamente fino alla prima differenza<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Automatically scroll to first difference<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Scorri automaticamente fino alla prima differenza<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:147 -msgid "<option>Disabled</option> (default): Compare window opens to the top of the folder or file, with no difference selected." +msgid "" +"<option>Disabled</option> (default): Compare window opens to the top of the " +"folder or file, with no difference selected." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): la finestra di confronto si apre nella parte superiore della cartella o del file, senza " +"<option>Disabilitato</option> (impostazione predefinita): la finestra di " +"confronto si apre nella parte superiore della cartella o del file, senza " "alcuna differenza selezionata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:154 -msgid "<option>Enabled</option>: When it first opens, the Compare window selects the first difference, scrolling to the location if necessary." +msgid "" +"<option>Enabled</option>: When it first opens, the Compare window selects " +"the first difference, scrolling to the location if necessary." msgstr "" -"<option>Abilitato</option>: alla prima apertura, la finestra Confronta seleziona la prima differenza, scorrendo fino alla posizione se necessario." +"<option>Abilitato</option>: alla prima apertura, la finestra Confronta " +"seleziona la prima differenza, scorrendo fino alla posizione se necessario." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:162 msgid "For a folder compare, selects the first different file or folders." -msgstr "Per un confronto di cartelle, seleziona il primo file o le prime cartelle diverse." +msgstr "" +"Per un confronto di cartelle, seleziona il primo file o le prime cartelle " +"diverse." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:169 msgid "For a file compare, selects the first difference block in the files." -msgstr "Per un confronto di file, seleziona il primo blocco di differenza nei file." +msgstr "" +"Per un confronto di file, seleziona il primo blocco di differenza nei file." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:181 @@ -6496,24 +8640,33 @@ msgstr "scorrimento automatico fino alla prima differenza in linea" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:180 -msgid "Automatically scroll to first inline difference<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Scorri automaticamente fino alla prima differenza in linea<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Automatically scroll to first inline difference<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Scorri automaticamente fino alla prima differenza in linea<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:188 msgid "" -"<option>Disabled</option> (default): When moving to a difference block, does not automatically scroll to the first inline difference within the lines " -"of text." +"<option>Disabled</option> (default): When moving to a difference block, does " +"not automatically scroll to the first inline difference within the lines of " +"text." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): quando ci si sposta su un blocco di differenze, non scorre automaticamente fino alla prima " -"differenza in linea all'interno delle righe di testo." +"<option>Disabilitato</option> (impostazione predefinita): quando ci si " +"sposta su un blocco di differenze, non scorre automaticamente fino alla " +"prima differenza in linea all'interno delle righe di testo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:194 -msgid "<option>Enabled</option>: When moving to a difference block, automatically scrolls to the first inline difference within the lines of text." +msgid "" +"<option>Enabled</option>: When moving to a difference block, automatically " +"scrolls to the first inline difference within the lines of text." msgstr "" -"<option>Abilitato</option>: quando ci si sposta su un blocco di differenze, scorre automaticamente fino alla prima differenza in linea all'interno " -"delle righe di testo." +"<option>Abilitato</option>: quando ci si sposta su un blocco di differenze, " +"scorre automaticamente fino alla prima differenza in linea all'interno delle " +"righe di testo." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:203 @@ -6522,50 +8675,71 @@ msgstr "chiudere le finestre utilizzando il tasto Esc" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:202 -msgid "Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Chiudi Windows con '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Chiudi Windows con '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:210 msgid "" -"<option>MDI child window or main window</option> (default): Lets you use the <keycap>Esc</keycap> key to close WinMerge windows. Pressing " -"<keycap>Esc</keycap> once closes one window, so with one File Compare window open, it takes three key presses to close WinMerge: first the File " -"Compare window, then the Folder Compare window, and finally the WinMerge window." -msgstr "" -"<option>Finestra secondaria MDI o finestra principale</option> (impostazione predefinita): consente di utilizzare il tasto <keycap>Esc</keycap> per " -"chiudere le finestre WinMerge.Premendo <keycap>Esc</keycap> una volta si chiude una finestra, quindi con una finestra di confronto file aperta, sono " -"necessarie tre pressioni di tasti per chiudere WinMerge: prima la finestra di confronto file, quindi la finestra di confronto cartelle e infine la " +"<option>MDI child window or main window</option> (default): Lets you use the " +"<keycap>Esc</keycap> key to close WinMerge windows. Pressing <keycap>Esc</" +"keycap> once closes one window, so with one File Compare window open, it " +"takes three key presses to close WinMerge: first the File Compare window, " +"then the Folder Compare window, and finally the WinMerge window." +msgstr "" +"<option>Finestra secondaria MDI o finestra principale</option> (impostazione " +"predefinita): consente di utilizzare il tasto <keycap>Esc</keycap> per " +"chiudere le finestre WinMerge.Premendo <keycap>Esc</keycap> una volta si " +"chiude una finestra, quindi con una finestra di confronto file aperta, sono " +"necessarie tre pressioni di tasti per chiudere WinMerge: prima la finestra " +"di confronto file, quindi la finestra di confronto cartelle e infine la " "finestra WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:219 msgid "" -"Note that in the WinMerge command line, the <parameter>-e</parameter> parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> just " -"once." +"Note that in the WinMerge command line, the <parameter>-e</parameter> " +"parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> " +"just once." msgstr "" -"Tieni presente che nella riga di comando di WinMerge, il parametro <parameter>-e</parameter> ti consente di chiudere WinMerge premendo <keycap>Esc</" -"keycap> solo una volta." +"Tieni presente che nella riga di comando di WinMerge, il parametro " +"<parameter>-e</parameter> ti consente di chiudere WinMerge premendo " +"<keycap>Esc</keycap> solo una volta." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:227 -msgid "<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes a child window, but not the last remaining main window." +msgid "" +"<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes " +"a child window, but not the last remaining main window." msgstr "" -"<option>Solo finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra secondaria, ma non l'ultima finestra principale " +"<option>Solo finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> " +"si chiude una finestra secondaria, ma non l'ultima finestra principale " "rimanente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:234 msgid "" -"<option>Close main window if there is on one MDI child window</option>: Pressing <keycap>Esc</keycap> closes a child window, and if there is only one " -"child window, it will also close the main window." +"<option>Close main window if there is on one MDI child window</option>: " +"Pressing <keycap>Esc</keycap> closes a child window, and if there is only " +"one child window, it will also close the main window." msgstr "" -"<option>Chiudi la finestra principale se è presente una finestra secondaria MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra " -"secondaria e, se è presente una sola finestra secondaria, verrà chiusa anche la finestra principale." +"<option>Chiudi la finestra principale se è presente una finestra secondaria " +"MDI</option>: premendo <keycap>Esc</keycap> si chiude una finestra " +"secondaria e, se è presente una sola finestra secondaria, verrà chiusa anche " +"la finestra principale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:241 -msgid "<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any WinMerge windows." -msgstr "<option>Disabilitato</option>: premendo <keycap>Esc</keycap> non si chiude alcuna finestra WinMerge." +msgid "" +"<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any " +"WinMerge windows." +msgstr "" +"<option>Disabilitato</option>: premendo <keycap>Esc</keycap> non si chiude " +"alcuna finestra WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:249 @@ -6575,23 +8749,32 @@ msgstr "Verifica automaticamente i percorsi nella finestra di dialogo Apri" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:254 msgid "" -"<option>Enabled</option> (default): The Select Files or Folders dialog checks both or all three paths as you enter them. The <guibutton>Compare</" -"guibutton> button remains disabled until both or all three paths are validated. Note that this checking can cause some delay." +"<option>Enabled</option> (default): The Select Files or Folders dialog " +"checks both or all three paths as you enter them. The <guibutton>Compare</" +"guibutton> button remains disabled until both or all three paths are " +"validated. Note that this checking can cause some delay." msgstr "" -"<option>Abilitato</option> (predefinito): la finestra di dialogo Seleziona file o cartelle controlla entrambi o tutti e tre i percorsi quando li " -"inserisci.Il pulsante <guibutton >Confronta</guibutton > rimane disabilitato finché entrambi o tutti e tre i percorsi non vengono convalidati.Tieni " +"<option>Abilitato</option> (predefinito): la finestra di dialogo Seleziona " +"file o cartelle controlla entrambi o tutti e tre i percorsi quando li " +"inserisci.Il pulsante <guibutton >Confronta</guibutton > rimane disabilitato " +"finché entrambi o tutti e tre i percorsi non vengono convalidati.Tieni " "presente che questo controllo può causare qualche ritardo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:264 msgid "" -"<option>Disabled</option>: The <guibutton>Compare</guibutton> button in the Select Files or Folders dialog is always enabled, and attempts to open " -"any paths you specify. Since there is no delay during validation, this can speed up the selection of paths. However, if the path cannot be opened, an " -"error dialog is displayed." +"<option>Disabled</option>: The <guibutton>Compare</guibutton> button in the " +"Select Files or Folders dialog is always enabled, and attempts to open any " +"paths you specify. Since there is no delay during validation, this can speed " +"up the selection of paths. However, if the path cannot be opened, an error " +"dialog is displayed." msgstr "" -"<option >Disabilitato</option >: il pulsante <guibutton >Confronta</guibutton > nella finestra di dialogo Seleziona file o cartelle è sempre " -"abilitato e tenta di aprire qualsiasi percorso specificato.Poiché non vi è alcun ritardo durante la convalida, ciò può accelerare la selezione dei " -"percorsi.Tuttavia, se non è possibile aprire il percorso, viene visualizzata una finestra di dialogo di errore." +"<option >Disabilitato</option >: il pulsante <guibutton >Confronta</" +"guibutton > nella finestra di dialogo Seleziona file o cartelle è sempre " +"abilitato e tenta di aprire qualsiasi percorso specificato.Poiché non vi è " +"alcun ritardo durante la convalida, ciò può accelerare la selezione dei " +"percorsi.Tuttavia, se non è possibile aprire il percorso, viene visualizzata " +"una finestra di dialogo di errore." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:276 @@ -6601,45 +8784,63 @@ msgstr "Modalità a istanza singola<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:286 msgid "" -"<option>Disabled</option> (default): You can run multiple WinMerge instances. For example, if WinMerge is currently running and you click the " +"<option>Disabled</option> (default): You can run multiple WinMerge " +"instances. For example, if WinMerge is currently running and you click the " "WinMerge desktop shortcut, a new WinMerge window is opened." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): puoi eseguire più istanze WinMerge.Ad esempio, se WinMerge è attualmente in esecuzione e si " -"fa clic sul collegamento WinMerge sul desktop, verrà aperta una nuova finestra WinMerge." +"<option>Disabilitato</option> (impostazione predefinita): puoi eseguire più " +"istanze WinMerge.Ad esempio, se WinMerge è attualmente in esecuzione e si fa " +"clic sul collegamento WinMerge sul desktop, verrà aperta una nuova finestra " +"WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:295 -msgid "<option>Allow only one instance to run</option>: Limits the WinMerge program to one instance:" -msgstr "<option>Consenti l'esecuzione di una sola istanza</option>: limita il programma WinMerge a un'istanza:" +msgid "" +"<option>Allow only one instance to run</option>: Limits the WinMerge program " +"to one instance:" +msgstr "" +"<option>Consenti l'esecuzione di una sola istanza</option>: limita il " +"programma WinMerge a un'istanza:" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:302 msgid "" -"If WinMerge is currently running and you try to start a new instance, no new application window is opened: the current WinMerge window is used " -"instead." +"If WinMerge is currently running and you try to start a new instance, no new " +"application window is opened: the current WinMerge window is used instead." msgstr "" -"Se WinMerge è attualmente in esecuzione e si tenta di avviare una nuova istanza, non viene aperta alcuna nuova finestra dell'applicazione: viene " +"Se WinMerge è attualmente in esecuzione e si tenta di avviare una nuova " +"istanza, non viene aperta alcuna nuova finestra dell'applicazione: viene " "invece utilizzata la finestra WinMerge corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:310 -msgid "If you start a new instance with paths (for example on the command line), a new Compare window is opened in the existing WinMerge window." +msgid "" +"If you start a new instance with paths (for example on the command line), a " +"new Compare window is opened in the existing WinMerge window." msgstr "" -"Se si avvia una nuova istanza con percorsi (ad esempio sulla riga di comando), viene aperta una nuova finestra Confronta nella finestra WinMerge " +"Se si avvia una nuova istanza con percorsi (ad esempio sulla riga di " +"comando), viene aperta una nuova finestra Confronta nella finestra WinMerge " "esistente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:320 msgid "" -"<option>Allow only one instance; wait for termination</option>: Similar to the \"Allow only one instance to run\" option, this setting restricts " -"WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is " -"closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete " -"temporary files." +"<option>Allow only one instance; wait for termination</option>: Similar to " +"the \"Allow only one instance to run\" option, this setting restricts " +"WinMerge to a single application window. However, it also ensures that the " +"WinMerge process does not terminate until the application window is closed. " +"This is useful for situations where external applications, like SourceTree, " +"need to wait for WinMerge to finish before they can safely delete temporary " +"files." msgstr "" -"<option>Consenti solo un'istanza;attendi la terminazione</option>: simile all'opzione \"Consenti l'esecuzione di una sola istanza\", questa " -"impostazione limita WinMerge a una singola finestra dell'applicazione.Tuttavia, garantisce anche che il processo WinMerge non termini fino alla " -"chiusura della finestra dell'applicazione.Ciò è utile per le situazioni in cui le applicazioni esterne, come SourceTree, devono attendere il " -"completamento di WinMerge prima di poter eliminare in sicurezza i file temporanei." +"<option>Consenti solo un'istanza;attendi la terminazione</option>: simile " +"all'opzione \"Consenti l'esecuzione di una sola istanza\", questa " +"impostazione limita WinMerge a una singola finestra dell'applicazione." +"Tuttavia, garantisce anche che il processo WinMerge non termini fino alla " +"chiusura della finestra dell'applicazione.Ciò è utile per le situazioni in " +"cui le applicazioni esterne, come SourceTree, devono attendere il " +"completamento di WinMerge prima di poter eliminare in sicurezza i file " +"temporanei." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:327 @@ -6649,21 +8850,26 @@ msgstr "Chiedi quando si chiudono più finestre" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:332 msgid "" -"<option>Disabled</option> (default): If you exit WinMerge while multiple Compare windows are open, WinMerge prompts you to confirm whether to close " +"<option>Disabled</option> (default): If you exit WinMerge while multiple " +"Compare windows are open, WinMerge prompts you to confirm whether to close " "all the windows." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): se esci da WinMerge mentre sono aperte più finestre di confronto, WinMerge ti chiede di " +"<option>Disabilitato</option> (impostazione predefinita): se esci da " +"WinMerge mentre sono aperte più finestre di confronto, WinMerge ti chiede di " "confermare se chiudere tutte le finestre." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:340 -msgid "<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there are no pending file changes, WinMerge closes immediately." +msgid "" +"<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there " +"are no pending file changes, WinMerge closes immediately." msgstr "" -"<option >Abilitato</option >: se fai clic su <guibutton >Esci</guibutton > e non ci sono modifiche ai file in sospeso, WinMerge si chiude " -"immediatamente." +"<option >Abilitato</option >: se fai clic su <guibutton >Esci</guibutton > e " +"non ci sono modifiche ai file in sospeso, WinMerge si chiude immediatamente." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:351 English/Configuration.xml:1138 English/Configuration.xml:1245 +#: English/Configuration.xml:351 English/Configuration.xml:1138 +#: English/Configuration.xml:1245 msgid "timestamps" msgstr "timestamp" @@ -6674,21 +8880,33 @@ msgstr "preservando" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:350 -msgid "Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Conserva il tempo del file nel confronto file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Conserva il tempo del file nel confronto file<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:360 -msgid "<option>Disabled</option> (default): If you save changes to a file in WinMerge, the timestamp of the file is updated." -msgstr "<option>Disabilitato</option> (impostazione predefinita): se salvi le modifiche a un file in WinMerge, il timestamp del file viene aggiornato." +msgid "" +"<option>Disabled</option> (default): If you save changes to a file in " +"WinMerge, the timestamp of the file is updated." +msgstr "" +"<option>Disabilitato</option> (impostazione predefinita): se salvi le " +"modifiche a un file in WinMerge, il timestamp del file viene aggiornato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:367 -msgid "<option>Enabled</option>: If you save changes to a file in WinMerge, the timestamp of the file is not changed in your file system." -msgstr "<option>Abilitato</option>: se salvi le modifiche a un file in WinMerge, il timestamp del file non viene modificato nel file system." +msgid "" +"<option>Enabled</option>: If you save changes to a file in WinMerge, the " +"timestamp of the file is not changed in your file system." +msgstr "" +"<option>Abilitato</option>: se salvi le modifiche a un file in WinMerge, il " +"timestamp del file non viene modificato nel file system." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:378 English/Configuration.xml:408 English/Open_paths.xml:38 English/Quick_start.xml:75 +#: English/Configuration.xml:378 English/Configuration.xml:408 +#: English/Open_paths.xml:38 English/Quick_start.xml:75 msgid "Select Files or Folders dialog" msgstr "Seleziona la finestra di dialogo File o Cartelle" @@ -6699,47 +8917,71 @@ msgstr "apertura automatica" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:377 -msgid "Show \"Select Files or Folders\" dialog on startup<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Visualizza la finestra di dialogo \"Seleziona file o cartelle\" all'avvio<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Show \"Select Files or Folders\" dialog on startup<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Visualizza la finestra di dialogo \"Seleziona file o cartelle\" " +"all'avvio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:387 msgid "" -"<option>Disabled</option> (default): The WinMerge window opens when you launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> " -"<guimenuitem>Open</guimenuitem> </menuchoice> to open Select Files or Folders." +"<option>Disabled</option> (default): The WinMerge window opens when you " +"launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Open</guimenuitem> </menuchoice> to open Select Files or " +"Folders." msgstr "" -"<option>Disabilitato</option> (predefinito): la finestra WinMerge si apre quando avvii WinMerge.Devi quindi fare clic su <menuchoice> <guimenu >File</" -"guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice > per aprire Seleziona file o cartelle." +"<option>Disabilitato</option> (predefinito): la finestra WinMerge si apre " +"quando avvii WinMerge.Devi quindi fare clic su <menuchoice> <guimenu >File</" +"guimenu > <guimenuitem >Apri</guimenuitem > </menuchoice > per aprire " +"Seleziona file o cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:398 -msgid "<option>Enabled</option>: The Select Files or Folders dialog opens along with the WinMerge window when you launch WinMerge." -msgstr "<option>Abilitato</option>: la finestra di dialogo Seleziona file o cartelle si apre insieme alla finestra WinMerge quando si avvia WinMerge." +msgid "" +"<option>Enabled</option>: The Select Files or Folders dialog opens along " +"with the WinMerge window when you launch WinMerge." +msgstr "" +"<option>Abilitato</option>: la finestra di dialogo Seleziona file o cartelle " +"si apre insieme alla finestra WinMerge quando si avvia WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:407 -msgid "Close \"Select Files or Folders\" dialog on clicking Compare button<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Chiudi la finestra di dialogo \"Seleziona file o cartelle\" facendo clic sul pulsante Confronta<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Close \"Select Files or Folders\" dialog on clicking Compare " +"button<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Chiudi la finestra di dialogo \"Seleziona file o cartelle\" facendo clic sul " +"pulsante Confronta<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:415 msgid "" -"<option>Disabled</option> (default): When you click <guibutton>Compare</guibutton> button, the Select File or Folders dialog will remain open instead " -"of closing." +"<option>Disabled</option> (default): When you click <guibutton>Compare</" +"guibutton> button, the Select File or Folders dialog will remain open " +"instead of closing." msgstr "" -"<option >Disabilitato</option> (predefinito): quando fai clic sul pulsante <guibutton >Confronta</guibutton >, la finestra di dialogo Seleziona file " -"o cartelle rimarrà aperta invece di chiudersi." +"<option >Disabilitato</option> (predefinito): quando fai clic sul pulsante " +"<guibutton >Confronta</guibutton >, la finestra di dialogo Seleziona file o " +"cartelle rimarrà aperta invece di chiudersi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:421 -msgid "<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button closes the Select Files or Folders dialog." +msgid "" +"<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button " +"closes the Select Files or Folders dialog." msgstr "" -"<option >Abilitato</option >: facendo clic sul pulsante <guibutton >Confronta</guibutton > si chiude la finestra di dialogo Seleziona file o cartelle." +"<option >Abilitato</option >: facendo clic sul pulsante <guibutton " +">Confronta</guibutton > si chiude la finestra di dialogo Seleziona file o " +"cartelle." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:429 msgid "Open dialog Auto completion<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Apri la finestra di dialogo Completamento automatico<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Apri la finestra di dialogo Completamento automatico<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:434 English/Configuration.xml:470 @@ -6748,28 +8990,36 @@ msgstr "Scegli una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:439 -msgid "<guilabel>Disabled</guilabel>: No autocompletion is performed when you enter paths in the Select Files or Folders dialog." +msgid "" +"<guilabel>Disabled</guilabel>: No autocompletion is performed when you enter " +"paths in the Select Files or Folders dialog." msgstr "" -"<guilabel >Disabilitato</guilabel >: non viene eseguito alcun completamento automatico quando inserisci percorsi nella finestra di dialogo Seleziona " +"<guilabel >Disabilitato</guilabel >: non viene eseguito alcun completamento " +"automatico quando inserisci percorsi nella finestra di dialogo Seleziona " "file o cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:447 msgid "" -"<guilabel>From file system</guilabel> (default): Checks paths as you type. It attempts to locate paths in the file system that match the letters you " +"<guilabel>From file system</guilabel> (default): Checks paths as you type. " +"It attempts to locate paths in the file system that match the letters you " "type, and if a matching path is found, completes the path." msgstr "" -"<guilabel >Dal file system</guilabel> (predefinito): controlla i percorsi mentre scrivi.Tenta di individuare i percorsi nel file system che " -"corrispondono alle lettere digitate e, se viene trovato un percorso corrispondente, completa il percorso." +"<guilabel >Dal file system</guilabel> (predefinito): controlla i percorsi " +"mentre scrivi.Tenta di individuare i percorsi nel file system che " +"corrispondono alle lettere digitate e, se viene trovato un percorso " +"corrispondente, completa il percorso." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:455 msgid "" -"<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the most recently used (MRU) list. This is handy when you have a limited set " -"of paths to compare." +"<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the " +"most recently used (MRU) list. This is handy when you have a limited set of " +"paths to compare." msgstr "" -"<guilabel >Dall'elenco degli usi più recenti</guilabel >: controlla i percorsi solo dall'elenco degli usi più recenti (MRU).Ciò è utile quando hai un " -"insieme limitato di percorsi da confrontare." +"<guilabel >Dall'elenco degli usi più recenti</guilabel >: controlla i " +"percorsi solo dall'elenco degli usi più recenti (MRU).Ciò è utile quando hai " +"un insieme limitato di percorsi da confrontare." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:466 @@ -6779,32 +9029,44 @@ msgstr "Ricarica automatica" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:465 msgid "Auto-reload modified files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ricarica automaticamente i file modificati<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Ricarica automaticamente i file modificati<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:475 msgid "<guilabel>Disabled</guilabel>: Disables automatic reloading." -msgstr "<guilabel >Disabilitato</guilabel >: disabilita il ricaricamento automatico." +msgstr "" +"<guilabel >Disabilitato</guilabel >: disabilita il ricaricamento automatico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:481 msgid "" -"<guilabel>Only on window activated</guilabel> (default): When the WinMerge window is activated, if the file has been modified, it will reload the " -"file. However, a message box asking if you want to reload the file will be displayed at this time. If you do not want to see this message box, " -"check \"Don't ask this question again\" and press the Yes button." +"<guilabel>Only on window activated</guilabel> (default): When the WinMerge " +"window is activated, if the file has been modified, it will reload the " +"file. However, a message box asking if you want to reload the file will be " +"displayed at this time. If you do not want to see this message box, check " +"\"Don't ask this question again\" and press the Yes button." msgstr "" -"<guilabel >Solo su finestra attivata</guilabel> (predefinito): quando la finestra WinMerge è attivata, se il file è stato modificato, ricaricherà il " -"file.Tuttavia, in questo momento verrà visualizzata una finestra di messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere questa " -"finestra di messaggio, seleziona \"Non fare più questa domanda\" e premi il pulsante Sì." +"<guilabel >Solo su finestra attivata</guilabel> (predefinito): quando la " +"finestra WinMerge è attivata, se il file è stato modificato, ricaricherà il " +"file.Tuttavia, in questo momento verrà visualizzata una finestra di " +"messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere " +"questa finestra di messaggio, seleziona \"Non fare più questa domanda\" e " +"premi il pulsante Sì." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:491 msgid "" -"<guilabel>Immediately</guilabel>: Reloads the file immediately when it has been modified. However, a message box asking if you want to reload the " -"file will be displayed at this time. If you do not want to see this message box, check \"Don't ask this question again\" and press the Yes button." +"<guilabel>Immediately</guilabel>: Reloads the file immediately when it has " +"been modified. However, a message box asking if you want to reload the file " +"will be displayed at this time. If you do not want to see this message box, " +"check \"Don't ask this question again\" and press the Yes button." msgstr "" -"<guilabel >Immediatamente</guilabel >: ricarica immediatamente il file quando è stato modificato.Tuttavia, in questo momento verrà visualizzata una " -"finestra di messaggio che chiede se si desidera ricaricare il file.Se non vuoi vedere questa finestra di messaggio, seleziona \"Non fare più questa " +"<guilabel >Immediatamente</guilabel >: ricarica immediatamente il file " +"quando è stato modificato.Tuttavia, in questo momento verrà visualizzata una " +"finestra di messaggio che chiede se si desidera ricaricare il file.Se non " +"vuoi vedere questa finestra di messaggio, seleziona \"Non fare più questa " "domanda\" e premi il pulsante Sì." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -6830,44 +9092,59 @@ msgstr "Confronta >Pagina generale" #. type: Content of: <article><section><para> #: English/Configuration.xml:518 msgid "" -"The options in this page enable you to change some of the ways that WinMerge detects differences, such as comparing only file size, or ignoring some " +"The options in this page enable you to change some of the ways that WinMerge " +"detects differences, such as comparing only file size, or ignoring some " "types of differences, like case." msgstr "" -"Le opzioni in questa pagina ti consentono di modificare alcuni dei modi in cui WinMerge rileva le differenze, ad esempio confrontando solo le " -"dimensioni del file o ignorando alcuni tipi di differenze, come le maiuscole e minuscole." +"Le opzioni in questa pagina ti consentono di modificare alcuni dei modi in " +"cui WinMerge rileva le differenze, ad esempio confrontando solo le " +"dimensioni del file o ignorando alcuni tipi di differenze, come le maiuscole " +"e minuscole." #. type: Content of: <article><section><important><para> #: English/Configuration.xml:525 msgid "" -"Customizing difference detection can be useful during comparisons, when you might not be interested in some differences. However, these options also " -"affect merging. For example, if you ignore whitespace changes, then indentation changes in source code files are not preserved when you merge." +"Customizing difference detection can be useful during comparisons, when you " +"might not be interested in some differences. However, these options also " +"affect merging. For example, if you ignore whitespace changes, then " +"indentation changes in source code files are not preserved when you merge." msgstr "" -"La personalizzazione del rilevamento delle differenze può essere utile durante i confronti, quando potresti non essere interessato ad alcune " -"differenze.Tuttavia, queste opzioni influiscono anche sulla fusione.Ad esempio, se ignori le modifiche agli spazi bianchi, le modifiche al rientro " +"La personalizzazione del rilevamento delle differenze può essere utile " +"durante i confronti, quando potresti non essere interessato ad alcune " +"differenze.Tuttavia, queste opzioni influiscono anche sulla fusione.Ad " +"esempio, se ignori le modifiche agli spazi bianchi, le modifiche al rientro " "nei file del codice sorgente non verranno conservate durante l'unione." #. type: Content of: <article><section><important><para> #: English/Configuration.xml:533 msgid "" -"For this reason, before you merge any differences, we strongly recommend resetting the options on this page to their default settings, especially the " -"ignore options. To reset all the options on this page, click the <guibutton>Defaults</guibutton> button." +"For this reason, before you merge any differences, we strongly recommend " +"resetting the options on this page to their default settings, especially the " +"ignore options. To reset all the options on this page, click the " +"<guibutton>Defaults</guibutton> button." msgstr "" -"Per questo motivo, prima di unire eventuali differenze, consigliamo vivamente di ripristinare le opzioni di questa pagina alle impostazioni " -"predefinite, in particolare le opzioni di ignora.Per ripristinare tutte le opzioni in questa pagina, fai clic sul pulsante <guibutton >Predefinite</" +"Per questo motivo, prima di unire eventuali differenze, consigliamo " +"vivamente di ripristinare le opzioni di questa pagina alle impostazioni " +"predefinite, in particolare le opzioni di ignora.Per ripristinare tutte le " +"opzioni in questa pagina, fai clic sul pulsante <guibutton >Predefinite</" "guibutton >." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:542 msgid "About ignore options<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Informazioni sulle opzioni di ignora<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Informazioni sulle opzioni di ignora<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:548 msgid "" -"A number of options in the Compare page (described later in this section) enable you to ignore certain differences. Ignored differences are treated " -"in special ways in WinMerge:" +"A number of options in the Compare page (described later in this section) " +"enable you to ignore certain differences. Ignored differences are treated in " +"special ways in WinMerge:" msgstr "" -"Numerose opzioni nella pagina Confronta (descritte più avanti in questa sezione) consentono di ignorare alcune differenze.Le differenze ignorate " +"Numerose opzioni nella pagina Confronta (descritte più avanti in questa " +"sezione) consentono di ignorare alcune differenze.Le differenze ignorate " "vengono trattate in modi speciali in WinMerge:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> @@ -6883,12 +9160,17 @@ msgstr "Le differenze ignorate non possono essere unite." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:563 msgid "Ignored differences are not included in difference counts." -msgstr "Le differenze ignorate non vengono incluse nei conteggi delle differenze." +msgstr "" +"Le differenze ignorate non vengono incluse nei conteggi delle differenze." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:568 -msgid "Files containing only ignored differences are marked as identical in a folder comparison." -msgstr "I file contenenti solo differenze ignorate vengono contrassegnati come identici in un confronto di cartelle." +msgid "" +"Files containing only ignored differences are marked as identical in a " +"folder comparison." +msgstr "" +"I file contenenti solo differenze ignorate vengono contrassegnati come " +"identici in un confronto di cartelle." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:578 @@ -6896,9 +9178,11 @@ msgid "whitespaces" msgstr "spazi bianchi" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:580 English/Configuration.xml:690 English/Configuration.xml:745 English/Configuration.xml:774 English/Configuration.xml:798 -#: English/Configuration.xml:1247 English/Configuration.xml:1294 English/Configuration.xml:1318 English/Configuration.xml:1354 -#: English/Configuration.xml:1378 +#: English/Configuration.xml:580 English/Configuration.xml:690 +#: English/Configuration.xml:745 English/Configuration.xml:774 +#: English/Configuration.xml:798 English/Configuration.xml:1247 +#: English/Configuration.xml:1294 English/Configuration.xml:1318 +#: English/Configuration.xml:1354 English/Configuration.xml:1378 msgid "detecting and ignoring differences" msgstr "individuare e ignorare le differenze" @@ -6910,25 +9194,35 @@ msgstr "Spazi bianchi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:585 msgid "" -"Whitespace is the space between words and lines. It is represented in text files by special, nonprinting characters like spaces, tabs, and linefeeds. " -"The significance of whitespace depends on how you want to read or process differences. It might be important to detect all changes in whitespace. " -"Conversely, you might prefer to treat all whitespace the same whether one space, two spaces, an indent, or a tab. And in some structured documents " +"Whitespace is the space between words and lines. It is represented in text " +"files by special, nonprinting characters like spaces, tabs, and linefeeds. " +"The significance of whitespace depends on how you want to read or process " +"differences. It might be important to detect all changes in whitespace. " +"Conversely, you might prefer to treat all whitespace the same whether one " +"space, two spaces, an indent, or a tab. And in some structured documents " "(like comma-separated lists), you might want to disregard all whitespace." msgstr "" -"Lo spazio bianco è lo spazio tra parole e righe.È rappresentato nei file di testo da caratteri speciali, non stampabili come spazi, tabulazioni e " -"avanzamenti di riga.Il significato degli spazi bianchi dipende da come si desidera leggere o elaborare le differenze.Potrebbe essere importante " -"rilevare tutte le modifiche negli spazi bianchi.Al contrario, potresti preferire trattare tutti gli spazi bianchi allo stesso modo: uno spazio, due " -"spazi, un rientro o una tabulazione.E in alcuni documenti strutturati (come gli elenchi separati da virgole), potresti voler ignorare tutti gli spazi " +"Lo spazio bianco è lo spazio tra parole e righe.È rappresentato nei file di " +"testo da caratteri speciali, non stampabili come spazi, tabulazioni e " +"avanzamenti di riga.Il significato degli spazi bianchi dipende da come si " +"desidera leggere o elaborare le differenze.Potrebbe essere importante " +"rilevare tutte le modifiche negli spazi bianchi.Al contrario, potresti " +"preferire trattare tutti gli spazi bianchi allo stesso modo: uno spazio, due " +"spazi, un rientro o una tabulazione.E in alcuni documenti strutturati (come " +"gli elenchi separati da virgole), potresti voler ignorare tutti gli spazi " "bianchi." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:597 msgid "" -"The effects of whitespace on changes within lines are visible only when <option>View line differences</option> is enabled. This is in contrast to " +"The effects of whitespace on changes within lines are visible only when " +"<option>View line differences</option> is enabled. This is in contrast to " "difference blocks, which are always highlighted." msgstr "" -"Gli effetti degli spazi bianchi sulle modifiche all'interno delle righe sono visibili solo quando è abilitata <option>Visualizza differenze di riga</" -"option>.Ciò è in contrasto con i blocchi differenza, che sono sempre evidenziati." +"Gli effetti degli spazi bianchi sulle modifiche all'interno delle righe sono " +"visibili solo quando è abilitata <option>Visualizza differenze di riga</" +"option>.Ciò è in contrasto con i blocchi differenza, che sono sempre " +"evidenziati." #. type: Content of: <article><section><section><example><title> #: English/Configuration.xml:604 @@ -6976,7 +9270,9 @@ msgstr "Nessuno spazio tra le parole:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:624 msgid "You can control whitespace detection by choosing one of these options:" -msgstr "Puoi controllare il rilevamento degli spazi bianchi scegliendo una di queste opzioni:" +msgstr "" +"Puoi controllare il rilevamento degli spazi bianchi scegliendo una di queste " +"opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:630 @@ -6986,11 +9282,14 @@ msgstr "Confrontare" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:634 msgid "" -"All whitespace is compared (default). If you are not sure which option your document requires, this is probably the safest choice. In the example, " -"all lines are detected as different." +"All whitespace is compared (default). If you are not sure which option your " +"document requires, this is probably the safest choice. In the example, all " +"lines are detected as different." msgstr "" -"Tutti gli spazi bianchi vengono confrontati (impostazione predefinita).Se non sei sicuro di quale opzione richieda il tuo documento, questa è " -"probabilmente la scelta più sicura.Nell'esempio, tutte le linee vengono rilevate come diverse." +"Tutti gli spazi bianchi vengono confrontati (impostazione predefinita).Se " +"non sei sicuro di quale opzione richieda il tuo documento, questa è " +"probabilmente la scelta più sicura.Nell'esempio, tutte le linee vengono " +"rilevate come diverse." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:642 @@ -7000,12 +9299,16 @@ msgstr "Ignora il cambiamento" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:646 msgid "" -"Compares differences in whitespace. In the example, the first three lines have different whitespace, but are detected as identical: tabs and multiple " -"are treated as if they are single space. The last line has no whitespace, so the difference is <emphasis>not</emphasis> ignored (in effect, the words " -"in the last two lines are different):" +"Compares differences in whitespace. In the example, the first three lines " +"have different whitespace, but are detected as identical: tabs and multiple " +"are treated as if they are single space. The last line has no whitespace, so " +"the difference is <emphasis>not</emphasis> ignored (in effect, the words in " +"the last two lines are different):" msgstr "" -"Confronta le differenze negli spazi bianchi.Nell'esempio, le prime tre righe hanno spazi diversi, ma vengono rilevate come identiche: tabulazioni e " -"multipli vengono trattati come se fossero spazi singoli.L'ultima riga non ha spazi, quindi la differenza <emphasis>non</emphasis> viene ignorata (in " +"Confronta le differenze negli spazi bianchi.Nell'esempio, le prime tre righe " +"hanno spazi diversi, ma vengono rilevate come identiche: tabulazioni e " +"multipli vengono trattati come se fossero spazi singoli.L'ultima riga non ha " +"spazi, quindi la differenza <emphasis>non</emphasis> viene ignorata (in " "effetti, le parole nelle ultime due righe sono diverse):" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -7016,11 +9319,13 @@ msgstr "Ignora tutto" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:661 msgid "" -"Ignores all whitespace characters, except linefeeds (so lines are detected and preserved in a merge). All lines in the example are detected as " +"Ignores all whitespace characters, except linefeeds (so lines are detected " +"and preserved in a merge). All lines in the example are detected as " "identical." msgstr "" -"Ignora tutti i caratteri di spazio bianco, eccetto gli avanzamenti di riga (quindi le righe vengono rilevate e conservate in un'unione).Tutte le " -"linee nell'esempio vengono rilevate come identiche." +"Ignora tutti i caratteri di spazio bianco, eccetto gli avanzamenti di riga " +"(quindi le righe vengono rilevate e conservate in un'unione).Tutte le linee " +"nell'esempio vengono rilevate come identiche." #. type: Content of: <article><section><section><note><title> #: English/Configuration.xml:670 @@ -7029,18 +9334,24 @@ msgstr "Argomenti correlati" #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:673 -msgid "The effects of whitespace settings on line differences is described in <xref linkend=\"CompareFiles_linediff-highlight\" />." +msgid "" +"The effects of whitespace settings on line differences is described in <xref " +"linkend=\"CompareFiles_linediff-highlight\" />." msgstr "" -"Gli effetti delle impostazioni degli spazi bianchi sulle differenze di riga sono descritti in <xref linkend=\"CompareFiles_linediff-highlight\" />." +"Gli effetti delle impostazioni degli spazi bianchi sulle differenze di riga " +"sono descritti in <xref linkend=\"CompareFiles_linediff-highlight\" />." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:678 msgid "" -"The Options dialog Editor page contains related options that control how whitespace is used to detect breaks between words. See <xref " +"The Options dialog Editor page contains related options that control how " +"whitespace is used to detect breaks between words. See <xref " "linkend=\"Configuration_viewlinediffs\" /> for details." msgstr "" -"La pagina Editor della finestra di dialogo Opzioni contiene opzioni correlate che controllano il modo in cui vengono utilizzati gli spazi bianchi per " -"rilevare le interruzioni tra le parole.Vedi <xref linkend=\"Configuration_viewlinediffs\" /> per i dettagli." +"La pagina Editor della finestra di dialogo Opzioni contiene opzioni " +"correlate che controllano il modo in cui vengono utilizzati gli spazi " +"bianchi per rilevare le interruzioni tra le parole.Vedi <xref " +"linkend=\"Configuration_viewlinediffs\" /> per i dettagli." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:688 @@ -7055,20 +9366,25 @@ msgstr "Ignora le righe vuote<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:697 msgid "" -"<option>Disabled</option> (default): Empty lines in the source files are detected and represented in the File Compare window as blank lines with the " +"<option>Disabled</option> (default): Empty lines in the source files are " +"detected and represented in the File Compare window as blank lines with the " "Deleted Difference colors." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): le righe vuote nei file di origine vengono rilevate e rappresentate nella finestra " -"Confronto file come righe vuote con i colori della differenza eliminata." +"<option>Disabilitato</option> (impostazione predefinita): le righe vuote nei " +"file di origine vengono rilevate e rappresentate nella finestra Confronto " +"file come righe vuote con i colori della differenza eliminata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:705 msgid "" -"<option>Enabled</option>: Empty lines in the source files are ignored. They are represented in the File Compare window as blank lines with the " -"Ignored Difference colors. However the difference cannot be merged." +"<option>Enabled</option>: Empty lines in the source files are ignored. They " +"are represented in the File Compare window as blank lines with the Ignored " +"Difference colors. However the difference cannot be merged." msgstr "" -"<option>Abilitato</option>: le righe vuote nei file di origine vengono ignorate.Sono rappresentati nella finestra Confronto file come righe vuote con " -"i colori della differenza ignorata.Tuttavia la differenza non può essere fusa." +"<option>Abilitato</option>: le righe vuote nei file di origine vengono " +"ignorate.Sono rappresentati nella finestra Confronto file come righe vuote " +"con i colori della differenza ignorata.Tuttavia la differenza non può essere " +"fusa." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:717 @@ -7083,37 +9399,53 @@ msgstr "Ignora maiuscole e minuscole<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:724 msgid "" -"<option>Disabled</option> (default): Comparisons are case-sensitive. For example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and " +"<option>Disabled</option> (default): Comparisons are case-sensitive. For " +"example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and " "<literal>lowercase</literal> are all different." msgstr "" -"<option>Disabilitato</option> (predefinito): i confronti fanno distinzione tra maiuscole e minuscole.Ad esempio, <literal>LowerCase</literal>, " -"<literal>LOWERCASE</literal> e <literal>lowercase</literal> sono tutti diversi." +"<option>Disabilitato</option> (predefinito): i confronti fanno distinzione " +"tra maiuscole e minuscole.Ad esempio, <literal>LowerCase</literal>, " +"<literal>LOWERCASE</literal> e <literal>lowercase</literal> sono tutti " +"diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:733 -msgid "<option>Enabled</option>: Differences between lowercase and uppercase letters are ignored." -msgstr "<option>Abilitato</option>: le differenze tra lettere minuscole e maiuscole vengono ignorate." +msgid "" +"<option>Enabled</option>: Differences between lowercase and uppercase " +"letters are ignored." +msgstr "" +"<option>Abilitato</option>: le differenze tra lettere minuscole e maiuscole " +"vengono ignorate." #. type: Content of: <article><section><section><title><indexterm><see> -#: English/Configuration.xml:743 English/Configuration.xml:849 English/Configuration.xml:2216 English/Configuration.xml:2222 +#: English/Configuration.xml:743 English/Configuration.xml:849 +#: English/Configuration.xml:2216 English/Configuration.xml:2222 msgid "EOL" msgstr "EOL" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:742 -msgid "Ignore carriage return differences (Windows/Unix/Mac)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ignora le differenze di ritorno a capo (Windows/Unix/Mac)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Ignore carriage return differences (Windows/Unix/Mac)<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Ignora le differenze di ritorno a capo (Windows/Unix/Mac)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:752 msgid "" -"<option>Disabled</option> (default): End of line (EOL) style differences are detected. For example, if you compare two lines that have the same " -"contents but different line endings, the lines are considered to be different. When this happens, WinMerge displays a dialog prompting you to confirm " -"whether to detect or ignore the difference." +"<option>Disabled</option> (default): End of line (EOL) style differences are " +"detected. For example, if you compare two lines that have the same contents " +"but different line endings, the lines are considered to be different. When " +"this happens, WinMerge displays a dialog prompting you to confirm whether to " +"detect or ignore the difference." msgstr "" -"<option>Disabilitato</option> (predefinito): vengono rilevate differenze di stile di fine riga (EOL).Ad esempio, se si confrontano due righe che " -"hanno lo stesso contenuto ma terminazioni di riga diverse, le righe vengono considerate diverse.Quando ciò accade, WinMerge visualizza una finestra " -"di dialogo che richiede di confermare se rilevare o ignorare la differenza." +"<option>Disabilitato</option> (predefinito): vengono rilevate differenze di " +"stile di fine riga (EOL).Ad esempio, se si confrontano due righe che hanno " +"lo stesso contenuto ma terminazioni di riga diverse, le righe vengono " +"considerate diverse.Quando ciò accade, WinMerge visualizza una finestra di " +"dialogo che richiede di confermare se rilevare o ignorare la differenza." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:763 @@ -7133,7 +9465,9 @@ msgstr "Ignora i numeri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:781 msgid "<option>Disabled</option> (default): Numeric differences are detected." -msgstr "<option>Disabilitato</option> (predefinito): vengono rilevate differenze numeriche." +msgstr "" +"<option>Disabilitato</option> (predefinito): vengono rilevate differenze " +"numeriche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:787 @@ -7148,20 +9482,26 @@ msgstr "tabella codici" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:795 msgid "Ignore codepage differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ignora le differenze nella tabella codici<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Ignora le differenze nella tabella codici<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:805 msgid "" -"<option>Disabled</option> (default): File encoding differences are detected. Also, differences between the presence and absence of BOM are detected." +"<option>Disabled</option> (default): File encoding differences are detected. " +"Also, differences between the presence and absence of BOM are detected." msgstr "" -"<option>Disabilitato</option> (predefinito): vengono rilevate le differenze di codifica dei file.Inoltre, vengono rilevate differenze tra la presenza " -"e l'assenza della distinta base." +"<option>Disabilitato</option> (predefinito): vengono rilevate le differenze " +"di codifica dei file.Inoltre, vengono rilevate differenze tra la presenza e " +"l'assenza della distinta base." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:811 msgid "<option>Enabled</option>: File encoding differences are ignored." -msgstr "<option>Abilitato</option>: le differenze di codifica dei file vengono ignorate." +msgstr "" +"<option>Abilitato</option>: le differenze di codifica dei file vengono " +"ignorate." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:822 @@ -7171,22 +9511,31 @@ msgstr "commenti" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:819 msgid "Ignore comment differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ignora le differenze nei commenti<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Ignora le differenze nei commenti<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:829 -msgid "<option>Disabled</option> (default): WinMerge compares comments in code, along with other content." -msgstr "<option>Disabilitato</option> (predefinito): WinMerge confronta i commenti nel codice, insieme ad altri contenuti." +msgid "" +"<option>Disabled</option> (default): WinMerge compares comments in code, " +"along with other content." +msgstr "" +"<option>Disabilitato</option> (predefinito): WinMerge confronta i commenti " +"nel codice, insieme ad altri contenuti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:836 msgid "" -"<option>Enabled</option>: This option optimizes comparisons by detecting comments in certain programming language file types (such as C++ and Java), " -"and ignoring them. The detection is based on syntax highlighting, so it has no effect on file types that are not supported by WinMerge." +"<option>Enabled</option>: This option optimizes comparisons by detecting " +"comments in certain programming language file types (such as C++ and Java), " +"and ignoring them. The detection is based on syntax highlighting, so it has " +"no effect on file types that are not supported by WinMerge." msgstr "" -"<option>Abilitato</option>: questa opzione ottimizza i confronti rilevando i commenti in determinati tipi di file del linguaggio di programmazione " -"(come C++ e Java) e ignorandoli.Il rilevamento si basa sull'evidenziazione della sintassi, quindi non ha alcun effetto sui tipi di file non " -"supportati da WinMerge." +"<option>Abilitato</option>: questa opzione ottimizza i confronti rilevando i " +"commenti in determinati tipi di file del linguaggio di programmazione (come " +"C++ e Java) e ignorandoli.Il rilevamento si basa sull'evidenziazione della " +"sintassi, quindi non ha alcun effetto sui tipi di file non supportati da " +"WinMerge." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:847 @@ -7196,19 +9545,23 @@ msgstr "Ignora l'EOL finale mancante<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:856 msgid "" -"<option>Disabled</option> (default): Differences in the presence or absence of trailing EOL characters are detected as differences, even if the " -"content of the lines matches." +"<option>Disabled</option> (default): Differences in the presence or absence " +"of trailing EOL characters are detected as differences, even if the content " +"of the lines matches." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): le differenze nella presenza o assenza di caratteri EOL finali vengono rilevate come " +"<option>Disabilitato</option> (impostazione predefinita): le differenze " +"nella presenza o assenza di caratteri EOL finali vengono rilevate come " "differenze, anche se il contenuto delle righe corrisponde." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:862 msgid "" -"<option>Enabled</option>: When one file ends with an EOL character (e.g., LF or CRLF) and the other does not, but the line content matches, these " +"<option>Enabled</option>: When one file ends with an EOL character (e.g., LF " +"or CRLF) and the other does not, but the line content matches, these " "differences are ignored." msgstr "" -"<option>Abilitato</option>: quando un file termina con un carattere EOL (ad esempio, LF o CRLF) e l'altro no, ma il contenuto della riga corrisponde, " +"<option>Abilitato</option>: quando un file termina con un carattere EOL (ad " +"esempio, LF o CRLF) e l'altro no, ma il contenuto della riga corrisponde, " "queste differenze vengono ignorate." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -7218,13 +9571,21 @@ msgstr "interruzioni di riga" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:870 -msgid "Ignore line breaks (treat as spaces)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ignora le interruzioni di riga (considera come spazi)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Ignore line breaks (treat as spaces)<placeholder type=\"indexterm\" id=\"0\"/" +">" +msgstr "" +"Ignora le interruzioni di riga (considera come spazi)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:879 -msgid "<option>Disabled</option> (default): Line breaks (EOL characters) are not treated as spaces." -msgstr "<option>Disabilitato</option> (predefinito): le interruzioni di riga (caratteri EOL) non vengono trattate come spazi." +msgid "" +"<option>Disabled</option> (default): Line breaks (EOL characters) are not " +"treated as spaces." +msgstr "" +"<option>Disabilitato</option> (predefinito): le interruzioni di riga " +"(caratteri EOL) non vengono trattate come spazi." #. type: Content of: <article><section><section><itemizedlist><listitem><para><screen> #: English/Configuration.xml:886 @@ -7247,41 +9608,63 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:885 msgid "" -"<option>Enabled</option>: Within a diff hunk, line breaks are treated as spaces. For example, the following difference is ignored: <placeholder " -"type=\"screen\" id=\"0\"/> <note> Useful when combined with whitespace options such as <option>Whitespaces → Ignore change</option> or " +"<option>Enabled</option>: Within a diff hunk, line breaks are treated as " +"spaces. For example, the following difference is ignored: <placeholder " +"type=\"screen\" id=\"0\"/> <note> Useful when combined with whitespace " +"options such as <option>Whitespaces → Ignore change</option> or " "<option>Whitespaces → Ignore all</option>. </note>" msgstr "" -"<option>Abilitato</option>: all'interno di un blocco differenziale, le interruzioni di riga vengono trattate come spazi.Ad esempio, la seguente " -"differenza viene ignorata: <placeholder type=\"screen\" id=\"0\"/> <note> Utile se combinato con opzioni di spazi bianchi come <option>Spazi bianchi " -"→ Ignora modifica</option> o <option>Spazi bianchi → Ignora tutto</option>.</note>" +"<option>Abilitato</option>: all'interno di un blocco differenziale, le " +"interruzioni di riga vengono trattate come spazi.Ad esempio, la seguente " +"differenza viene ignorata: <placeholder type=\"screen\" id=\"0\"/> <note> " +"Utile se combinato con opzioni di spazi bianchi come <option>Spazi bianchi → " +"Ignora modifica</option> o <option>Spazi bianchi → Ignora tutto</option>.</" +"note>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:905 msgid "Enable moved block detection<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Abilita il rilevamento dei blocchi spostati<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Abilita il rilevamento dei blocchi spostati<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:913 -msgid "<option>Disabled</option> (default): WinMerge does not detect when differences are due to moved lines." -msgstr "<option>Disabilitato</option> (predefinito): WinMerge non rileva quando le differenze sono dovute allo spostamento delle linee." +msgid "" +"<option>Disabled</option> (default): WinMerge does not detect when " +"differences are due to moved lines." +msgstr "" +"<option>Disabilitato</option> (predefinito): WinMerge non rileva quando le " +"differenze sono dovute allo spostamento delle linee." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:920 msgid "" -"<option>Enabled</option>: WinMerge tries to detect lines that are moved (in different locations in each file). Moved blocks are indicated by the " -"<guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> difference colors. If the Location bar is displayed, corresponding difference " -"locations in the left and right location bars are connected with a line. Showing moved blocks can make it easier to visualize changes in files, if " -"there are not too many." -msgstr "" -"<option>Abilitato</option>: WinMerge tenta di rilevare le righe che vengono spostate (in posizioni diverse in ciascun file).I blocchi spostati sono " -"indicati dalla differenza di colori <guilabel >Spostato</guilabel > e <guilabel >Spostato selezionato </guilabel >.Se viene visualizzata la barra " -"della posizione, le posizioni differenti corrispondenti nelle barre della posizione sinistra e destra sono collegate con una linea.Mostrare i blocchi " -"spostati può rendere più semplice la visualizzazione delle modifiche nei file, se non ce ne sono troppi." +"<option>Enabled</option>: WinMerge tries to detect lines that are moved (in " +"different locations in each file). Moved blocks are indicated by the " +"<guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> " +"difference colors. If the Location bar is displayed, corresponding " +"difference locations in the left and right location bars are connected with " +"a line. Showing moved blocks can make it easier to visualize changes in " +"files, if there are not too many." +msgstr "" +"<option>Abilitato</option>: WinMerge tenta di rilevare le righe che vengono " +"spostate (in posizioni diverse in ciascun file).I blocchi spostati sono " +"indicati dalla differenza di colori <guilabel >Spostato</guilabel > e " +"<guilabel >Spostato selezionato </guilabel >.Se viene visualizzata la barra " +"della posizione, le posizioni differenti corrispondenti nelle barre della " +"posizione sinistra e destra sono collegate con una linea.Mostrare i blocchi " +"spostati può rendere più semplice la visualizzazione delle modifiche nei " +"file, se non ce ne sono troppi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:932 -msgid "For an example, see the Location pane description in <xref linkend=\"Compare_files\" />." -msgstr "Per un esempio, vedi la descrizione del riquadro Posizione in <xref linkend=\"Compare_files\" />." +msgid "" +"For an example, see the Location pane description in <xref " +"linkend=\"Compare_files\" />." +msgstr "" +"Per un esempio, vedi la descrizione del riquadro Posizione in <xref " +"linkend=\"Compare_files\" />." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:942 @@ -7295,24 +9678,35 @@ msgstr "Allinea linee simili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:949 -msgid "<option>Disabled</option> (default): Lines within difference blocks are shown as they occur in the source files." +msgid "" +"<option>Disabled</option> (default): Lines within difference blocks are " +"shown as they occur in the source files." msgstr "" -"<option>Disabilitato</option> (predefinito): le linee all'interno dei blocchi di differenza vengono mostrate così come si presentano nei file di " +"<option>Disabilitato</option> (predefinito): le linee all'interno dei " +"blocchi di differenza vengono mostrate così come si presentano nei file di " "origine." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:956 msgid "" -"<option>Enabled</option>: WinMerge tries to detect lines within a difference blocks that are similar, and adds blank lines in the File panes to align " -"them. This option is most effective when lines are quite similar; less effective if lines are too different." +"<option>Enabled</option>: WinMerge tries to detect lines within a difference " +"blocks that are similar, and adds blank lines in the File panes to align " +"them. This option is most effective when lines are quite similar; less " +"effective if lines are too different." msgstr "" -"<option>Abilitato</option>: WinMerge tenta di rilevare righe simili all'interno di blocchi di differenza e aggiunge righe vuote nei riquadri File per " -"allinearle.Questa opzione è più efficace quando le linee sono abbastanza simili;meno efficace se le linee sono troppo diverse." +"<option>Abilitato</option>: WinMerge tenta di rilevare righe simili " +"all'interno di blocchi di differenza e aggiunge righe vuote nei riquadri " +"File per allinearle.Questa opzione è più efficace quando le linee sono " +"abbastanza simili;meno efficace se le linee sono troppo diverse." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:963 -msgid "For an example, see the <citetitle>Similar lines</citetitle> description in <xref linkend=\"CompareFiles_diffcolors\" />." -msgstr "Per un esempio, vedi la descrizione <citetitle>Righe simili</citetitle> in <xref linkend=\"CompareFiles_diffcolors\" />." +msgid "" +"For an example, see the <citetitle>Similar lines</citetitle> description in " +"<xref linkend=\"CompareFiles_diffcolors\" />." +msgstr "" +"Per un esempio, vedi la descrizione <citetitle>Righe simili</citetitle> in " +"<xref linkend=\"CompareFiles_diffcolors\" />." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:973 @@ -7331,23 +9725,39 @@ msgstr "<option>default</option> (default): l'algoritmo greedy diff di base." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:987 -msgid "<option>minimal</option>: Spend extra time to make sure the smallest possible diff is produced." -msgstr "<option>minimo</option>: dedica più tempo per assicurarti che venga prodotta la differenza più piccola possibile." +msgid "" +"<option>minimal</option>: Spend extra time to make sure the smallest " +"possible diff is produced." +msgstr "" +"<option>minimo</option>: dedica più tempo per assicurarti che venga prodotta " +"la differenza più piccola possibile." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:994 -msgid "<option>patience</option>: Use \"patience diff\" algorithm when generating diff." -msgstr "<option>pazienza</option>: usa l'algoritmo \"pazienza diff\" quando generi diff." +msgid "" +"<option>patience</option>: Use \"patience diff\" algorithm when generating " +"diff." +msgstr "" +"<option>pazienza</option>: usa l'algoritmo \"pazienza diff\" quando generi " +"diff." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1001 -msgid "<option>histogram</option>: This algorithm extends the patience algorithm to \"support low-occurrence common elements\"." -msgstr "<option>istogramma</option>: questo algoritmo estende l'algoritmo della pazienza per \"supportare elementi comuni a bassa frequenza\"." +msgid "" +"<option>histogram</option>: This algorithm extends the patience algorithm to " +"\"support low-occurrence common elements\"." +msgstr "" +"<option>istogramma</option>: questo algoritmo estende l'algoritmo della " +"pazienza per \"supportare elementi comuni a bassa frequenza\"." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1008 -msgid "<option>none</option>: This algorithm does not detect insertions or deletions of lines." -msgstr "<option>nessuno</option>: questo algoritmo non rileva inserimenti o eliminazioni di righe." +msgid "" +"<option>none</option>: This algorithm does not detect insertions or " +"deletions of lines." +msgstr "" +"<option>nessuno</option>: questo algoritmo non rileva inserimenti o " +"eliminazioni di righe." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1018 @@ -7357,16 +9767,19 @@ msgstr "euristica del rientro" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1017 msgid "Enable indent heuristic<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Abilita l'euristica del rientro<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Abilita l'euristica del rientro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1025 msgid "" -"<option>Enabled</option> (default): Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read. It has no effect if the Diff " +"<option>Enabled</option> (default): Enable the heuristic that shifts diff " +"hunk boundaries to make diffs easier to read. It has no effect if the Diff " "algorithm is default." msgstr "" -"<option>Abilitato</option> (predefinito): abilita l'euristica che sposta i confini dei blocchi diff per rendere le differenze più facili da " -"leggere.Non ha alcun effetto se l'algoritmo Diff è predefinito." +"<option>Abilitato</option> (predefinito): abilita l'euristica che sposta i " +"confini dei blocchi diff per rendere le differenze più facili da leggere.Non " +"ha alcun effetto se l'algoritmo Diff è predefinito." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1033 @@ -7380,26 +9793,34 @@ msgstr "eliminare l'evidenziazione delle differenze ignorate" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1041 -msgid "Completely unhighlight the ignored differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Deseleziona completamente le differenze ignorate<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Completely unhighlight the ignored differences<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Deseleziona completamente le differenze ignorate<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1049 msgid "" -"<option>Disabled</option> (default): Difference lines ignored by line filters and substitution filters are displayed in the color of Ignored " +"<option>Disabled</option> (default): Difference lines ignored by line " +"filters and substitution filters are displayed in the color of Ignored " "Difference." msgstr "" -"<option>Disabilitato</option> (predefinito): le linee di differenza ignorate dai filtri di linea e dai filtri di sostituzione vengono visualizzate " -"nel colore della Differenza Ignorata." +"<option>Disabilitato</option> (predefinito): le linee di differenza ignorate " +"dai filtri di linea e dai filtri di sostituzione vengono visualizzate nel " +"colore della Differenza Ignorata." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1057 msgid "" -"<option>Enabled</option>: Makes the color of the different lines ignored by line filters and substitution filters the same as the color of the " -"identical lines." +"<option>Enabled</option>: Makes the color of the different lines ignored by " +"line filters and substitution filters the same as the color of the identical " +"lines." msgstr "" -"<option>Abilitato</option>: rende il colore delle diverse linee ignorate dai filtri di linea e dai filtri di sostituzione uguale al colore delle " -"linee identiche." +"<option>Abilitato</option>: rende il colore delle diverse linee ignorate dai " +"filtri di linea e dai filtri di sostituzione uguale al colore delle linee " +"identiche." #. type: Content of: <article><section><title> #: English/Configuration.xml:1067 @@ -7418,8 +9839,12 @@ msgstr "Metodo di confronto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1079 -msgid "This option lets you determine how complete your file comparisons are. Choose one of these five choices:" -msgstr "Questa opzione ti consente di determinare quanto sono completi i confronti dei file.Scegli una di queste cinque scelte:" +msgid "" +"This option lets you determine how complete your file comparisons are. " +"Choose one of these five choices:" +msgstr "" +"Questa opzione ti consente di determinare quanto sono completi i confronti " +"dei file.Scegli una di queste cinque scelte:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1085 @@ -7429,11 +9854,15 @@ msgstr "Contenuto completo" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1089 msgid "" -"Default: Full comparison of files by content, with all the bells and whistles. This method invokes plugins and uses the diffutils engine for fully " -"accurate differencing and moved block detection. This is the most complete and recommended method." +"Default: Full comparison of files by content, with all the bells and " +"whistles. This method invokes plugins and uses the diffutils engine for " +"fully accurate differencing and moved block detection. This is the most " +"complete and recommended method." msgstr "" -"Impostazione predefinita: confronto completo dei file in base al contenuto, con tutti i fronzoli.Questo metodo richiama plugin e utilizza il motore " -"diffutils per una differenziazione completamente accurata e il rilevamento dei blocchi spostati.Questo è il metodo più completo e consigliato." +"Impostazione predefinita: confronto completo dei file in base al contenuto, " +"con tutti i fronzoli.Questo metodo richiama plugin e utilizza il motore " +"diffutils per una differenziazione completamente accurata e il rilevamento " +"dei blocchi spostati.Questo è il metodo più completo e consigliato." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1098 @@ -7443,19 +9872,25 @@ msgstr "Contenuti rapidi" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1102 msgid "" -"Slimmed-down comparison of files by content. This method uses streamlined file comparison code which skips plugins and moved block detection. This " -"method is faster than <guilabel> Full Contents </guilabel>, because it does not load the files." +"Slimmed-down comparison of files by content. This method uses streamlined " +"file comparison code which skips plugins and moved block detection. This " +"method is faster than <guilabel> Full Contents </guilabel>, because it does " +"not load the files." msgstr "" -"Confronto ridotto dei file in base al contenuto.Questo metodo utilizza un codice di confronto file semplificato che ignora i plug-in e il rilevamento " -"dei blocchi spostati.Questo metodo è più veloce del <guilabel> Contenuto completo </guilabel>, perché non carica i file." +"Confronto ridotto dei file in base al contenuto.Questo metodo utilizza un " +"codice di confronto file semplificato che ignora i plug-in e il rilevamento " +"dei blocchi spostati.Questo metodo è più veloce del <guilabel> Contenuto " +"completo </guilabel>, perché non carica i file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1111 msgid "" -"Its drawback is that line filters are not applied when comparing. For example, this method sees file as different even if line filters are set to " +"Its drawback is that line filters are not applied when comparing. For " +"example, this method sees file as different even if line filters are set to " "ignore all differences in the files." msgstr "" -"Lo svantaggio è che durante il confronto non vengono applicati i filtri di linea.Ad esempio, questo metodo considera il file come diverso anche se i " +"Lo svantaggio è che durante il confronto non vengono applicati i filtri di " +"linea.Ad esempio, questo metodo considera il file come diverso anche se i " "filtri di linea sono impostati per ignorare tutte le differenze nei file." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -7466,16 +9901,23 @@ msgstr "Contenuti binari" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1123 msgid "" -"This method is faster than the Quick contents compare method. However, it does not apply any plugins, line filters, 'Ignore case' option, etc. First, " -"it compares the file sizes, and if they are different, it treats the contents of the file as different without comparing them. If the file sizes " -"match, it simply compares the contents of the file in bytes. No file encoding detection, EOL detection, or binary file detection is performed. This " -"compare method is good for comparing files against backed up files." -msgstr "" -"Questo metodo è più veloce del metodo di confronto rapido dei contenuti.Tuttavia, non applica alcun plugin, filtro di linea, opzione 'Ignora " -"maiuscole e minuscole', ecc. Innanzitutto confronta le dimensioni del file e, se sono diverse, tratta i contenuti del file come diversi senza " -"confrontarli.Se le dimensioni del file corrispondono, confronta semplicemente il contenuto del file in byte.Non viene eseguito alcun rilevamento " -"della codifica file, rilevamento EOL o rilevamento file binario.Questo metodo di confronto è utile per confrontare i file con i file di cui è stato " -"eseguito il backup." +"This method is faster than the Quick contents compare method. However, it " +"does not apply any plugins, line filters, 'Ignore case' option, etc. First, " +"it compares the file sizes, and if they are different, it treats the " +"contents of the file as different without comparing them. If the file sizes " +"match, it simply compares the contents of the file in bytes. No file " +"encoding detection, EOL detection, or binary file detection is performed. " +"This compare method is good for comparing files against backed up files." +msgstr "" +"Questo metodo è più veloce del metodo di confronto rapido dei contenuti." +"Tuttavia, non applica alcun plugin, filtro di linea, opzione 'Ignora " +"maiuscole e minuscole', ecc. Innanzitutto confronta le dimensioni del file " +"e, se sono diverse, tratta i contenuti del file come diversi senza " +"confrontarli.Se le dimensioni del file corrispondono, confronta " +"semplicemente il contenuto del file in byte.Non viene eseguito alcun " +"rilevamento della codifica file, rilevamento EOL o rilevamento file binario." +"Questo metodo di confronto è utile per confrontare i file con i file di cui " +"è stato eseguito il backup." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1137 @@ -7485,10 +9927,12 @@ msgstr "Data di modifica<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1146 msgid "" -"Compares only the modification dates on the files, so it is far faster than either of the contents methods. But obviously, it is only as accurate as " -"the modification dates." +"Compares only the modification dates on the files, so it is far faster than " +"either of the contents methods. But obviously, it is only as accurate as the " +"modification dates." msgstr "" -"Confronta solo le date di modifica sui file, quindi è molto più veloce di entrambi i metodi dei contenuti.Ma ovviamente, è accurato solo quanto lo " +"Confronta solo le date di modifica sui file, quindi è molto più veloce di " +"entrambi i metodi dei contenuti.Ma ovviamente, è accurato solo quanto lo " "sono le date di modifica." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -7498,8 +9942,12 @@ msgstr "Data e dimensione modificate" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1158 -msgid "Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes when dates are identical." -msgstr "Simile a <guilabel >Data modificata</guilabel >, ma controlla anche le dimensioni dei file quando le date sono identiche." +msgid "" +"Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes " +"when dates are identical." +msgstr "" +"Simile a <guilabel >Data modificata</guilabel >, ma controlla anche le " +"dimensioni dei file quando le date sono identiche." #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> #: English/Configuration.xml:1167 @@ -7513,8 +9961,12 @@ msgstr "Dimensioni<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1175 -msgid "Compares only file sizes, so it is fast but not as accurate as the contents methods." -msgstr "Confronta solo le dimensioni dei file, quindi è veloce ma non accurato come i metodi dei contenuti." +msgid "" +"Compares only file sizes, so it is fast but not as accurate as the contents " +"methods." +msgstr "" +"Confronta solo le dimensioni dei file, quindi è veloce ma non accurato come " +"i metodi dei contenuti." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1182 @@ -7524,10 +9976,12 @@ msgstr "Esistenza" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1186 msgid "" -"Compares only whether files exist on both sides. If a file exists on both the left and right, they are considered identical, without checking " +"Compares only whether files exist on both sides. If a file exists on both " +"the left and right, they are considered identical, without checking " "contents, size, or timestamps." msgstr "" -"Confronta solo se i file esistono su entrambi i lati.Se un file esiste sia a sinistra che a destra, vengono considerati identici, senza controllare " +"Confronta solo se i file esistono su entrambi i lati.Se un file esiste sia a " +"sinistra che a destra, vengono considerati identici, senza controllare " "contenuto, dimensione o timestamp." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -7537,72 +9991,112 @@ msgstr "fermarsi dopo la prima differenza" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1197 -msgid "Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Interrompi dopo la prima differenza<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Interrompi dopo la prima differenza<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1209 -msgid "This option is enabled only when the <guilabel> Quick Contents </guilabel> compare method is selected." -msgstr "Questa opzione è abilitata solo quando è selezionato il metodo di confronto <guilabel > Contenuti rapidi </guilabel >." +msgid "" +"This option is enabled only when the <guilabel> Quick Contents </guilabel> " +"compare method is selected." +msgstr "" +"Questa opzione è abilitata solo quando è selezionato il metodo di confronto " +"<guilabel > Contenuti rapidi </guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1218 -msgid "<option>Disabled</option> (default): WinMerge examines all differences in the files." -msgstr "<option>Disabilitato</option> (predefinito): WinMerge esamina tutte le differenze nei file." +msgid "" +"<option>Disabled</option> (default): WinMerge examines all differences in " +"the files." +msgstr "" +"<option>Disabilitato</option> (predefinito): WinMerge esamina tutte le " +"differenze nei file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1225 msgid "" -"<option>Enabled</option>: This option optimizes comparisons by examining files only until the first difference is found, instead always scanning the " +"<option>Enabled</option>: This option optimizes comparisons by examining " +"files only until the first difference is found, instead always scanning the " "entire files." msgstr "" -"<option>Abilitato</option>: questa opzione ottimizza i confronti esaminando i file solo fino a quando non viene trovata la prima differenza, " +"<option>Abilitato</option>: questa opzione ottimizza i confronti esaminando " +"i file solo fino a quando non viene trovata la prima differenza, " "scansionando invece sempre l'intero file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1231 msgid "" -"The drawback is that WinMerge may be unable to identify binary files as binary. This is likely to happen if the first difference is near the " -"beginning of the file. If you know what kind of files you are comparing (for example, which are binary files), this option can be a good way to speed " -"up comparisons. However, don't enable this option if you are not sure what kind of files you are comparing." +"The drawback is that WinMerge may be unable to identify binary files as " +"binary. This is likely to happen if the first difference is near the " +"beginning of the file. If you know what kind of files you are comparing (for " +"example, which are binary files), this option can be a good way to speed up " +"comparisons. However, don't enable this option if you are not sure what kind " +"of files you are comparing." msgstr "" -"Lo svantaggio è che WinMerge potrebbe non essere in grado di identificare i file binari come binari.È probabile che ciò accada se la prima differenza " -"è vicino all'inizio del file.Se sai che tipo di file stai confrontando (ad esempio, quali sono file binari), questa opzione può essere un buon modo " -"per accelerare i confronti.Tuttavia, non abilitare questa opzione se non sei sicuro del tipo di file che stai confrontando." +"Lo svantaggio è che WinMerge potrebbe non essere in grado di identificare i " +"file binari come binari.È probabile che ciò accada se la prima differenza è " +"vicino all'inizio del file.Se sai che tipo di file stai confrontando (ad " +"esempio, quali sono file binari), questa opzione può essere un buon modo per " +"accelerare i confronti.Tuttavia, non abilitare questa opzione se non sei " +"sicuro del tipo di file che stai confrontando." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1244 -msgid "Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ignora le differenze orarie inferiori a 3 secondi<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Ignora le differenze orarie inferiori a 3 secondi<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1254 -msgid "<option>Disabled</option> (default): Files with different timestamps are detected as different." -msgstr "<option>Disabilitato</option> (predefinito): i file con timestamp diversi vengono rilevati come diversi." +msgid "" +"<option>Disabled</option> (default): Files with different timestamps are " +"detected as different." +msgstr "" +"<option>Disabilitato</option> (predefinito): i file con timestamp diversi " +"vengono rilevati come diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1261 msgid "" -"<option>Enabled</option>: Sometimes (for example, when you use network shares) small differences in timestamps are not significant. To get more " -"meaningful results in such situations, this option enables you to ignore time differences smaller than three seconds." +"<option>Enabled</option>: Sometimes (for example, when you use network " +"shares) small differences in timestamps are not significant. To get more " +"meaningful results in such situations, this option enables you to ignore " +"time differences smaller than three seconds." msgstr "" -"<option>Abilitato</option>: a volte (ad esempio, quando utilizzi le condivisioni di rete) piccole differenze nei timestamp non sono significative.Per " -"ottenere risultati più significativi in ​​tali situazioni, questa opzione consente di ignorare le differenze orarie inferiori a tre secondi." +"<option>Abilitato</option>: a volte (ad esempio, quando utilizzi le " +"condivisioni di rete) piccole differenze nei timestamp non sono " +"significative.Per ottenere risultati più significativi in ​​tali situazioni, " +"questa opzione consente di ignorare le differenze orarie inferiori a tre " +"secondi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1268 msgid "" -"This option works only with the <guimenuitem> Modified Date </guimenuitem> and <guimenuitem> Modified Date and Size </guimenuitem> compare methods " -"(described in <xref linkend=\"Configuration_compmethod\" />). It has no effect with other methods." +"This option works only with the <guimenuitem> Modified Date </guimenuitem> " +"and <guimenuitem> Modified Date and Size </guimenuitem> compare methods " +"(described in <xref linkend=\"Configuration_compmethod\" />). It has no " +"effect with other methods." msgstr "" -"Questa opzione funziona solo con i metodi di confronto <guimenuitem > Data di modifica </guimenuitem > e <guimenuitem > Data e dimensione di modifica " -"</guimenuitem > (descritti in <xref linkend=\"Configuration_compmethod\" />).Non ha alcun effetto con altri metodi." +"Questa opzione funziona solo con i metodi di confronto <guimenuitem > Data " +"di modifica </guimenuitem > e <guimenuitem > Data e dimensione di modifica </" +"guimenuitem > (descritti in <xref linkend=\"Configuration_compmethod\" />)." +"Non ha alcun effetto con altri metodi." #. type: Content of: <article><section><section><itemizedlist><listitem><warning><para> #: English/Configuration.xml:1281 -msgid "This option should be enabled only when the time difference is detected. Otherwise, it can cause incorrect compare results." +msgid "" +"This option should be enabled only when the time difference is detected. " +"Otherwise, it can cause incorrect compare results." msgstr "" -"Questa opzione dovrebbe essere abilitata solo quando viene rilevata la differenza oraria.In caso contrario, potrebbero verificarsi risultati di " +"Questa opzione dovrebbe essere abilitata solo quando viene rilevata la " +"differenza oraria.In caso contrario, potrebbero verificarsi risultati di " "confronto errati." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -7617,13 +10111,21 @@ msgstr "Includi sottocartelle<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1301 -msgid "<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders." -msgstr "<option>Abilitato</option> (predefinito): WinMerge esegue un confronto ricorsivo e include anche le sottocartelle." +msgid "" +"<option>Enabled</option> (default): WinMerge doing a recursive comparing and " +"also includes subfolders." +msgstr "" +"<option>Abilitato</option> (predefinito): WinMerge esegue un confronto " +"ricorsivo e include anche le sottocartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1307 -msgid "<option>Disabled</option>: WinMerge only comparing the files in the root folder." -msgstr "<option>Disabilitato</option>: WinMerge confronta solo i file nella cartella principale." +msgid "" +"<option>Disabled</option>: WinMerge only comparing the files in the root " +"folder." +msgstr "" +"<option>Disabilitato</option>: WinMerge confronta solo i file nella cartella " +"principale." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1316 @@ -7632,28 +10134,47 @@ msgstr "espandere le sottocartelle" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1315 -msgid "Expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Espandi le sottocartelle dopo il confronto<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Espandi le sottocartelle dopo il confronto<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1325 -msgid "<option>Do not expand</option> (default): Subfolders remain collapsed after comparison." -msgstr "<option>Non espandere</option> (impostazione predefinita): le sottocartelle rimangono compresse dopo il confronto." +msgid "" +"<option>Do not expand</option> (default): Subfolders remain collapsed after " +"comparison." +msgstr "" +"<option>Non espandere</option> (impostazione predefinita): le sottocartelle " +"rimangono compresse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1331 -msgid "<option>Expand all subfolders</option>: All subfolders are expanded after comparison." -msgstr "<option>Espandi tutte le sottocartelle</option>: tutte le sottocartelle vengono espanse dopo il confronto." +msgid "" +"<option>Expand all subfolders</option>: All subfolders are expanded after " +"comparison." +msgstr "" +"<option>Espandi tutte le sottocartelle</option>: tutte le sottocartelle " +"vengono espanse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1337 -msgid "<option>Expand different subfolders</option>: Only subfolders with differences are expanded after comparison." -msgstr "<option>Espandi sottocartelle diverse</option>: solo le sottocartelle con differenze vengono espanse dopo il confronto." +msgid "" +"<option>Expand different subfolders</option>: Only subfolders with " +"differences are expanded after comparison." +msgstr "" +"<option>Espandi sottocartelle diverse</option>: solo le sottocartelle con " +"differenze vengono espanse dopo il confronto." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1343 -msgid "<option>Expand identical subfolders</option>: Only subfolders without differences are expanded after comparison." -msgstr "<option>Espandi sottocartelle identiche</option>: solo le sottocartelle senza differenze vengono espanse dopo il confronto." +msgid "" +"<option>Expand identical subfolders</option>: Only subfolders without " +"differences are expanded after comparison." +msgstr "" +"<option>Espandi sottocartelle identiche</option>: solo le sottocartelle " +"senza differenze vengono espanse dopo il confronto." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1352 @@ -7662,18 +10183,29 @@ msgstr "includere sottocartelle univoche" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1351 -msgid "Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Includi contenuti univoci delle sottocartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Includi contenuti univoci delle sottocartelle<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1361 -msgid "<option>Enabled</option> (default): WinMerge also shows the content from unique subfolders." -msgstr "<option>Abilitato</option> (impostazione predefinita): WinMerge mostra anche il contenuto di sottocartelle univoche." +msgid "" +"<option>Enabled</option> (default): WinMerge also shows the content from " +"unique subfolders." +msgstr "" +"<option>Abilitato</option> (impostazione predefinita): WinMerge mostra anche " +"il contenuto di sottocartelle univoche." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1367 -msgid "<option>Disabled</option>: WinMerge ignore unique subfolders when comparing folders." -msgstr "<option>Disabilitato</option>: WinMerge ignora le sottocartelle univoche durante il confronto delle cartelle." +msgid "" +"<option>Disabled</option>: WinMerge ignore unique subfolders when comparing " +"folders." +msgstr "" +"<option>Disabilitato</option>: WinMerge ignora le sottocartelle univoche " +"durante il confronto delle cartelle." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1376 @@ -7687,18 +10219,26 @@ msgstr "Ignora i punti di analisi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1385 -msgid "<option>Disabled</option> (default): Compares the contents of reparse point folders as if they were normal folders." +msgid "" +"<option>Disabled</option> (default): Compares the contents of reparse point " +"folders as if they were normal folders." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): confronta il contenuto delle cartelle dei punti di analisi come se fossero cartelle normali." +"<option>Disabilitato</option> (impostazione predefinita): confronta il " +"contenuto delle cartelle dei punti di analisi come se fossero cartelle " +"normali." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1391 msgid "" -"<option>Enabled</option>: Ignores the contents of folders that are reparse points. For example, C:\\Users\\All Users is a symbolic link to C:" -"\\ProgramData, and enabling this option will skip comparing the C:\\Users\\All Users folder." +"<option>Enabled</option>: Ignores the contents of folders that are reparse " +"points. For example, C:\\Users\\All Users is a symbolic link to C:" +"\\ProgramData, and enabling this option will skip comparing the C:" +"\\Users\\All Users folder." msgstr "" -"<option>Abilitato</option>: ignora il contenuto delle cartelle che sono punti di analisi.Ad esempio, C:\\Users\\All Users è un collegamento simbolico " -"a C:\\ProgramData e l'abilitazione di questa opzione salterà il confronto della cartella C:\\Users\\All Users." +"<option>Abilitato</option>: ignora il contenuto delle cartelle che sono " +"punti di analisi.Ad esempio, C:\\Users\\All Users è un collegamento " +"simbolico a C:\\ProgramData e l'abilitazione di questa opzione salterà il " +"confronto della cartella C:\\Users\\All Users." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1400 @@ -7712,30 +10252,44 @@ msgstr "limite" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1399 -msgid "Switch to quick compare when size exceeds (MB)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Passa al confronto rapido quando la dimensione supera (MB)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Switch to quick compare when size exceeds (MB)<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Passa al confronto rapido quando la dimensione supera (MB)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1409 -msgid "<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> compare method." +msgid "" +"<option>Disabled</option>: Is not active unless the Compare method is set to " +"other than <guilabel>Full Contents</guilabel> compare method." msgstr "" -"<option >Disabilitato</option >: non è attivo a meno che il metodo di confronto non sia impostato su un metodo diverso da <guilabel>Contenuto " +"<option >Disabilitato</option >: non è attivo a meno che il metodo di " +"confronto non sia impostato su un metodo diverso da <guilabel>Contenuto " "completo</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1416 -msgid "<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> compare method." +msgid "" +"<option>Enabled</option>: Is active when the Compare method is set to " +"<guilabel>Full Contents</guilabel> compare method." msgstr "" -"<option >Abilitato</option >: è attivo quando il metodo di confronto è impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel >." +"<option >Abilitato</option >: è attivo quando il metodo di confronto è " +"impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1421 msgid "" -"Threshold size for switching to <guilabel>Quick Contents</guilabel> compare method. When <guilabel>Full Contents</guilabel> compare method is " -"selected, files bigger (in mega bytes) than this value are compared using <guilabel>Quick Contents</guilabel> compare method." +"Threshold size for switching to <guilabel>Quick Contents</guilabel> compare " +"method. When <guilabel>Full Contents</guilabel> compare method is selected, " +"files bigger (in mega bytes) than this value are compared using " +"<guilabel>Quick Contents</guilabel> compare method." msgstr "" -"Dimensione soglia per passare al metodo di confronto <guilabel >Contenuti rapidi</guilabel >.Quando è selezionato il metodo di confronto <guilabel " -">Contenuti completi</guilabel >, i file più grandi (in mega byte) di questo valore vengono confrontati usando il metodo di confronto <guilabel " +"Dimensione soglia per passare al metodo di confronto <guilabel >Contenuti " +"rapidi</guilabel >.Quando è selezionato il metodo di confronto <guilabel " +">Contenuti completi</guilabel >, i file più grandi (in mega byte) di questo " +"valore vengono confrontati usando il metodo di confronto <guilabel " ">Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -7745,36 +10299,48 @@ msgstr "Confronto binario" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1431 -msgid "Switch to binary compare when size exceeds (MB)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Passa al confronto binario quando la dimensione supera (MB)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Switch to binary compare when size exceeds (MB)<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Passa al confronto binario quando la dimensione supera (MB)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1441 msgid "" -"<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> and <guilabel>Quick " -"Contents</guilabel> compare method." +"<option>Disabled</option>: Is not active unless the Compare method is set to " +"other than <guilabel>Full Contents</guilabel> and <guilabel>Quick Contents</" +"guilabel> compare method." msgstr "" -"<option >Disabilitato</option >: non è attivo a meno che il metodo di confronto non sia impostato su un metodo diverso da <guilabel >Contenuti " +"<option >Disabilitato</option >: non è attivo a meno che il metodo di " +"confronto non sia impostato su un metodo diverso da <guilabel >Contenuti " "completi</guilabel > e <guilabel >Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1448 msgid "" -"<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " +"<option>Enabled</option>: Is active when the Compare method is set to " +"<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " "compare method." msgstr "" -"<option >Abilitato</option >: è attivo quando il metodo di confronto è impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel > o " -"<guilabel >Contenuti rapidi</guilabel >." +"<option >Abilitato</option >: è attivo quando il metodo di confronto è " +"impostato sul metodo di confronto <guilabel >Contenuti completi</guilabel > " +"o <guilabel >Contenuti rapidi</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1453 msgid "" -"Threshold size for switching to Binary Contents compare method. When <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " -"compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Binary Contents</guilabel> compare method." +"Threshold size for switching to Binary Contents compare method. When " +"<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " +"compare method is selected, files bigger (in mega bytes) than this value are " +"compared using <guilabel>Binary Contents</guilabel> compare method." msgstr "" -"Dimensione soglia per il passaggio al metodo di confronto dei contenuti binari.Quando è selezionato il metodo di confronto <guilabel >Contenuti " -"completi</guilabel > o <guilabel >Contenuti rapidi</guilabel >, i file più grandi (in mega byte) di questo valore vengono confrontati usando il " -"metodo di confronto <guilabel >Contenuti binari</guilabel >." +"Dimensione soglia per il passaggio al metodo di confronto dei contenuti " +"binari.Quando è selezionato il metodo di confronto <guilabel >Contenuti " +"completi</guilabel > o <guilabel >Contenuti rapidi</guilabel >, i file più " +"grandi (in mega byte) di questo valore vengono confrontati usando il metodo " +"di confronto <guilabel >Contenuti binari</guilabel >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1464 @@ -7788,8 +10354,12 @@ msgstr "Core della CPU da utilizzare<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1469 -msgid "Number of threads which use to comparing. With a negative value WinMerge will use addition of the number of available CPU cores." -msgstr "Numero di thread utilizzati per il confronto.Con un valore negativo WinMerge utilizzerà l'aggiunta del numero di core CPU disponibili." +msgid "" +"Number of threads which use to comparing. With a negative value WinMerge " +"will use addition of the number of available CPU cores." +msgstr "" +"Numero di thread utilizzati per il confronto.Con un valore negativo WinMerge " +"utilizzerà l'aggiunta del numero di core CPU disponibili." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1477 @@ -7798,8 +10368,10 @@ msgstr "espressione del filtro" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1476 -msgid "Additional comparison conditions<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Condizioni di confronto aggiuntive<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Additional comparison conditions<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Condizioni di confronto aggiuntive<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para><screen> #: English/Configuration.xml:1484 @@ -7816,18 +10388,28 @@ msgstr "Data Sinistra = Data Destra" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1482 msgid "" -"Allows specifying additional comparison conditions using filter expressions when comparing folders. For example, even if files are considered " -"identical by the selected comparison method (such as Full Contents), you can add conditions like <placeholder type=\"screen\" id=\"0\"/> or " -"<placeholder type=\"screen\" id=\"1\"/> to require that file modification dates also match. When you click the <guilabel>=</guilabel> button to the " -"right of the input field, a menu appears with items such as <guilabel>Compare Size</guilabel> and <guilabel>Compare Date</guilabel>. Selecting " -"<guilabel>Compare Date</guilabel> automatically inserts <literal>allequal(Date)</literal> into the field." -msgstr "" -"Consente di specificare condizioni di confronto aggiuntive utilizzando espressioni di filtro durante il confronto delle cartelle.Ad esempio, anche se " -"i file sono considerati identici dal metodo di confronto selezionato (come Contenuto completo), puoi aggiungere condizioni come <placeholder " -"type=\"screen\" id=\"0\"/> o <placeholder type=\"screen\" id=\"1\"/> per richiedere che anche le date di modifica del file corrispondano.Quando fai " -"clic sul pulsante <guilabel >=</guilabel > a destra del campo di immissione, appare un menu con elementi come <guilabel >Confronta dimensioni</" -"guilabel > e <guilabel >Confronta data</guilabel >.Selezionando <guilabel >Confronta data</guilabel> si inserisce automaticamente " -"<literal>allequal(Data)</literal> nel campo." +"Allows specifying additional comparison conditions using filter expressions " +"when comparing folders. For example, even if files are considered identical " +"by the selected comparison method (such as Full Contents), you can add " +"conditions like <placeholder type=\"screen\" id=\"0\"/> or <placeholder " +"type=\"screen\" id=\"1\"/> to require that file modification dates also " +"match. When you click the <guilabel>=</guilabel> button to the right of the " +"input field, a menu appears with items such as <guilabel>Compare Size</" +"guilabel> and <guilabel>Compare Date</guilabel>. Selecting " +"<guilabel>Compare Date</guilabel> automatically inserts " +"<literal>allequal(Date)</literal> into the field." +msgstr "" +"Consente di specificare condizioni di confronto aggiuntive utilizzando " +"espressioni di filtro durante il confronto delle cartelle.Ad esempio, anche " +"se i file sono considerati identici dal metodo di confronto selezionato " +"(come Contenuto completo), puoi aggiungere condizioni come <placeholder " +"type=\"screen\" id=\"0\"/> o <placeholder type=\"screen\" id=\"1\"/> per " +"richiedere che anche le date di modifica del file corrispondano.Quando fai " +"clic sul pulsante <guilabel >=</guilabel > a destra del campo di immissione, " +"appare un menu con elementi come <guilabel >Confronta dimensioni</guilabel > " +"e <guilabel >Confronta data</guilabel >.Selezionando <guilabel >Confronta " +"data</guilabel> si inserisce automaticamente <literal>allequal(Data)</" +"literal> nel campo." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1495 @@ -7841,31 +10423,46 @@ msgstr "rilevamento dei movimenti" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1494 -msgid "Rename/move detection<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Rinomina/rilevamento spostamento<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Rename/move detection<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Rinomina/rilevamento spostamento<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1504 -msgid "<option>Disabled</option> (default): WinMerge does not detect renamed or moved files/folders." -msgstr "<option>Disabilitato</option> (predefinito): WinMerge non rileva file/cartelle rinominati o spostati." +msgid "" +"<option>Disabled</option> (default): WinMerge does not detect renamed or " +"moved files/folders." +msgstr "" +"<option>Disabilitato</option> (predefinito): WinMerge non rileva file/" +"cartelle rinominati o spostati." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1510 msgid "" -"<option>Rename detection</option>: Detects files or folders with different names but matching detection keys within the same directory. Files/" -"folders are grouped together when they share the same detection key." +"<option>Rename detection</option>: Detects files or folders with different " +"names but matching detection keys within the same directory. Files/folders " +"are grouped together when they share the same detection key." msgstr "" -"<option>Rilevamento ridenominazione</option>: rileva file o cartelle con nomi diversi ma chiavi di rilevamento corrispondenti all'interno della " -"stessa cartella. File/cartelle vengono raggruppati quando condividono la stessa chiave di rilevamento." +"<option>Rilevamento ridenominazione</option>: rileva file o cartelle con " +"nomi diversi ma chiavi di rilevamento corrispondenti all'interno della " +"stessa cartella. File/cartelle vengono raggruppati quando condividono la " +"stessa chiave di rilevamento." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1517 msgid "" -"<option>Rename and move detection</option>: Detects files or folders with different names or in different directories but matching detection keys. " -"This mode detects both renamed items (same directory) and moved items (different directories)." +"<option>Rename and move detection</option>: Detects files or folders with " +"different names or in different directories but matching detection keys. " +"This mode detects both renamed items (same directory) and moved items " +"(different directories)." msgstr "" -"<option>Rinomina e rilevamento spostamento</option>: rileva file o cartelle con nomi diversi o in diverse ma chiavi di rilevamento corrispondenti. " -"Questa modalità rileva sia gli elementi rinominati (stessa cartella) sia gli elementi spostati (cartella diverse)." +"<option>Rinomina e rilevamento spostamento</option>: rileva file o cartelle " +"con nomi diversi o in diverse ma chiavi di rilevamento corrispondenti. " +"Questa modalità rileva sia gli elementi rinominati (stessa cartella) sia gli " +"elementi spostati (cartella diverse)." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:1527 @@ -7879,26 +10476,39 @@ msgstr "tasti di rilevamento movimento" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1526 -msgid "Rename/move detection keys<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Rinomina/sposta le chiavi di rilevamento<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Rename/move detection keys<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Rinomina/sposta le chiavi di rilevamento<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1534 msgid "" -"Specifies the filter expression used to generate detection keys for matching files/folders across sides. Items with matching keys are grouped " -"together as potentially renamed or moved items. For example, setting the key to <literal>Size</literal> will group files with the same size, while " -"<literal>Name</literal> will group files with the same filename (useful for detecting moves)." -msgstr "" -"Specifica l'espressione di filtro utilizzata per generare chiavi di rilevamento per la corrispondenza di file/cartelle su tutti i lati.Gli elementi " -"con chiavi corrispondenti vengono raggruppati come elementi potenzialmente rinominati o spostati.Ad esempio, impostando la chiave su <literal>Size</" -"literal> raggrupperà i file con la stessa dimensione, mentre <literal>Name</literal> raggrupperà i file con lo stesso nome (utile per rilevare gli " -"spostamenti)." +"Specifies the filter expression used to generate detection keys for matching " +"files/folders across sides. Items with matching keys are grouped together " +"as potentially renamed or moved items. For example, setting the key to " +"<literal>Size</literal> will group files with the same size, while " +"<literal>Name</literal> will group files with the same filename (useful for " +"detecting moves)." +msgstr "" +"Specifica l'espressione di filtro utilizzata per generare chiavi di " +"rilevamento per la corrispondenza di file/cartelle su tutti i lati.Gli " +"elementi con chiavi corrispondenti vengono raggruppati come elementi " +"potenzialmente rinominati o spostati.Ad esempio, impostando la chiave su " +"<literal>Size</literal> raggrupperà i file con la stessa dimensione, mentre " +"<literal>Name</literal> raggrupperà i file con lo stesso nome (utile per " +"rilevare gli spostamenti)." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1541 -msgid "When you click the <guilabel>=</guilabel> button to the right of the input field, a helper menu appears with common detection key expressions:" +msgid "" +"When you click the <guilabel>=</guilabel> button to the right of the input " +"field, a helper menu appears with common detection key expressions:" msgstr "" -"Quando fai clic sul pulsante <guilabel>=</guilabel> a destra del campo di input, viene visualizzato un menu di supporto con le espressioni chiave di " +"Quando fai clic sul pulsante <guilabel>=</guilabel> a destra del campo di " +"input, viene visualizzato un menu di supporto con le espressioni chiave di " "rilevamento comuni:" #. type: Content of: <article><section><section><section><title> @@ -7913,8 +10523,12 @@ msgstr "Nome" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1552 -msgid "Matches files/folders by name. Useful for detecting files that have been moved to different directories but kept the same name." -msgstr "Abbina file/cartelle per nome. Utile per rilevare file che sono stati spostati in cartelle diverse ma hanno mantenuto lo stesso nome." +msgid "" +"Matches files/folders by name. Useful for detecting files that have been " +"moved to different directories but kept the same name." +msgstr "" +"Abbina file/cartelle per nome. Utile per rilevare file che sono stati " +"spostati in cartelle diverse ma hanno mantenuto lo stesso nome." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1558 @@ -7923,8 +10537,12 @@ msgstr "Nome base (senza estensione)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1561 -msgid "Matches files by name without extension. For example, \"file.txt\" and \"file.doc\" would match." -msgstr "Corrisponde ai file per nome senza estensione.Ad esempio, \"file.txt\" e \"file.doc\" corrisponderebbero." +msgid "" +"Matches files by name without extension. For example, \"file.txt\" and " +"\"file.doc\" would match." +msgstr "" +"Corrisponde ai file per nome senza estensione.Ad esempio, \"file.txt\" e " +"\"file.doc\" corrisponderebbero." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1567 @@ -7934,11 +10552,15 @@ msgstr "Nome Unicode normalizzato" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1570 msgid "" -"Inserts <literal>normalizeUnicode(Name, \"NFC\")</literal> which matches files by normalized Unicode filename. Useful for detecting files with " -"equivalent names but different Unicode representations (e.g., composed vs. decomposed characters)." +"Inserts <literal>normalizeUnicode(Name, \"NFC\")</literal> which matches " +"files by normalized Unicode filename. Useful for detecting files with " +"equivalent names but different Unicode representations (e.g., composed vs. " +"decomposed characters)." msgstr "" -"Inserisce <literal>normalizeUnicode(Name, \"NFC\")</literal> che corrisponde ai file in base al nome file Unicode normalizzato.Utile per rilevare " -"file con nomi equivalenti ma diverse rappresentazioni Unicode (ad esempio, caratteri composti e scomposti)." +"Inserisce <literal>normalizeUnicode(Name, \"NFC\")</literal> che corrisponde " +"ai file in base al nome file Unicode normalizzato.Utile per rilevare file " +"con nomi equivalenti ma diverse rappresentazioni Unicode (ad esempio, " +"caratteri composti e scomposti)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1577 @@ -7948,10 +10570,12 @@ msgstr "Percorso relativo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1580 msgid "" -"Matches files by their relative path from the comparison root. Useful for detecting files that have been renamed but maintain their relative " -"directory structure." +"Matches files by their relative path from the comparison root. Useful for " +"detecting files that have been renamed but maintain their relative directory " +"structure." msgstr "" -"Corrisponde ai file in base al percorso relativo dalla radice di confronto. Utile per rilevare file che sono stati rinominati ma che mantengono la " +"Corrisponde ai file in base al percorso relativo dalla radice di confronto. " +"Utile per rilevare file che sono stati rinominati ma che mantengono la " "relativa struttura di cartella." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -7961,8 +10585,12 @@ msgstr "Misurare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1589 -msgid "Matches files by size. Useful for detecting files that have been renamed but have the same size." -msgstr "Corrisponde ai file in base alla dimensione.Utile per rilevare file che sono stati rinominati ma hanno la stessa dimensione." +msgid "" +"Matches files by size. Useful for detecting files that have been renamed but " +"have the same size." +msgstr "" +"Corrisponde ai file in base alla dimensione.Utile per rilevare file che sono " +"stati rinominati ma hanno la stessa dimensione." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1595 @@ -7982,12 +10610,16 @@ msgstr "Hash (MD5)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1607 msgid "" -"Inserts <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>. For folders, matches by name. For files, matches by MD5 hash of content. This is " -"the most accurate method for detecting renamed files, but requires computing MD5 hashes which can be slow for large files." +"Inserts <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>. For " +"folders, matches by name. For files, matches by MD5 hash of content. This " +"is the most accurate method for detecting renamed files, but requires " +"computing MD5 hashes which can be slow for large files." msgstr "" -"Inserisce <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>.Per le cartelle, corrisponde per nome.Per i file, corrisponde all'hash MD5 del " -"contenuto.Questo è il metodo più accurato per rilevare i file rinominati, ma richiede il calcolo degli hash MD5 che può essere lento per i file di " -"grandi dimensioni." +"Inserisce <literal>if(IsFolder, Name, prop(\"Hash.MD5\"))</literal>.Per le " +"cartelle, corrisponde per nome.Per i file, corrisponde all'hash MD5 del " +"contenuto.Questo è il metodo più accurato per rilevare i file rinominati, ma " +"richiede il calcolo degli hash MD5 che può essere lento per i file di grandi " +"dimensioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1615 @@ -7997,12 +10629,16 @@ msgstr "Ulteriori proprietà..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1618 msgid "" -"Opens a submenu providing access to Windows file properties such as <literal>System.Author</literal>, <literal>System.Title</literal>, " -"<literal>System.Keywords</literal>, etc. You can use these to match files based on their metadata. The inserted expression will be " +"Opens a submenu providing access to Windows file properties such as " +"<literal>System.Author</literal>, <literal>System.Title</literal>, " +"<literal>System.Keywords</literal>, etc. You can use these to match files " +"based on their metadata. The inserted expression will be " "<literal>if(IsFolder, Name, prop(\"PropertyName\"))</literal>." msgstr "" -"Apre un sottomenu che fornisce accesso alle proprietà dei file Windows come <literal>System.Author</literal>, <literal>System.Title</literal>, " -"<literal>System.Keywords</literal>, ecc. Puoi usarli per abbinare i file in base ai loro metadati.L'espressione inserita sarà <literal>if(IsFolder, " +"Apre un sottomenu che fornisce accesso alle proprietà dei file Windows come " +"<literal>System.Author</literal>, <literal>System.Title</literal>, " +"<literal>System.Keywords</literal>, ecc. Puoi usarli per abbinare i file in " +"base ai loro metadati.L'espressione inserita sarà <literal>if(IsFolder, " "Name, prop(\"PropertyName\"))</literal>." #. type: Content of: <article><section><section><section><title> @@ -8013,10 +10649,12 @@ msgstr "Funzioni di trasformazione delle stringhe" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1631 msgid "" -"The menu includes string transformation functions that can be applied to detection keys. When selected, these functions wrap the current expression " +"The menu includes string transformation functions that can be applied to " +"detection keys. When selected, these functions wrap the current expression " "(or <literal>Name</literal> if empty):" msgstr "" -"Il menu include funzioni di trasformazione delle stringhe che possono essere applicate alle chiavi di rilevamento.Quando selezionate, queste funzioni " +"Il menu include funzioni di trasformazione delle stringhe che possono essere " +"applicate alle chiavi di rilevamento.Quando selezionate, queste funzioni " "racchiudono l'espressione corrente (o <literal>Nome</literal> se vuoto):" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -8027,13 +10665,17 @@ msgstr "Inserisci la funzione replace()" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1640 msgid "" -"Inserts <literal>replace(expression, \"from\", \"to\")</literal> to replace literal text strings in the key. You need to edit the placeholder " -"strings \"from\" and \"to\" to specify what text to search for and what to replace it with. Example: <literal>replace(Name, \".backup\", \"\")</" -"literal> removes \".backup\" from filenames." +"Inserts <literal>replace(expression, \"from\", \"to\")</literal> to replace " +"literal text strings in the key. You need to edit the placeholder strings " +"\"from\" and \"to\" to specify what text to search for and what to replace " +"it with. Example: <literal>replace(Name, \".backup\", \"\")</literal> " +"removes \".backup\" from filenames." msgstr "" -"Inserisce <literal>replace(expression, \"from\", \"to\")</literal> per sostituire le stringhe di testo letterale nella chiave.È necessario modificare " -"le stringhe segnaposto \"da\" e \"a\" per specificare quale testo cercare e con cosa sostituirlo.Esempio: <literal>replace(Name, \".backup\", \"\")</" -"literal> rimuove \".backup\" dai nomi dei file." +"Inserisce <literal>replace(expression, \"from\", \"to\")</literal> per " +"sostituire le stringhe di testo letterale nella chiave.È necessario " +"modificare le stringhe segnaposto \"da\" e \"a\" per specificare quale testo " +"cercare e con cosa sostituirlo.Esempio: <literal>replace(Name, \".backup\", " +"\"\")</literal> rimuove \".backup\" dai nomi dei file." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1648 @@ -8043,13 +10685,18 @@ msgstr "Inserisci la funzione regexReplace()" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1651 msgid "" -"Inserts <literal>regexReplace(expression, \"pattern\", \"replacement\")</literal> to replace text using regular expressions. Supports backreferences " -"($1, $2, etc.) in the replacement string. Example: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", \"$2\")</literal> removes a leading number and " -"underscore from filenames." +"Inserts <literal>regexReplace(expression, \"pattern\", \"replacement\")</" +"literal> to replace text using regular expressions. Supports backreferences " +"($1, $2, etc.) in the replacement string. Example: " +"<literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", \"$2\")</literal> removes a " +"leading number and underscore from filenames." msgstr "" -"Inserisce <literal>regexReplace(expression, \"pattern\", \"replacement\")</literal> per sostituire il testo utilizzando le espressioni " -"regolari.Supporta i riferimenti all'indietro ($1, $2, ecc.) nella stringa di sostituzione.Esempio: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", " -"\"$2\")</literal> rimuove un numero iniziale e un carattere di sottolineatura dai nomi dei file." +"Inserisce <literal>regexReplace(expression, \"pattern\", \"replacement\")</" +"literal> per sostituire il testo utilizzando le espressioni regolari." +"Supporta i riferimenti all'indietro ($1, $2, ecc.) nella stringa di " +"sostituzione.Esempio: <literal>regexReplace(Name, \"^(\\\\d+)_(.+)$\", " +"\"$2\")</literal> rimuove un numero iniziale e un carattere di " +"sottolineatura dai nomi dei file." #. type: Content of: <article><section><section><section><title> #: English/Configuration.xml:1661 @@ -8058,8 +10705,12 @@ msgstr "Sostituisci elenchi" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1663 -msgid "The Replace Lists submenu provides access to batch string replacement functionality using external files:" -msgstr "Il sottomenu Sostituisci elenchi fornisce l'accesso alla funzionalità di sostituzione delle stringhe batch utilizzando file esterni:" +msgid "" +"The Replace Lists submenu provides access to batch string replacement " +"functionality using external files:" +msgstr "" +"Il sottomenu Sostituisci elenchi fornisce l'accesso alla funzionalità di " +"sostituzione delle stringhe batch utilizzando file esterni:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1668 @@ -8069,21 +10720,31 @@ msgstr "Crea stringa Sostituisci elenco e inserisci..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1671 msgid "" -"Creates a new tab-separated values (TSV) file with a template for string replacements. The file is stored in <filename>%APPDATA%" -"\\WinMerge\\ReplaceLists</filename> (or <filename>Documents\\WinMerge\\ReplaceLists</filename> depending on your settings). After creation, the file " -"opens in your default text editor and the function <literal>replaceWithList(expression, \"filepath\")</literal> is inserted." -msgstr "" -"Crea un nuovo file di valori separati da tabulazioni (TSV) con un modello per le sostituzioni di stringhe.Il file è archiviato in <filename>%APPDATA%" -"\\WinMerge\\ReplaceLists</filename> (o <filename>Documents\\WinMerge\\ReplaceLists</filename> a seconda delle impostazioni).Dopo la creazione, il " -"file si apre nell'editor di testo predefinito e viene inserita la funzione <literal>replaceWithList(expression, \"filepath\")</literal>." +"Creates a new tab-separated values (TSV) file with a template for string " +"replacements. The file is stored in <filename>%APPDATA%" +"\\WinMerge\\ReplaceLists</filename> (or " +"<filename>Documents\\WinMerge\\ReplaceLists</filename> depending on your " +"settings). After creation, the file opens in your default text editor and " +"the function <literal>replaceWithList(expression, \"filepath\")</literal> is " +"inserted." +msgstr "" +"Crea un nuovo file di valori separati da tabulazioni (TSV) con un modello " +"per le sostituzioni di stringhe.Il file è archiviato in <filename>%APPDATA%" +"\\WinMerge\\ReplaceLists</filename> (o " +"<filename>Documents\\WinMerge\\ReplaceLists</filename> a seconda delle " +"impostazioni).Dopo la creazione, il file si apre nell'editor di testo " +"predefinito e viene inserita la funzione " +"<literal>replaceWithList(expression, \"filepath\")</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1676 msgid "" -"The file format is one replacement per line: <literal>search_string<TAB>replacement_string</literal>. Lines starting with <literal>#</literal> " -"are comments." +"The file format is one replacement per line: <literal>search_string<" +"TAB>replacement_string</literal>. Lines starting with <literal>#</" +"literal> are comments." msgstr "" -"Il formato del file è una sostituzione per riga: <literal>search_string<TAB>replacement_string</literal>.Le righe che iniziano con <literal>#</" +"Il formato del file è una sostituzione per riga: <literal>search_string<" +"TAB>replacement_string</literal>.Le righe che iniziano con <literal>#</" "literal> sono commenti." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para><screen> @@ -8111,18 +10772,26 @@ msgstr "Crea elenco di sostituzione Regex e inserisci..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1692 msgid "" -"Similar to Create String Replace List, but for regular expression replacements. Creates a template file in <filename>%APPDATA%" -"\\WinMerge\\RegexReplaceLists</filename> (or <filename>Documents\\WinMerge\\RegexReplaceLists</filename>). Inserts " +"Similar to Create String Replace List, but for regular expression " +"replacements. Creates a template file in <filename>%APPDATA%" +"\\WinMerge\\RegexReplaceLists</filename> (or " +"<filename>Documents\\WinMerge\\RegexReplaceLists</filename>). Inserts " "<literal>regexReplaceWithList(expression, \"filepath\")</literal>." msgstr "" -"Simile a Crea elenco di sostituzione stringhe, ma per la sostituzione di espressioni regolari.Crea un file modello in <filename>%APPDATA%" -"\\WinMerge\\RegexReplaceLists</filename> (o <filename>Documents\\WinMerge\\RegexReplaceLists</filename>).Inserisce " +"Simile a Crea elenco di sostituzione stringhe, ma per la sostituzione di " +"espressioni regolari.Crea un file modello in <filename>%APPDATA%" +"\\WinMerge\\RegexReplaceLists</filename> (o " +"<filename>Documents\\WinMerge\\RegexReplaceLists</filename>).Inserisce " "<literal>regexReplaceWithList(expression, \"filepath\")</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1697 -msgid "The file format is: <literal>regex_pattern<TAB>replacement</literal> with support for backreferences." -msgstr "Il formato del file è: <literal>regex_pattern<TAB>sostituzione</literal> con supporto per backreference." +msgid "" +"The file format is: <literal>regex_pattern<TAB>replacement</literal> " +"with support for backreferences." +msgstr "" +"Il formato del file è: <literal>regex_pattern<TAB>sostituzione</" +"literal> con supporto per backreference." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para><screen> #: English/Configuration.xml:1701 @@ -8144,26 +10813,36 @@ msgstr "Elenchi di sostituzione stringhe/Elenchi di sostituzione regex" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1712 msgid "" -"These submenus list all TSV files found in the respective ReplaceLists folders. Selecting a file from the list inserts the corresponding " -"<literal>replaceWithList()</literal> or <literal>regexReplaceWithList()</literal> function with the file's path. This allows you to quickly reuse " +"These submenus list all TSV files found in the respective ReplaceLists " +"folders. Selecting a file from the list inserts the corresponding " +"<literal>replaceWithList()</literal> or <literal>regexReplaceWithList()</" +"literal> function with the file's path. This allows you to quickly reuse " "previously created replacement lists." msgstr "" -"Questi sottomenu elencano tutti i file TSV trovati nelle rispettive cartelle replacelists.Selezionando un file dall'elenco si inserisce la " -"corrispondente funzione <literal>replaceWithList()</literal> o <literal>regexReplaceWithList()</literal> con il percorso del file.Ciò consente di " -"riutilizzare rapidamente gli elenchi di sostituzione creati in precedenza." +"Questi sottomenu elencano tutti i file TSV trovati nelle rispettive cartelle " +"replacelists.Selezionando un file dall'elenco si inserisce la corrispondente " +"funzione <literal>replaceWithList()</literal> o " +"<literal>regexReplaceWithList()</literal> con il percorso del file.Ciò " +"consente di riutilizzare rapidamente gli elenchi di sostituzione creati in " +"precedenza." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1721 -msgid "Open String Replace Lists Folder... / Open Regex Replace Lists Folder..." -msgstr "Apri stringa Sostituisci cartella elenchi... / Apri Regex Sostituisci cartella elenchi..." +msgid "" +"Open String Replace Lists Folder... / Open Regex Replace Lists Folder..." +msgstr "" +"Apri stringa Sostituisci cartella elenchi... / Apri Regex Sostituisci " +"cartella elenchi..." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1724 msgid "" -"Opens Windows Explorer at the folder where replacement list files are stored, allowing you to manage (edit, delete, organize) your replacement list " -"files directly." +"Opens Windows Explorer at the folder where replacement list files are " +"stored, allowing you to manage (edit, delete, organize) your replacement " +"list files directly." msgstr "" -"Apre Esplora risorse nella cartella in cui sono archiviati i file dell'elenco di sostituzione, consentendo di gestire (modificare, eliminare, " +"Apre Esplora risorse nella cartella in cui sono archiviati i file " +"dell'elenco di sostituzione, consentendo di gestire (modificare, eliminare, " "organizzare) direttamente i file dell'elenco di sostituzione." #. type: Content of: <article><section><section><section><title> @@ -8173,8 +10852,12 @@ msgstr "Normalizzazione del testo" #. type: Content of: <article><section><section><section><para> #: English/Configuration.xml:1735 -msgid "The Text Normalization submenu provides functions to normalize text for more flexible matching:" -msgstr "Il sottomenu Normalizzazione testo fornisce funzioni per normalizzare il testo per una corrispondenza più flessibile:" +msgid "" +"The Text Normalization submenu provides functions to normalize text for more " +"flexible matching:" +msgstr "" +"Il sottomenu Normalizzazione testo fornisce funzioni per normalizzare il " +"testo per una corrispondenza più flessibile:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1740 @@ -8184,12 +10867,17 @@ msgstr "Minuscolo/Maiuscolo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1743 msgid "" -"Inserts <literal>toLower(expression)</literal> or <literal>toUpper(expression)</literal> to convert all characters to lowercase or uppercase. Useful " -"for case-insensitive matching. Example: <literal>toLower(Name)</literal> matches \"File.txt\", \"FILE.TXT\", and \"file.txt\" as identical." +"Inserts <literal>toLower(expression)</literal> or " +"<literal>toUpper(expression)</literal> to convert all characters to " +"lowercase or uppercase. Useful for case-insensitive matching. Example: " +"<literal>toLower(Name)</literal> matches \"File.txt\", \"FILE.TXT\", and " +"\"file.txt\" as identical." msgstr "" -"Inserisce <literal>toLower(expression)</literal> o <literal>toUpper(expression)</literal> per convertire tutti i caratteri in minuscolo o " -"maiuscolo.Utile per la corrispondenza senza distinzione tra maiuscole e minuscole.Esempio: <literal>toLower(Name)</literal> corrisponde a " -"\"File.txt\", \"FILE.TXT\" e \"file.txt\" come identici." +"Inserisce <literal>toLower(expression)</literal> o " +"<literal>toUpper(expression)</literal> per convertire tutti i caratteri in " +"minuscolo o maiuscolo.Utile per la corrispondenza senza distinzione tra " +"maiuscole e minuscole.Esempio: <literal>toLower(Name)</literal> corrisponde " +"a \"File.txt\", \"FILE.TXT\" e \"file.txt\" come identici." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1751 @@ -8199,13 +10887,17 @@ msgstr "Metà larghezza/larghezza intera" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1754 msgid "" -"Inserts <literal>toHalfWidth(expression)</literal> or <literal>toFullWidth(expression)</literal>. Converts between half-width and full-width " -"characters (primarily for Japanese text). Example: <literal>toHalfWidth(Name)</literal> converts \"ファイル\" (full-width katakana) to \"ﾌｧｲﾙ\" " -"(half-width)." +"Inserts <literal>toHalfWidth(expression)</literal> or " +"<literal>toFullWidth(expression)</literal>. Converts between half-width and " +"full-width characters (primarily for Japanese text). Example: " +"<literal>toHalfWidth(Name)</literal> converts \"ファイル\" (full-width " +"katakana) to \"ﾌｧｲﾙ\" (half-width)." msgstr "" -"Inserisce <literal>toHalfWidth(expression)</literal> o <literal>toFullWidth(expression)</literal>.Converte tra caratteri a mezza larghezza e a " -"larghezza intera (principalmente per il testo giapponese).Esempio: <literal>toHalfWidth(Name)</literal> converte \"ファイル\" (katakana a larghezza " -"intera) in \"ﾌｧｲﾙ\" (mezza larghezza)." +"Inserisce <literal>toHalfWidth(expression)</literal> o " +"<literal>toFullWidth(expression)</literal>.Converte tra caratteri a mezza " +"larghezza e a larghezza intera (principalmente per il testo giapponese)." +"Esempio: <literal>toHalfWidth(Name)</literal> converte \"ファイル" +"\" (katakana a larghezza intera) in \"ﾌｧｲﾙ\" (mezza larghezza)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1762 @@ -8215,11 +10907,15 @@ msgstr "Conversione cinese" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1765 msgid "" -"Provides <literal>toSimplifiedChinese(expression)</literal> and <literal>toTraditionalChinese(expression)</literal> functions. Converts between " -"Simplified and Traditional Chinese characters. Useful for matching files with names in different Chinese character sets." +"Provides <literal>toSimplifiedChinese(expression)</literal> and " +"<literal>toTraditionalChinese(expression)</literal> functions. Converts " +"between Simplified and Traditional Chinese characters. Useful for matching " +"files with names in different Chinese character sets." msgstr "" -"Fornisce le funzioni <literal>toSimplifiedChinese(expression)</literal> e <literal>toTraditionalChinese(expression)</literal>.Converte tra caratteri " -"cinesi semplificati e tradizionali.Utile per abbinare file con nomi in diversi set di caratteri cinesi." +"Fornisce le funzioni <literal>toSimplifiedChinese(expression)</literal> e " +"<literal>toTraditionalChinese(expression)</literal>.Converte tra caratteri " +"cinesi semplificati e tradizionali.Utile per abbinare file con nomi in " +"diversi set di caratteri cinesi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1773 @@ -8229,11 +10925,13 @@ msgstr "Conversione giapponese" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1776 msgid "" -"Provides <literal>toHiragana(expression)</literal> and <literal>toKatakana(expression)</literal> functions. Converts between Hiragana and Katakana " -"Japanese characters." +"Provides <literal>toHiragana(expression)</literal> and " +"<literal>toKatakana(expression)</literal> functions. Converts between " +"Hiragana and Katakana Japanese characters." msgstr "" -"Fornisce le funzioni <literal>toHiragana(espressione)</literal> e <literal>toKatakana(espressione)</literal>.Converte tra i caratteri giapponesi " -"Hiragana e Katakana." +"Fornisce le funzioni <literal>toHiragana(espressione)</literal> e " +"<literal>toKatakana(espressione)</literal>.Converte tra i caratteri " +"giapponesi Hiragana e Katakana." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:1783 @@ -8243,32 +10941,42 @@ msgstr "Normalizza Unicode" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1786 msgid "" -"Inserts <literal>normalizeUnicode(expression)</literal> which normalizes Unicode text to NFC (Normalization Form Canonical Composition) form. This " -"is useful for matching files whose names may use different Unicode encodings for the same characters (e.g., a single é character vs. e + combining " -"acute accent)." +"Inserts <literal>normalizeUnicode(expression)</literal> which normalizes " +"Unicode text to NFC (Normalization Form Canonical Composition) form. This " +"is useful for matching files whose names may use different Unicode encodings " +"for the same characters (e.g., a single é character vs. e + combining acute " +"accent)." msgstr "" -"Inserisce <literal>normalizeUnicode(expression)</literal> che normalizza il testo Unicode nel formato NFC (Normalization Form Canonical " -"Composition).Ciò è utile per abbinare file i cui nomi possono utilizzare codifiche Unicode diverse per gli stessi caratteri (ad esempio, un singolo " -"carattere é contro e + che combina l'accento acuto)." +"Inserisce <literal>normalizeUnicode(expression)</literal> che normalizza il " +"testo Unicode nel formato NFC (Normalization Form Canonical Composition).Ciò " +"è utile per abbinare file i cui nomi possono utilizzare codifiche Unicode " +"diverse per gli stessi caratteri (ad esempio, un singolo carattere é contro " +"e + che combina l'accento acuto)." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1796 msgid "" -"You can combine multiple keys using the <literal>+</literal> operator with a separator. For example, <literal>Name + \"|\" + Size</literal> will " -"create a composite key combining both filename and size." +"You can combine multiple keys using the <literal>+</literal> operator with a " +"separator. For example, <literal>Name + \"|\" + Size</literal> will create " +"a composite key combining both filename and size." msgstr "" -"Puoi combinare più chiavi utilizzando l'operatore <literal>+</literal> con un separatore.Ad esempio, <literal>Nome + \"|\"+ Size</literal> creerà una " +"Puoi combinare più chiavi utilizzando l'operatore <literal>+</literal> con " +"un separatore.Ad esempio, <literal>Nome + \"|\"+ Size</literal> creerà una " "chiave composita che combina nome file e dimensione." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:1802 msgid "" -"The detection key expression is evaluated for each side of a file/folder comparison to produce a key. Items are grouped when their keys match. For " -"example, with the key <literal>Size</literal>, a file of 1024 bytes on the left and a file of 1024 bytes on the right (even with different names) " -"will be grouped together." +"The detection key expression is evaluated for each side of a file/folder " +"comparison to produce a key. Items are grouped when their keys match. For " +"example, with the key <literal>Size</literal>, a file of 1024 bytes on the " +"left and a file of 1024 bytes on the right (even with different names) will " +"be grouped together." msgstr "" -"L'espressione della chiave di rilevamento viene valutata per ciascun lato di un confronto file/cartella per produrre una chiave.Gli elementi vengono " -"raggruppati quando le relative chiavi corrispondono.Ad esempio, con il tasto <literal>Size</literal>, verranno raggruppati un file di 1024 byte a " +"L'espressione della chiave di rilevamento viene valutata per ciascun lato di " +"un confronto file/cartella per produrre una chiave.Gli elementi vengono " +"raggruppati quando le relative chiavi corrispondono.Ad esempio, con il tasto " +"<literal>Size</literal>, verranno raggruppati un file di 1024 byte a " "sinistra e un file di 1024 byte a destra (anche con nomi diversi)." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -8283,56 +10991,78 @@ msgstr "unire gli elementi spostati" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1811 -msgid "Merge renames and moves<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Unisci rinominazioni e spostamenti<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Merge renames and moves<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Unisci rinominazioni e spostamenti<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1819 msgid "" -"Specifies how renamed and moved items detected by the rename/move detection feature should be merged into single entries in the folder comparison " -"tree." +"Specifies how renamed and moved items detected by the rename/move detection " +"feature should be merged into single entries in the folder comparison tree." msgstr "" -"Specifica il modo in cui gli elementi rinominati e spostati rilevati dalla funzionalità di rilevamento di ridenominazione/spostamento devono essere " +"Specifica il modo in cui gli elementi rinominati e spostati rilevati dalla " +"funzionalità di rilevamento di ridenominazione/spostamento devono essere " "uniti in singole voci nell'albero di confronto delle cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1825 msgid "" -"<option>Disabled</option> (default): Renamed/moved items remain as separate entries in the folder comparison tree. The items are grouped together " -"(indicated by a common group ID), but each side's file/folder is shown separately." +"<option>Disabled</option> (default): Renamed/moved items remain as separate " +"entries in the folder comparison tree. The items are grouped together " +"(indicated by a common group ID), but each side's file/folder is shown " +"separately." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): gli elementi rinominati/spostati rimangono come voci separate nell'albero di confronto " -"delle cartelle.Gli elementi sono raggruppati insieme (indicati da un ID di gruppo comune), ma il file/la cartella di ciascun lato viene visualizzato " +"<option>Disabilitato</option> (impostazione predefinita): gli elementi " +"rinominati/spostati rimangono come voci separate nell'albero di confronto " +"delle cartelle.Gli elementi sono raggruppati insieme (indicati da un ID di " +"gruppo comune), ma il file/la cartella di ciascun lato viene visualizzato " "separatamente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1832 msgid "" -"<option>Merge renames</option>: Items that have been detected as renamed but are in the same directory are merged into a single entry. This " -"simplifies the comparison tree by showing a single item that exists on multiple sides with different names. Items in different directories (moved " -"items) are not merged." +"<option>Merge renames</option>: Items that have been detected as renamed but " +"are in the same directory are merged into a single entry. This simplifies " +"the comparison tree by showing a single item that exists on multiple sides " +"with different names. Items in different directories (moved items) are not " +"merged." msgstr "" -"<option>Unisci rinomina</option>: gli elementi che sono stati rilevati come rinominati ma che si trovano nella stessa cartella vengono uniti in " -"un'unica voce.Ciò semplifica l'albero di confronto mostrando un singolo elemento che esiste su più lati con nomi diversi.Gli elementi in cartella " -"diverse (elementi spostati) non vengono uniti." +"<option>Unisci rinomina</option>: gli elementi che sono stati rilevati come " +"rinominati ma che si trovano nella stessa cartella vengono uniti in un'unica " +"voce.Ciò semplifica l'albero di confronto mostrando un singolo elemento che " +"esiste su più lati con nomi diversi.Gli elementi in cartella diverse " +"(elementi spostati) non vengono uniti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1840 msgid "" -"<option>Merge renames and moves</option>: Both renamed items (same directory, different names) and moved items (different directories) are merged " -"into single entries when detected. This provides the most compact view of renamed and relocated files/folders." +"<option>Merge renames and moves</option>: Both renamed items (same " +"directory, different names) and moved items (different directories) are " +"merged into single entries when detected. This provides the most compact " +"view of renamed and relocated files/folders." msgstr "" -"<option>Unisci rinominazioni e spostamenti</option>: sia gli elementi rinominati (stessa cartella, nomi diversi) che gli elementi spostati (cartella " -"diverse) vengono uniti in singole voci quando rilevati.Ciò fornisce la visualizzazione più compatta di file/cartelle rinominati e riposizionati." +"<option>Unisci rinominazioni e spostamenti</option>: sia gli elementi " +"rinominati (stessa cartella, nomi diversi) che gli elementi spostati " +"(cartella diverse) vengono uniti in singole voci quando rilevati.Ciò " +"fornisce la visualizzazione più compatta di file/cartelle rinominati e " +"riposizionati." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:1848 msgid "" -"Merging only occurs when each side has at most one item in the group and the items satisfy the merge criteria (same directory for renames, or any " -"directory for moves). If multiple files match on one side (ambiguous case), they are not merged." +"Merging only occurs when each side has at most one item in the group and the " +"items satisfy the merge criteria (same directory for renames, or any " +"directory for moves). If multiple files match on one side (ambiguous case), " +"they are not merged." msgstr "" -"L'unione avviene solo quando ciascuna parte ha al massimo un elemento nel gruppo e gli elementi soddisfano i criteri di unione (stessa cartella per " -"le ridenominazioni o qualsiasi cartella per gli spostamenti). Se più file corrispondono su un lato (caso ambiguo), non vengono uniti." +"L'unione avviene solo quando ciascuna parte ha al massimo un elemento nel " +"gruppo e gli elementi soddisfano i criteri di unione (stessa cartella per le " +"ridenominazioni o qualsiasi cartella per gli spostamenti). Se più file " +"corrispondono su un lato (caso ambiguo), non vengono uniti." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:1858 @@ -8342,7 +11072,8 @@ msgstr "file di tabella" #. type: Content of: <article><section><title> #: English/Configuration.xml:1857 msgid "Compare > Table page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronta >Pagina della tabella<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronta >Pagina della tabella<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1862 @@ -8352,11 +11083,15 @@ msgstr "Modelli di file CSV" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1864 msgid "" -"Specifies file name pattern for comma-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By " -"default, *.csv is specified. If you do not want to open the files with the extension .csv in table format. Delete the *.csv." +"Specifies file name pattern for comma-separated values files to open in " +"table format. To specify multiple items, separate them with a semicolon. " +"By default, *.csv is specified. If you do not want to open the files with " +"the extension .csv in table format. Delete the *.csv." msgstr "" -"Specifica il modello del nome file per i file con valori separati da virgole da aprire in formato tabella.Per specificare più elementi, separarli con " -"un punto e virgola.Per impostazione predefinita, è specificato *.csv.Se non desideri aprire i file con estensione .csv in formato tabella.Elimina il " +"Specifica il modello del nome file per i file con valori separati da virgole " +"da aprire in formato tabella.Per specificare più elementi, separarli con un " +"punto e virgola.Per impostazione predefinita, è specificato *.csv.Se non " +"desideri aprire i file con estensione .csv in formato tabella.Elimina il " "file *.csv." #. type: Content of: <article><section><section><title> @@ -8367,12 +11102,16 @@ msgstr "Modelli di file TSV" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1873 msgid "" -"Specifies file name pattern for tab-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By " -"default, *.tsv is specified. If you do not want to open the files with the extension .tsv in table format. Delete the *.tsv." +"Specifies file name pattern for tab-separated values files to open in table " +"format. To specify multiple items, separate them with a semicolon. By " +"default, *.tsv is specified. If you do not want to open the files with the " +"extension .tsv in table format. Delete the *.tsv." msgstr "" -"Specifica il modello del nome file per i file con valori separati da tabulazioni da aprire in formato tabella.Per specificare più elementi, separarli " -"con un punto e virgola.Per impostazione predefinita, è specificato *.tsv.Se non desideri aprire i file con estensione .tsv in formato " -"tabella.Eliminare il file *.tsv." +"Specifica il modello del nome file per i file con valori separati da " +"tabulazioni da aprire in formato tabella.Per specificare più elementi, " +"separarli con un punto e virgola.Per impostazione predefinita, è specificato " +"*.tsv.Se non desideri aprire i file con estensione .tsv in formato tabella." +"Eliminare il file *.tsv." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1880 @@ -8382,11 +11121,13 @@ msgstr "Valori personalizzati separati da delimitatori" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1882 msgid "" -"If you want to open text files, with values separated by characters other than commas or tabs, in tabular format, specify the file name pattern and " +"If you want to open text files, with values separated by characters other " +"than commas or tabs, in tabular format, specify the file name pattern and " "delimiter." msgstr "" -"Se si desidera aprire file di testo, con valori separati da caratteri diversi da virgole o tabulazioni, in formato tabellare, specificare il modello " -"e il delimitatore del nome file." +"Se si desidera aprire file di testo, con valori separati da caratteri " +"diversi da virgole o tabulazioni, in formato tabellare, specificare il " +"modello e il delimitatore del nome file." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1888 @@ -8396,17 +11137,25 @@ msgstr "Consenti i ritorni a capo tra virgolette" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1892 msgid "" -"<option>Enabled</option> (default): If there is a newline character between the quote character and the next quote character, the newline character " -"is treated as part of a value. Enable this option if you want to process CSV/TSV files that contain multiple lines in one field." +"<option>Enabled</option> (default): If there is a newline character between " +"the quote character and the next quote character, the newline character is " +"treated as part of a value. Enable this option if you want to process CSV/" +"TSV files that contain multiple lines in one field." msgstr "" -"<option>Abilitato</option> (predefinito): se c'è un carattere di nuova riga tra il carattere di virgoletta e il carattere di virgoletta successivo, " -"il carattere di nuova riga viene trattato come parte di un valore.Abilita questa opzione se desideri elaborare file CSV/TSV che contengono più righe " +"<option>Abilitato</option> (predefinito): se c'è un carattere di nuova riga " +"tra il carattere di virgoletta e il carattere di virgoletta successivo, il " +"carattere di nuova riga viene trattato come parte di un valore.Abilita " +"questa opzione se desideri elaborare file CSV/TSV che contengono più righe " "in un campo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:1901 -msgid "<option>Disabled</option>: Disable the above. Disable this option when opening files with incorrect quotes." -msgstr "<option>Disabilitato</option>: disabilita quanto sopra.Disabilitare questa opzione quando si aprono file con virgolette errate." +msgid "" +"<option>Disabled</option>: Disable the above. Disable this option when " +"opening files with incorrect quotes." +msgstr "" +"<option>Disabilitato</option>: disabilita quanto sopra.Disabilitare questa " +"opzione quando si aprono file con virgolette errate." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:1910 @@ -8416,12 +11165,16 @@ msgstr "Carattere di citazione" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1912 msgid "" -"Specifies the character that is treated as quotation marks. Delimiters within the text range enclosed by the characters specified here are treated " -"as part of a value. This field can be empty. To open files in which the quotation marks are mere values, leave it empty or specify a character that " +"Specifies the character that is treated as quotation marks. Delimiters " +"within the text range enclosed by the characters specified here are treated " +"as part of a value. This field can be empty. To open files in which the " +"quotation marks are mere values, leave it empty or specify a character that " "does not exist in the file." msgstr "" -"Specifica il carattere da considerare come virgolette.I delimitatori all'interno dell'intervallo di testo racchiuso dai caratteri qui specificati " -"vengono trattati come parte di un valore.Questo campo può essere vuoto.Per aprire file in cui le virgolette sono semplici valori, lasciarlo vuoto o " +"Specifica il carattere da considerare come virgolette.I delimitatori " +"all'interno dell'intervallo di testo racchiuso dai caratteri qui specificati " +"vengono trattati come parte di un valore.Questo campo può essere vuoto.Per " +"aprire file in cui le virgolette sono semplici valori, lasciarlo vuoto o " "specificare un carattere che non esiste nel file." #. type: Content of: <article><section><title> @@ -8442,12 +11195,16 @@ msgstr "Modelli di file binari<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:1930 msgid "" -"Specifies file name patterns for binary files to be opened in the binary compare window. To specify multiple items, separate them with a semicolon. " -"By default, *.bin is specified. If you do not want files with the .bin extension to be opened in the binary compare window, remove *.bin from the " +"Specifies file name patterns for binary files to be opened in the binary " +"compare window. To specify multiple items, separate them with a semicolon. " +"By default, *.bin is specified. If you do not want files with the .bin " +"extension to be opened in the binary compare window, remove *.bin from the " "list." msgstr "" -"Specifica i modelli di nome file per i file binari da aprire nella finestra di confronto binario.Per specificare più elementi, separarli con un punto " -"e virgola.Per impostazione predefinita, è specificato *.bin.Se non desideri che i file con estensione .bin vengano aperti nella finestra di confronto " +"Specifica i modelli di nome file per i file binari da aprire nella finestra " +"di confronto binario.Per specificare più elementi, separarli con un punto e " +"virgola.Per impostazione predefinita, è specificato *.bin.Se non desideri " +"che i file con estensione .bin vengano aperti nella finestra di confronto " "binario, rimuovi *.bin dall'elenco." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -8472,47 +11229,67 @@ msgstr "Qui puoi scegliere:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1949 -msgid "The number of bytes to display per line of hexdump (only applies if "Automatically adjust number of bytes per line" is disabled)" -msgstr "Il numero di byte da visualizzare per riga di hexdump (si applica solo se \"Regola automaticamente il numero di byte per riga\" è disabilitato)" +msgid "" +"The number of bytes to display per line of hexdump (only applies if "" +"Automatically adjust number of bytes per line" is disabled)" +msgstr "" +"Il numero di byte da visualizzare per riga di hexdump (si applica solo se " +"\"Regola automaticamente il numero di byte per riga\" è disabilitato)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1954 msgid "" -"If the "Automatically adjust number of bytes per line"- checkbox is checked, then the number of bytes displayed per hexdump line is " -"adjusted in such a way that the whole window width is used at all times." +"If the "Automatically adjust number of bytes per line"- checkbox " +"is checked, then the number of bytes displayed per hexdump line is adjusted " +"in such a way that the whole window width is used at all times." msgstr "" -"Se la casella \"Regola automaticamente il numero di byte per riga\" - è selezionata, il numero di byte visualizzati per riga esadecimale viene " +"Se la casella \"Regola automaticamente il numero di byte per riga\" - è " +"selezionata, il numero di byte visualizzati per riga esadecimale viene " "regolato in modo tale da utilizzare sempre l'intera larghezza della finestra." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1960 -msgid "The number of digits for the offset length (only applies if "Adjust offset length" is disabled)" -msgstr "Il numero di cifre per la lunghezza dell'offset (si applica solo se \"Regola lunghezza dell'offset\" è disabilitato)" +msgid "" +"The number of digits for the offset length (only applies if "Adjust " +"offset length" is disabled)" +msgstr "" +"Il numero di cifre per la lunghezza dell'offset (si applica solo se \"Regola " +"lunghezza dell'offset\" è disabilitato)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1964 -msgid "If the offset length should be automatically adjusted to that of the maximum offset (enabled) or right-padded with spaces (disabled)" +msgid "" +"If the offset length should be automatically adjusted to that of the maximum " +"offset (enabled) or right-padded with spaces (disabled)" msgstr "" -"Se la lunghezza dell'offset deve essere regolata automaticamente su quella dell'offset massimo (abilitato) o riempita a destra con spazi " -"(disabilitata)" +"Se la lunghezza dell'offset deve essere regolata automaticamente su quella " +"dell'offset massimo (abilitato) o riempita a destra con spazi (disabilitata)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1969 -msgid "How to display the values at the caret position, either as signed or as unsigned integer values" -msgstr "Come visualizzare i valori nella posizione del cursore, come valori interi con segno o senza segno" +msgid "" +"How to display the values at the caret position, either as signed or as " +"unsigned integer values" +msgstr "" +"Come visualizzare i valori nella posizione del cursore, come valori interi " +"con segno o senza segno" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1973 msgid "If read-only mode should be automatically set after opening files." -msgstr "Se la modalità di sola lettura deve essere impostata automaticamente dopo l'apertura dei file." +msgstr "" +"Se la modalità di sola lettura deve essere impostata automaticamente dopo " +"l'apertura dei file." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:1977 msgid "" -"The name of the text editor that will be called by the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Open in text editor </guimenuitem></" -"menuchoice> command." +"The name of the text editor that will be called by the " +"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Open in text editor </" +"guimenuitem></menuchoice> command." msgstr "" -"Il nome dell'editor di testo che verrà richiamato dal comando <menuchoice ><guimenu >Modifica</guimenu ><guimenuitem >Apri nell'editor di testo </" +"Il nome dell'editor di testo che verrà richiamato dal comando <menuchoice " +"><guimenu >Modifica</guimenu ><guimenuitem >Apri nell'editor di testo </" "guimenuitem ></menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -8523,11 +11300,15 @@ msgstr "Modalità binaria..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1989 msgid "" -"What kind of byte order to use: Either Little-endian, as used in Intel-computers or Big-endian, used for example in computers with a Motorola " -"processor. The difference between these modes is thus: Consider a longword, which is 4 bytes (named A to D) long." +"What kind of byte order to use: Either Little-endian, as used in Intel-" +"computers or Big-endian, used for example in computers with a Motorola " +"processor. The difference between these modes is thus: Consider a longword, " +"which is 4 bytes (named A to D) long." msgstr "" -"Che tipo di ordine dei byte utilizzare: Little-endian, come utilizzato nei computer Intel o Big-endian, utilizzato ad esempio nei computer con " -"processore Motorola.La differenza tra queste modalità è quindi: Considera una parola lunga, che è lunga 4 byte (dai nomi da A a D)." +"Che tipo di ordine dei byte utilizzare: Little-endian, come utilizzato nei " +"computer Intel o Big-endian, utilizzato ad esempio nei computer con " +"processore Motorola.La differenza tra queste modalità è quindi: Considera " +"una parola lunga, che è lunga 4 byte (dai nomi da A a D)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Configuration.xml:1994 @@ -8538,12 +11319,15 @@ msgstr "Parola lunga nel registro del processore = ABCD." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:1996 msgid "" -"The least significant bit, which has the value 1, is found in byte \"D\". In a processor register the longword is ordered in this way. If this value " -"is written to a position in memory, then by Intel convention the longword is written in this way, with the growing offsets to the right:" +"The least significant bit, which has the value 1, is found in byte \"D\". In " +"a processor register the longword is ordered in this way. If this value is " +"written to a position in memory, then by Intel convention the longword is " +"written in this way, with the growing offsets to the right:" msgstr "" -"Il bit meno significativo, che ha il valore 1, si trova nel byte \"D\".In un registro del processore la longword è ordinata in questo modo.Se questo " -"valore viene scritto in una posizione in memoria, per convenzione Intel la parola lunga viene scritta in questo modo, con gli offset crescenti a " -"destra:" +"Il bit meno significativo, che ha il valore 1, si trova nel byte \"D\".In un " +"registro del processore la longword è ordinata in questo modo.Se questo " +"valore viene scritto in una posizione in memoria, per convenzione Intel la " +"parola lunga viene scritta in questo modo, con gli offset crescenti a destra:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Configuration.xml:2002 @@ -8553,16 +11337,22 @@ msgstr "Parola lunga in memoria = DCBA." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2004 -msgid "That is, the bytes making up the longword are written in reverse order as they are found in a processor register." -msgstr "Cioè, i byte che compongono la longword vengono scritti in ordine inverso rispetto a come si trovano in un registro del processore." +msgid "" +"That is, the bytes making up the longword are written in reverse order as " +"they are found in a processor register." +msgstr "" +"Cioè, i byte che compongono la longword vengono scritti in ordine inverso " +"rispetto a come si trovano in un registro del processore." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2007 msgid "" -"This means that a file written by a Big-endian machine will contain wrong longword and word values if read by a Little-endian machine without " +"This means that a file written by a Big-endian machine will contain wrong " +"longword and word values if read by a Little-endian machine without " "conversion." msgstr "" -"Ciò significa che un file scritto da una macchina Big-endian conterrà valori longword e parole errati se letto da una macchina Little-endian senza " +"Ciò significa che un file scritto da una macchina Big-endian conterrà valori " +"longword e parole errati se letto da una macchina Little-endian senza " "conversione." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -8573,11 +11363,13 @@ msgstr "Set di caratteri..." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2017 msgid "" -"Here you can choose the character set for displaying and writing characters, either ANSI (the Windows character set) or OEM (the DOS character set). " -"The font size in points can also be chosen." +"Here you can choose the character set for displaying and writing characters, " +"either ANSI (the Windows character set) or OEM (the DOS character set). The " +"font size in points can also be chosen." msgstr "" -"Qui puoi scegliere il set di caratteri per visualizzare e scrivere i caratteri, ANSI (il set di caratteri di Windows) o OEM (il set di caratteri di " -"DOS).È possibile scegliere anche la dimensione del carattere in punti." +"Qui puoi scegliere il set di caratteri per visualizzare e scrivere i " +"caratteri, ANSI (il set di caratteri di Windows) o OEM (il set di caratteri " +"di DOS).È possibile scegliere anche la dimensione del carattere in punti." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2029 @@ -8587,7 +11379,8 @@ msgstr "file di immagini" #. type: Content of: <article><section><title> #: English/Configuration.xml:2028 msgid "Compare > Image page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronta >Pagina immagine<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronta >Pagina immagine<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2033 @@ -8597,13 +11390,18 @@ msgstr "Modelli di file di immagine" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2035 msgid "" -"Specifies file name patterns for image files to be opened in the image compare window. To specify multiple items, separate them with a semicolon. " -"By default, the .pdf, .svg, .wmf, and .emf extensions are not in the list. Add them if you want files with these extensions to be displayed in the " +"Specifies file name patterns for image files to be opened in the image " +"compare window. To specify multiple items, separate them with a semicolon. " +"By default, the .pdf, .svg, .wmf, and .emf extensions are not in the list. " +"Add them if you want files with these extensions to be displayed in the " "image compare window." msgstr "" -"Specifica i modelli di nome file per i file di immagine da aprire nella finestra di confronto delle immagini.Per specificare più elementi, separarli " -"con un punto e virgola.Per impostazione predefinita, le estensioni .pdf, .svg, .wmf e .emf non sono nell'elenco.Aggiungili se desideri che i file con " -"queste estensioni vengano visualizzati nella finestra di confronto delle immagini." +"Specifica i modelli di nome file per i file di immagine da aprire nella " +"finestra di confronto delle immagini.Per specificare più elementi, separarli " +"con un punto e virgola.Per impostazione predefinita, le estensioni .pdf, ." +"svg, .wmf e .emf non sono nell'elenco.Aggiungili se desideri che i file con " +"queste estensioni vengano visualizzati nella finestra di confronto delle " +"immagini." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2043 @@ -8613,11 +11411,15 @@ msgstr "Abilita il confronto delle immagini nel confronto delle cartelle" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2045 msgid "" -"When this option is enabled, folder comparisons will compare files that match the specified patterns as images. Metadata differences will be " -"ignored, and a color distance threshold will be applied to determine visual differences between images." +"When this option is enabled, folder comparisons will compare files that " +"match the specified patterns as images. Metadata differences will be " +"ignored, and a color distance threshold will be applied to determine visual " +"differences between images." msgstr "" -"Quando questa opzione è abilitata, i confronti delle cartelle confronteranno i file che corrispondono ai modelli specificati come immagini.Le " -"differenze nei metadati verranno ignorate e verrà applicata una soglia di distanza del colore per determinare le differenze visive tra le immagini." +"Quando questa opzione è abilitata, i confronti delle cartelle confronteranno " +"i file che corrispondono ai modelli specificati come immagini.Le differenze " +"nei metadati verranno ignorate e verrà applicata una soglia di distanza del " +"colore per determinare le differenze visive tra le immagini." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2051 @@ -8626,19 +11428,30 @@ msgstr "Risultato dell'OCR" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2055 -msgid "<option>Text only</option> (default): Shows only the text recognized from the image." -msgstr "<option>Solo testo</option> (impostazione predefinita): mostra solo il testo riconosciuto dall'immagine." +msgid "" +"<option>Text only</option> (default): Shows only the text recognized from " +"the image." +msgstr "" +"<option>Solo testo</option> (impostazione predefinita): mostra solo il testo " +"riconosciuto dall'immagine." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2062 -msgid "<option>Line-by-line position and text</option>: Shows the recognized text line by line with its position in the original image." -msgstr "<option>Posizione e testo riga per riga</option>: mostra il testo riconosciuto riga per riga con la sua posizione nell'immagine originale." +msgid "" +"<option>Line-by-line position and text</option>: Shows the recognized text " +"line by line with its position in the original image." +msgstr "" +"<option>Posizione e testo riga per riga</option>: mostra il testo " +"riconosciuto riga per riga con la sua posizione nell'immagine originale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2069 -msgid "<option>Word-by-word position and text</option>: Shows the recognized text word by word with its position in the original image." +msgid "" +"<option>Word-by-word position and text</option>: Shows the recognized text " +"word by word with its position in the original image." msgstr "" -"<option>Posizione e testo parola per parola</option>: mostra il testo riconosciuto parola per parola con la sua posizione nell'immagine originale." +"<option>Posizione e testo parola per parola</option>: mostra il testo " +"riconosciuto parola per parola con la sua posizione nell'immagine originale." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2080 @@ -8648,68 +11461,102 @@ msgstr "pagine web" #. type: Content of: <article><section><title> #: English/Configuration.xml:2079 msgid "Compare > Webpage page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronta >Pagina della pagina web<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronta >Pagina della pagina web<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2086 -msgid "URL pattern to include (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Pattern URL da includere (espressione regolare)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"URL pattern to include (Regular expression)<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Pattern URL da includere (espressione regolare)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2090 msgid "" -"Enter a regular expression in this field to specify the file paths or URLs that should be opened in the webpage compare window. For example, if you " -"enter the regular expression <code>.*\\.html?|https?://.*</code>, files with the .html or .htm extension and URLs starting with http:// or https:// " -"will be opened in the webpage compare window." +"Enter a regular expression in this field to specify the file paths or URLs " +"that should be opened in the webpage compare window. For example, if you " +"enter the regular expression <code>.*\\.html?|https?://.*</code>, files with " +"the .html or .htm extension and URLs starting with http:// or https:// will " +"be opened in the webpage compare window." msgstr "" -"Inserisci un'espressione regolare in questo campo per specificare i percorsi dei file o gli URL che devono essere aperti nella finestra di confronto " -"delle pagine web.Ad esempio, se inserisci l'espressione regolare <code>.*\\.html?|https?://.*</code>, i file con estensione .html o .htm e gli URL " -"che iniziano con http:// o https:// verranno aperti nella finestra di confronto delle pagine web." +"Inserisci un'espressione regolare in questo campo per specificare i percorsi " +"dei file o gli URL che devono essere aperti nella finestra di confronto " +"delle pagine web.Ad esempio, se inserisci l'espressione regolare <code>.*\\." +"html?|https?://.*</code>, i file con estensione .html o .htm e gli URL che " +"iniziano con http:// o https:// verranno aperti nella finestra di confronto " +"delle pagine web." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2098 -msgid "URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Pattern URL da escludere (espressione regolare)<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Pattern URL da escludere (espressione regolare)<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2102 msgid "" -"Enter a regular expression to exclude certain file paths or URLs from the Webpage Comparison window. This applies to items that match the \"URL " -"pattern to include\" field. Use this to exclude specific patterns you don't want to include." +"Enter a regular expression to exclude certain file paths or URLs from the " +"Webpage Comparison window. This applies to items that match the \"URL " +"pattern to include\" field. Use this to exclude specific patterns you don't " +"want to include." msgstr "" -"Inserisci un'espressione regolare per escludere determinati percorsi di file o URL dalla finestra Confronto pagine web.Questo vale per gli elementi " -"che corrispondono al campo \"Pattern URL da includere\".Utilizzalo per escludere modelli specifici che non desideri includere." +"Inserisci un'espressione regolare per escludere determinati percorsi di file " +"o URL dalla finestra Confronto pagine web.Questo vale per gli elementi che " +"corrispondono al campo \"Pattern URL da includere\".Utilizzalo per escludere " +"modelli specifici che non desideri includere." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2110 msgid "User data folder location<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Posizione della cartella dei dati utente<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Posizione della cartella dei dati utente<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2116 -msgid "<option>AppData folder</option> (default): Stores cookies, browsing history, and cache data in the %APPDATA%\\WinMerge\\WinWebDiff folder." +msgid "" +"<option>AppData folder</option> (default): Stores cookies, browsing history, " +"and cache data in the %APPDATA%\\WinMerge\\WinWebDiff folder." msgstr "" -"<option>Cartella AppData</option> (impostazione predefinita): archivia cookie, cronologia di navigazione e dati della cache nella cartella %APPDATA%" +"<option>Cartella AppData</option> (impostazione predefinita): archivia " +"cookie, cronologia di navigazione e dati della cache nella cartella %APPDATA%" "\\WinMerge\\WinWebDiff." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2122 msgid "" -"<option>Install folder</option>: Saves data in the WinMerge installation directory, which usually requires administrator permissions to write. This " +"<option>Install folder</option>: Saves data in the WinMerge installation " +"directory, which usually requires administrator permissions to write. This " "is generally not recommended." msgstr "" -"<option>Cartella di installazione</option>: salva i dati nella cartella di installazione di WinMerge, che in genere richiede autorizzazioni di " +"<option>Cartella di installazione</option>: salva i dati nella cartella di " +"installazione di WinMerge, che in genere richiede autorizzazioni di " "amministratore per la scrittura.Questo generalmente non è raccomandato." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2130 -msgid "Separate user data folders for each pane<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Cartelle dei dati utente separate per ciascun riquadro<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Separate user data folders for each pane<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Cartelle dei dati utente separate per ciascun riquadro<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2133 -msgid "Creates distinct data folders for each pane, preventing data overlap between them." -msgstr "Crea cartelle di dati distinte per ciascun riquadro, impedendo la sovrapposizione dei dati tra di loro." +msgid "" +"Creates distinct data folders for each pane, preventing data overlap between " +"them." +msgstr "" +"Crea cartelle di dati distinte per ciascun riquadro, impedendo la " +"sovrapposizione dei dati tra di loro." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2140 @@ -8729,32 +11576,43 @@ msgstr "Reset" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2148 msgid "" -"WinMerge allows you to suppress some common message boxes. For example, when two identical files are opened, the message box titled, <guilabel>The " -"files are identical</guilabel>, is normally opened. If you don't want this box to display any more, you can enable (check) the option in that message " -"box to not show the message again." +"WinMerge allows you to suppress some common message boxes. For example, when " +"two identical files are opened, the message box titled, <guilabel>The files " +"are identical</guilabel>, is normally opened. If you don't want this box to " +"display any more, you can enable (check) the option in that message box to " +"not show the message again." msgstr "" -"WinMerge consente di eliminare alcune finestre di messaggio comuni.Ad esempio, quando vengono aperti due file identici, viene normalmente aperta la " -"finestra di messaggio intitolata <guilabel >I file sono identici</guilabel >.Se non vuoi che questa casella venga più visualizzata, puoi abilitare " -"(selezionare) l'opzione in quella finestra di messaggio per non mostrare più il messaggio." +"WinMerge consente di eliminare alcune finestre di messaggio comuni.Ad " +"esempio, quando vengono aperti due file identici, viene normalmente aperta " +"la finestra di messaggio intitolata <guilabel >I file sono identici</" +"guilabel >.Se non vuoi che questa casella venga più visualizzata, puoi " +"abilitare (selezionare) l'opzione in quella finestra di messaggio per non " +"mostrare più il messaggio." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2156 msgid "" -"Later, you might decide that you want to see those messages again. If so, click the <guibutton>Reset</guibutton> button to make the message boxes " +"Later, you might decide that you want to see those messages again. If so, " +"click the <guibutton>Reset</guibutton> button to make the message boxes " "display again." msgstr "" -"Successivamente, potresti decidere di voler rivedere quei messaggi.In tal caso, fai clic sul pulsante <guibutton >Ripristina</guibutton > per " +"Successivamente, potresti decidere di voler rivedere quei messaggi.In tal " +"caso, fai clic sul pulsante <guibutton >Ripristina</guibutton > per " "visualizzare nuovamente le finestre di messaggio." #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:2163 msgid "" -"We recommend that you not suppress messages when updating WinMerge to a newer version. The installer enables their display automatically, but if you " -"don't use the installer, then remember to enable message display by using the <guibutton>Reset</guibutton> button." +"We recommend that you not suppress messages when updating WinMerge to a " +"newer version. The installer enables their display automatically, but if you " +"don't use the installer, then remember to enable message display by using " +"the <guibutton>Reset</guibutton> button." msgstr "" -"Ti consigliamo di non eliminare i messaggi durante l'aggiornamento di WinMerge a una versione più recente.Il programma di installazione ne abilita la " -"visualizzazione automaticamente, ma se non usi il programma di installazione, ricordati di abilitare la visualizzazione dei messaggi utilizzando il " -"pulsante <guibutton >Ripristina</guibutton >." +"Ti consigliamo di non eliminare i messaggi durante l'aggiornamento di " +"WinMerge a una versione più recente.Il programma di installazione ne abilita " +"la visualizzazione automaticamente, ma se non usi il programma di " +"installazione, ricordati di abilitare la visualizzazione dei messaggi " +"utilizzando il pulsante <guibutton >Ripristina</guibutton >." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Configuration.xml:2177 English/Configuration.xml:2348 @@ -8784,20 +11642,26 @@ msgstr "Evidenzia la sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2193 msgid "" -"<option>Enabled</option> (default): WinMerge can syntax highlight many programming language and web formats. To see the formats that are supported by " -"default, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Syntax Highlight</guimenuitem> </menuchoice>." +"<option>Enabled</option> (default): WinMerge can syntax highlight many " +"programming language and web formats. To see the formats that are supported " +"by default, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Syntax " +"Highlight</guimenuitem> </menuchoice>." msgstr "" -"<option>Abilitato</option> (predefinito): WinMerge può evidenziare la sintassi di molti linguaggi di programmazione e formati web.Per vedere i " -"formati supportati per impostazione predefinita, fai clic su <menuchoice> <guimenu >Visualizza</guimenu > <guimenuitem >Evidenziazione sintassi</" +"<option>Abilitato</option> (predefinito): WinMerge può evidenziare la " +"sintassi di molti linguaggi di programmazione e formati web.Per vedere i " +"formati supportati per impostazione predefinita, fai clic su <menuchoice> " +"<guimenu >Visualizza</guimenu > <guimenuitem >Evidenziazione sintassi</" "guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2205 msgid "" -"<option>Disabled</option>: Syntax highlighting consumes some processing power, so if WinMerge screen updating seems to be slow, turning off this " +"<option>Disabled</option>: Syntax highlighting consumes some processing " +"power, so if WinMerge screen updating seems to be slow, turning off this " "option might help." msgstr "" -"<option>Disabilitato</option>: l'evidenziazione della sintassi consuma una certa potenza di elaborazione, quindi se l'aggiornamento dello schermo di " +"<option>Disabilitato</option>: l'evidenziazione della sintassi consuma una " +"certa potenza di elaborazione, quindi se l'aggiornamento dello schermo di " "WinMerge sembra lento, disattivare questa opzione potrebbe essere d'aiuto." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -8807,48 +11671,68 @@ msgstr "fine della riga" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2215 -msgid "Preserve original EOL<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Conserva l'EOL originale<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Preserve original EOL<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Conserva l'EOL originale<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2229 msgid "" -"<option>Disabled</option> (default): Assumes that files are meant to be Windows files. If a file does not use the standard Windows line ending, " -"WinMerge considers this to be an error. It silently changes the line endings to the Windows style instead of detecting them as differences. Thus, the " -"File Compare window status bar shows the EOL style as <guilabel>Win</guilabel>." +"<option>Disabled</option> (default): Assumes that files are meant to be " +"Windows files. If a file does not use the standard Windows line ending, " +"WinMerge considers this to be an error. It silently changes the line endings " +"to the Windows style instead of detecting them as differences. Thus, the " +"File Compare window status bar shows the EOL style as <guilabel>Win</" +"guilabel>." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): presuppone che i file debbano essere file Windows.Se un file non utilizza la fine riga " -"standard di Windows, WinMerge lo considera un errore.Cambia silenziosamente le terminazioni di riga nello stile Windows invece di rilevarle come " -"differenze.Pertanto, la barra di stato della finestra Confronta file mostra lo stile EOL come <guilabel >Win</guilabel >." +"<option>Disabilitato</option> (impostazione predefinita): presuppone che i " +"file debbano essere file Windows.Se un file non utilizza la fine riga " +"standard di Windows, WinMerge lo considera un errore.Cambia silenziosamente " +"le terminazioni di riga nello stile Windows invece di rilevarle come " +"differenze.Pertanto, la barra di stato della finestra Confronta file mostra " +"lo stile EOL come <guilabel >Win</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2238 msgid "" -"For most situations you should leave this option disabled: the default behavior works even when comparing two files that have different line ending " +"For most situations you should leave this option disabled: the default " +"behavior works even when comparing two files that have different line ending " "styles." msgstr "" -"Nella maggior parte dei casi dovresti lasciare questa opzione disabilitata: il comportamento predefinito funziona anche quando si confrontano due " -"file che hanno stili di fine riga diversi." +"Nella maggior parte dei casi dovresti lasciare questa opzione disabilitata: " +"il comportamento predefinito funziona anche quando si confrontano due file " +"che hanno stili di fine riga diversi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2246 msgid "" -"<option>Enabled</option>: Prevents WinMerge from automatically changing line endings, so that it detects different EOL styles for every line. This " -"might be useful for handling files from systems with different EOL styles (for example, Windows and Unix)." +"<option>Enabled</option>: Prevents WinMerge from automatically changing line " +"endings, so that it detects different EOL styles for every line. This might " +"be useful for handling files from systems with different EOL styles (for " +"example, Windows and Unix)." msgstr "" -"<option>Abilitato</option>: impedisce a WinMerge di modificare automaticamente le terminazioni di riga, in modo che rilevi diversi stili EOL per ogni " -"riga.Ciò potrebbe essere utile per gestire file da sistemi con stili EOL diversi (ad esempio, Windows e Unix)." +"<option>Abilitato</option>: impedisce a WinMerge di modificare " +"automaticamente le terminazioni di riga, in modo che rilevi diversi stili " +"EOL per ogni riga.Ciò potrebbe essere utile per gestire file da sistemi con " +"stili EOL diversi (ad esempio, Windows e Unix)." #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> #: English/Configuration.xml:2254 msgid "" -"This is an advanced option for users who are familiar with EOL bytes and who want to compare files with different EOL styles inside <emphasis>one</" -"emphasis> file. We recommend that you not enable this option unless you need this advanced functionality. Remember, this option is not required to " +"This is an advanced option for users who are familiar with EOL bytes and who " +"want to compare files with different EOL styles inside <emphasis>one</" +"emphasis> file. We recommend that you not enable this option unless you need " +"this advanced functionality. Remember, this option is not required to " "compare two files with different EOL styles." msgstr "" -"Questa è un'opzione avanzata per gli utenti che hanno familiarità con i byte EOL e che desiderano confrontare file con stili EOL diversi all'interno " -"di <emphasis>un</emphasis> file.Ti consigliamo di non abilitare questa opzione a meno che non ti serva questa funzionalità avanzata.Ricorda, questa " -"opzione non è necessaria per confrontare due file con stili EOL diversi." +"Questa è un'opzione avanzata per gli utenti che hanno familiarità con i byte " +"EOL e che desiderano confrontare file con stili EOL diversi all'interno di " +"<emphasis>un</emphasis> file.Ti consigliamo di non abilitare questa opzione " +"a meno che non ti serva questa funzionalità avanzata.Ricorda, questa opzione " +"non è necessaria per confrontare due file con stili EOL diversi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2271 @@ -8868,11 +11752,14 @@ msgstr "Dimensioni della scheda" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2281 msgid "" -"Width of a tab space. Specify a value <replaceable>n</replaceable>: the resulting width is equivalent to that of <replaceable>n</replaceable> " +"Width of a tab space. Specify a value <replaceable>n</replaceable>: the " +"resulting width is equivalent to that of <replaceable>n</replaceable> " "characters. Default: 4. The maximum value is 64." msgstr "" -"Larghezza di uno spazio di tabulazione.Specificare un valore <replaceable>n</replaceable>: la larghezza risultante è equivalente a quella di " -"<replaceable>n</replaceable> caratteri.Impostazione predefinita: 4. Il valore massimo è 64." +"Larghezza di uno spazio di tabulazione.Specificare un valore <replaceable>n</" +"replaceable>: la larghezza risultante è equivalente a quella di " +"<replaceable>n</replaceable> caratteri.Impostazione predefinita: 4. Il " +"valore massimo è 64." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:2290 @@ -8881,22 +11768,32 @@ msgstr "Opzioni di inserimento schede" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2294 -msgid "Determines what kind of character is used when you insert a tab in text. Only one of these options can be enabled:" -msgstr "Determina il tipo di carattere utilizzato quando si inserisce una tabulazione nel testo.È possibile abilitare solo una di queste opzioni:" +msgid "" +"Determines what kind of character is used when you insert a tab in text. " +"Only one of these options can be enabled:" +msgstr "" +"Determina il tipo di carattere utilizzato quando si inserisce una " +"tabulazione nel testo.È possibile abilitare solo una di queste opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2301 -msgid "<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." -msgstr "<guilabel >Inserisci tabulazioni</guilabel> (predefinito): utilizza un singolo carattere di tabulazione." +msgid "" +"<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." +msgstr "" +"<guilabel >Inserisci tabulazioni</guilabel> (predefinito): utilizza un " +"singolo carattere di tabulazione." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2308 msgid "" -"<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by the <option>Tab size</option>) instead of a tab character. For example, " -"with the default tab size, four spaces are inserted." +"<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by " +"the <option>Tab size</option>) instead of a tab character. For example, with " +"the default tab size, four spaces are inserted." msgstr "" -"<guilabel >Inserisci spazi</guilabel >: utilizza uno o più spazi (determinati dalla <option >dimensione della tabulazione</option >) invece del " -"carattere di tabulazione.Ad esempio, con la dimensione di tabulazione predefinita, vengono inseriti quattro spazi." +"<guilabel >Inserisci spazi</guilabel >: utilizza uno o più spazi " +"(determinati dalla <option >dimensione della tabulazione</option >) invece " +"del carattere di tabulazione.Ad esempio, con la dimensione di tabulazione " +"predefinita, vengono inseriti quattro spazi." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2323 @@ -8910,25 +11807,37 @@ msgstr "Modalità di rendering<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2330 -msgid "<option>GDI</option> (default): Renders text using the Graphics Device Interface (GDI)." -msgstr "<option>GDI</option> (predefinito): esegue il rendering del testo utilizzando la Graphics Device Interface (GDI)." +msgid "" +"<option>GDI</option> (default): Renders text using the Graphics Device " +"Interface (GDI)." +msgstr "" +"<option>GDI</option> (predefinito): esegue il rendering del testo " +"utilizzando la Graphics Device Interface (GDI)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2336 msgid "" -"<option>DirectWrite Modes</option>: Renders text using various DirectWrite rendering modes, including support for colored emojis on Windows 8.1 and " -"later. Available only in the 64-bit version of WinMerge. See <ulink url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-" -"dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for details." +"<option>DirectWrite Modes</option>: Renders text using various DirectWrite " +"rendering modes, including support for colored emojis on Windows 8.1 and " +"later. Available only in the 64-bit version of WinMerge. See <ulink " +"url=\"https://learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-" +"dwrite_rendering_mode#constants\">DirectWrite Rendering Modes</ulink> for " +"details." msgstr "" -"<option>Modalità DirectWrite</option>: esegue il rendering del testo utilizzando varie modalità di rendering DirectWrite, incluso il supporto per " -"emoji colorati su Windows 8.1 e versioni successive.Disponibile solo nella versione a 64 bit di WinMerge.Vedi <ulink url=\"https://" -"learn.microsoft.com/en-us/windows/win32/api/dwrite/ne-dwrite-dwrite_rendering_mode#constants\">Modalità di rendering DirectWrite</ulink> per i " -"dettagli." +"<option>Modalità DirectWrite</option>: esegue il rendering del testo " +"utilizzando varie modalità di rendering DirectWrite, incluso il supporto per " +"emoji colorati su Windows 8.1 e versioni successive.Disponibile solo nella " +"versione a 64 bit di WinMerge.Vedi <ulink url=\"https://learn.microsoft.com/" +"en-us/windows/win32/api/dwrite/ne-dwrite-" +"dwrite_rendering_mode#constants\">Modalità di rendering DirectWrite</ulink> " +"per i dettagli." #. type: Content of: <article><section><title> #: English/Configuration.xml:2345 -msgid "Editor > Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Editore >Confronta/Unisci pagina<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Editor > Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Editore >Confronta/Unisci pagina<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2357 @@ -8943,25 +11852,35 @@ msgstr "Nuova scansione automatica<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2364 msgid "" -"<option>Disabled</option> (default): WinMerge rescans automatically when you merge a difference, or if you manually rescan (for example, click the " +"<option>Disabled</option> (default): WinMerge rescans automatically when you " +"merge a difference, or if you manually rescan (for example, click the " "<guibutton>Rescan</guibutton> button)." msgstr "" -"<option >Disabilitato</option> (predefinito): WinMerge esegue nuovamente la scansione automaticamente quando unisci una differenza o se esegui " -"nuovamente la scansione manualmente (ad esempio, facendo clic sul pulsante <guibutton >Ripeti scansione</guibutton >)." +"<option >Disabilitato</option> (predefinito): WinMerge esegue nuovamente la " +"scansione automaticamente quando unisci una differenza o se esegui " +"nuovamente la scansione manualmente (ad esempio, facendo clic sul pulsante " +"<guibutton >Ripeti scansione</guibutton >)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2372 -msgid "<option>Enabled</option>: Forces WinMerge to rescan after every edit event (a change to files, like typing)." -msgstr "<option>Abilitato</option>: forza WinMerge a ripetere la scansione dopo ogni evento di modifica (una modifica ai file, come la digitazione)." +msgid "" +"<option>Enabled</option>: Forces WinMerge to rescan after every edit event " +"(a change to files, like typing)." +msgstr "" +"<option>Abilitato</option>: forza WinMerge a ripetere la scansione dopo ogni " +"evento di modifica (una modifica ai file, come la digitazione)." #. type: Content of: <article><section><section><itemizedlist><listitem><note><para> #: English/Configuration.xml:2378 msgid "" -"To avoid slowing down your editing, WinMerge delays automatic rescanning a little: it waits one second after each edit event. Because each new edit " +"To avoid slowing down your editing, WinMerge delays automatic rescanning a " +"little: it waits one second after each edit event. Because each new edit " "event resets the timer, no rescans occur until you pause or stop editing." msgstr "" -"Per evitare di rallentare la modifica, WinMerge ritarda leggermente la scansione automatica: attende un secondo dopo ogni evento di modifica.Poiché " -"ogni nuovo evento di modifica reimposta il timer, non vengono eseguite nuove scansioni finché non si mette in pausa o si interrompe la modifica." +"Per evitare di rallentare la modifica, WinMerge ritarda leggermente la " +"scansione automatica: attende un secondo dopo ogni evento di modifica.Poiché " +"ogni nuovo evento di modifica reimposta il timer, non vengono eseguite nuove " +"scansioni finché non si mette in pausa o si interrompe la modifica." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2391 @@ -8970,37 +11889,55 @@ msgstr "granularità della copia" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2390 -msgid "Copy granularity for selected differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Granularità della copia per le differenze selezionate<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Copy granularity for selected differences<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Granularità della copia per le differenze selezionate<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2396 msgid "" -"Specifies the copy granularity when copying to another pane by clicking the <guimenuitem>Copy to right</guimenuitem> menu item etc. with text " -"selected." +"Specifies the copy granularity when copying to another pane by clicking the " +"<guimenuitem>Copy to right</guimenuitem> menu item etc. with text selected." msgstr "" -"Specifica la granularità della copia quando si copia in un altro pannello facendo clic sulla voce del menu <guimenuitem >Copia a destra</guimenuitem " -"> ecc. con il testo selezionato." +"Specifica la granularità della copia quando si copia in un altro pannello " +"facendo clic sulla voce del menu <guimenuitem >Copia a destra</guimenuitem > " +"ecc. con il testo selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2404 msgid "<option>Diff hunk</option>: Copies diff hunks within the selected text." -msgstr "<option>Diff hunk</option>: copia i diff hunk all'interno del testo selezionato." +msgstr "" +"<option>Diff hunk</option>: copia i diff hunk all'interno del testo " +"selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2411 -msgid "<option>Inline diff</option>: Copies inline diffs within the selected text." -msgstr "<option>DIFF in linea</option>: copia le differenze in linea all'interno del testo selezionato." +msgid "" +"<option>Inline diff</option>: Copies inline diffs within the selected text." +msgstr "" +"<option>DIFF in linea</option>: copia le differenze in linea all'interno del " +"testo selezionato." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2418 -msgid "<option>Line</option>: Copies the differences within the selected text line by line." -msgstr "<option>Line</option>: copia le differenze all'interno del testo selezionato riga per riga." +msgid "" +"<option>Line</option>: Copies the differences within the selected text line " +"by line." +msgstr "" +"<option>Line</option>: copia le differenze all'interno del testo selezionato " +"riga per riga." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2425 -msgid "<option>Character</option> (default): Copies the differences within the selected text character by character." -msgstr "<option>Carattere</option> (predefinito): copia le differenze all'interno del testo selezionato carattere per carattere." +msgid "" +"<option>Character</option> (default): Copies the differences within the " +"selected text character by character." +msgstr "" +"<option>Carattere</option> (predefinito): copia le differenze all'interno " +"del testo selezionato carattere per carattere." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Configuration.xml:2438 @@ -9014,9 +11951,12 @@ msgstr "Colorazione differenza linea<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2443 -msgid "These settings enable and configure the detection of <glossterm> line differences </glossterm> (changes within the lines of difference blocks):" +msgid "" +"These settings enable and configure the detection of <glossterm> line " +"differences </glossterm> (changes within the lines of difference blocks):" msgstr "" -"Queste impostazioni abilitano e configurano il rilevamento delle <glossterm> differenze di riga </glossterm> (modifiche all'interno delle righe dei " +"Queste impostazioni abilitano e configurano il rilevamento delle <glossterm> " +"differenze di riga </glossterm> (modifiche all'interno delle righe dei " "blocchi di differenza):" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -9027,11 +11967,14 @@ msgstr "Visualizza le differenze di linea" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2458 msgid "" -"<option>Enabled</option> (default): WinMerge highlights differences within lines. Also enables the <menuchoice> <guimenu>View</guimenu> " +"<option>Enabled</option> (default): WinMerge highlights differences within " +"lines. Also enables the <menuchoice> <guimenu>View</guimenu> " "<guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." msgstr "" -"<option>Abilitato</option> (predefinito): WinMerge evidenzia le differenze all'interno delle righe.Abilita anche la voce di menu <menuchoice> " -"<guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</guimenuitem > </menuchoice >." +"<option>Abilitato</option> (predefinito): WinMerge evidenzia le differenze " +"all'interno delle righe.Abilita anche la voce di menu <menuchoice> <guimenu " +">Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2466 @@ -9041,44 +11984,61 @@ msgstr "Scegli una di queste opzioni secondarie:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2471 msgid "" -"<guilabel>Character level</guilabel>: Highlights individual characters that are different. This option can be useful if you are looking for changes " +"<guilabel>Character level</guilabel>: Highlights individual characters that " +"are different. This option can be useful if you are looking for changes " "within words, or for file formats that do not have clear word breaks." msgstr "" -"<guilabel >Livello carattere</guilabel >: evidenzia i singoli caratteri che sono diversi.Questa opzione può essere utile se stai cercando modifiche " -"all'interno delle parole o per formati di file che non presentano interruzioni di parola chiare." +"<guilabel >Livello carattere</guilabel >: evidenzia i singoli caratteri che " +"sono diversi.Questa opzione può essere utile se stai cercando modifiche " +"all'interno delle parole o per formati di file che non presentano " +"interruzioni di parola chiare." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2480 -msgid "<guilabel>Word-level</guilabel> (default): Highlights entire words that are different." -msgstr "<guilabel >A livello di parola</guilabel > (predefinito): evidenzia intere parole che sono diverse." +msgid "" +"<guilabel>Word-level</guilabel> (default): Highlights entire words that are " +"different." +msgstr "" +"<guilabel >A livello di parola</guilabel > (predefinito): evidenzia intere " +"parole che sono diverse." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2487 msgid "" -"<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be separated by whitespace characters. This usually works for typical text " +"<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be " +"separated by whitespace characters. This usually works for typical text " "files." msgstr "" -"<guilabel >Interrompi nello spazio</guilabel> (predefinito): si presuppone che le parole siano separate da caratteri di spazio.Questo di solito " +"<guilabel >Interrompi nello spazio</guilabel> (predefinito): si presuppone " +"che le parole siano separate da caratteri di spazio.Questo di solito " "funziona per i tipici file di testo." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2495 msgid "" -"<guilabel>Break at whitespace or punctuation</guilabel>: Considers both whitespace and punctuation characters to be word breaks. This can useful for " -"handling lists that are separated with punctuation (like comma-separated lists)." +"<guilabel>Break at whitespace or punctuation</guilabel>: Considers both " +"whitespace and punctuation characters to be word breaks. This can useful for " +"handling lists that are separated with punctuation (like comma-separated " +"lists)." msgstr "" -"<guilabel >Interruzione negli spazi bianchi o nella punteggiatura</guilabel >: considera sia gli spazi bianchi che i caratteri di punteggiatura come " -"interruzioni di parola.Ciò può essere utile per gestire elenchi separati da punteggiatura (come elenchi separati da virgole)." +"<guilabel >Interruzione negli spazi bianchi o nella punteggiatura</guilabel " +">: considera sia gli spazi bianchi che i caratteri di punteggiatura come " +"interruzioni di parola.Ciò può essere utile per gestire elenchi separati da " +"punteggiatura (come elenchi separati da virgole)." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2509 msgid "" -"<option>Disabled</option>: WinMerge does not highlight line differences, and all settings for the level and whitespace options are ignored. Also " -"disables the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." +"<option>Disabled</option>: WinMerge does not highlight line differences, and " +"all settings for the level and whitespace options are ignored. Also disables " +"the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</" +"guimenuitem> </menuchoice> menu item." msgstr "" -"<option>Disabilitato</option>: WinMerge non evidenzia le differenze di linea e tutte le impostazioni per le opzioni di livello e spazio bianco " -"vengono ignorate.Disabilita anche la voce di menu <menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza differenze di riga</" -"guimenuitem > </menuchoice >." +"<option>Disabilitato</option>: WinMerge non evidenzia le differenze di linea " +"e tutte le impostazioni per le opzioni di livello e spazio bianco vengono " +"ignorate.Disabilita anche la voce di menu <menuchoice> <guimenu >Visualizza</" +"guimenu> <guimenuitem >Visualizza differenze di riga</guimenuitem > </" +"menuchoice >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:2525 @@ -9088,9 +12048,11 @@ msgstr "Caratteri di interruzione di parola" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2528 msgid "" -"Specifies the symbols that are treated as non-whitespace word separators when <guilabel>Break at whitespace or punctuation</guilabel> is selected." +"Specifies the symbols that are treated as non-whitespace word separators " +"when <guilabel>Break at whitespace or punctuation</guilabel> is selected." msgstr "" -"Specifica i simboli che vengono trattati come separatori di parole non spazi bianchi quando è selezionato <guilabel >Interrompi in corrispondenza di " +"Specifica i simboli che vengono trattati come separatori di parole non spazi " +"bianchi quando è selezionato <guilabel >Interrompi in corrispondenza di " "spazi bianchi o punteggiatura</guilabel>." #. type: Content of: <article><section><section><note><title> @@ -9100,13 +12062,18 @@ msgstr "Argomento correlato" #. type: Content of: <article><section><section><note><para> #: English/Configuration.xml:2540 -msgid "<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail how WinMerge detects and marks line differences." -msgstr "<xref linkend=\"CompareFiles_linediff-highlight\" /> spiega in modo più dettagliato come WinMerge rileva e contrassegna le differenze di linea." +msgid "" +"<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail " +"how WinMerge detects and marks line differences." +msgstr "" +"<xref linkend=\"CompareFiles_linediff-highlight\" /> spiega in modo più " +"dettagliato come WinMerge rileva e contrassegna le differenze di linea." #. type: Content of: <article><section><title> #: English/Configuration.xml:2550 msgid "Editor > Syntax page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Editore >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Editore >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2565 @@ -9115,17 +12082,24 @@ msgstr "combinazioni di colori" #. type: Content of: <article><section><title> #: English/Configuration.xml:2564 -msgid "Colors > Color Schemes page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Colori >Pagina Combinazioni di colori<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Colors > Color Schemes page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Colori >Pagina Combinazioni di colori<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2572 msgid "" -"The Color Schemes page allows you to customize the overall color appearance of WinMerge, including support for light and dark modes. You can select " -"and manage color schemes for each mode, and save or delete your own custom schemes." +"The Color Schemes page allows you to customize the overall color appearance " +"of WinMerge, including support for light and dark modes. You can select and " +"manage color schemes for each mode, and save or delete your own custom " +"schemes." msgstr "" -"La pagina Combinazioni colori consente di personalizzare l'aspetto cromatico generale di WinMerge, incluso il supporto per le modalità chiaro e " -"scuro.Puoi selezionare e gestire combinazioni di colori per ciascuna modalità e salvare o eliminare le tue combinazioni personalizzate." +"La pagina Combinazioni colori consente di personalizzare l'aspetto cromatico " +"generale di WinMerge, incluso il supporto per le modalità chiaro e scuro." +"Puoi selezionare e gestire combinazioni di colori per ciascuna modalità e " +"salvare o eliminare le tue combinazioni personalizzate." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2577 @@ -9140,26 +12114,35 @@ msgstr "Seleziona la modalità colore per l'applicazione.Scegli tra:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2585 msgid "" -"<option>Light</option> (default): Uses the color scheme specified for light mode. When selected, the appearance of dialog windows, menus, and other " -"UI elements will be shown in a light style." +"<option>Light</option> (default): Uses the color scheme specified for light " +"mode. When selected, the appearance of dialog windows, menus, and other UI " +"elements will be shown in a light style." msgstr "" -"<option>Luce</option> (predefinito): utilizza lo schema di colori specificato per la modalità luce.Quando selezionato, l'aspetto delle finestre di " -"dialogo, dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in uno stile chiaro." +"<option>Luce</option> (predefinito): utilizza lo schema di colori " +"specificato per la modalità luce.Quando selezionato, l'aspetto delle " +"finestre di dialogo, dei menu e degli altri elementi dell'interfaccia utente " +"verrà mostrato in uno stile chiaro." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2590 msgid "" -"<option>Dark</option>: Uses the color scheme specified for dark mode. When selected, the appearance of dialog windows, menus, and other UI elements " +"<option>Dark</option>: Uses the color scheme specified for dark mode. When " +"selected, the appearance of dialog windows, menus, and other UI elements " "will be shown in a dark style." msgstr "" -"<option>Scuro</option>: utilizza la combinazione di colori specificata per la modalità oscura.Quando selezionato, l'aspetto delle finestre di " -"dialogo, dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in uno stile scuro." +"<option>Scuro</option>: utilizza la combinazione di colori specificata per " +"la modalità oscura.Quando selezionato, l'aspetto delle finestre di dialogo, " +"dei menu e degli altri elementi dell'interfaccia utente verrà mostrato in " +"uno stile scuro." #. type: Content of: <article><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:2595 -msgid "<option>Follow system</option>: Automatically switches between light and dark mode based on your operating system's setting." +msgid "" +"<option>Follow system</option>: Automatically switches between light and " +"dark mode based on your operating system's setting." msgstr "" -"<option>Segui il sistema</option>: passa automaticamente dalla modalità chiara a quella scura in base alle impostazioni del tuo sistema operativo." +"<option>Segui il sistema</option>: passa automaticamente dalla modalità " +"chiara a quella scura in base alle impostazioni del tuo sistema operativo." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2603 @@ -9169,11 +12152,14 @@ msgstr "Schema della modalità luce" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2606 msgid "" -"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set to Light. Available schemes include <option>Default</option> (default), " +"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set " +"to Light. Available schemes include <option>Default</option> (default), " "<option>Modern</option>, and any user-defined schemes you have saved." msgstr "" -"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità colore</guilabel > è impostata su Luce.Gli schemi disponibili includono " -"<option>Default</option> (predefinito), <option>Modern</option> e qualsiasi schema definito dall'utente che hai salvato." +"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità " +"colore</guilabel > è impostata su Luce.Gli schemi disponibili includono " +"<option>Default</option> (predefinito), <option>Modern</option> e qualsiasi " +"schema definito dall'utente che hai salvato." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2612 @@ -9183,11 +12169,14 @@ msgstr "Schema della modalità oscura" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2615 msgid "" -"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set to Dark. Available schemes include <option>VS Dark</option> (default), " +"Selects the color scheme to use when <guilabel>Color mode</guilabel> is set " +"to Dark. Available schemes include <option>VS Dark</option> (default), " "<option>Solarized Dark</option>, and any user-defined schemes you have saved." msgstr "" -"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità colore</guilabel > è impostata su Scuro.Gli schemi disponibili includono " -"<option>VS Dark</option> (predefinito), <option>Solarized Dark</option> e qualsiasi schema definito dall'utente che hai salvato." +"Seleziona lo schema di colori da utilizzare quando la <guilabel >Modalità " +"colore</guilabel > è impostata su Scuro.Gli schemi disponibili includono " +"<option>VS Dark</option> (predefinito), <option>Solarized Dark</option> e " +"qualsiasi schema definito dall'utente che hai salvato." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Configuration.xml:2621 @@ -9197,12 +12186,16 @@ msgstr "Salva lo schema corrente" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2624 msgid "" -"Saves the current color settings as a new scheme. The scheme is saved as an INI file. <emphasis> Only schemes saved in the <filename>Documents/" -"WinMerge/ColorSchemes</filename> folder will appear in the <guilabel>Light mode scheme</guilabel> and <guilabel>Dark mode scheme</guilabel> lists. </" +"Saves the current color settings as a new scheme. The scheme is saved as an " +"INI file. <emphasis> Only schemes saved in the <filename>Documents/WinMerge/" +"ColorSchemes</filename> folder will appear in the <guilabel>Light mode " +"scheme</guilabel> and <guilabel>Dark mode scheme</guilabel> lists. </" "emphasis>" msgstr "" -"Salva le impostazioni colore correnti come nuovo schema.Lo schema viene salvato come file INI.<emphasis>Solo gli schemi salvati nella cartella " -"<filename>Documents/WinMerge/ColorSchemes</filename> appariranno negli elenchi <guilabel >Schema modalità luce</guilabel > e <guilabel >Schema " +"Salva le impostazioni colore correnti come nuovo schema.Lo schema viene " +"salvato come file INI.<emphasis>Solo gli schemi salvati nella cartella " +"<filename>Documents/WinMerge/ColorSchemes</filename> appariranno negli " +"elenchi <guilabel >Schema modalità luce</guilabel > e <guilabel >Schema " "modalità scura</guilabel >.</emphasis>" #. type: Content of: <article><section><variablelist><varlistentry><term> @@ -9213,46 +12206,62 @@ msgstr "Elimina lo schema corrente" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Configuration.xml:2635 msgid "" -"Deletes the currently selected color scheme. This button is only enabled for user-defined schemes (not for built-in schemes like Default or VS Dark)." +"Deletes the currently selected color scheme. This button is only enabled for " +"user-defined schemes (not for built-in schemes like Default or VS Dark)." msgstr "" -"Elimina la combinazione di colori attualmente selezionata.Questo pulsante è abilitato solo per gli schemi definiti dall'utente (non per gli schemi " +"Elimina la combinazione di colori attualmente selezionata.Questo pulsante è " +"abilitato solo per gli schemi definiti dall'utente (non per gli schemi " "integrati come Predefinito o VS Scuro)." #. type: Content of: <article><section><para> #: English/Configuration.xml:2642 msgid "" -"Use these options to tailor the WinMerge interface to your preferences or to match your system theme. Custom color schemes make it easy to share or " -"reuse your preferred color settings." +"Use these options to tailor the WinMerge interface to your preferences or to " +"match your system theme. Custom color schemes make it easy to share or reuse " +"your preferred color settings." msgstr "" -"Utilizza queste opzioni per personalizzare l'interfaccia WinMerge in base alle tue preferenze o per adattarla al tema del tuo sistema.Le combinazioni " -"di colori personalizzate semplificano la condivisione o il riutilizzo delle impostazioni di colore preferite." +"Utilizza queste opzioni per personalizzare l'interfaccia WinMerge in base " +"alle tue preferenze o per adattarla al tema del tuo sistema.Le combinazioni " +"di colori personalizzate semplificano la condivisione o il riutilizzo delle " +"impostazioni di colore preferite." #. type: Content of: <article><section><title> #: English/Configuration.xml:2648 msgid "Colors > Differences page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Colori >Pagina delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Colori >Pagina delle differenze<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2656 msgid "" -"Use this page if you want to change any of the difference colors used in the File Compare window. You can set the background, deleted, and text color." +"Use this page if you want to change any of the difference colors used in the " +"File Compare window. You can set the background, deleted, and text color." msgstr "" -"Utilizza questa pagina se desideri modificare uno qualsiasi dei colori diversi utilizzati nella finestra Confronto file.È possibile impostare lo " +"Utilizza questa pagina se desideri modificare uno qualsiasi dei colori " +"diversi utilizzati nella finestra Confronto file.È possibile impostare lo " "sfondo, l'eliminazione e il colore del testo." #. type: Content of: <article><section><para> #: English/Configuration.xml:2662 English/Configuration.xml:2743 msgid "" -"To change a color, click in its box to open a standard Color chooser dialog. Choose one of the predefined colors or define your own custom color, " -"then click <guibutton>OK</guibutton> to load the new color in the box." +"To change a color, click in its box to open a standard Color chooser dialog. " +"Choose one of the predefined colors or define your own custom color, then " +"click <guibutton>OK</guibutton> to load the new color in the box." msgstr "" -"Per cambiare un colore, fare clic nella sua casella per aprire una finestra di dialogo standard per la scelta del colore.Scegli uno dei colori " -"predefiniti o definisci il tuo colore personalizzato, quindi fai clic su <guibutton >OK</guibutton > per caricare il nuovo colore nella casella." +"Per cambiare un colore, fare clic nella sua casella per aprire una finestra " +"di dialogo standard per la scelta del colore.Scegli uno dei colori " +"predefiniti o definisci il tuo colore personalizzato, quindi fai clic su " +"<guibutton >OK</guibutton > per caricare il nuovo colore nella casella." #. type: Content of: <article><section><para> -#: English/Configuration.xml:2669 English/Configuration.xml:2692 English/Configuration.xml:2750 -msgid "To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme." -msgstr "Per ripristinare i colori predefiniti di uno schema, scegli uno schema diverso e torna allo schema modificato." +#: English/Configuration.xml:2669 English/Configuration.xml:2692 +#: English/Configuration.xml:2750 +msgid "" +"To revert to the default colors of a scheme, choose a different scheme and " +"return to the modified scheme." +msgstr "" +"Per ripristinare i colori predefiniti di uno schema, scegli uno schema " +"diverso e torna allo schema modificato." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Configuration.xml:2679 @@ -9267,13 +12276,17 @@ msgstr "Colori >Pagina di sintassi<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2684 msgid "" -"By default, the WinMerge File Compare window marks the syntax of certain kinds of source code, as described in <xref " -"linkend=\"Configuration_syntaxhighlight\" />. This page lists the syntax elements that are recognized, and enables you to change their text color and " +"By default, the WinMerge File Compare window marks the syntax of certain " +"kinds of source code, as described in <xref " +"linkend=\"Configuration_syntaxhighlight\" />. This page lists the syntax " +"elements that are recognized, and enables you to change their text color and " "weight." msgstr "" -"Per impostazione predefinita, la finestra Confronto file WinMerge contrassegna la sintassi di determinati tipi di codice sorgente, come descritto in " -"<xref linkend=\"Configuration_syntaxhighlight\" />.Questa pagina elenca gli elementi di sintassi riconosciuti e consente di modificare il colore e lo " -"spessore del testo." +"Per impostazione predefinita, la finestra Confronto file WinMerge " +"contrassegna la sintassi di determinati tipi di codice sorgente, come " +"descritto in <xref linkend=\"Configuration_syntaxhighlight\" />.Questa " +"pagina elenca gli elementi di sintassi riconosciuti e consente di modificare " +"il colore e lo spessore del testo." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2700 @@ -9288,13 +12301,18 @@ msgstr "Colori >Pagina di testo<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2707 msgid "" -"Use this page to change the colors used for text. First, check the option, <guilabel>Use customized text colors</guilabel>. This activates the text " -"options. There is an option for three kinds of text: whitespace, regular text, and selected text. For each kind of text , you can choose a color for " +"Use this page to change the colors used for text. First, check the option, " +"<guilabel>Use customized text colors</guilabel>. This activates the text " +"options. There is an option for three kinds of text: whitespace, regular " +"text, and selected text. For each kind of text , you can choose a color for " "the background and the text." msgstr "" -"Utilizza questa pagina per modificare i colori utilizzati per il testo.Innanzitutto, seleziona l'opzione <guilabel >Utilizza colori testo " -"personalizzati</guilabel >.Questo attiva le opzioni di testo.È disponibile un'opzione per tre tipi di testo: spazio bianco, testo normale e testo " -"selezionato.Per ogni tipo di testo puoi scegliere un colore per lo sfondo e il testo." +"Utilizza questa pagina per modificare i colori utilizzati per il testo." +"Innanzitutto, seleziona l'opzione <guilabel >Utilizza colori testo " +"personalizzati</guilabel >.Questo attiva le opzioni di testo.È disponibile " +"un'opzione per tre tipi di testo: spazio bianco, testo normale e testo " +"selezionato.Per ogni tipo di testo puoi scegliere un colore per lo sfondo e " +"il testo." #. type: Content of: <article><section><title><indexterm><primary> #: English/Configuration.xml:2718 @@ -9313,16 +12331,21 @@ msgstr "cartella confronta i colori" #. type: Content of: <article><section><title> #: English/Configuration.xml:2729 -msgid "Colors > Folder Compare page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Colori >Pagina di confronto delle cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Colors > Folder Compare page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Colori >Pagina di confronto delle cartelle<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2737 msgid "" -"By default, the WinMerge Folder Compare window use background colors to show the status from a item (equal, different, not exists on all sides or " +"By default, the WinMerge Folder Compare window use background colors to show " +"the status from a item (equal, different, not exists on all sides or " "filtered)." msgstr "" -"Per impostazione predefinita, la finestra Confronto cartelle di WinMerge utilizza i colori di sfondo per mostrare lo stato di un elemento (uguale, " +"Per impostazione predefinita, la finestra Confronto cartelle di WinMerge " +"utilizza i colori di sfondo per mostrare lo stato di un elemento (uguale, " "diverso, non esiste su tutti i lati o filtrato)." #. type: Content of: <article><section><title><indexterm><secondary> @@ -9333,12 +12356,15 @@ msgstr "configurazione del supporto dopo l'installazione" #. type: Content of: <article><section><title> #: English/Configuration.xml:2757 msgid "Archive Support page<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Archivia la pagina di supporto<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Archivia la pagina di supporto<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:2765 msgid "This page contains options for configuring archive support using 7-Zip." -msgstr "Questa pagina contiene le opzioni per configurare il supporto dell'archivio utilizzando 7-Zip." +msgstr "" +"Questa pagina contiene le opzioni per configurare il supporto dell'archivio " +"utilizzando 7-Zip." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2772 English/Open_paths.xml:60 @@ -9353,22 +12379,31 @@ msgstr "abilitare e disabilitare l'integrazione" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2771 msgid "Enable archive file support<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Abilita il supporto dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Abilita il supporto dei file di archivio<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2779 -msgid "This option controls how WinMerge handles archive files (based on 7-Zip integration)." -msgstr "Questa opzione controlla il modo in cui WinMerge gestisce i file di archivio (basato sull'integrazione 7-Zip)." +msgid "" +"This option controls how WinMerge handles archive files (based on 7-Zip " +"integration)." +msgstr "" +"Questa opzione controlla il modo in cui WinMerge gestisce i file di archivio " +"(basato sull'integrazione 7-Zip)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2786 msgid "<option>Enabled</option> (default): WinMerge recognizes 7-Zip archives." -msgstr "<option>Abilitato</option> (impostazione predefinita): WinMerge riconosce gli archivi 7-Zip." +msgstr "" +"<option>Abilitato</option> (impostazione predefinita): WinMerge riconosce " +"gli archivi 7-Zip." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2793 msgid "<option>Disabled</option>: Turns off 7-Zip archive integration." -msgstr "<option>Disabilitato</option>: disattiva l'integrazione dell'archivio 7-Zip." +msgstr "" +"<option>Disabilitato</option>: disattiva l'integrazione dell'archivio 7-Zip." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2803 @@ -9377,34 +12412,46 @@ msgstr "rilevamento dei tipi di archivio" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2802 -msgid "Detect archive type from file signature<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Rileva il tipo di archivio dalla firma del file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Detect archive type from file signature<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Rileva il tipo di archivio dalla firma del file<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2810 msgid "" -"<option>Disabled</option> (default): WinMerge recognizes only archives whose file extension is known on your system (for example, in the registry or " +"<option>Disabled</option> (default): WinMerge recognizes only archives whose " +"file extension is known on your system (for example, in the registry or " "through a file association)." msgstr "" -"<option>Disabilitato</option> (impostazione predefinita): WinMerge riconosce solo gli archivi la cui estensione di file è nota sul tuo sistema (ad " +"<option>Disabilitato</option> (impostazione predefinita): WinMerge riconosce " +"solo gli archivi la cui estensione di file è nota sul tuo sistema (ad " "esempio, nel registro o tramite un'associazione di file)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2818 msgid "" -"<option>Enabled</option>: WinMerge can recognize archive files even if their file extension is not known. To recognize an archive, WinMerge searches " -"the beginning of the file for the archive signature bytes." +"<option>Enabled</option>: WinMerge can recognize archive files even if their " +"file extension is not known. To recognize an archive, WinMerge searches the " +"beginning of the file for the archive signature bytes." msgstr "" -"<option>Abilitato</option>: WinMerge può riconoscere i file di archivio anche se la loro estensione non è nota.Per riconoscere un archivio, WinMerge " +"<option>Abilitato</option>: WinMerge può riconoscere i file di archivio " +"anche se la loro estensione non è nota.Per riconoscere un archivio, WinMerge " "cerca all'inizio del file i byte della firma dell'archivio." #. type: Content of: <article><section><section><itemizedlist><listitem><para><tip><para> #: English/Configuration.xml:2823 -msgid "You can use this option to enable WinMerge to recognize Open Office files." -msgstr "È possibile utilizzare questa opzione per consentire a WinMerge di riconoscere i file Open Office." +msgid "" +"You can use this option to enable WinMerge to recognize Open Office files." +msgstr "" +"È possibile utilizzare questa opzione per consentire a WinMerge di " +"riconoscere i file Open Office." #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:2836 English/Open_paths.xml:367 English/Quick_start.xml:203 +#: English/Configuration.xml:2836 English/Open_paths.xml:367 +#: English/Quick_start.xml:203 msgid "project files" msgstr "file di progetto" @@ -9420,26 +12467,38 @@ msgstr "Pagina di sistema" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:2852 -msgid "Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Invia i file eliminati al Cestino<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Invia i file eliminati al Cestino<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2862 msgid "" -"<option>Enabled</option> (default): Files and folders that you delete in a Folder Compare window are moved to the Recycle Bin, if it is available." +"<option>Enabled</option> (default): Files and folders that you delete in a " +"Folder Compare window are moved to the Recycle Bin, if it is available." msgstr "" -"<option>Abilitato</option> (impostazione predefinita): i file e le cartelle eliminati in una finestra Confronto cartelle vengono spostati nel " -"Cestino, se disponibile." +"<option>Abilitato</option> (impostazione predefinita): i file e le cartelle " +"eliminati in una finestra Confronto cartelle vengono spostati nel Cestino, " +"se disponibile." #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> #: English/Configuration.xml:2869 -msgid "Remember: if the Recycle Bin on your system has been deactivated, this option does not work, and deleted files are lost!" -msgstr "Ricorda: se il Cestino del tuo sistema è stato disattivato, questa opzione non funziona e i file cancellati andranno persi!" +msgid "" +"Remember: if the Recycle Bin on your system has been deactivated, this " +"option does not work, and deleted files are lost!" +msgstr "" +"Ricorda: se il Cestino del tuo sistema è stato disattivato, questa opzione " +"non funziona e i file cancellati andranno persi!" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2879 -msgid "<option>Disabled</option>: Files and folders deleted in a directory compare actually deleted." -msgstr "<option>Disabilitato</option>: i file e le cartelle eliminati in una cartella vengono confrontati con quelli effettivamente eliminati." +msgid "" +"<option>Disabled</option>: Files and folders deleted in a directory compare " +"actually deleted." +msgstr "" +"<option>Disabilitato</option>: i file e le cartelle eliminati in una " +"cartella vengono confrontati con quelli effettivamente eliminati." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2889 @@ -9459,41 +12518,55 @@ msgstr "Editor esterno<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2896 msgid "" -"The WinMerge File Compare window provides common editing functions. If you prefer using your favorite, full-featured editor, you can configure " -"WinMerge to open an external editor from the Folder Compare context menu." +"The WinMerge File Compare window provides common editing functions. If you " +"prefer using your favorite, full-featured editor, you can configure WinMerge " +"to open an external editor from the Folder Compare context menu." msgstr "" -"La finestra Confronta file WinMerge fornisce funzioni di modifica comuni.Se preferisci utilizzare il tuo editor preferito e completo, puoi " -"configurare WinMerge per aprire un editor esterno dal menu contestuale Confronto cartelle." +"La finestra Confronta file WinMerge fornisce funzioni di modifica comuni.Se " +"preferisci utilizzare il tuo editor preferito e completo, puoi configurare " +"WinMerge per aprire un editor esterno dal menu contestuale Confronto " +"cartelle." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2903 msgid "" -"Installation configures Notepad as the default external editor, because it is found on all Windows systems. To configure a different external editor, " +"Installation configures Notepad as the default external editor, because it " +"is found on all Windows systems. To configure a different external editor, " "enter the full path to its executable file." msgstr "" -"L'installazione configura Blocco note come editor esterno predefinito, perché si trova su tutti i sistemi Windows.Per configurare un diverso editor " +"L'installazione configura Blocco note come editor esterno predefinito, " +"perché si trova su tutti i sistemi Windows.Per configurare un diverso editor " "esterno, inserisci il percorso completo del suo file eseguibile." #. type: Content of: <article><section><section><tip><para> #: English/Configuration.xml:2910 msgid "" -"Along with the path, you can include any command line parameters supported by the external tool, in this format: <command> <replaceable>path to " -"executable</replaceable> </command> <option>-option1</option> <option>-option2</option> <option> <replaceable>...</replaceable> </option>" +"Along with the path, you can include any command line parameters supported " +"by the external tool, in this format: <command> <replaceable>path to " +"executable</replaceable> </command> <option>-option1</option> <option>-" +"option2</option> <option> <replaceable>...</replaceable> </option>" msgstr "" -"Insieme al percorso, puoi includere qualsiasi parametro della riga di comando supportato dallo strumento esterno, in questo formato: <command> " -"<replaceable>percorso dell'eseguibile</replaceable> </command> <option>-option1</option> <option>-option2</option> <option> <replaceable>...</" +"Insieme al percorso, puoi includere qualsiasi parametro della riga di " +"comando supportato dallo strumento esterno, in questo formato: <command> " +"<replaceable>percorso dell'eseguibile</replaceable> </command> <option>-" +"option1</option> <option>-option2</option> <option> <replaceable>...</" "replaceable> </option>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2923 msgid "" -"To use the configured external editor, right-click a file in the Folder Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> " -"<guimenuitem>With External Editor</guimenuitem> </menuchoice> or <menuchoice> <guimenuitem>Open Right</guimenuitem> <guimenuitem>With External " -"Editor</guimenuitem> </menuchoice>." -msgstr "" -"Per usare l'editor esterno configurato, fai clic con il pulsante destro del mouse su un file nella finestra Confronta cartelle e scegli <menuchoice> " -"<guimenuitem >Apri a sinistra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </menuchoice > o <menuchoice> <guimenuitem >Apri a " -"destra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </menuchoice >." +"To use the configured external editor, right-click a file in the Folder " +"Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> " +"<guimenuitem>With External Editor</guimenuitem> </menuchoice> or " +"<menuchoice> <guimenuitem>Open Right</guimenuitem> <guimenuitem>With " +"External Editor</guimenuitem> </menuchoice>." +msgstr "" +"Per usare l'editor esterno configurato, fai clic con il pulsante destro del " +"mouse su un file nella finestra Confronta cartelle e scegli <menuchoice> " +"<guimenuitem >Apri a sinistra</guimenuitem > <guimenuitem >Con editor " +"esterno</guimenuitem > </menuchoice > o <menuchoice> <guimenuitem >Apri a " +"destra</guimenuitem > <guimenuitem >Con editor esterno</guimenuitem > </" +"menuchoice >." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Configuration.xml:2939 @@ -9512,21 +12585,31 @@ msgstr "Archivia i dati utente in<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2945 -msgid "Specifies where WinMerge stores user data such as filters, plugins, color schemes, and configuration logs." -msgstr "Specifica dove WinMerge archivia i dati utente come filtri, plug-in, combinazioni di colori e registri di configurazione." +msgid "" +"Specifies where WinMerge stores user data such as filters, plugins, color " +"schemes, and configuration logs." +msgstr "" +"Specifica dove WinMerge archivia i dati utente come filtri, plug-in, " +"combinazioni di colori e registri di configurazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2952 -msgid "<guilabel>AppData (Roaming) folder</guilabel> (default): Stores user data in the roaming application data folder of your user profile." +msgid "" +"<guilabel>AppData (Roaming) folder</guilabel> (default): Stores user data in " +"the roaming application data folder of your user profile." msgstr "" -"<guilabel >Cartella AppData (Roaming)</guilabel > (predefinita): memorizza i dati dell'utente nella cartella dei dati dell'applicazione in roaming " -"del tuo profilo utente." +"<guilabel >Cartella AppData (Roaming)</guilabel > (predefinita): memorizza i " +"dati dell'utente nella cartella dei dati dell'applicazione in roaming del " +"tuo profilo utente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:2959 -msgid "<guilabel>Documents folder</guilabel>: Stores user data in the <filename>WinMerge</filename> subfolder of your Documents directory." +msgid "" +"<guilabel>Documents folder</guilabel>: Stores user data in the " +"<filename>WinMerge</filename> subfolder of your Documents directory." msgstr "" -"<guilabel >Cartella Documenti</guilabel >: memorizza i dati dell'utente nella sottocartella <filename >WinMerge</filename > della cartella Documenti." +"<guilabel >Cartella Documenti</guilabel >: memorizza i dati dell'utente " +"nella sottocartella <filename >WinMerge</filename > della cartella Documenti." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2966 @@ -9551,11 +12634,15 @@ msgstr "Cartella filtro<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2980 msgid "" -"Use this field to specify your own private folder for file filters. By default this folder is your user profile directory (for example, " -"<filename>Documents</filename> on Windows 10). When you create a file filter, it is automatically added to this folder." +"Use this field to specify your own private folder for file filters. By " +"default this folder is your user profile directory (for example, " +"<filename>Documents</filename> on Windows 10). When you create a file " +"filter, it is automatically added to this folder." msgstr "" -"Utilizza questo campo per specificare la tua cartella privata per i filtri di file. Per impostazione predefinita, questa cartella è la cartella del " -"profilo utente (ad esempio, <filename>Documents</filename> su Windows 10). Quando crei un filtro file, questo viene automaticamente aggiunto a questa " +"Utilizza questo campo per specificare la tua cartella privata per i filtri " +"di file. Per impostazione predefinita, questa cartella è la cartella del " +"profilo utente (ad esempio, <filename>Documents</filename> su Windows 10). " +"Quando crei un filtro file, questo viene automaticamente aggiunto a questa " "cartella." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -9570,21 +12657,31 @@ msgstr "Cartella dei file temporanei<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:2995 -msgid "Specify the folder where WinMerge stores temporary files. Either one of these options is available:" -msgstr "Specificare la cartella in cui WinMerge memorizza i file temporanei.È disponibile una di queste opzioni:" +msgid "" +"Specify the folder where WinMerge stores temporary files. Either one of " +"these options is available:" +msgstr "" +"Specificare la cartella in cui WinMerge memorizza i file temporanei.È " +"disponibile una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3002 -msgid "<guilabel>System's temp folder</guilabel> (default): For example, this might be <filename>C:\\Windows\\Temp</filename> on your system." +msgid "" +"<guilabel>System's temp folder</guilabel> (default): For example, this might " +"be <filename>C:\\Windows\\Temp</filename> on your system." msgstr "" -"<guilabel >Cartella temporanea del sistema</guilabel> (predefinita): ad esempio, potrebbe essere <filename>C:\\Windows\\Temp</filename> sul tuo " +"<guilabel >Cartella temporanea del sistema</guilabel> (predefinita): ad " +"esempio, potrebbe essere <filename>C:\\Windows\\Temp</filename> sul tuo " "sistema." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3009 -msgid "<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and select a different folder where you have write access." +msgid "" +"<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and " +"select a different folder where you have write access." msgstr "" -"<guilabel >Cartella personalizzata</guilabel >: fai clic su <guibutton >Sfoglia</guibutton > e seleziona una cartella diversa dove hai accesso in " +"<guilabel >Cartella personalizzata</guilabel >: fai clic su <guibutton " +">Sfoglia</guibutton > e seleziona una cartella diversa dove hai accesso in " "scrittura." #. type: Content of: <article><section><title><indexterm><primary> @@ -9600,7 +12697,9 @@ msgstr "Pagina File di backup<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:3025 msgid "This page allows you to control how WinMerge creates backup files." -msgstr "Questa pagina consente di controllare il modo in cui WinMerge crea i file di backup." +msgstr "" +"Questa pagina consente di controllare il modo in cui WinMerge crea i file di " +"backup." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3030 @@ -9609,21 +12708,32 @@ msgstr "Crea file di backup per" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3033 -msgid "Specify when WinMerge should create backup files. You can enable or disable each of these options independently:" -msgstr "Specificare quando WinMerge deve creare i file di backup.Puoi abilitare o disabilitare ciascuna di queste opzioni in modo indipendente:" +msgid "" +"Specify when WinMerge should create backup files. You can enable or disable " +"each of these options independently:" +msgstr "" +"Specificare quando WinMerge deve creare i file di backup.Puoi abilitare o " +"disabilitare ciascuna di queste opzioni in modo indipendente:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3040 -msgid "<guilabel>Folder compare</guilabel> (disabled by default): Backup files are create whenever files are overwritten (copied)." +msgid "" +"<guilabel>Folder compare</guilabel> (disabled by default): Backup files are " +"create whenever files are overwritten (copied)." msgstr "" -"<guilabel >Confronto cartelle</guilabel > (disabilitato per impostazione predefinita): i file di backup vengono creati ogni volta che i file vengono " +"<guilabel >Confronto cartelle</guilabel > (disabilitato per impostazione " +"predefinita): i file di backup vengono creati ogni volta che i file vengono " "sovrascritti (copiati)." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3048 -msgid "<guilabel>File compare</guilabel> (enabled by default): Backup files are created whenever files are saved." +msgid "" +"<guilabel>File compare</guilabel> (enabled by default): Backup files are " +"created whenever files are saved." msgstr "" -"<guilabel >Confronto file</guilabel > (abilitato per impostazione predefinita): i file di backup vengono creati ogni volta che i file vengono salvati." +"<guilabel >Confronto file</guilabel > (abilitato per impostazione " +"predefinita): i file di backup vengono creati ogni volta che i file vengono " +"salvati." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3056 @@ -9632,27 +12742,39 @@ msgstr "Crea file di backup in" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3059 -msgid "Specify where backup files are created. Only one of these options can be enabled:" -msgstr "Specificare dove vengono creati i file di backup.È possibile abilitare solo una di queste opzioni:" +msgid "" +"Specify where backup files are created. Only one of these options can be " +"enabled:" +msgstr "" +"Specificare dove vengono creati i file di backup.È possibile abilitare solo " +"una di queste opzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3066 msgid "" -"<guilabel>Original file's folder</guilabel> (enabled by default): Backup files are created in the same folder as the source file. This is usually a " -"good choice. The down side is that cleaning up backup files in big folders can take a lot of work." +"<guilabel>Original file's folder</guilabel> (enabled by default): Backup " +"files are created in the same folder as the source file. This is usually a " +"good choice. The down side is that cleaning up backup files in big folders " +"can take a lot of work." msgstr "" -"<guilabel >Cartella del file originale</guilabel > (abilitata per impostazione predefinita): i file di backup vengono creati nella stessa cartella " -"del file sorgente.Di solito questa è una buona scelta.Lo svantaggio è che la pulizia dei file di backup in cartelle di grandi dimensioni può " +"<guilabel >Cartella del file originale</guilabel > (abilitata per " +"impostazione predefinita): i file di backup vengono creati nella stessa " +"cartella del file sorgente.Di solito questa è una buona scelta.Lo svantaggio " +"è che la pulizia dei file di backup in cartelle di grandi dimensioni può " "richiedere molto lavoro." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3075 msgid "" -"<guilabel>Global backup folder</guilabel> (disabled by default): All backup files are created in one global folder. This makes them easy to clean up. " -"But, if there are multiple source files with same file name, then the most recent backup file overwrites the previous one of the same name." +"<guilabel>Global backup folder</guilabel> (disabled by default): All backup " +"files are created in one global folder. This makes them easy to clean up. " +"But, if there are multiple source files with same file name, then the most " +"recent backup file overwrites the previous one of the same name." msgstr "" -"<guilabel >Cartella di backup globale</guilabel > (disabilitata per impostazione predefinita): tutti i file di backup vengono creati in una cartella " -"globale.Questo li rende facili da pulire.Tuttavia, se sono presenti più file di origine con lo stesso nome file, il file di backup più recente " +"<guilabel >Cartella di backup globale</guilabel > (disabilitata per " +"impostazione predefinita): tutti i file di backup vengono creati in una " +"cartella globale.Questo li rende facili da pulire.Tuttavia, se sono presenti " +"più file di origine con lo stesso nome file, il file di backup più recente " "sovrascrive quello precedente con lo stesso nome." #. type: Content of: <article><section><section><title> @@ -9662,36 +12784,46 @@ msgstr "Nome del file di backup" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3089 -msgid "When WinMerge creates a backup file, it appends an extension to the source file name. You can choose either or both of these extension schemes:" +msgid "" +"When WinMerge creates a backup file, it appends an extension to the source " +"file name. You can choose either or both of these extension schemes:" msgstr "" -"Quando WinMerge crea un file di backup, aggiunge un'estensione al nome del file di origine.Puoi scegliere uno o entrambi questi schemi di estensione:" +"Quando WinMerge crea un file di backup, aggiunge un'estensione al nome del " +"file di origine.Puoi scegliere uno o entrambi questi schemi di estensione:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3097 msgid "" -"<guilabel>Append .bak extension</guilabel> (enabled by default): For example, the <filename>file.txt</filename> is backed up to " -"<filename>file.txt.bak</filename>." +"<guilabel>Append .bak extension</guilabel> (enabled by default): For " +"example, the <filename>file.txt</filename> is backed up to <filename>file." +"txt.bak</filename>." msgstr "" -"<guilabel >Aggiungi estensione .bak</guilabel> (abilitato per impostazione predefinita): ad esempio, viene eseguito il backup di <filename>file.txt</" +"<guilabel >Aggiungi estensione .bak</guilabel> (abilitato per impostazione " +"predefinita): ad esempio, viene eseguito il backup di <filename>file.txt</" "filename> in <filename>file.txt.bak</filename>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3105 msgid "" -"<guilabel>Append timestamp</guilabel> (enabled by default): Timestamps are almost always unique, so this option usually avoids duplicating backup " -"file names when the source files have the same names." +"<guilabel>Append timestamp</guilabel> (enabled by default): Timestamps are " +"almost always unique, so this option usually avoids duplicating backup file " +"names when the source files have the same names." msgstr "" -"<guilabel >Aggiungi timestamp</guilabel > (abilitato per impostazione predefinita): i timestamp sono quasi sempre univoci, quindi questa opzione " -"solitamente evita di duplicare i nomi dei file di backup quando i file di origine hanno gli stessi nomi." +"<guilabel >Aggiungi timestamp</guilabel > (abilitato per impostazione " +"predefinita): i timestamp sono quasi sempre univoci, quindi questa opzione " +"solitamente evita di duplicare i nomi dei file di backup quando i file di " +"origine hanno gli stessi nomi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3112 msgid "" -"Also, storing a copy of a file each time you save it provides a way to track changes to the file. However, you should consider that this option can " +"Also, storing a copy of a file each time you save it provides a way to track " +"changes to the file. However, you should consider that this option can " "create a lot of files." msgstr "" -"Inoltre, la memorizzazione di una copia di un file ogni volta che lo salvi fornisce un modo per tenere traccia delle modifiche apportate al " -"file.Tuttavia, dovresti considerare che questa opzione può creare molti file." +"Inoltre, la memorizzazione di una copia di un file ogni volta che lo salvi " +"fornisce un modo per tenere traccia delle modifiche apportate al file." +"Tuttavia, dovresti considerare che questa opzione può creare molti file." #. type: Content of: <article><section><title> #: English/Configuration.xml:3123 @@ -9701,38 +12833,48 @@ msgstr "Pagina della tabella codici<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Configuration.xml:3131 msgid "" -"WinMerge detects handles file encoding transparently, and in most cases you should not need to change the default settings.This page allows you to " +"WinMerge detects handles file encoding transparently, and in most cases you " +"should not need to change the default settings.This page allows you to " "specify the codepages of certain file formats, should you need to." msgstr "" -"WinMerge rileva la codifica dei file in modo trasparente e nella maggior parte dei casi non dovrebbe essere necessario modificare le impostazioni " -"predefinite. Questa pagina consente di specificare le codepage di determinati formati di file, se necessario." +"WinMerge rileva la codifica dei file in modo trasparente e nella maggior " +"parte dei casi non dovrebbe essere necessario modificare le impostazioni " +"predefinite. Questa pagina consente di specificare le codepage di " +"determinati formati di file, se necessario." #. type: Content of: <article><section><note><para> #: English/Configuration.xml:3138 msgid "" -"A full explanation of text encoding and Windows codepages is beyond the scope of WinMerge documentation. Fortunately, there is lots of information " +"A full explanation of text encoding and Windows codepages is beyond the " +"scope of WinMerge documentation. Fortunately, there is lots of information " "about them on the Internet. For example, here are some places to start:" msgstr "" -"Una spiegazione completa della codifica del testo e delle codepage di Windows va oltre lo scopo della documentazione di WinMerge.Fortunatamente, su " -"Internet si trovano molte informazioni su di loro.Ad esempio, ecco alcuni punti da cui iniziare:" +"Una spiegazione completa della codifica del testo e delle codepage di " +"Windows va oltre lo scopo della documentazione di WinMerge.Fortunatamente, " +"su Internet si trovano molte informazioni su di loro.Ad esempio, ecco alcuni " +"punti da cui iniziare:" #. type: Content of: <article><section><note><itemizedlist><listitem><para> #: English/Configuration.xml:3147 msgid "" -"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" +"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code " +"pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" "Character_encoding\"> Character encoding </ulink>" msgstr "" -"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: pagine di codici </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" +"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: pagine " +"di codici </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" "Character_encoding\"> Codifica dei caratteri </ulink>" #. type: Content of: <article><section><note><itemizedlist><listitem><para> #: English/Configuration.xml:3160 msgid "" -"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages " +"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-" +"ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages " "Supported by Windows </ulink>" msgstr "" -"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: pagine " -"codici supportate da Windows </ulink>" +"<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-" +"ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: pagine codici " +"supportate da Windows </ulink>" #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3170 @@ -9741,103 +12883,142 @@ msgstr "Tabella codici predefinita" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3173 -msgid "Choose one of these radio buttons to set the default codepage that WinMerge uses when handling ANSI files:" -msgstr "Scegli uno di questi pulsanti di opzione per impostare la codepage predefinita utilizzata da WinMerge durante la gestione dei file ANSI:" +msgid "" +"Choose one of these radio buttons to set the default codepage that WinMerge " +"uses when handling ANSI files:" +msgstr "" +"Scegli uno di questi pulsanti di opzione per impostare la codepage " +"predefinita utilizzata da WinMerge durante la gestione dei file ANSI:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3180 msgid "" -"<guilabel>System codepage</guilabel> (default):The codepage used by your Windows system. This default is usually the best choice. However if you " -"know that you are comparing files that do not use the system codepage, consider one of the other options." +"<guilabel>System codepage</guilabel> (default):The codepage used by your " +"Windows system. This default is usually the best choice. However if you " +"know that you are comparing files that do not use the system codepage, " +"consider one of the other options." msgstr "" -"<guilabel >Codice di sistema</guilabel> (predefinito): il codice utilizzato dal tuo sistema Windows.Questa impostazione predefinita è solitamente la " -"scelta migliore.Tuttavia, se sai che stai confrontando file che non utilizzano la codepage di sistema, considera una delle altre opzioni." +"<guilabel >Codice di sistema</guilabel> (predefinito): il codice utilizzato " +"dal tuo sistema Windows.Questa impostazione predefinita è solitamente la " +"scelta migliore.Tuttavia, se sai che stai confrontando file che non " +"utilizzano la codepage di sistema, considera una delle altre opzioni." #. This is just a guess - don't find any info on this option. #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3189 -msgid "<guilabel>According to WinMerge User Interface</guilabel>: The encoding used by your installation of WinMerge." -msgstr "<guilabel >Secondo l'interfaccia utente di WinMerge</guilabel >: la codifica utilizzata dalla tua installazione di WinMerge." +msgid "" +"<guilabel>According to WinMerge User Interface</guilabel>: The encoding used " +"by your installation of WinMerge." +msgstr "" +"<guilabel >Secondo l'interfaccia utente di WinMerge</guilabel >: la codifica " +"utilizzata dalla tua installazione di WinMerge." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3196 msgid "" -"<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</" +"<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. " +"For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</" "userinput>." msgstr "" -"<guilabel >Codice personalizzato</guilabel >: inserisci esplicitamente il numero della tabella codici.Ad esempio, <userinput>UTF-8</userinput> o " +"<guilabel >Codice personalizzato</guilabel >: inserisci esplicitamente il " +"numero della tabella codici.Ad esempio, <userinput>UTF-8</userinput> o " "<userinput>ISO-8851-1</userinput>." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3205 msgid "Detect codepage info for these files: .html, .rc, .xml" -msgstr "Rileva informazioni sulla tabella codici per questi file: .html, .rc, .xml" +msgstr "" +"Rileva informazioni sulla tabella codici per questi file: .html, .rc, .xml" -#. What option? The one in the Options page? If it should always be unchecked, +#. What option? The one in the Options page? If it should always be unchecked, #. why is the option there? Also, should we mention WinMergeU.exe when we mention WinMerge.exe, #. or is this understood? #. type: Content of: <article><section><section><important><para> #: English/Configuration.xml:3209 msgid "" -"Uncheck this option in <filename>WinMerge.exe</filename>. Characters conversions can result in lossy conversions and the risk is very high. " -"<filename>WinMerge.exe</filename> can display files only with your current codepage." +"Uncheck this option in <filename>WinMerge.exe</filename>. Characters " +"conversions can result in lossy conversions and the risk is very high. " +"<filename>WinMerge.exe</filename> can display files only with your current " +"codepage." msgstr "" -"Deseleziona questa opzione in <filename>WinMerge.exe</filename>.Le conversioni dei caratteri possono comportare conversioni con perdita e il rischio " -"è molto alto.<filename>WinMerge.exe</filename> può visualizzare solo file con la codepage corrente." +"Deseleziona questa opzione in <filename>WinMerge.exe</filename>.Le " +"conversioni dei caratteri possono comportare conversioni con perdita e il " +"rischio è molto alto.<filename>WinMerge.exe</filename> può visualizzare solo " +"file con la codepage corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3221 msgid "" -"<option>Disabled</option> (default): WinMerge does not read codepage information from the source files. It uses the default codepage setting instead." +"<option>Disabled</option> (default): WinMerge does not read codepage " +"information from the source files. It uses the default codepage setting " +"instead." msgstr "" -"<option>Disabilitato</option> (predefinito): WinMerge non legge le informazioni sulla tabella codici dai file sorgente.Utilizza invece l'impostazione " -"della tabella codici predefinita." +"<option>Disabilitato</option> (predefinito): WinMerge non legge le " +"informazioni sulla tabella codici dai file sorgente.Utilizza invece " +"l'impostazione della tabella codici predefinita." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3229 msgid "" -"<option>Enabled</option>: WinMerge detects the codepage for these extensions: <filename class=\"extension\">html</filename>, <filename " -"class=\"extension\">rc</filename> (resource files for VC++) and <filename class=\"extension\">xml</filename>. The detected codepage overrides the " +"<option>Enabled</option>: WinMerge detects the codepage for these " +"extensions: <filename class=\"extension\">html</filename>, <filename " +"class=\"extension\">rc</filename> (resource files for VC++) and <filename " +"class=\"extension\">xml</filename>. The detected codepage overrides the " "setting for the default codepage option." msgstr "" -"<option>Abilitato</option>: WinMerge rileva la codepage per queste estensioni: <filename class=\"extension\">html</filename>, <filename " -"class=\"extension\">rc</filename> (file di risorse per VC++) e <filename class=\"extension\">xml</filename>.La codepage rilevata sovrascrive " +"<option>Abilitato</option>: WinMerge rileva la codepage per queste " +"estensioni: <filename class=\"extension\">html</filename>, <filename " +"class=\"extension\">rc</filename> (file di risorse per VC++) e <filename " +"class=\"extension\">xml</filename>.La codepage rilevata sovrascrive " "l'impostazione dell'opzione codepage predefinita." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3237 -msgid "This option is of interest when your documents use a codepage that is different from the codepage of your Windows configuration." +msgid "" +"This option is of interest when your documents use a codepage that is " +"different from the codepage of your Windows configuration." msgstr "" -"Questa opzione è interessante quando i tuoi documenti utilizzano una tabella codici diversa dalla tabella codici della configurazione di Windows." +"Questa opzione è interessante quando i tuoi documenti utilizzano una tabella " +"codici diversa dalla tabella codici della configurazione di Windows." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3243 msgid "" -"For example, you might merge two Slovak or two Japanese files in an English environment. With this option enabled (and with the required fonts), your " -"Slovak, or Japanese, the files are displayed using Slovak, or Japanese, characters." +"For example, you might merge two Slovak or two Japanese files in an English " +"environment. With this option enabled (and with the required fonts), your " +"Slovak, or Japanese, the files are displayed using Slovak, or Japanese, " +"characters." msgstr "" -"Ad esempio, potresti unire due file slovacchi o due giapponesi in un ambiente inglese.Con questa opzione abilitata (e con i caratteri richiesti), il " -"tuo slovacco o giapponese, i file vengono visualizzati utilizzando i caratteri slovacchi o giapponesi." +"Ad esempio, potresti unire due file slovacchi o due giapponesi in un " +"ambiente inglese.Con questa opzione abilitata (e con i caratteri richiesti), " +"il tuo slovacco o giapponese, i file vengono visualizzati utilizzando i " +"caratteri slovacchi o giapponesi." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Configuration.xml:3250 msgid "" -"WinMerge also detects a codepage difference between the left/right files. To avoid lossy conversions when you merge, copy, or paste, we suggest that " -"you ignore the codepage information." +"WinMerge also detects a codepage difference between the left/right files. To " +"avoid lossy conversions when you merge, copy, or paste, we suggest that you " +"ignore the codepage information." msgstr "" -"WinMerge rileva anche una differenza di codepage tra i file sinistro/destro.Per evitare conversioni con perdita di dati quando unisci, copi o " -"incolli, ti suggeriamo di ignorare le informazioni sulla tabella codici." +"WinMerge rileva anche una differenza di codepage tra i file sinistro/destro." +"Per evitare conversioni con perdita di dati quando unisci, copi o incolli, " +"ti suggeriamo di ignorare le informazioni sulla tabella codici." #. type: Content of: <article><section><section><itemizedlist><listitem><caution><para> #: English/Configuration.xml:3257 msgid "" -"When you copy or paste text to an external application, the external application must use the same codepage as WinMerge does. Refer to the " -"documentation for your external editor. For copying to WinMerge, Internet Explorer offers codepage selection. If your external editor does not " -"support custom codepages, disable this option." +"When you copy or paste text to an external application, the external " +"application must use the same codepage as WinMerge does. Refer to the " +"documentation for your external editor. For copying to WinMerge, Internet " +"Explorer offers codepage selection. If your external editor does not support " +"custom codepages, disable this option." msgstr "" -"Quando copi o incolli testo su un'applicazione esterna, l'applicazione esterna deve utilizzare la stessa tabella codici di WinMerge.Fare riferimento " -"alla documentazione dell'editor esterno.Per copiare su WinMerge, Internet Explorer offre la selezione della tabella codici.Se il tuo editor esterno " -"non supporta le codepage personalizzate, disabilita questa opzione." +"Quando copi o incolli testo su un'applicazione esterna, l'applicazione " +"esterna deve utilizzare la stessa tabella codici di WinMerge.Fare " +"riferimento alla documentazione dell'editor esterno.Per copiare su WinMerge, " +"Internet Explorer offre la selezione della tabella codici.Se il tuo editor " +"esterno non supporta le codepage personalizzate, disabilita questa opzione." #. type: Content of: <article><section><section><title> #: English/Configuration.xml:3270 @@ -9850,13 +13031,15 @@ msgid "Shell Integration page" msgstr "Pagina Integrazione shell" #. type: Content of: <article><title><indexterm><primary> -#: English/Configuration.xml:3283 English/Faq.xml:95 English/Install.xml:174 English/Install.xml:189 English/Install.xml:352 +#: English/Configuration.xml:3283 English/Faq.xml:95 English/Install.xml:174 +#: English/Install.xml:189 English/Install.xml:352 #: English/Version_control.xml:4 msgid "integration" msgstr "integrazione" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:3285 English/Install.xml:191 English/Install.xml:354 +#: English/Configuration.xml:3285 English/Install.xml:191 +#: English/Install.xml:354 msgid "with Windows shell" msgstr "con la shell di Windows" @@ -9868,12 +13051,16 @@ msgstr "Esplora<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3290 msgid "" -"The <option>Add to context menu</option> option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected " -"there. It is enabled or disabled by default during WinMerge installation. If enabled, you can also enable one or both of these options:" +"The <option>Add to context menu</option> option enables you to launch " +"WinMerge directly from Windows Explorer, comparing items that you have " +"selected there. It is enabled or disabled by default during WinMerge " +"installation. If enabled, you can also enable one or both of these options:" msgstr "" -"L'opzione <option>Aggiungi al menu contestuale</option> ti consente di avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi " -"che hai selezionato lì.È abilitato o disabilitato per impostazione predefinita durante l'installazione di WinMerge.Se abilitato, puoi anche abilitare " -"una o entrambe queste opzioni:" +"L'opzione <option>Aggiungi al menu contestuale</option> ti consente di " +"avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi " +"che hai selezionato lì.È abilitato o disabilitato per impostazione " +"predefinita durante l'installazione di WinMerge.Se abilitato, puoi anche " +"abilitare una o entrambe queste opzioni:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Configuration.xml:3299 @@ -9882,18 +13069,23 @@ msgstr "Abilita il menu avanzato" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3305 -msgid "<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</guimenuitem> shortcut is included in the Windows Explorer context menu." +msgid "" +"<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</" +"guimenuitem> shortcut is included in the Windows Explorer context menu." msgstr "" -"<option >Disabilitato</option> (predefinito): solo la scorciatoia <guimenuitem >WinMerge</guimenuitem > è inclusa nel menu contestuale di Esplora " -"risorse." +"<option >Disabilitato</option> (predefinito): solo la scorciatoia " +"<guimenuitem >WinMerge</guimenuitem > è inclusa nel menu contestuale di " +"Esplora risorse." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3313 msgid "" -"<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> shortcut in the Explorer context menu with <guimenuitem>Compare</" +"<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> " +"shortcut in the Explorer context menu with <guimenuitem>Compare</" "guimenuitem> shortcuts." msgstr "" -"<option >Abilitato</option >: sostituisce la scorciatoia <guimenuitem >WinMerge</guimenuitem > nel menu contestuale di Explorer con le scorciatoie " +"<option >Abilitato</option >: sostituisce la scorciatoia <guimenuitem " +">WinMerge</guimenuitem > nel menu contestuale di Explorer con le scorciatoie " "<guimenuitem >Confronta</guimenuitem >." #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -9903,19 +13095,30 @@ msgstr "Abilita il menu Confronta come" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3332 -msgid "<option>Disabled</option> (default): Removes <guimenuitem>Compare As</guimenuitem> menu item from Explorer context menu." +msgid "" +"<option>Disabled</option> (default): Removes <guimenuitem>Compare As</" +"guimenuitem> menu item from Explorer context menu." msgstr "" -"<option >Disabilitato</option> (predefinito): rimuove la voce di menu <guimenuitem >Confronta come</guimenuitem > dal menu contestuale di Explorer." +"<option >Disabilitato</option> (predefinito): rimuove la voce di menu " +"<guimenuitem >Confronta come</guimenuitem > dal menu contestuale di Explorer." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Configuration.xml:3340 -msgid "<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu item to Explorer context menu." -msgstr "<option >Abilitato</option >: aggiunge la voce di menu <guimenuitem >Confronta come</guimenuitem > al menu contestuale di Explorer." +msgid "" +"<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu " +"item to Explorer context menu." +msgstr "" +"<option >Abilitato</option >: aggiunge la voce di menu <guimenuitem " +">Confronta come</guimenuitem > al menu contestuale di Explorer." #. type: Content of: <article><section><section><para> #: English/Configuration.xml:3351 -msgid "<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge and Compare shortcuts." -msgstr "<xref linkend=\"OpenPaths_shell-integ\" /> descrive come utilizzare le scorciatoie WinMerge e Confronta." +msgid "" +"<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge " +"and Compare shortcuts." +msgstr "" +"<xref linkend=\"OpenPaths_shell-integ\" /> descrive come utilizzare le " +"scorciatoie WinMerge e Confronta." #. type: Content of: <article><title> #: English/Faq.xml:3 @@ -9955,58 +13158,83 @@ msgstr "ANSI" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:14 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>Beginning with Version " -"2.14, WinMerge ended support for older 32-bit Windows systems, including Windows 9x, ME, and NT4. In addition, WinMerge version 2.16 does not " +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>Beginning with Version " +"2.14, WinMerge ended support for older 32-bit Windows systems, including " +"Windows 9x, ME, and NT4. In addition, WinMerge version 2.16 does not " "support Windows 2000." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>A partire dalla " -"versione 2.14, WinMerge ha interrotto il supporto per i vecchi sistemi Windows a 32 bit, inclusi Windows 9x, ME e NT4.Inoltre, WinMerge versione 2.16 " -"non supporta Windows 2000." +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>A partire dalla versione " +"2.14, WinMerge ha interrotto il supporto per i vecchi sistemi Windows a 32 " +"bit, inclusi Windows 9x, ME e NT4.Inoltre, WinMerge versione 2.16 non " +"supporta Windows 2000." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:25 msgid "" -"Previously, WinMerge provided an ANSI (8-bit) executable, <filename>WinMerge.exe</filename>, that was designed around the old Windows codepages. " -"<filename>WinMerge.exe</filename> internally stored only the ANSI characters supported by the Windows codepage. This executable had severe " -"limitations for working with Unicode: if you opened a Unicode file, the characters were converted to the Windows ANSI codepage. Because there are " -"over 100,000 Unicode characters, and only 256 can be represented in the ANSI character set, data loss could occur. Conversion might be approximate " -"(for example, accents are lost) or impossible: characters were replaced by question marks ( <literal>?</literal> )." -msgstr "" -"In precedenza, WinMerge forniva un eseguibile ANSI (8 bit), <filename>WinMerge.exe</filename>, progettato attorno alle vecchie codepage di Windows." -"<filename>WinMerge.exe</filename> memorizzava internamente solo i caratteri ANSI supportati dalla codepage di Windows.Questo eseguibile presentava " -"gravi limitazioni per lavorare con Unicode: se si apriva un file Unicode, i caratteri venivano convertiti nella codepage ANSI di Windows.Poiché sono " -"presenti oltre 100.000 caratteri Unicode e solo 256 possono essere rappresentati nel set di caratteri ANSI, potrebbe verificarsi una perdita di " -"dati.La conversione potrebbe essere approssimativa (ad esempio, gli accenti vengono persi) o impossibile: i caratteri sono stati sostituiti da punti " -"interrogativi ( <literal>?</literal> )." +"Previously, WinMerge provided an ANSI (8-bit) executable, <filename>WinMerge." +"exe</filename>, that was designed around the old Windows codepages. " +"<filename>WinMerge.exe</filename> internally stored only the ANSI characters " +"supported by the Windows codepage. This executable had severe limitations " +"for working with Unicode: if you opened a Unicode file, the characters were " +"converted to the Windows ANSI codepage. Because there are over 100,000 " +"Unicode characters, and only 256 can be represented in the ANSI character " +"set, data loss could occur. Conversion might be approximate (for example, " +"accents are lost) or impossible: characters were replaced by question marks " +"( <literal>?</literal> )." +msgstr "" +"In precedenza, WinMerge forniva un eseguibile ANSI (8 bit), " +"<filename>WinMerge.exe</filename>, progettato attorno alle vecchie codepage " +"di Windows.<filename>WinMerge.exe</filename> memorizzava internamente solo i " +"caratteri ANSI supportati dalla codepage di Windows.Questo eseguibile " +"presentava gravi limitazioni per lavorare con Unicode: se si apriva un file " +"Unicode, i caratteri venivano convertiti nella codepage ANSI di Windows." +"Poiché sono presenti oltre 100.000 caratteri Unicode e solo 256 possono " +"essere rappresentati nel set di caratteri ANSI, potrebbe verificarsi una " +"perdita di dati.La conversione potrebbe essere approssimativa (ad esempio, " +"gli accenti vengono persi) o impossibile: i caratteri sono stati sostituiti " +"da punti interrogativi ( <literal>?</literal> )." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:36 msgid "" -"<filename>WinMerge.exe</filename> also could not open files with names outside the current ANSI codepage. For example, on an English system, " +"<filename>WinMerge.exe</filename> also could not open files with names " +"outside the current ANSI codepage. For example, on an English system, " "<filename>WinMerge.exe</filename> could not open a file with a Hebrew name." msgstr "" -"Inoltre, <filename>WinMerge.exe</filename> non è in grado di aprire file con nomi esterni alla codepage ANSI corrente.Ad esempio, su un sistema " -"inglese, <filename>WinMerge.exe</filename> non è riuscito ad aprire un file con un nome ebraico." +"Inoltre, <filename>WinMerge.exe</filename> non è in grado di aprire file con " +"nomi esterni alla codepage ANSI corrente.Ad esempio, su un sistema inglese, " +"<filename>WinMerge.exe</filename> non è riuscito ad aprire un file con un " +"nome ebraico." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:40 msgid "" -"WinMerge developed the Unicode-enabled <filename>WinMergeU.exe</filename> executable to work with newer, Unicode-based Windows systems. " -"<filename>WinMergeU.exe</filename> has none of the limitations of the ANSI executable." +"WinMerge developed the Unicode-enabled <filename>WinMergeU.exe</filename> " +"executable to work with newer, Unicode-based Windows systems. " +"<filename>WinMergeU.exe</filename> has none of the limitations of the ANSI " +"executable." msgstr "" -"WinMerge ha sviluppato l'eseguibile <filename>WinMergeU.exe</filename> abilitato per Unicode per funzionare con i nuovi sistemi Windows basati su " -"Unicode.<filename>WinMergeU.exe</filename> non presenta nessuna delle limitazioni dell'eseguibile ANSI." +"WinMerge ha sviluppato l'eseguibile <filename>WinMergeU.exe</filename> " +"abilitato per Unicode per funzionare con i nuovi sistemi Windows basati su " +"Unicode.<filename>WinMergeU.exe</filename> non presenta nessuna delle " +"limitazioni dell'eseguibile ANSI." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:44 msgid "" -"<filename>WinMergeU.exe</filename> has been installed by default for some time, and since few ANSI-based Windows systems remain, the value of " -"maintaining <filename>WinMerge.exe</filename> is minimal. As of Version 2.14, WinMerge no longer includes <filename>WinMerge.exe</filename> in the " +"<filename>WinMergeU.exe</filename> has been installed by default for some " +"time, and since few ANSI-based Windows systems remain, the value of " +"maintaining <filename>WinMerge.exe</filename> is minimal. As of Version " +"2.14, WinMerge no longer includes <filename>WinMerge.exe</filename> in the " "installer." msgstr "" -"<filename>WinMergeU.exe</filename> è stato installato per impostazione predefinita da qualche tempo e poiché rimangono pochi sistemi Windows basati " -"su ANSI, l'utilità di mantenere <filename>WinMerge.exe</filename> è minima.A partire dalla versione 2.14, WinMerge non include più " -"<filename>WinMerge.exe</filename> nel programma di installazione." +"<filename>WinMergeU.exe</filename> è stato installato per impostazione " +"predefinita da qualche tempo e poiché rimangono pochi sistemi Windows basati " +"su ANSI, l'utilità di mantenere <filename>WinMerge.exe</filename> è minima.A " +"partire dalla versione 2.14, WinMerge non include più <filename>WinMerge." +"exe</filename> nel programma di installazione." #. type: Content of: <article><para><indexterm><secondary> #: English/Faq.xml:58 English/Open_paths.xml:11 English/Open_paths.xml:15 @@ -10015,37 +13243,51 @@ msgstr "selezionando nella finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:54 -msgid "I want to compare folders, but I cannot select a folder in the Browse dialog.<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"I want to compare folders, but I cannot select a folder in the Browse dialog." +"<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Desidero confrontare le cartelle, ma non riesco a selezionare una cartella nella finestra di dialogo Sfoglia.<placeholder type=\"indexterm\" id=\"0\"/" -">" +"Desidero confrontare le cartelle, ma non riesco a selezionare una cartella " +"nella finestra di dialogo Sfoglia.<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:63 msgid "" -"Browse in the folder contents to the folder you want to compare. Do not select any of the files or subfolders, just click <guibutton>Open</" -"guibutton> when <literal>Folder Selection</literal> is displayed in the <guilabel>File name</guilabel> field. If you already selected a files or " -"subfolders, just type a random string in the <guilabel>File name</guilabel> field and click <guibutton>Open</guibutton>. If the file name you enter " -"is not found, WinMerge opens the folder." -msgstr "" -"Sfoglia il contenuto della cartella fino alla cartella che desideri confrontare.Non selezionare nessun file o sottocartella, fai semplicemente clic " -"su <guibutton >Apri</guibutton > quando <literal >Selezione cartella</literal > è visualizzato nel campo <guilabel >Nome file</guilabel >.Se hai già " -"selezionato un file o una sottocartella, digita semplicemente una stringa casuale nel campo <guilabel >Nome file</guilabel > e fai clic su <guibutton " -">Apri</guibutton >.Se il nome file immesso non viene trovato, WinMerge apre la cartella." +"Browse in the folder contents to the folder you want to compare. Do not " +"select any of the files or subfolders, just click <guibutton>Open</" +"guibutton> when <literal>Folder Selection</literal> is displayed in the " +"<guilabel>File name</guilabel> field. If you already selected a files or " +"subfolders, just type a random string in the <guilabel>File name</guilabel> " +"field and click <guibutton>Open</guibutton>. If the file name you enter is " +"not found, WinMerge opens the folder." +msgstr "" +"Sfoglia il contenuto della cartella fino alla cartella che desideri " +"confrontare.Non selezionare nessun file o sottocartella, fai semplicemente " +"clic su <guibutton >Apri</guibutton > quando <literal >Selezione cartella</" +"literal > è visualizzato nel campo <guilabel >Nome file</guilabel >.Se hai " +"già selezionato un file o una sottocartella, digita semplicemente una " +"stringa casuale nel campo <guilabel >Nome file</guilabel > e fai clic su " +"<guibutton >Apri</guibutton >.Se il nome file immesso non viene trovato, " +"WinMerge apre la cartella." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:76 -msgid "Do you have any plans to support other operating systems besides Windows?" +msgid "" +"Do you have any plans to support other operating systems besides Windows?" msgstr "Prevedi di supportare altri sistemi operativi oltre a Windows?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:81 msgid "" -"There are currently no plans for cross-platform support but you can try the unofficial version <ulink url=\"https://github.com/datadiode/" -"winmerge2011\"> WinMerge 2011</ulink> by Jochen Neubeck. This version should work with Wine also under Linux." +"There are currently no plans for cross-platform support but you can try the " +"unofficial version <ulink url=\"https://github.com/datadiode/winmerge2011\"> " +"WinMerge 2011</ulink> by Jochen Neubeck. This version should work with Wine " +"also under Linux." msgstr "" -"Al momento non è previsto il supporto multipiattaforma, ma puoi provare la versione non ufficiale <ulink url=\"https://github.com/datadiode/" -"winmerge2011\"> WinMerge 2011</ulink> di Jochen Neubeck.Questa versione dovrebbe funzionare con Wine anche sotto Linux." +"Al momento non è previsto il supporto multipiattaforma, ma puoi provare la " +"versione non ufficiale <ulink url=\"https://github.com/datadiode/" +"winmerge2011\"> WinMerge 2011</ulink> di Jochen Neubeck.Questa versione " +"dovrebbe funzionare con Wine anche sotto Linux." #. type: Content of: <article><section><title><indexterm><primary> #: English/Faq.xml:91 English/Install.xml:180 English/Version_control.xml:53 @@ -10064,19 +13306,27 @@ msgstr "con sistemi di controllo della versione" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:90 -msgid "Why is there no CVS integration?<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Perché non è disponibile alcuna integrazione CVS?<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Why is there no CVS integration?<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Perché non è disponibile alcuna integrazione CVS?<placeholder " +"type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:102 msgid "" -"Providing an integration with CVS is of questionable value because there already are so many good CVS clients. However, WinMerge does provide an " -"integration with the diff function of one of those clients, TortoiseCVS (as described in <xref linkend=\"Version_control\" />). Also, WinMerge can " +"Providing an integration with CVS is of questionable value because there " +"already are so many good CVS clients. However, WinMerge does provide an " +"integration with the diff function of one of those clients, TortoiseCVS (as " +"described in <xref linkend=\"Version_control\" />). Also, WinMerge can " "resolve conflict files (see <xref linkend=\"ResolveConflictFiles\" />)." msgstr "" -"Fornire un'integrazione con CVS ha un valore discutibile perché esistono già tanti buoni client CVS.Tuttavia, WinMerge fornisce un'integrazione con " -"la funzione diff di uno di questi client, TortoiseCVS (come descritto in <xref linkend=\"Version_control\" />).Inoltre, WinMerge può risolvere i file " -"in conflitto (vedi <xref linkend=\"ResolveConflictFiles\" />)." +"Fornire un'integrazione con CVS ha un valore discutibile perché esistono già " +"tanti buoni client CVS.Tuttavia, WinMerge fornisce un'integrazione con la " +"funzione diff di uno di questi client, TortoiseCVS (come descritto in <xref " +"linkend=\"Version_control\" />).Inoltre, WinMerge può risolvere i file in " +"conflitto (vedi <xref linkend=\"ResolveConflictFiles\" />)." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:113 @@ -10086,11 +13336,14 @@ msgstr "Cos'è un elenco MRU?<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:119 msgid "" -"MRU is an abbreviation for <quote>Most Recently Used</quote>, and refers to the history lists in the Select Files or Folders dialog. The list " -"contains the last twenty paths used on each side." +"MRU is an abbreviation for <quote>Most Recently Used</quote>, and refers to " +"the history lists in the Select Files or Folders dialog. The list contains " +"the last twenty paths used on each side." msgstr "" -"MRU è un'abbreviazione di <quote>Utilizzato più recentemente</quote> e si riferisce agli elenchi della cronologia nella finestra di dialogo Seleziona " -"file o cartelle.L'elenco contiene gli ultimi venti percorsi utilizzati su ciascun lato." +"MRU è un'abbreviazione di <quote>Utilizzato più recentemente</quote> e si " +"riferisce agli elenchi della cronologia nella finestra di dialogo Seleziona " +"file o cartelle.L'elenco contiene gli ultimi venti percorsi utilizzati su " +"ciascun lato." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> #: English/Faq.xml:128 @@ -10099,40 +13352,59 @@ msgstr "OpenOffice, apertura di file in WinMerge" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:127 -msgid "Can WinMerge open OpenOffice files?<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "WinMerge può aprire file OpenOffice?<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Can WinMerge open OpenOffice files?<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"WinMerge può aprire file OpenOffice?<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:133 -msgid "OpenOffice files are archives. To be able to open them in WinMerge, you have to configure archive support:" -msgstr "I file OpenOffice sono archivi.Per poterli aprire in WinMerge, devi configurare il supporto dell'archivio:" +msgid "" +"OpenOffice files are archives. To be able to open them in WinMerge, you have " +"to configure archive support:" +msgstr "" +"I file OpenOffice sono archivi.Per poterli aprire in WinMerge, devi " +"configurare il supporto dell'archivio:" #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:138 msgid "" -"In WinMerge, click the <guibutton>Options</guibutton> button (or click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" -"menuchoice>). In the Archive Support page, enable the <guilabel>Detect archive type from file signature</guilabel> option" +"In WinMerge, click the <guibutton>Options</guibutton> button (or click " +"<menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" +"menuchoice>). In the Archive Support page, enable the <guilabel>Detect " +"archive type from file signature</guilabel> option" msgstr "" -"In WinMerge, fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" -"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >" +"In WinMerge, fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai " +"clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" +"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita " +"l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:153 -msgid "Why do large files sometimes show up as different in the Folder Compare window, but identical in the File Compare window?" +msgid "" +"Why do large files sometimes show up as different in the Folder Compare " +"window, but identical in the File Compare window?" msgstr "" -"Perché i file di grandi dimensioni a volte vengono visualizzati come diversi nella finestra Confronto cartelle, ma identici nella finestra Confronto " -"file?" +"Perché i file di grandi dimensioni a volte vengono visualizzati come diversi " +"nella finestra Confronto cartelle, ma identici nella finestra Confronto file?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:158 msgid "" -"This is because WinMerge always uses the <guilabel>Quick Contents</guilabel> file compare method for large files. This method enables WinMerge to " -"compare large files more efficiently. To test if this is causing the behavior you're seeing, you can try raising the <guilabel>Quick Contents</" -"guilabel> threshold for large files. See the discussion of this method in <xref linkend=\"Compare_dirs_starting\" /> to learn how." -msgstr "" -"Questo perché WinMerge usa sempre il metodo di confronto file <guilabel >Contenuti rapidi</guilabel > per file di grandi dimensioni.Questo metodo " -"consente a WinMerge di confrontare file di grandi dimensioni in modo più efficiente.Per verificare se questo è la causa del comportamento che stai " -"riscontrando, puoi provare ad aumentare la soglia dei <guilabel >Contenuti rapidi</guilabel > per i file di grandi dimensioni.Vedi la discussione di " +"This is because WinMerge always uses the <guilabel>Quick Contents</guilabel> " +"file compare method for large files. This method enables WinMerge to compare " +"large files more efficiently. To test if this is causing the behavior you're " +"seeing, you can try raising the <guilabel>Quick Contents</guilabel> " +"threshold for large files. See the discussion of this method in <xref " +"linkend=\"Compare_dirs_starting\" /> to learn how." +msgstr "" +"Questo perché WinMerge usa sempre il metodo di confronto file <guilabel " +">Contenuti rapidi</guilabel > per file di grandi dimensioni.Questo metodo " +"consente a WinMerge di confrontare file di grandi dimensioni in modo più " +"efficiente.Per verificare se questo è la causa del comportamento che stai " +"riscontrando, puoi provare ad aumentare la soglia dei <guilabel >Contenuti " +"rapidi</guilabel > per i file di grandi dimensioni.Vedi la discussione di " "questo metodo in <xref linkend=\"Compare_dirs_starting\" /> per sapere come." #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> @@ -10148,31 +13420,42 @@ msgstr "ordine di selezione dei file" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:170 msgid "" -"When comparing multiple files from Windows Explorer, how can I control which file appears on the left side?<placeholder type=\"indexterm\" id=\"0\"/>" +"When comparing multiple files from Windows Explorer, how can I control which " +"file appears on the left side?<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Quando si confrontano più file da Esplora risorse, come posso controllare quale file viene visualizzato sul lato sinistro?<placeholder " +"Quando si confrontano più file da Esplora risorse, come posso controllare " +"quale file viene visualizzato sul lato sinistro?<placeholder " "type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:177 msgid "" -"When multiple files are selected in Windows Explorer, the file you right-click becomes the first (primary) item. The remaining items follow in the " -"order they were selected. Therefore, to make a file appear on the left side in WinMerge, select multiple files and right-click the one you want to " +"When multiple files are selected in Windows Explorer, the file you right-" +"click becomes the first (primary) item. The remaining items follow in the " +"order they were selected. Therefore, to make a file appear on the left side " +"in WinMerge, select multiple files and right-click the one you want to " "compare on the left." msgstr "" -"Quando vengono selezionati più file in Esplora risorse, il file su cui si fa clic con il pulsante destro del mouse diventa il primo elemento " -"(primario).Gli elementi rimanenti seguono nell'ordine in cui sono stati selezionati.Pertanto, per far apparire un file sul lato sinistro in WinMerge, " -"seleziona più file e fai clic con il pulsante destro del mouse su quello che desideri confrontare a sinistra." +"Quando vengono selezionati più file in Esplora risorse, il file su cui si fa " +"clic con il pulsante destro del mouse diventa il primo elemento (primario)." +"Gli elementi rimanenti seguono nell'ordine in cui sono stati selezionati." +"Pertanto, per far apparire un file sul lato sinistro in WinMerge, seleziona " +"più file e fai clic con il pulsante destro del mouse su quello che desideri " +"confrontare a sinistra." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:178 msgid "" -"For more information about this Windows shell behavior, see: <ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?p=102406\">The Old " -"New Thing: How does Explorer determine which program to use to open a file if an explicit command is not provided?</ulink>." +"For more information about this Windows shell behavior, see: <ulink " +"url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?p=102406\">The " +"Old New Thing: How does Explorer determine which program to use to open a " +"file if an explicit command is not provided?</ulink>." msgstr "" -"Per ulteriori informazioni sul comportamento della shell di Windows, vedi: <ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?" -"p=102406\">The Old New Thing: in che modo Explorer determina quale programma utilizzare per aprire un file se non viene fornito un comando esplicito?" -"</ulink>." +"Per ulteriori informazioni sul comportamento della shell di Windows, vedi: " +"<ulink url=\"https://devblogs.microsoft.com/oldnewthing/20190409-00/?" +"p=102406\">The Old New Thing: in che modo Explorer determina quale programma " +"utilizzare per aprire un file se non viene fornito un comando esplicito?</" +"ulink>." #. type: Content of: <article><section><title> #: English/Faq.xml:186 @@ -10181,19 +13464,28 @@ msgstr "Confronto di file" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:191 -msgid "Why do my files have all lines marked as different (colored), even though I know all the lines are not different?" -msgstr "Perché i miei file hanno tutte le linee contrassegnate come diverse (colorate), anche se so che non tutte le linee sono diverse?" +msgid "" +"Why do my files have all lines marked as different (colored), even though I " +"know all the lines are not different?" +msgstr "" +"Perché i miei file hanno tutte le linee contrassegnate come diverse " +"(colorate), anche se so che non tutte le linee sono diverse?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:196 msgid "" -"Maybe your files have different line ending styles (for example, Windows and Unix). By default, WinMerge compares line ending styles. To disable it, " -"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice>. In the Compare page, enable (check) the option, " +"Maybe your files have different line ending styles (for example, Windows and " +"Unix). By default, WinMerge compares line ending styles. To disable it, " +"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" +"guimenuitem> </menuchoice>. In the Compare page, enable (check) the option, " "<guilabel>Ignore carriage return differences</guilabel>." msgstr "" -"Forse i tuoi file hanno stili di fine riga diversi (ad esempio, Windows e Unix).Per impostazione predefinita, WinMerge confronta gli stili di fine " -"riga.Per disabilitarlo, fai clic su <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Nella pagina " -"Confronta, abilita (seleziona) l'opzione <guilabel >Ignora differenze di ritorno a capo</guilabel >." +"Forse i tuoi file hanno stili di fine riga diversi (ad esempio, Windows e " +"Unix).Per impostazione predefinita, WinMerge confronta gli stili di fine " +"riga.Per disabilitarlo, fai clic su <menuchoice> <guimenu >Modifica</guimenu " +"> <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Nella pagina " +"Confronta, abilita (seleziona) l'opzione <guilabel >Ignora differenze di " +"ritorno a capo</guilabel >." #. type: Content of: <article><section><title> #: English/Faq.xml:210 @@ -10208,18 +13500,24 @@ msgstr "Vedo punti interrogativi invece di lettere nei file." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:219 msgid "This is what we call a <glossterm>lossy conversion</glossterm>." -msgstr "Questo è ciò che chiamiamo <glossterm>conversione con perdita</glossterm>." +msgstr "" +"Questo è ciò che chiamiamo <glossterm>conversione con perdita</glossterm>." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:223 msgid "" -"For ANSI files, this is probably due to code-page problems. To troubleshoot, click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" -"guimenuitem> </menuchoice>. Then in the Codepages page, see if the option <guilabel>Detect codepage info</guilabel> is checked. If it is, deselect " -"the option, click <guibutton>OK</guibutton>, and see if that helps." +"For ANSI files, this is probably due to code-page problems. To troubleshoot, " +"click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" +"guimenuitem> </menuchoice>. Then in the Codepages page, see if the option " +"<guilabel>Detect codepage info</guilabel> is checked. If it is, deselect the " +"option, click <guibutton>OK</guibutton>, and see if that helps." msgstr "" -"Per i file ANSI, ciò è probabilmente dovuto a problemi di tabella codici.Per risolvere il problema, fai clic su <menuchoice> <guimenu >Modifica</" -"guimenu > <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Quindi, nella pagina Codepages, verifica se l'opzione <guilabel >Rileva informazioni " -"codepage</guilabel > è selezionata.Se lo è, deseleziona l'opzione, fai clic su <guibutton >OK</guibutton > e vedi se aiuta." +"Per i file ANSI, ciò è probabilmente dovuto a problemi di tabella codici.Per " +"risolvere il problema, fai clic su <menuchoice> <guimenu >Modifica</guimenu " +"> <guimenuitem >Opzioni</guimenuitem > </menuchoice >.Quindi, nella pagina " +"Codepages, verifica se l'opzione <guilabel >Rileva informazioni codepage</" +"guilabel > è selezionata.Se lo è, deseleziona l'opzione, fai clic su " +"<guibutton >OK</guibutton > e vedi se aiuta." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:237 @@ -10233,20 +13531,29 @@ msgstr "Sfortunatamente, WinMerge supporta solo caratteri non proporzionali." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:248 -msgid "What is <glossterm>delay of automatic rescan</glossterm>? Why it is needed?" -msgstr "Cos'è il <glossterm>ritardo della nuova scansione automatica</glossterm>?Perché è necessario?" +msgid "" +"What is <glossterm>delay of automatic rescan</glossterm>? Why it is needed?" +msgstr "" +"Cos'è il <glossterm>ritardo della nuova scansione automatica</glossterm>?" +"Perché è necessario?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:253 msgid "" -"When <guilabel>Automatic Rescan</guilabel> is enabled (in the Editor page of Options), WinMerge delays rescanning while you edit files. That is, no " -"rescanning occurs until shortly after you stop typing. Without this delay, WinMerge would rescan after every typed character, making the editing " -"process too slow. The delay especially improves editing bigger files, which can take several seconds to rescan." -msgstr "" -"Quando è abilitata la <guilabel >Riscansione automatica</guilabel > (nella pagina Editor delle Opzioni), WinMerge ritarda la nuova scansione mentre " -"modifichi i file.Cioè, non viene eseguita alcuna nuova scansione fino a poco dopo aver smesso di digitare.Senza questo ritardo, WinMerge eseguirebbe " -"nuovamente la scansione dopo ogni carattere digitato, rendendo il processo di modifica troppo lento.Il ritardo migliora soprattutto la modifica di " -"file più grandi, la cui nuova scansione può richiedere diversi secondi." +"When <guilabel>Automatic Rescan</guilabel> is enabled (in the Editor page of " +"Options), WinMerge delays rescanning while you edit files. That is, no " +"rescanning occurs until shortly after you stop typing. Without this delay, " +"WinMerge would rescan after every typed character, making the editing " +"process too slow. The delay especially improves editing bigger files, which " +"can take several seconds to rescan." +msgstr "" +"Quando è abilitata la <guilabel >Riscansione automatica</guilabel > (nella " +"pagina Editor delle Opzioni), WinMerge ritarda la nuova scansione mentre " +"modifichi i file.Cioè, non viene eseguita alcuna nuova scansione fino a poco " +"dopo aver smesso di digitare.Senza questo ritardo, WinMerge eseguirebbe " +"nuovamente la scansione dopo ogni carattere digitato, rendendo il processo " +"di modifica troppo lento.Il ritardo migliora soprattutto la modifica di file " +"più grandi, la cui nuova scansione può richiedere diversi secondi." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:265 @@ -10255,22 +13562,31 @@ msgstr "Posso stampare file dai riquadri File nella finestra Confronta file?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:270 -msgid "Yes, there is basic printing support: click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>." +msgid "" +"Yes, there is basic printing support: click <menuchoice> <guimenu>File</" +"guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>." msgstr "" -"Sì, esiste un supporto di stampa di base: fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Stampa</guimenuitem > </menuchoice >." +"Sì, esiste un supporto di stampa di base: fai clic su <menuchoice> <guimenu " +">File</guimenu > <guimenuitem >Stampa</guimenuitem > </menuchoice >." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:280 -msgid "Can I hide similar lines in a file comparison, so that only different lines are visible?" -msgstr "Posso nascondere righe simili in un confronto di file, in modo che siano visibili solo righe diverse?" +msgid "" +"Can I hide similar lines in a file comparison, so that only different lines " +"are visible?" +msgstr "" +"Posso nascondere righe simili in un confronto di file, in modo che siano " +"visibili solo righe diverse?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:285 msgid "" -"Yes, you can show only different lines by clicking <menuchoice> <guimenu>View</guimenu><guimenuitem>Diff Context</guimenuitem> <guimenuitem>0 lines</" -"guimenuitem> </menuchoice>." +"Yes, you can show only different lines by clicking <menuchoice> " +"<guimenu>View</guimenu><guimenuitem>Diff Context</guimenuitem> " +"<guimenuitem>0 lines</guimenuitem> </menuchoice>." msgstr "" -"Sì, puoi mostrare solo righe diverse facendo clic su <menuchoice> <guimenu >Visualizza</guimenu ><guimenuitem >Contesto differenze</guimenuitem > " +"Sì, puoi mostrare solo righe diverse facendo clic su <menuchoice> <guimenu " +">Visualizza</guimenu ><guimenuitem >Contesto differenze</guimenuitem > " "<guimenuitem >0 righe</guimenuitem > </menuchoice >." #. type: Content of: <article><section><title> @@ -10280,18 +13596,29 @@ msgstr "WinMerge come strumento di confronto o diff esterno" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:300 -msgid "I want WinMerge to close with a single <keycap>Esc</keycap> press after I'm done?" -msgstr "Voglio che WinMerge si chiuda con una singola pressione di <keycap>Esc</keycap> dopo aver finito?" +msgid "" +"I want WinMerge to close with a single <keycap>Esc</keycap> press after I'm " +"done?" +msgstr "" +"Voglio che WinMerge si chiuda con una singola pressione di <keycap>Esc</" +"keycap> dopo aver finito?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:305 -msgid "Open WinMerge from the command line, and include the <option>-e</option> switch." -msgstr "Apri WinMerge dalla riga di comando e includi l'opzione <option>-e</option>." +msgid "" +"Open WinMerge from the command line, and include the <option>-e</option> " +"switch." +msgstr "" +"Apri WinMerge dalla riga di comando e includi l'opzione <option>-e</option>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:312 -msgid "I don't want to see the <guilabel>Files Are Identical</guilabel> message when I compare identical files, I just want WinMerge to quit." -msgstr "Non voglio vedere il messaggio <guilabel >I file sono identici</guilabel > quando confronto file identici, voglio solo che WinMerge esca." +msgid "" +"I don't want to see the <guilabel>Files Are Identical</guilabel> message " +"when I compare identical files, I just want WinMerge to quit." +msgstr "" +"Non voglio vedere il messaggio <guilabel >I file sono identici</guilabel > " +"quando confronto file identici, voglio solo che WinMerge esca." #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:318 @@ -10300,18 +13627,28 @@ msgstr "Utilizza l'opzione della riga di comando <option>-x</option>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:324 -msgid "How can I avoid filling the Select Files or Folders dialog history lists with temporary paths?" -msgstr "Come posso evitare di riempire gli elenchi della cronologia della finestra di dialogo Seleziona file o cartelle con percorsi temporanei?" +msgid "" +"How can I avoid filling the Select Files or Folders dialog history lists " +"with temporary paths?" +msgstr "" +"Come posso evitare di riempire gli elenchi della cronologia della finestra " +"di dialogo Seleziona file o cartelle con percorsi temporanei?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:329 -msgid "Have your external program invoke WinMerge with the <option>/ub</option> option, which tells WinMerge to not add the files to the MRU." -msgstr "Chiedi al tuo programma esterno di invocare WinMerge con l'opzione <option>/ub</option>, che dice a WinMerge di non aggiungere i file alla MRU." +msgid "" +"Have your external program invoke WinMerge with the <option>/ub</option> " +"option, which tells WinMerge to not add the files to the MRU." +msgstr "" +"Chiedi al tuo programma esterno di invocare WinMerge con l'opzione <option>/" +"ub</option>, che dice a WinMerge di non aggiungere i file alla MRU." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:337 msgid "But the program I'm using doesn't allow command line parameters!" -msgstr "Ma il programma che sto utilizzando non consente i parametri della riga di comando!" +msgstr "" +"Ma il programma che sto utilizzando non consente i parametri della riga di " +"comando!" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:342 @@ -10347,35 +13684,52 @@ msgstr "file patch, in stile Perry" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:367 -msgid "How can I open the Perry-style patch files that WinMerge developers use when submitting patches?<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"How can I open the Perry-style patch files that WinMerge developers use when " +"submitting patches?<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" -"Come posso aprire i file patch in stile Perry che gli sviluppatori WinMerge utilizzano quando inviano le patch?<placeholder type=\"indexterm\" " -"id=\"0\"/>" +"Come posso aprire i file patch in stile Perry che gli sviluppatori WinMerge " +"utilizzano quando inviano le patch?<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:374 msgid "" -"Perry-style patches are zip files containing original and changed files in different directories. WinMerge has internal support (surprise!) for " -"handling these files: just launch a compare operation, selecting the zip file for both the left and right sides. WinMerge opens the contents of the " -"zip file in a Folder Compare window, comparing the original and changed files." +"Perry-style patches are zip files containing original and changed files in " +"different directories. WinMerge has internal support (surprise!) for " +"handling these files: just launch a compare operation, selecting the zip " +"file for both the left and right sides. WinMerge opens the contents of the " +"zip file in a Folder Compare window, comparing the original and changed " +"files." msgstr "" -"Le patch in stile Perry sono file zip contenenti file originali e modificati in cartella diverse. WinMerge ha un supporto interno (sorpresa!) per la " -"gestione di questi file: basta avviare un'operazione di confronto, selezionando il file zip sia per il lato sinistro che per quello destro. WinMerge " -"apre il contenuto del file zip in una finestra Confronto cartelle, confrontando i file originali e modificati." +"Le patch in stile Perry sono file zip contenenti file originali e modificati " +"in cartella diverse. WinMerge ha un supporto interno (sorpresa!) per la " +"gestione di questi file: basta avviare un'operazione di confronto, " +"selezionando il file zip sia per il lato sinistro che per quello destro. " +"WinMerge apre il contenuto del file zip in una finestra Confronto cartelle, " +"confrontando i file originali e modificati." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:385 -msgid "Can WinMerge open archive files with non-standard file-extensions? (For example .jar files as zip-files)" -msgstr "WinMerge può aprire file di archivio con estensioni di file non standard?(Ad esempio file .jar come file zip)" +msgid "" +"Can WinMerge open archive files with non-standard file-extensions? (For " +"example .jar files as zip-files)" +msgstr "" +"WinMerge può aprire file di archivio con estensioni di file non standard?(Ad " +"esempio file .jar come file zip)" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:390 msgid "" -"Yes: click the <guibutton>Options</guibutton> button (or click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </" -"menuchoice>). In the Archive Support page, enable the <guilabel>Detect archive type from file signature</guilabel> option." +"Yes: click the <guibutton>Options</guibutton> button (or click <menuchoice> " +"<guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice>). " +"In the Archive Support page, enable the <guilabel>Detect archive type from " +"file signature</guilabel> option." msgstr "" -"Sì: fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su <menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" -"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel >." +"Sì: fai clic sul pulsante <guibutton >Opzioni</guibutton > (o fai clic su " +"<menuchoice > <guimenu >Modifica</guimenu > <guimenuitem >Opzioni</" +"guimenuitem > </menuchoice >).Nella pagina Supporto archivio, abilita " +"l'opzione <guilabel >Rileva tipo di archivio dalla firma del file</guilabel " +">." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Faq.xml:407 @@ -10385,52 +13739,72 @@ msgstr "rilevamento nei file utilizzando Blocco note" #. type: Content of: <article><section><title> #: English/Faq.xml:404 msgid "Text encoding (codepages)<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Codifica del testo (codepage)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Codifica del testo (codepage)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:413 msgid "How do I tell if my file is coded in the local Windows (ANSI) codepage?" -msgstr "Come faccio a sapere se il mio file è codificato nella codepage locale di Windows (ANSI)?" +msgstr "" +"Come faccio a sapere se il mio file è codificato nella codepage locale di " +"Windows (ANSI)?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:418 msgid "" -"Open the file in Windows Notepad (for example, click <menuchoice> <guimenu>Start</guimenu> <guisubmenu>(All) Programs</guisubmenu> " -"<guisubmenu>Accessories</guisubmenu> <guimenuitem>Notepad</guimenuitem> </menuchoice>). Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save " -"As</guimenuitem> </menuchoice>, and in the Save As dialog, scroll to the <guilabel>Encoding</guilabel> item at the dropdown list. The possible values " +"Open the file in Windows Notepad (for example, click <menuchoice> " +"<guimenu>Start</guimenu> <guisubmenu>(All) Programs</guisubmenu> " +"<guisubmenu>Accessories</guisubmenu> <guimenuitem>Notepad</guimenuitem> </" +"menuchoice>). Click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save " +"As</guimenuitem> </menuchoice>, and in the Save As dialog, scroll to the " +"<guilabel>Encoding</guilabel> item at the dropdown list. The possible values " "include:" msgstr "" -"Apri il file nel Blocco note di Windows (ad esempio, fai clic su <menuchoice> <guimenu >Start</guimenu > <guisubmenu >Programmi (tutti)</guisubmenu > " -"<guisubmenu >Accessori</guisubmenu > <guimenuitem >Blocco note</guimenuitem > </menuchoice >).Fai clic su <menuchoice> <guimenu >File</guimenu > " -"<guimenuitem >Salva con nome</guimenuitem > </menuchoice > e, nella finestra di dialogo Salva con nome, scorri fino alla voce <guilabel >Codifica</" -"guilabel > nell'elenco a discesa.I possibili valori includono:" +"Apri il file nel Blocco note di Windows (ad esempio, fai clic su " +"<menuchoice> <guimenu >Start</guimenu > <guisubmenu >Programmi (tutti)</" +"guisubmenu > <guisubmenu >Accessori</guisubmenu > <guimenuitem >Blocco note</" +"guimenuitem > </menuchoice >).Fai clic su <menuchoice> <guimenu >File</" +"guimenu > <guimenuitem >Salva con nome</guimenuitem > </menuchoice > e, " +"nella finestra di dialogo Salva con nome, scorri fino alla voce <guilabel " +">Codifica</guilabel > nell'elenco a discesa.I possibili valori includono:" #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:436 msgid "" -"<guilabel>ANSI</guilabel>: The file is apparently in the local Windows codepage. If the file is entirely in English and normal punctuation, then the " -"file is also in ASCII." +"<guilabel>ANSI</guilabel>: The file is apparently in the local Windows " +"codepage. If the file is entirely in English and normal punctuation, then " +"the file is also in ASCII." msgstr "" -"<guilabel >ANSI</guilabel >: apparentemente il file si trova nella codepage locale di Windows.Se il file è interamente in inglese e con punteggiatura " +"<guilabel >ANSI</guilabel >: apparentemente il file si trova nella codepage " +"locale di Windows.Se il file è interamente in inglese e con punteggiatura " "normale, anche il file è in ASCII." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:442 -msgid "<guilabel>Unicode</guilabel>: The file is probably in the default Windows Unicode encoding, UCS-2LE." -msgstr "<guilabel >Unicode</guilabel >: il file probabilmente ha la codifica Unicode predefinita di Windows, UCS-2LE." +msgid "" +"<guilabel>Unicode</guilabel>: The file is probably in the default Windows " +"Unicode encoding, UCS-2LE." +msgstr "" +"<guilabel >Unicode</guilabel >: il file probabilmente ha la codifica Unicode " +"predefinita di Windows, UCS-2LE." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:447 -msgid "<guilabel>UTF-8</guilabel>: The file is in the cross-platform Unicode encoding, UTF-8." -msgstr "<guilabel >UTF-8</guilabel >: il file è nella codifica Unicode multipiattaforma, UTF-8." +msgid "" +"<guilabel>UTF-8</guilabel>: The file is in the cross-platform Unicode " +"encoding, UTF-8." +msgstr "" +"<guilabel >UTF-8</guilabel >: il file è nella codifica Unicode " +"multipiattaforma, UTF-8." #. type: Content of: <article><section><qandaset><qandaentry><answer><itemizedlist><listitem><para> #: English/Faq.xml:452 msgid "" -"<guilabel>Unicode big endian</guilabel>: The file is in a different Unicode encoding that is little used or supported in Windows, probably UCS-2BE." +"<guilabel>Unicode big endian</guilabel>: The file is in a different Unicode " +"encoding that is little used or supported in Windows, probably UCS-2BE." msgstr "" -"<guilabel >Unicode big endian</guilabel >: il file ha una codifica Unicode diversa che è poco utilizzata o supportata in Windows, probabilmente " -"UCS-2BE." +"<guilabel >Unicode big endian</guilabel >: il file ha una codifica Unicode " +"diversa che è poco utilizzata o supportata in Windows, probabilmente UCS-2BE." #. type: Content of: <article><section><title><indexterm><primary> #: English/Faq.xml:464 @@ -10454,8 +13828,12 @@ msgstr "Patch WinMerge compatibili con" #. type: Content of: <article><section><title> #: English/Faq.xml:463 -msgid "Patch files<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "File di patch<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Patch files<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"File di patch<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:476 @@ -10465,13 +13843,19 @@ msgstr "C'è un modo per creare file patch dalla riga di comando?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:480 msgid "" -"No. It might be added in later versions. Until then, you can use the Win32 port of <filename>diffutils</filename>. The latest version of " -"<filename>diffutils</filename> (and patch) can be downloaded from <application>the SourceForge GnuWin32</application> project page: <ulink " -"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/projects/gnuwin32</ulink>." +"No. It might be added in later versions. Until then, you can use the Win32 " +"port of <filename>diffutils</filename>. The latest version of " +"<filename>diffutils</filename> (and patch) can be downloaded from " +"<application>the SourceForge GnuWin32</application> project page: <ulink " +"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/" +"projects/gnuwin32</ulink>." msgstr "" -"No. Potrebbe essere aggiunto nelle versioni successive.Fino ad allora, puoi usare il port Win32 di <filename>diffutils</filename>.L'ultima versione " -"di <filename>diffutils</filename> (e patch) può essere scaricata dalla pagina del progetto <application>SourceForge GnuWin32</application>: <ulink " -"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/projects/gnuwin32</ulink>." +"No. Potrebbe essere aggiunto nelle versioni successive.Fino ad allora, puoi " +"usare il port Win32 di <filename>diffutils</filename>.L'ultima versione di " +"<filename>diffutils</filename> (e patch) può essere scaricata dalla pagina " +"del progetto <application>SourceForge GnuWin32</application>: <ulink " +"url=\"https://sourceforge.net/projects/gnuwin32/\"> https://sourceforge.net/" +"projects/gnuwin32</ulink>." #. type: Content of: <article><section><qandaset><qandaentry><question><para> #: English/Faq.xml:491 @@ -10480,17 +13864,23 @@ msgstr "È possibile applicare le patch utilizzando WinMerge?" #. type: Content of: <article><section><qandaset><qandaentry><answer><para> #: English/Faq.xml:495 -msgid "You can apply patches using the experimental plugin ApplyPatch.sct. The extensions of patches supported by the plugin are .diff or .patch." -msgstr "Puoi applicare le patch utilizzando il plugin sperimentale ApplyPatch.sct.Le estensioni delle patch supportate dal plugin sono .diff o .patch." +msgid "" +"You can apply patches using the experimental plugin ApplyPatch.sct. The " +"extensions of patches supported by the plugin are .diff or .patch." +msgstr "" +"Puoi applicare le patch utilizzando il plugin sperimentale ApplyPatch.sct.Le " +"estensioni delle patch supportate dal plugin sono .diff o .patch." #. type: Content of: <article><section><section><section><title><indexterm><primary> -#: English/Filters.xml:6 English/Filters.xml:1299 English/Filters.xml:1312 English/Filters.xml:1329 English/Filters.xml:1373 English/Filters.xml:1459 +#: English/Filters.xml:6 English/Filters.xml:1299 English/Filters.xml:1312 +#: English/Filters.xml:1329 English/Filters.xml:1373 English/Filters.xml:1459 #: English/Filters.xml:1939 English/Filters.xml:2138 msgid "file filters" msgstr "filtri di file" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Filters.xml:8 English/Filters.xml:85 English/Filters.xml:89 English/Filters.xml:131 English/Filters.xml:135 +#: English/Filters.xml:8 English/Filters.xml:85 English/Filters.xml:89 +#: English/Filters.xml:131 English/Filters.xml:135 msgid "file masks" msgstr "maschere di file" @@ -10510,7 +13900,8 @@ msgid "Using Filters<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "Utilizzo dei filtri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Filters.xml:20 English/Filters.xml:28 English/Filters.xml:137 English/Filters.xml:1551 English/Filters.xml:1555 English/Filters.xml:1739 +#: English/Filters.xml:20 English/Filters.xml:28 English/Filters.xml:137 +#: English/Filters.xml:1551 English/Filters.xml:1555 English/Filters.xml:1739 #: English/Filters.xml:2325 msgid "regular expressions" msgstr "espressioni regolari" @@ -10533,31 +13924,45 @@ msgstr "espressione regolare" #. type: Content of: <article><para> #: English/Filters.xml:15 msgid "" -"When you compare files or folders, you can use filters to narrow the scope of the comparison. This can be useful when you want to simplify the " -"comparison result by eliminating differences that you are not interested in. Filters are rules based on regular expressions. WinMerge uses the " -"popular PCRE (Perl Compatible Regular Expressions) regular expression engine.<placeholder type=\"indexterm\" id=\"0\"/><placeholder " -"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" -msgstr "" -"Quando confronti file o cartelle, puoi utilizzare i filtri per restringere l'ambito del confronto.Ciò può essere utile quando desideri semplificare " -"il risultato del confronto eliminando le differenze che non ti interessano. I filtri sono regole basate su espressioni regolari.WinMerge utilizza il " -"popolare motore di espressioni regolari PCRE (Perl Compatibile Regular Expressions).<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"When you compare files or folders, you can use filters to narrow the scope " +"of the comparison. This can be useful when you want to simplify the " +"comparison result by eliminating differences that you are not interested " +"in. Filters are rules based on regular expressions. WinMerge uses the " +"popular PCRE (Perl Compatible Regular Expressions) regular expression engine." +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgstr "" +"Quando confronti file o cartelle, puoi utilizzare i filtri per restringere " +"l'ambito del confronto.Ciò può essere utile quando desideri semplificare il " +"risultato del confronto eliminando le differenze che non ti interessano. I " +"filtri sono regole basate su espressioni regolari.WinMerge utilizza il " +"popolare motore di espressioni regolari PCRE (Perl Compatibile Regular " +"Expressions).<placeholder type=\"indexterm\" id=\"0\"/><placeholder " "type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><para> #: English/Filters.xml:31 msgid "" -"The basic function of filtering is simple: evaluate each item that would normally be compared (a folder, file, or line within a file), and if the " -"filter expression matches the target item, apply the filter. Depending on the type of filter, the item is either included or excluded in the " +"The basic function of filtering is simple: evaluate each item that would " +"normally be compared (a folder, file, or line within a file), and if the " +"filter expression matches the target item, apply the filter. Depending on " +"the type of filter, the item is either included or excluded in the " "comparison." msgstr "" -"La funzione di base del filtro è semplice: valuta ogni elemento che verrebbe normalmente confrontato (una cartella, un file o una riga all'interno di " -"un file) e, se l'espressione del filtro corrisponde all'elemento di destinazione, applica il filtro.A seconda del tipo di filtro, l'elemento viene " -"incluso o escluso dal confronto." +"La funzione di base del filtro è semplice: valuta ogni elemento che verrebbe " +"normalmente confrontato (una cartella, un file o una riga all'interno di un " +"file) e, se l'espressione del filtro corrisponde all'elemento di " +"destinazione, applica il filtro.A seconda del tipo di filtro, l'elemento " +"viene incluso o escluso dal confronto." #. type: Content of: <article><para> #: English/Filters.xml:37 -msgid "There are different WinMerge filters for folder compare and file compare operations:" -msgstr "Esistono diversi filtri WinMerge per le operazioni di confronto di cartelle e file:" +msgid "" +"There are different WinMerge filters for folder compare and file compare " +"operations:" +msgstr "" +"Esistono diversi filtri WinMerge per le operazioni di confronto di cartelle " +"e file:" #. type: Content of: <article><variablelist><varlistentry><term><indexterm><secondary> #: English/Filters.xml:45 English/Filters.xml:68 @@ -10566,48 +13971,72 @@ msgstr "filtraggio" #. type: Content of: <article><variablelist><varlistentry><term> #: English/Filters.xml:42 -msgid "Folder comparison: File masks and file filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronto cartelle: maschere di file e filtri di file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Folder comparison: File masks and file filters<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronto cartelle: maschere di file e filtri di file<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:49 msgid "" -"You can specify files to include in a folder comparison by using simple file masks, or, for more complex filtering, by applying multiple rules " -"specified in a file filter." +"You can specify files to include in a folder comparison by using simple file " +"masks, or, for more complex filtering, by applying multiple rules specified " +"in a file filter." msgstr "" -"È possibile specificare i file da includere in un confronto di cartelle utilizzando semplici maschere di file o, per filtri più complessi, applicando " -"più regole specificate in un filtro di file." +"È possibile specificare i file da includere in un confronto di cartelle " +"utilizzando semplici maschere di file o, per filtri più complessi, " +"applicando più regole specificate in un filtro di file." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:53 msgid "" -"Files and folders that are filtered are hidden in the result by default, which is typically what you want. You can click <menuchoice> <guimenu>View</" -"guimenu> <guimenuitem>Show Skipped Items</guimenuitem> </menuchoice> to unhide filtered items, but the Folder Compare window shows only minimal " -"information about them. For example, you cannot tell whether a skipped file is a text file or binary." -msgstr "" -"I file e le cartelle filtrati vengono nascosti nel risultato per impostazione predefinita, che in genere è ciò che desideri.Puoi fare clic su " -"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza elementi saltati</guimenuitem > </menuchoice > per mostrare gli elementi " -"filtrati, ma la finestra Confronta cartelle mostra solo informazioni minime su di essi.Ad esempio, non è possibile stabilire se un file ignorato è un " +"Files and folders that are filtered are hidden in the result by default, " +"which is typically what you want. You can click <menuchoice> <guimenu>View</" +"guimenu> <guimenuitem>Show Skipped Items</guimenuitem> </menuchoice> to " +"unhide filtered items, but the Folder Compare window shows only minimal " +"information about them. For example, you cannot tell whether a skipped file " +"is a text file or binary." +msgstr "" +"I file e le cartelle filtrati vengono nascosti nel risultato per " +"impostazione predefinita, che in genere è ciò che desideri.Puoi fare clic su " +"<menuchoice> <guimenu >Visualizza</guimenu> <guimenuitem >Visualizza " +"elementi saltati</guimenuitem > </menuchoice > per mostrare gli elementi " +"filtrati, ma la finestra Confronta cartelle mostra solo informazioni minime " +"su di essi.Ad esempio, non è possibile stabilire se un file ignorato è un " "file di testo o binario." #. type: Content of: <article><variablelist><varlistentry><term> #: English/Filters.xml:65 -msgid "File comparisons: Line filters and substitution filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Confronti di file: filtri di riga e filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"File comparisons: Line filters and substitution filters<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Confronti di file: filtri di riga e filtri di sostituzione<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:72 -msgid "Line filters are applied only to file compare operations. They let you ignore single line differences." -msgstr "I filtri di riga vengono applicati solo alle operazioni di confronto dei file.Ti consentono di ignorare le differenze su una singola riga." +msgid "" +"Line filters are applied only to file compare operations. They let you " +"ignore single line differences." +msgstr "" +"I filtri di riga vengono applicati solo alle operazioni di confronto dei " +"file.Ti consentono di ignorare le differenze su una singola riga." #. type: Content of: <article><variablelist><varlistentry><listitem><para> #: English/Filters.xml:74 msgid "" -"Substitution filters are applied only to file compare operations. They replace the strings in the diff block with the specified strings, compare " -"them, and ignore the diff block if the replacement results match. They are useful for ignoring large numbers of uninteresting changes." +"Substitution filters are applied only to file compare operations. They " +"replace the strings in the diff block with the specified strings, compare " +"them, and ignore the diff block if the replacement results match. They are " +"useful for ignoring large numbers of uninteresting changes." msgstr "" -"I filtri di sostituzione vengono applicati solo alle operazioni di confronto dei file.Sostituiscono le stringhe nel blocco diff con le stringhe " -"specificate, le confrontano e ignorano il blocco diff se i risultati della sostituzione corrispondono.Sono utili per ignorare un gran numero di " +"I filtri di sostituzione vengono applicati solo alle operazioni di confronto " +"dei file.Sostituiscono le stringhe nel blocco diff con le stringhe " +"specificate, le confrontano e ignorano il blocco diff se i risultati della " +"sostituzione corrispondono.Sono utili per ignorare un gran numero di " "modifiche poco interessanti." #. type: Content of: <article><section><title><indexterm><secondary> @@ -10617,19 +14046,24 @@ msgstr "nei confronti delle cartelle" #. type: Content of: <article><section><title> #: English/Filters.xml:84 -msgid "Using file masks<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "" +"Using file masks<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Utilizzo delle maschere dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " +"Utilizzo delle maschere dei file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " "id=\"2\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:96 msgid "" -"You can use one or more <glossterm>file masks</glossterm> that specify file extensions to include in a folder comparison. All other files are omitted " +"You can use one or more <glossterm>file masks</glossterm> that specify file " +"extensions to include in a folder comparison. All other files are omitted " "from your selection." msgstr "" -"È possibile utilizzare una o più <glossterm>maschere file</glossterm> che specificano le estensioni dei file da includere in un confronto di " -"cartelle.Tutti gli altri file vengono omessi dalla selezione." +"È possibile utilizzare una o più <glossterm>maschere file</glossterm> che " +"specificano le estensioni dei file da includere in un confronto di cartelle." +"Tutti gli altri file vengono omessi dalla selezione." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:104 @@ -10638,29 +14072,43 @@ msgstr "applicare maschere di file" #. type: Content of: <article><section><section><title> #: English/Filters.xml:101 -msgid "Defining and applying file masks<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Definizione e applicazione di maschere di file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Defining and applying file masks<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Definizione e applicazione di maschere di file<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:107 -msgid "Define and apply a file mask at the time you launch your folder compare operation:" -msgstr "Definisci e applica una maschera file nel momento in cui avvii l'operazione di confronto delle cartelle:" +msgid "" +"Define and apply a file mask at the time you launch your folder compare " +"operation:" +msgstr "" +"Definisci e applica una maschera file nel momento in cui avvii l'operazione " +"di confronto delle cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:112 msgid "" -"If you are using the Select Files or Folders dialog, after choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, enter one or " -"more file masks in the <guilabel>Filter</guilabel> field. The masks are applied when you start the folder compare operation." +"If you are using the Select Files or Folders dialog, after choosing the " +"<guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, enter one or " +"more file masks in the <guilabel>Filter</guilabel> field. The masks are " +"applied when you start the folder compare operation." msgstr "" -"Se stai usando la finestra di dialogo Seleziona file o cartelle, dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, " -"inserisci una o più maschere di file nel campo <guilabel >Filtro</guilabel >.Le maschere vengono applicate quando si avvia l'operazione di confronto " +"Se stai usando la finestra di dialogo Seleziona file o cartelle, dopo aver " +"scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, " +"inserisci una o più maschere di file nel campo <guilabel >Filtro</guilabel >." +"Le maschere vengono applicate quando si avvia l'operazione di confronto " "delle cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:120 -msgid "If you are using the WinMerge command line, use the <option>-f</option> flag to specify file masks (see the example in the next section)." +msgid "" +"If you are using the WinMerge command line, use the <option>-f</option> flag " +"to specify file masks (see the example in the next section)." msgstr "" -"Se stai usando la riga di comando di WinMerge, usa il flag <option>-f</option> per specificare le maschere dei file (vedi l'esempio nella prossima " +"Se stai usando la riga di comando di WinMerge, usa il flag <option>-f</" +"option> per specificare le maschere dei file (vedi l'esempio nella prossima " "sezione)." #. type: Content of: <article><section><section><title><indexterm><primary> @@ -10676,16 +14124,19 @@ msgstr "nelle maschere dei file" #. type: Content of: <article><section><section><title> #: English/Filters.xml:128 msgid "" -"File mask syntax and example<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " +"File mask syntax and example<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" " "id=\"2\"/>" msgstr "" -"Sintassi ed esempio della maschera file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder " +"Sintassi ed esempio della maschera file<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>><placeholder " "type=\"indexterm\" id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:142 msgid "You can specify file masks and extended filters using this format:" -msgstr "Puoi specificare maschere file e filtri estesi utilizzando questo formato:" +msgstr "" +"Puoi specificare maschere file e filtri estesi utilizzando questo formato:" #. type: Content of: <article><section><section><synopsis> #: English/Filters.xml:145 @@ -10699,27 +14150,42 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:149 -msgid "The <filename>|</filename> character separates filter groups and acts as a logical AND." -msgstr "Il carattere <filename>|</filename> separa i gruppi di filtri e funge da AND logico." +msgid "" +"The <filename>|</filename> character separates filter groups and acts as a " +"logical AND." +msgstr "" +"Il carattere <filename>|</filename> separa i gruppi di filtri e funge da AND " +"logico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:150 -msgid "Filters within the same group are separated by <filename>;</filename> and are interpreted with a logical OR." -msgstr "I filtri all'interno dello stesso gruppo sono separati da <filename>;</filename> e vengono interpretati con un OR logico." +msgid "" +"Filters within the same group are separated by <filename>;</filename> and " +"are interpreted with a logical OR." +msgstr "" +"I filtri all'interno dello stesso gruppo sono separati da <filename>;</" +"filename> e vengono interpretati con un OR logico." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:151 -msgid "A file is included only if it matches at least one filter in each group." -msgstr "Un file viene incluso solo se corrisponde ad almeno un filtro in ciascun gruppo." +msgid "" +"A file is included only if it matches at least one filter in each group." +msgstr "" +"Un file viene incluso solo se corrisponde ad almeno un filtro in ciascun " +"gruppo." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:153 msgid "" -"To include a literal <filename>|</filename> (pipe) character in a regular expression that is not enclosed in double quotes (such as in <filename>f:</" -"filename> or <filename>f!:</filename> filters), use <filename>||</filename> instead." +"To include a literal <filename>|</filename> (pipe) character in a regular " +"expression that is not enclosed in double quotes (such as in <filename>f:</" +"filename> or <filename>f!:</filename> filters), use <filename>||</filename> " +"instead." msgstr "" -"Per includere un carattere letterale <filename>|</filename> (pipe) in un'espressione regolare che non è racchiusa tra virgolette doppie (come nei " -"filtri <filename>f:</filename> o <filename>f!:</filename>), utilizzare invece <filename>||</filename>." +"Per includere un carattere letterale <filename>|</filename> (pipe) in " +"un'espressione regolare che non è racchiusa tra virgolette doppie (come nei " +"filtri <filename>f:</filename> o <filename>f!:</filename>), utilizzare " +"invece <filename>||</filename>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:154 @@ -10729,7 +14195,9 @@ msgstr "Esempio: <userinput>f:(abc||def)\\.txt$</userinput>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:157 msgid "Each filter (e.g., Filter1, Filter2) can be one of the following types:" -msgstr "Ciascun filtro (ad esempio, Filtro1, Filtro2) può essere uno dei seguenti tipi:" +msgstr "" +"Ciascun filtro (ad esempio, Filtro1, Filtro2) può essere uno dei seguenti " +"tipi:" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:159 @@ -10759,7 +14227,9 @@ msgstr "!<replaceable>*.ext</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:161 msgid "Exclude files matching the extension (Available since 2.16.19)" -msgstr "Escludi file corrispondenti all'estensione (disponibile dalla versione 2.16.19)" +msgstr "" +"Escludi file corrispondenti all'estensione (disponibile dalla versione " +"2.16.19)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:162 @@ -10769,7 +14239,8 @@ msgstr "<replaceable>cartella</replaceable>\\" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:162 msgid "Target folders (must end with \\) (Available since 2.16.19)" -msgstr "Cartelle di destinazione (devono terminare con \\) (disponibile dal 16.2.19)" +msgstr "" +"Cartelle di destinazione (devono terminare con \\) (disponibile dal 16.2.19)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:163 @@ -10789,7 +14260,9 @@ msgstr "f: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:164 msgid "Match file names using regular expressions (Available since 2.16.49)" -msgstr "Abbina i nomi dei file utilizzando le espressioni regolari (disponibile dalla versione 2.16.49)" +msgstr "" +"Abbina i nomi dei file utilizzando le espressioni regolari (disponibile " +"dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:165 English/Filters.xml:1538 @@ -10799,7 +14272,8 @@ msgstr "f!: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:165 msgid "Exclude files matching regex (Available since 2.16.49)" -msgstr "Escludi file corrispondenti a regex (disponibile dalla versione 2.16.49)" +msgstr "" +"Escludi file corrispondenti a regex (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:166 English/Filters.xml:1539 @@ -10809,7 +14283,9 @@ msgstr "d: <replaceable>regexp</replaceable>" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:166 msgid "Match folder names using regex (Available since 2.16.49)" -msgstr "Abbina i nomi delle cartelle utilizzando regex (disponibile dalla versione 2.16.49)" +msgstr "" +"Abbina i nomi delle cartelle utilizzando regex (disponibile dalla versione " +"2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:167 English/Filters.xml:1540 @@ -10828,8 +14304,11 @@ msgstr "fe: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:168 English/Filters.xml:1541 -msgid "Filter expression for files (e.g. fe:Size < 1KB) (Available since 2.16.49)" -msgstr "Espressione di filtro per file (ad esempio fe:Size < 1KB) (disponibile dal 16.2.49)" +msgid "" +"Filter expression for files (e.g. fe:Size < 1KB) (Available since 2.16.49)" +msgstr "" +"Espressione di filtro per file (ad esempio fe:Size < 1KB) (disponibile " +"dal 16.2.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:169 English/Filters.xml:1542 @@ -10839,7 +14318,8 @@ msgstr "fe!: <replaceable>expr</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:169 English/Filters.xml:1542 msgid "Filter expression to exclude files (Available since 2.16.49)" -msgstr "Espressione di filtro per escludere file (disponibile dalla versione 2.16.49)" +msgstr "" +"Espressione di filtro per escludere file (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:170 English/Filters.xml:1543 @@ -10849,7 +14329,8 @@ msgstr "de: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:170 English/Filters.xml:1543 msgid "Filter expression for folders (Available since 2.16.49)" -msgstr "Espressione di filtro per cartelle (disponibile dalla versione 2.16.49)" +msgstr "" +"Espressione di filtro per cartelle (disponibile dalla versione 2.16.49)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:171 English/Filters.xml:1544 @@ -10859,7 +14340,9 @@ msgstr "de!: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:171 English/Filters.xml:1544 msgid "Filter expression to exclude folders (Available since 2.16.49)" -msgstr "Espressione di filtro per escludere cartelle (disponibile dalla versione 2.16.49)" +msgstr "" +"Espressione di filtro per escludere cartelle (disponibile dalla versione " +"2.16.49)" #. type: Content of: <article><section><section><itemizedlist><listitem><variablelist><varlistentry><term> #: English/Filters.xml:172 @@ -10879,16 +14362,20 @@ msgstr "Maschera di archivio" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:180 msgid "" -"In this command-line example, the folder compare operation includes only files with <filename>xml</filename> or <filename>txt</filename> extensions. " +"In this command-line example, the folder compare operation includes only " +"files with <filename>xml</filename> or <filename>txt</filename> extensions. " "All other files are omitted:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle cartelle include solo file con estensioni <filename>xml</filename> o " +"In questo esempio da riga di comando, l'operazione di confronto delle " +"cartelle include solo file con estensioni <filename>xml</filename> o " "<filename>txt</filename>.Tutti gli altri file vengono omessi:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:184 -msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" -msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" +msgid "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" +msgstr "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f *.xml;*.txt</userinput>" #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:189 @@ -10897,15 +14384,20 @@ msgstr "Escluse le cartelle (dalla versione 2.16.19)" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:191 -msgid "In this command-line example, the folder compare operation excludes <filename>.git</filename> and <filename>.vs</filename> folders:" +msgid "" +"In this command-line example, the folder compare operation excludes " +"<filename>.git</filename> and <filename>.vs</filename> folders:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle cartelle esclude le cartelle <filename>.git</filename> e <filename>.vs</" +"In questo esempio da riga di comando, l'operazione di confronto delle " +"cartelle esclude le cartelle <filename>.git</filename> e <filename>.vs</" "filename>:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:195 -msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" -msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" +msgid "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" +msgstr "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f !.git\\;!.vs\\</userinput>" #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:200 @@ -10915,16 +14407,22 @@ msgstr "Espressione filtro (dalla versione 2.16.49)" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:202 msgid "" -"In this command-line example, the folder compare operation includes only files with <filename>cpp</filename> or <filename>h</filename> extensions and " +"In this command-line example, the folder compare operation includes only " +"files with <filename>cpp</filename> or <filename>h</filename> extensions and " "a file size less than 1KB:" msgstr "" -"In questo esempio da riga di comando, l'operazione di confronto delle cartelle include solo file con estensioni <filename>cpp</filename> o " +"In questo esempio da riga di comando, l'operazione di confronto delle " +"cartelle include solo file con estensioni <filename>cpp</filename> o " "<filename>h</filename> e una dimensione di file inferiore a 1 KB:" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:206 -msgid "<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Size < 1KB\"</userinput>" -msgstr "<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Dimensione < 1KB\"</userinput>" +msgid "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Size < " +"1KB\"</userinput>" +msgstr "" +"<userinput>WinMergeU c:\\project\\docs c:\\temp /f \"*.cpp;*.h|fe:Dimensione " +"< 1KB\"</userinput>" #. type: Content of: <article><section><section><title> #: English/Filters.xml:212 @@ -10934,11 +14432,14 @@ msgstr "Sintassi dell'espressione di filtro" #. type: Content of: <article><section><section><para> #: English/Filters.xml:215 msgid "" -"WinMerge allows powerful filtering using expressions that operate on file metadata, contents, and comparison context. This section describes the " +"WinMerge allows powerful filtering using expressions that operate on file " +"metadata, contents, and comparison context. This section describes the " "supported attributes, operators, functions, data types, and evaluation rules." msgstr "" -"WinMerge consente un potente filtraggio utilizzando espressioni che operano sui metadati dei file, sui contenuti e sul contesto di confronto.Questa " -"sezione descrive gli attributi, gli operatori, le funzioni, i tipi di dati e le regole di valutazione supportati." +"WinMerge consente un potente filtraggio utilizzando espressioni che operano " +"sui metadati dei file, sui contenuti e sul contesto di confronto.Questa " +"sezione descrive gli attributi, gli operatori, le funzioni, i tipi di dati e " +"le regole di valutazione supportati." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:221 @@ -10952,38 +14453,52 @@ msgstr "I tipi letterali supportati includono:" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:225 -msgid "<emphasis>Boolean</emphasis>: <literal>true</literal>, <literal>false</literal>" -msgstr "<emphasis>Booleano</emphasis>: <literal>vero</literal>, <literal>falso</literal>" +msgid "" +"<emphasis>Boolean</emphasis>: <literal>true</literal>, <literal>false</" +"literal>" +msgstr "" +"<emphasis>Booleano</emphasis>: <literal>vero</literal>, <literal>falso</" +"literal>" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:226 msgid "" -"<emphasis>Integer</emphasis>: 64-bit signed integers (e.g., <literal>1024</literal>, or with units like <literal>100KB</literal>, <literal>7days</" +"<emphasis>Integer</emphasis>: 64-bit signed integers (e.g., <literal>1024</" +"literal>, or with units like <literal>100KB</literal>, <literal>7days</" "literal>)" msgstr "" -"<emphasis>Intero</emphasis>: interi con segno a 64 bit (ad esempio, <literal>1024</literal> o con unità come <literal>100KB</literal>, <literal>7 " -"giorni</literal>)" +"<emphasis>Intero</emphasis>: interi con segno a 64 bit (ad esempio, " +"<literal>1024</literal> o con unità come <literal>100KB</literal>, " +"<literal>7 giorni</literal>)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:227 msgid "" -"<emphasis>Real (Double)</emphasis>: Floating-point numbers with optional decimal or exponent (e.g., <literal>3.14</literal>, <literal>.5</literal>, " +"<emphasis>Real (Double)</emphasis>: Floating-point numbers with optional " +"decimal or exponent (e.g., <literal>3.14</literal>, <literal>.5</literal>, " "<literal>1e6</literal>)" msgstr "" -"<emphasis>Reale (doppio)</emphasis>: numeri in virgola mobile con decimale o esponente opzionale (ad esempio, <literal>3.14</literal>, <literal>.5</" +"<emphasis>Reale (doppio)</emphasis>: numeri in virgola mobile con decimale o " +"esponente opzionale (ad esempio, <literal>3.14</literal>, <literal>.5</" "literal>, <literal>1e6</literal>)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:228 -msgid "<emphasis>String</emphasis>: Enclosed in double quotes (e.g., <literal>\"example\"</literal>)" -msgstr "<emphasis>Stringa</emphasis>: racchiusa tra virgolette doppie (ad esempio, <literal>\"esempio\"</literal>)" +msgid "" +"<emphasis>String</emphasis>: Enclosed in double quotes (e.g., " +"<literal>\"example\"</literal>)" +msgstr "" +"<emphasis>Stringa</emphasis>: racchiusa tra virgolette doppie (ad esempio, " +"<literal>\"esempio\"</literal>)" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:232 msgid "" -"Internally, values may be of the following types: Boolean, Integer, Real, Timestamp, String, File Content, Array, or <literal>undefined</literal>." +"Internally, values may be of the following types: Boolean, Integer, Real, " +"Timestamp, String, File Content, Array, or <literal>undefined</literal>." msgstr "" -"Internamente, i valori possono essere dei seguenti tipi: Booleano, Intero, Reale, Timestamp, Stringa, Contenuto file, Array o <literal>non definito</" +"Internamente, i valori possono essere dei seguenti tipi: Booleano, Intero, " +"Reale, Timestamp, Stringa, Contenuto file, Array o <literal>non definito</" "literal>." #. type: Content of: <article><section><section><section><title> @@ -10994,11 +14509,15 @@ msgstr "Direttive" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:241 msgid "" -"Filter expressions support directives that control how the expression is evaluated. Directives are specified at the beginning of the expression, " -"prefixed with <literal>@</literal>, and separated from the expression by whitespace." +"Filter expressions support directives that control how the expression is " +"evaluated. Directives are specified at the beginning of the expression, " +"prefixed with <literal>@</literal>, and separated from the expression by " +"whitespace." msgstr "" -"Le espressioni di filtro supportano direttive che controllano il modo in cui viene valutata l'espressione.Le direttive sono specificate all'inizio " -"dell'espressione, precedute da <literal>@</literal> e separate dall'espressione da spazi bianchi." +"Le espressioni di filtro supportano direttive che controllano il modo in cui " +"viene valutata l'espressione.Le direttive sono specificate all'inizio " +"dell'espressione, precedute da <literal>@</literal> e separate " +"dall'espressione da spazi bianchi." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:247 @@ -11008,14 +14527,20 @@ msgstr "Direttive sulla distinzione tra maiuscole e minuscole" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:250 msgid "" -"By default, all string comparison operators (<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " -"<literal>></literal>, <literal>>=</literal>, <literal>contains</literal>, <literal>recontains</literal>, <literal>like</literal>, " -"<literal>matches</literal>) are case-insensitive. You can control this behavior using the following directives:" -msgstr "" -"Per impostazione predefinita, tutti gli operatori di confronto di stringhe (<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " -"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, <literal>contains</literal>, <literal>recontains</literal>, " -"<literal>like</literal>,<literal>corrispondenze</literal>) non fanno distinzione tra maiuscole e minuscole.Puoi controllare questo comportamento " -"utilizzando le seguenti direttive:" +"By default, all string comparison operators (<literal>=</literal>, <literal>!" +"=</literal>, <literal><</literal>, <literal><=</literal>, <literal>>" +"</literal>, <literal>>=</literal>, <literal>contains</literal>, " +"<literal>recontains</literal>, <literal>like</literal>, <literal>matches</" +"literal>) are case-insensitive. You can control this behavior using the " +"following directives:" +msgstr "" +"Per impostazione predefinita, tutti gli operatori di confronto di stringhe " +"(<literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " +"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, " +"<literal>contains</literal>, <literal>recontains</literal>, <literal>like</" +"literal>,<literal>corrispondenze</literal>) non fanno distinzione tra " +"maiuscole e minuscole.Puoi controllare questo comportamento utilizzando le " +"seguenti direttive:" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:258 @@ -11024,9 +14549,12 @@ msgstr "<literal>@cs</literal>, <literal>@casesensitive</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:261 -msgid "Enable case-sensitive comparison. With these directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are considered different." +msgid "" +"Enable case-sensitive comparison. With these directives, <literal>\"ABC\"</" +"literal> and <literal>\"abc\"</literal> are considered different." msgstr "" -"Abilita il confronto con distinzione tra maiuscole e minuscole.Con queste direttive, <literal>\"ABC\"</literal> e <literal>\"abc\"</literal> sono " +"Abilita il confronto con distinzione tra maiuscole e minuscole.Con queste " +"direttive, <literal>\"ABC\"</literal> e <literal>\"abc\"</literal> sono " "considerati diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -11037,11 +14565,13 @@ msgstr "<literal>@ci</literal>, <literal>@caseinsensitive</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:270 msgid "" -"Enable case-insensitive comparison (default behavior). With these directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are " +"Enable case-insensitive comparison (default behavior). With these " +"directives, <literal>\"ABC\"</literal> and <literal>\"abc\"</literal> are " "considered identical." msgstr "" -"Abilita il confronto senza distinzione tra maiuscole e minuscole (comportamento predefinito).Con queste direttive, <literal>\"ABC\"</literal> e " -"<literal>\"abc\"</literal> sono considerati identici." +"Abilita il confronto senza distinzione tra maiuscole e minuscole " +"(comportamento predefinito).Con queste direttive, <literal>\"ABC\"</literal> " +"e <literal>\"abc\"</literal> sono considerati identici." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:277 @@ -11063,7 +14593,8 @@ msgstr "" "@caseinsensitive Il contenuto contiene \"errore\" ## Non distingue tra maiuscole e minuscole: corrisponde a \"Errore\", \"ERRORE\", \"errore\", ecc." #. type: Content of: <article><section><section><section><section><section><example> -#: English/Filters.xml:278 English/Filters.xml:315 English/Filters.xml:347 English/Filters.xml:738 +#: English/Filters.xml:278 English/Filters.xml:315 English/Filters.xml:347 +#: English/Filters.xml:738 msgid "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "<placeholder type=\"programlisting\" id=\"0\"/>" @@ -11074,10 +14605,13 @@ msgstr "Direttive di ottimizzazione" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:289 -msgid "By default, filter expressions are optimized to improve performance. You can control this behavior using the following directives:" +msgid "" +"By default, filter expressions are optimized to improve performance. You can " +"control this behavior using the following directives:" msgstr "" -"Per impostazione predefinita, le espressioni di filtro sono ottimizzate per migliorare le prestazioni.Puoi controllare questo comportamento " -"utilizzando le seguenti direttive:" +"Per impostazione predefinita, le espressioni di filtro sono ottimizzate per " +"migliorare le prestazioni.Puoi controllare questo comportamento utilizzando " +"le seguenti direttive:" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:295 @@ -11086,9 +14620,13 @@ msgstr "<literal>@ottimizzare</literal>, <literal>@opt</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:298 -msgid "Enable filter expression optimization (default behavior). This may improve performance for complex expressions." +msgid "" +"Enable filter expression optimization (default behavior). This may improve " +"performance for complex expressions." msgstr "" -"Abilita l'ottimizzazione dell'espressione del filtro (comportamento predefinito).Ciò potrebbe migliorare le prestazioni per le espressioni complesse." +"Abilita l'ottimizzazione dell'espressione del filtro (comportamento " +"predefinito).Ciò potrebbe migliorare le prestazioni per le espressioni " +"complesse." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:304 @@ -11097,8 +14635,12 @@ msgstr "<literal>@nooptimize</literal>, <literal>@noopt</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:307 -msgid "Disable filter expression optimization. This is useful for debugging or when optimization causes unexpected results." -msgstr "Disabilita l'ottimizzazione dell'espressione del filtro.Ciò è utile per il debug o quando l'ottimizzazione provoca risultati imprevisti." +msgid "" +"Disable filter expression optimization. This is useful for debugging or when " +"optimization causes unexpected results." +msgstr "" +"Disabilita l'ottimizzazione dell'espressione del filtro.Ciò è utile per il " +"debug o quando l'ottimizzazione provoca risultati imprevisti." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:314 @@ -11125,34 +14667,44 @@ msgstr "Direttiva sui nomi" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:325 msgid "" -"The <literal>@name</literal> directive allows you to assign a descriptive name to a filter expression. This name is intended for use in error " +"The <literal>@name</literal> directive allows you to assign a descriptive " +"name to a filter expression. This name is intended for use in error " "messages and logs to help identify which filter expression caused an issue." msgstr "" -"La direttiva <literal>@name</literal> consente di assegnare un nome descrittivo a un'espressione di filtro.Questo nome è destinato all'uso nei " -"messaggi di errore e nei log per identificare quale espressione di filtro ha causato un problema." +"La direttiva <literal>@name</literal> consente di assegnare un nome " +"descrittivo a un'espressione di filtro.Questo nome è destinato all'uso nei " +"messaggi di errore e nei log per identificare quale espressione di filtro ha " +"causato un problema." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:331 -msgid "<literal>@name=\"Filter Name\"</literal>, <literal>@name=FilterName</literal>" -msgstr "<literal>@name=\"Nome filtro\"</literal>, <literal>@name=Nome filtro</literal>" +msgid "" +"<literal>@name=\"Filter Name\"</literal>, <literal>@name=FilterName</literal>" +msgstr "" +"<literal>@name=\"Nome filtro\"</literal>, <literal>@name=Nome filtro</" +"literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:334 msgid "" -"Assigns a name to the filter expression. If the name contains spaces or special characters, it must be enclosed in double quotes. Names without " +"Assigns a name to the filter expression. If the name contains spaces or " +"special characters, it must be enclosed in double quotes. Names without " "spaces can be specified without quotes." msgstr "" -"Assegna un nome all'espressione di filtro.Se il nome contiene spazi o caratteri speciali, deve essere racchiuso tra virgolette doppie.I nomi senza " +"Assegna un nome all'espressione di filtro.Se il nome contiene spazi o " +"caratteri speciali, deve essere racchiuso tra virgolette doppie.I nomi senza " "spazi possono essere specificati senza virgolette." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:338 msgid "" -"The specified name will be used in error messages and diagnostic output to identify the filter. This is particularly useful when working with " -"multiple complex filter expressions." +"The specified name will be used in error messages and diagnostic output to " +"identify the filter. This is particularly useful when working with multiple " +"complex filter expressions." msgstr "" -"Il nome specificato verrà utilizzato nei messaggi di errore e nell'output diagnostico per identificare il filtro.Ciò è particolarmente utile quando " -"si lavora con più espressioni di filtro complesse." +"Il nome specificato verrà utilizzato nei messaggi di errore e nell'output " +"diagnostico per identificare il filtro.Ciò è particolarmente utile quando si " +"lavora con più espressioni di filtro complesse." #. type: Content of: <article><section><section><section><section><example><title> #: English/Filters.xml:346 @@ -11176,10 +14728,12 @@ msgstr "" #. type: Content of: <article><section><section><section><section><note><para> #: English/Filters.xml:355 msgid "" -"The <literal>@name</literal> directive can be combined with other directives. When multiple directives are used, they should all appear at the " -"beginning of the expression, separated by whitespace." +"The <literal>@name</literal> directive can be combined with other " +"directives. When multiple directives are used, they should all appear at " +"the beginning of the expression, separated by whitespace." msgstr "" -"La direttiva <literal>@name</literal> può essere combinata con altre direttive.Quando vengono utilizzate più direttive, dovrebbero apparire tutte " +"La direttiva <literal>@name</literal> può essere combinata con altre " +"direttive.Quando vengono utilizzate più direttive, dovrebbero apparire tutte " "all'inizio dell'espressione, separate da spazi bianchi." #. type: Content of: <article><section><section><section><title> @@ -11190,11 +14744,15 @@ msgstr "Attributi" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:367 msgid "" -"Filter expressions support a variety of attributes referring to file metadata and content. Attribute names are case-insensitive. You can optionally " -"specify which side of the comparison (Left, Right, or Middle) an attribute applies to by using a prefix." +"Filter expressions support a variety of attributes referring to file " +"metadata and content. Attribute names are case-insensitive. You can " +"optionally specify which side of the comparison (Left, Right, or Middle) an " +"attribute applies to by using a prefix." msgstr "" -"Le espressioni di filtro supportano una varietà di attributi che fanno riferimento ai metadati e al contenuto dei file.I nomi degli attributi non " -"fanno distinzione tra maiuscole e minuscole.Facoltativamente, è possibile specificare a quale lato del confronto (Sinistra, Destra o Centro) si " +"Le espressioni di filtro supportano una varietà di attributi che fanno " +"riferimento ai metadati e al contenuto dei file.I nomi degli attributi non " +"fanno distinzione tra maiuscole e minuscole.Facoltativamente, è possibile " +"specificare a quale lato del confronto (Sinistra, Destra o Centro) si " "applica un attributo utilizzando un prefisso." #. type: Content of: <article><section><section><section><section><title> @@ -11209,8 +14767,12 @@ msgstr "<varname>Exists</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:377 -msgid "Returns <literal>true</literal> if the file exists, <literal>false</literal> otherwise" -msgstr "Restituisce <literal>true</literal> se il file esiste, <literal>false</literal> altrimenti" +msgid "" +"Returns <literal>true</literal> if the file exists, <literal>false</literal> " +"otherwise" +msgstr "" +"Restituisce <literal>true</literal> se il file esiste, <literal>false</" +"literal> altrimenti" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:380 @@ -11229,8 +14791,12 @@ msgstr "<varname>BaseName</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:385 -msgid "Returns the filename without extension. For example, \"document.txt\" returns \"document\"." -msgstr "Restituisce il nome del file senza estensione.Ad esempio, \"document.txt\" restituisce \"documento\"." +msgid "" +"Returns the filename without extension. For example, \"document.txt\" " +"returns \"document\"." +msgstr "" +"Restituisce il nome del file senza estensione.Ad esempio, \"document.txt\" " +"restituisce \"documento\"." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:388 @@ -11250,7 +14816,8 @@ msgstr "<varname>IsFolder</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:393 msgid "Returns true if the item is a folder/directory, false if it's a file." -msgstr "Restituisce vero se l'elemento è una cartella/cartella, falso se è un file." +msgstr "" +"Restituisce vero se l'elemento è una cartella/cartella, falso se è un file." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:396 @@ -11260,7 +14827,9 @@ msgstr "<varname>Folder</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:397 msgid "Returns the relative path excluding the file name and base folder" -msgstr "Restituisce il percorso relativo escludendo il nome del file e la cartella di base" +msgstr "" +"Restituisce il percorso relativo escludendo il nome del file e la cartella " +"di base" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:400 @@ -11270,11 +14839,14 @@ msgstr "<varname>RelPath</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:401 msgid "" -"Returns the relative path from the comparison root directory, including both folder path and filename. For example, if comparing \"C:\\Project\" and " -"the file is at \"C:\\Project\\src\\main.cpp\", RelPath returns \"src\\main.cpp\"." +"Returns the relative path from the comparison root directory, including both " +"folder path and filename. For example, if comparing \"C:\\Project\" and the " +"file is at \"C:\\Project\\src\\main.cpp\", RelPath returns \"src\\main.cpp\"." msgstr "" -"Restituisce il percorso relativo dalla cartella principale di confronto, inclusi sia il percorso della cartella che il nome del file. Ad esempio, se " -"si confronta \"C:\\Project\" e il file si trova in \"C:\\Project\\src\\main.cpp\", RelPath restituisce \"src\\main.cpp\"." +"Restituisce il percorso relativo dalla cartella principale di confronto, " +"inclusi sia il percorso della cartella che il nome del file. Ad esempio, se " +"si confronta \"C:\\Project\" e il file si trova in \"C:\\Project\\src\\main." +"cpp\", RelPath restituisce \"src\\main.cpp\"." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:404 @@ -11314,7 +14886,9 @@ msgstr "<varname>DateStr</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:417 msgid "Last modified date string in <literal>yyyy-MM-dd</literal> format" -msgstr "Stringa della data dell'ultima modifica nel formato <literal>aaaa-MM-gg</literal>" +msgstr "" +"Stringa della data dell'ultima modifica nel formato <literal>aaaa-MM-gg</" +"literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:420 @@ -11344,11 +14918,14 @@ msgstr "<varname>AttrStr</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:430 msgid "" -"Returns file attribute string. Examples: <literal>\"R\"</literal> for Read-only, <literal>\"H\"</literal> for Hidden, <literal>\"A\"</literal> for " +"Returns file attribute string. Examples: <literal>\"R\"</literal> for Read-" +"only, <literal>\"H\"</literal> for Hidden, <literal>\"A\"</literal> for " "Archive, <literal>\"S\"</literal> for System file." msgstr "" -"Restituisce la stringa dell'attributo del file.Esempi: <literal>\"R\"</literal> per sola lettura, <literal>\"H\"</literal> per nascosto, " -"<literal>\"A\"</literal> per archivio, <literal>\"S\"</literal> per file di sistema." +"Restituisce la stringa dell'attributo del file.Esempi: <literal>\"R\"</" +"literal> per sola lettura, <literal>\"H\"</literal> per nascosto, " +"<literal>\"A\"</literal> per archivio, <literal>\"S\"</literal> per file di " +"sistema." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:442 @@ -11357,9 +14934,12 @@ msgstr "Attributi solo file" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:444 -msgid "The following attributes are available only for file comparison items. When used with folder items, the behavior is undefined." +msgid "" +"The following attributes are available only for file comparison items. When " +"used with folder items, the behavior is undefined." msgstr "" -"I seguenti attributi sono disponibili solo per gli elementi di confronto file.Se utilizzato con elementi di cartelle, il comportamento non è definito." +"I seguenti attributi sono disponibili solo per gli elementi di confronto " +"file.Se utilizzato con elementi di cartelle, il comportamento non è definito." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:450 @@ -11369,9 +14949,12 @@ msgstr "<varname>Content</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:451 msgid "" -"Content of the file. Returns a FileContent-type value. Only <literal>contains</literal> and <literal>recontains</literal> can be used with this type." +"Content of the file. Returns a FileContent-type value. Only " +"<literal>contains</literal> and <literal>recontains</literal> can be used " +"with this type." msgstr "" -"Contenuto del file.Restituisce un valore di tipo FileContent.Con questo tipo è possibile utilizzare solo <literal>contains</literal> e " +"Contenuto del file.Restituisce un valore di tipo FileContent.Con questo tipo " +"è possibile utilizzare solo <literal>contains</literal> e " "<literal>recontains</literal>." #. type: Content of: <article><section><section><section><section><title> @@ -11381,9 +14964,12 @@ msgstr "Attributi solo cartella" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:459 -msgid "The following attributes are available only for folder comparison items. When used with file items, the behavior is undefined." +msgid "" +"The following attributes are available only for folder comparison items. " +"When used with file items, the behavior is undefined." msgstr "" -"I seguenti attributi sono disponibili solo per gli elementi di confronto delle cartelle.Se utilizzato con elementi file, il comportamento non è " +"I seguenti attributi sono disponibili solo per gli elementi di confronto " +"delle cartelle.Se utilizzato con elementi file, il comportamento non è " "definito." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -11404,7 +14990,8 @@ msgstr "<varname>RecursiveFiles</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:470 msgid "Number of files contained in the folder, including all subfolders." -msgstr "Numero di file contenuti nella cartella, incluse tutte le sottocartelle." +msgstr "" +"Numero di file contenuti nella cartella, incluse tutte le sottocartelle." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:473 @@ -11413,8 +15000,11 @@ msgstr "<varname>Items</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:474 -msgid "Number of items (files and subfolders) directly contained in the folder." -msgstr "Numero di elementi (file e sottocartelle) contenuti direttamente nella cartella." +msgid "" +"Number of items (files and subfolders) directly contained in the folder." +msgstr "" +"Numero di elementi (file e sottocartelle) contenuti direttamente nella " +"cartella." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:477 @@ -11423,8 +15013,12 @@ msgstr "<varname>RecursiveItems</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:478 -msgid "Number of items (files and subfolders) contained in the folder, including all subfolders." -msgstr "Numero di elementi (file e sottocartelle) contenuti nella cartella, incluse tutte le sottocartelle." +msgid "" +"Number of items (files and subfolders) contained in the folder, including " +"all subfolders." +msgstr "" +"Numero di elementi (file e sottocartelle) contenuti nella cartella, incluse " +"tutte le sottocartelle." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:481 @@ -11434,7 +15028,9 @@ msgstr "<varname>TotalSize</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:482 msgid "Total size of all files directly contained in the folder, in bytes." -msgstr "Dimensione totale di tutti i file direttamente contenuti nella cartella, in byte." +msgstr "" +"Dimensione totale di tutti i file direttamente contenuti nella cartella, in " +"byte." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:485 @@ -11443,8 +15039,12 @@ msgstr "<varname>RecursiveTotalSize</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:486 -msgid "Total size of all files contained in the folder, including all subfolders, in bytes." -msgstr "Dimensione totale di tutti i file contenuti nella cartella, incluse tutte le sottocartelle, in byte." +msgid "" +"Total size of all files contained in the folder, including all subfolders, " +"in bytes." +msgstr "" +"Dimensione totale di tutti i file contenuti nella cartella, incluse tutte le " +"sottocartelle, in byte." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:492 @@ -11458,25 +15058,40 @@ msgstr "È possibile aggiungere prefissi per specificare il lato di confronto:" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:497 -msgid "<emphasis>Left</emphasis>: Applies to the file on the left side (e.g., <literal>LeftSize</literal>)" -msgstr "<emphasis>Sinistra</emphasis>: si applica al file sul lato sinistro (ad esempio, <literal>LeftSize</literal>)" +msgid "" +"<emphasis>Left</emphasis>: Applies to the file on the left side (e.g., " +"<literal>LeftSize</literal>)" +msgstr "" +"<emphasis>Sinistra</emphasis>: si applica al file sul lato sinistro (ad " +"esempio, <literal>LeftSize</literal>)" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:498 -msgid "<emphasis>Right</emphasis>: Applies to the file on the right side (e.g., <literal>RightDate</literal>)" -msgstr "<emphasis>Destra</emphasis>: si applica al file sul lato destro (ad esempio, <literal>RightDate</literal>)" +msgid "" +"<emphasis>Right</emphasis>: Applies to the file on the right side (e.g., " +"<literal>RightDate</literal>)" +msgstr "" +"<emphasis>Destra</emphasis>: si applica al file sul lato destro (ad esempio, " +"<literal>RightDate</literal>)" #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:499 -msgid "<emphasis>Middle</emphasis>: Applies to the middle file in 3-way comparison (e.g., <literal>MiddleName</literal>)" -msgstr "<emphasis>Medio</emphasis>: si applica al file centrale nel confronto a 3 vie (ad esempio, <literal>MiddleName</literal>)" +msgid "" +"<emphasis>Middle</emphasis>: Applies to the middle file in 3-way comparison " +"(e.g., <literal>MiddleName</literal>)" +msgstr "" +"<emphasis>Medio</emphasis>: si applica al file centrale nel confronto a 3 " +"vie (ad esempio, <literal>MiddleName</literal>)" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:503 -msgid "Attributes without a prefix (e.g., <literal>Size</literal>) return an array of values from all available sides (Left, Middle, Right)." +msgid "" +"Attributes without a prefix (e.g., <literal>Size</literal>) return an array " +"of values from all available sides (Left, Middle, Right)." msgstr "" -"Gli attributi senza prefisso (ad esempio, <literal>Size</literal>) restituiscono un array di valori da tutti i lati disponibili (Sinistra, Centro, " -"Destra)." +"Gli attributi senza prefisso (ad esempio, <literal>Size</literal>) " +"restituiscono un array di valori da tutti i lati disponibili (Sinistra, " +"Centro, Destra)." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:508 @@ -11486,11 +15101,15 @@ msgstr "Attributi delle proprietà di Windows" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:510 msgid "" -"These attributes provide access to Windows Property System values, such as metadata defined by the Windows Property System schema (e.g., " -"<literal>System.Title</literal>, <literal>System.FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." +"These attributes provide access to Windows Property System values, such as " +"metadata defined by the Windows Property System schema (e.g., " +"<literal>System.Title</literal>, <literal>System.FileOwner</literal>, " +"<literal>System.Image.HorizontalResolution</literal>)." msgstr "" -"Questi attributi forniscono l'accesso ai valori del sistema di proprietà di Windows, come i metadati definiti dallo schema del sistema di proprietà " -"di Windows (ad esempio, <literal>System.Title</literal>, <literal>System.FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." +"Questi attributi forniscono l'accesso ai valori del sistema di proprietà di " +"Windows, come i metadati definiti dallo schema del sistema di proprietà di " +"Windows (ad esempio, <literal>System.Title</literal>, <literal>System." +"FileOwner</literal>, <literal>System.Image.HorizontalResolution</literal>)." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:518 @@ -11500,10 +15119,11 @@ msgstr "<varname>Prop</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:521 msgid "" -"Returns an array of property values (Left, Middle, Right) for the specified canonical property name. Example: <literal>prop(\"System.Title\")</" -"literal>" +"Returns an array of property values (Left, Middle, Right) for the specified " +"canonical property name. Example: <literal>prop(\"System.Title\")</literal>" msgstr "" -"Restituisce una matrice di valori di proprietà (Sinistra, Centro, Destra) per il nome della proprietà canonica specificata.Esempio: " +"Restituisce una matrice di valori di proprietà (Sinistra, Centro, Destra) " +"per il nome della proprietà canonica specificata.Esempio: " "<literal>prop(\"System.Title\")</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -11513,8 +15133,12 @@ msgstr "<varname>LeftProp</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:531 -msgid "Property value of the left-side file. Example: <literal>leftprop(\"System.FileOwner\")</literal>" -msgstr "Valore della proprietà del file sul lato sinistro.Esempio: <literal>leftprop(\"System.FileOwner\")</literal>" +msgid "" +"Property value of the left-side file. Example: <literal>leftprop(\"System." +"FileOwner\")</literal>" +msgstr "" +"Valore della proprietà del file sul lato sinistro.Esempio: " +"<literal>leftprop(\"System.FileOwner\")</literal>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:537 @@ -11544,15 +15168,22 @@ msgstr "Display Filters Only Attributes" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:555 msgid "" -"The following attributes are designed for use in <emphasis role=\"bold\">Display filters only</emphasis> (specified via <guilabel>e:</guilabel>, " -"<guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</guilabel>, or <guilabel>de!:</guilabel> prefixes in the " -"Filter field). They should not be used in file filter (<filename>.flt</filename>) include/exclude rules, as they require the comparison to be " +"The following attributes are designed for use in <emphasis " +"role=\"bold\">Display filters only</emphasis> (specified via <guilabel>e:</" +"guilabel>, <guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:" +"</guilabel>, <guilabel>de:</guilabel>, or <guilabel>de!:</guilabel> prefixes " +"in the Filter field). They should not be used in file filter (<filename>." +"flt</filename>) include/exclude rules, as they require the comparison to be " "completed first and may lead to unexpected behavior." msgstr "" -"I seguenti attributi sono progettati per essere usati solo nei filtri <emphasis role=\"bold\">Display fileters only</emphasis> (specificati tramite i " -"prefissi <guilabel>e:</guilabel>, <guilabel>e!:</guilabel>, <guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</guilabel> o " -"<guilabel>de!:</guilabel> in il campo Filtro). Non devono essere uszati nelle regole di inclusione/esclusione del filtro file (<nomefile>.flt</" -"nomefile>), poiché richiedono che il confronto venga prima completato e potrebbero causare comportamenti imprevisti." +"I seguenti attributi sono progettati per essere usati solo nei filtri " +"<emphasis role=\"bold\">Display fileters only</emphasis> (specificati " +"tramite i prefissi <guilabel>e:</guilabel>, <guilabel>e!:</guilabel>, " +"<guilabel>fe:</guilabel>, <guilabel>fe!:</guilabel>, <guilabel>de:</" +"guilabel> o <guilabel>de!:</guilabel> in il campo Filtro). Non devono essere " +"uszati nelle regole di inclusione/esclusione del filtro file (<nomefile>." +"flt</nomefile>), poiché richiedono che il confronto venga prima completato e " +"potrebbero causare comportamenti imprevisti." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:564 @@ -11562,12 +15193,15 @@ msgstr "<varname>Identical</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:567 msgid "" -"Returns <literal>true</literal> if the comparison result indicates the items are identical, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: <literal>Identical</literal> to show only identical files." +"Returns <literal>true</literal> if the comparison result indicates the items " +"are identical, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: " +"<literal>Identical</literal> to show only identical files." msgstr "" -"Restituisce <literal>true</literal> se il risultato del confronto indica che gli elementi sono identici, <literal>false</literal> se non sono " -"identici. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Identical</literal> visualizzare solo file " -"identici." +"Restituisce <literal>true</literal> se il risultato del confronto indica che " +"gli elementi sono identici, <literal>false</literal> se non sono identici. " +"Questo è un attributo globale (non supporta prefissi specifici del lato). " +"Esempio: <literal>Identical</literal> visualizzare solo file identici." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:575 @@ -11577,11 +15211,15 @@ msgstr "<varname>Different</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:578 msgid "" -"Returns <literal>true</literal> if the comparison result indicates the items are different, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: <literal>Different</literal> to show only different files." +"Returns <literal>true</literal> if the comparison result indicates the items " +"are different, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: " +"<literal>Different</literal> to show only different files." msgstr "" -"Restituisce <literal>true</literal> se il risultato del confronto indica che gli elementi sono diversi, <literal>false</literal>se non sono diversi. " -"Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Different</literal> per visualizzare solo file diversi." +"Restituisce <literal>true</literal> se il risultato del confronto indica che " +"gli elementi sono diversi, <literal>false</literal>se non sono diversi. " +"Questo è un attributo globale (non supporta prefissi specifici del lato). " +"Esempio: <literal>Different</literal> per visualizzare solo file diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:586 @@ -11591,12 +15229,16 @@ msgstr "<varname>Skipped</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:589 msgid "" -"Returns <literal>true</literal> if the comparison was skipped due to an error or filter rule, <literal>false</literal> otherwise. This is a global " -"attribute (does not support side-specific prefixes). Example: <literal>Skipped</literal> to show only skipped items." +"Returns <literal>true</literal> if the comparison was skipped due to an " +"error or filter rule, <literal>false</literal> otherwise. This is a global " +"attribute (does not support side-specific prefixes). Example: " +"<literal>Skipped</literal> to show only skipped items." msgstr "" -"Restituisce <literal>true</literal> se il confronto è stato saltato a causa di un errore o di una regola di filtro, <literal>false</literal> se non è " -"stato saltato. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Skipped</literal> per visualizzare solo " -"gli elementi saltati." +"Restituisce <literal>true</literal> se il confronto è stato saltato a causa " +"di un errore o di una regola di filtro, <literal>false</literal> se non è " +"stato saltato. Questo è un attributo globale (non supporta prefissi " +"specifici del lato). Esempio: <literal>Skipped</literal> per visualizzare " +"solo gli elementi saltati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:597 @@ -11606,13 +15248,19 @@ msgstr "<varname>Binary</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:600 msgid "" -"Returns <literal>true</literal> if the file is detected as binary, <literal>false</literal> if it's text, or <literal>undefined</literal> if the file " -"doesn't exist. This attribute supports side-specific prefixes (e.g., <literal>LeftBinary</literal>, <literal>RightBinary</literal>). Example: " -"<literal>allof(Binary)</literal> to show files that are binary on all sides." +"Returns <literal>true</literal> if the file is detected as binary, " +"<literal>false</literal> if it's text, or <literal>undefined</literal> if " +"the file doesn't exist. This attribute supports side-specific prefixes (e." +"g., <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " +"Example: <literal>allof(Binary)</literal> to show files that are binary on " +"all sides." msgstr "" -"Restituisce <literal>true</literal> se il file viene rilevato come binario, <literal>false</literal> se è testo o <literal>unfine</literal> se il " -"file non esiste. Questo attributo supporta prefissi specifici del lato (ad esempio, <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " -"Esempio: <literal>allof(Binary)</literal> per visualizzare i file binari su tutti i lati." +"Restituisce <literal>true</literal> se il file viene rilevato come binario, " +"<literal>false</literal> se è testo o <literal>unfine</literal> se il file " +"non esiste. Questo attributo supporta prefissi specifici del lato (ad " +"esempio, <literal>LeftBinary</literal>, <literal>RightBinary</literal>). " +"Esempio: <literal>allof(Binary)</literal> per visualizzare i file binari su " +"tutti i lati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:608 @@ -11622,13 +15270,19 @@ msgstr "<varname>DifferentLeftMiddle</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:611 msgid "" -"Returns <literal>true</literal> if the left and middle files are different in a 3-way comparison, <literal>false</literal> otherwise. Returns " -"<literal>undefined</literal> in 2-way comparisons. This is a global attribute (does not support side-specific prefixes). Example: " -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> to find files where only left differs from middle." +"Returns <literal>true</literal> if the left and middle files are different " +"in a 3-way comparison, <literal>false</literal> otherwise. Returns " +"<literal>undefined</literal> in 2-way comparisons. This is a global " +"attribute (does not support side-specific prefixes). Example: " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> to find " +"files where only left differs from middle." msgstr "" -"Restituisce <literal>true</literal> se in un confronto a 3 vie i file di sinistra e centrale sono diversi, <literal>false</literal> se non sono " -"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. Questo è un attributo globale (non supporta prefissi specifici del lato). " -"Esempio: <literal>DifferentLeftMiddle e non DifferentMiddleRight</literal> per trovare file in cui solo la sinistra differisce da quello al centro." +"Restituisce <literal>true</literal> se in un confronto a 3 vie i file di " +"sinistra e centrale sono diversi, <literal>false</literal> se non sono " +"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. " +"Questo è un attributo globale (non supporta prefissi specifici del lato). " +"Esempio: <literal>DifferentLeftMiddle e non DifferentMiddleRight</literal> " +"per trovare file in cui solo la sinistra differisce da quello al centro." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:620 @@ -11638,13 +15292,19 @@ msgstr "<varname>DifferentMiddleRight</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:623 msgid "" -"Returns <literal>true</literal> if the middle and right files are different in a 3-way comparison, <literal>false</literal> otherwise. Returns " -"<literal>undefined</literal> in 2-way comparisons. This is a global attribute (does not support side-specific prefixes). Example: " -"<literal>DifferentMiddleRight</literal> to show files where middle and right differ." +"Returns <literal>true</literal> if the middle and right files are different " +"in a 3-way comparison, <literal>false</literal> otherwise. Returns " +"<literal>undefined</literal> in 2-way comparisons. This is a global " +"attribute (does not support side-specific prefixes). Example: " +"<literal>DifferentMiddleRight</literal> to show files where middle and right " +"differ." msgstr "" -"Restituisce <literal>true</literal> se in un confronto a 3 vie i file centrale e destro sono diversi, <literal>false</literal> o se non sono diversi. " -"Nei confronti a due vie restituisce <literal>undefined</literal>. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: " -"<literal>DifferentMiddleRight</literal> per visualizzare i file in cui iquello centrale e quello a destra sono diversi." +"Restituisce <literal>true</literal> se in un confronto a 3 vie i file " +"centrale e destro sono diversi, <literal>false</literal> o se non sono " +"diversi. Nei confronti a due vie restituisce <literal>undefined</literal>. " +"Questo è un attributo globale (non supporta prefissi specifici del lato). " +"Esempio: <literal>DifferentMiddleRight</literal> per visualizzare i file in " +"cui iquello centrale e quello a destra sono diversi." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:632 @@ -11654,13 +15314,19 @@ msgstr "<varname>DifferentLeftRight</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:635 msgid "" -"In 3-way comparisons, returns <literal>true</literal> if the left and right files are different, <literal>false</literal> otherwise. In 2-way " -"comparisons, returns <literal>true</literal> if both files exist and are different. This is a global attribute (does not support side-specific " -"prefixes). Example: <literal>DifferentLeftRight</literal> to show files where left and right differ." +"In 3-way comparisons, returns <literal>true</literal> if the left and right " +"files are different, <literal>false</literal> otherwise. In 2-way " +"comparisons, returns <literal>true</literal> if both files exist and are " +"different. This is a global attribute (does not support side-specific " +"prefixes). Example: <literal>DifferentLeftRight</literal> to show files " +"where left and right differ." msgstr "" -"Nei confronti a 3 vie restituisce <literal>true</literal> se i file sinistro e destro sono diversi, <literal>false</literal> se non sono diversi. Nei " -"confronti a due vie restituisce <literal>true</literal> se entrambi i file esistono e sono diversi. Questo è un attributo globale (non supporta " -"prefissi specifici del lato). Esempio: <literal>DifferentLeftRight</literal> per visualizzare i file in cui la sinistra e la destra differiscono." +"Nei confronti a 3 vie restituisce <literal>true</literal> se i file sinistro " +"e destro sono diversi, <literal>false</literal> se non sono diversi. Nei " +"confronti a due vie restituisce <literal>true</literal> se entrambi i file " +"esistono e sono diversi. Questo è un attributo globale (non supporta " +"prefissi specifici del lato). Esempio: <literal>DifferentLeftRight</" +"literal> per visualizzare i file in cui la sinistra e la destra differiscono." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:644 @@ -11670,13 +15336,19 @@ msgstr "<varname>Differences</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:647 msgid "" -"Returns the number of text differences in the file comparison. This attribute is only meaningful for text files that have been compared. This is a " -"global attribute (does not support side-specific prefixes). Example: <literal>Differences > 0</literal> to show files with differences, or " -"<literal>Differences > 10</literal> to show files with more than 10 differences." +"Returns the number of text differences in the file comparison. This " +"attribute is only meaningful for text files that have been compared. This " +"is a global attribute (does not support side-specific prefixes). Example: " +"<literal>Differences > 0</literal> to show files with differences, or " +"<literal>Differences > 10</literal> to show files with more than 10 " +"differences." msgstr "" -"Restituisce il numero di differenze di testo nel confronto dei file. Questo attributo è significativo solo per i file di testo che sono stati " -"confrontati. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Differences > 0</literal> per visualizzare " -"file con differenze, o <literal>Differences > 10</literal> per visualizzare file con più di 10 differenze." +"Restituisce il numero di differenze di testo nel confronto dei file. Questo " +"attributo è significativo solo per i file di testo che sono stati " +"confrontati. Questo è un attributo globale (non supporta prefissi specifici " +"del lato). Esempio: <literal>Differences > 0</literal> per visualizzare file " +"con differenze, o <literal>Differences > 10</literal> per visualizzare file " +"con più di 10 differenze." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:657 @@ -11686,15 +15358,22 @@ msgstr "<varname>IgnoredDiffs</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:660 msgid "" -"Returns the number of ignored differences in the file comparison (differences filtered by line filters or whitespace settings). This attribute is " -"only meaningful for text files that have been compared. This is a global attribute (does not support side-specific prefixes). Example: " -"<literal>IgnoredDiffs > 0</literal> to show files with ignored differences, or <literal>Differences = 0 and IgnoredDiffs > 0</literal> to show " -"files that are identical except for ignored differences." -msgstr "" -"Restituisce il numero di differenze ignorate nel confronto dei file (differenze filtrate dai filtri di linea o dalle impostazioni degli spazi " -"bianchi). Questo attributo è significativo solo per i file di testo che sono stati confrontati. Questo è un attributo globale (non supporta prefissi " -"specifici del lato). Esempio: <literal>IgnoredDiffs > 0</literal> per visualizzare file con differenze ignorate, o <literal>Differences = 0 e " -"IgnoredDiffs > 0</literal> per visualizzare file identici tranne che per le differenze ignorate." +"Returns the number of ignored differences in the file comparison " +"(differences filtered by line filters or whitespace settings). This " +"attribute is only meaningful for text files that have been compared. This " +"is a global attribute (does not support side-specific prefixes). Example: " +"<literal>IgnoredDiffs > 0</literal> to show files with ignored " +"differences, or <literal>Differences = 0 and IgnoredDiffs > 0</literal> " +"to show files that are identical except for ignored differences." +msgstr "" +"Restituisce il numero di differenze ignorate nel confronto dei file " +"(differenze filtrate dai filtri di linea o dalle impostazioni degli spazi " +"bianchi). Questo attributo è significativo solo per i file di testo che sono " +"stati confrontati. Questo è un attributo globale (non supporta prefissi " +"specifici del lato). Esempio: <literal>IgnoredDiffs > 0</literal> per " +"visualizzare file con differenze ignorate, o <literal>Differences = 0 e " +"IgnoredDiffs > 0</literal> per visualizzare file identici tranne che per le " +"differenze ignorate." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:670 @@ -11704,13 +15383,19 @@ msgstr "<varname>Unpacker</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:673 msgid "" -"Returns the name of the unpacker plugin used for the file comparison, or an empty string if no unpacker was used. This is a global attribute (does " -"not support side-specific prefixes). Example: <literal>Unpacker = \"CompareMSExcelFiles\"</literal> to show files compared using the Excel unpacker, " -"or <literal>Unpacker != \"\"</literal> to show all files where an unpacker was used." -msgstr "" -"Restituisce il nome del plugin di decompressione usato per il confronto dei file o una stringa vuota se non è stato usato alcun programma di " -"decompressione. Questo è un attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Unpacker = \"CompareMSExcelFiles\"</" -"literal> per visualizzare i file confrontati usando il decompressore di Excel o <literal>Unpacker != \"\"</literal> per visualizzare tutti i file in " +"Returns the name of the unpacker plugin used for the file comparison, or an " +"empty string if no unpacker was used. This is a global attribute (does not " +"support side-specific prefixes). Example: <literal>Unpacker = " +"\"CompareMSExcelFiles\"</literal> to show files compared using the Excel " +"unpacker, or <literal>Unpacker != \"\"</literal> to show all files where an " +"unpacker was used." +msgstr "" +"Restituisce il nome del plugin di decompressione usato per il confronto dei " +"file o una stringa vuota se non è stato usato alcun programma di " +"decompressione. Questo è un attributo globale (non supporta prefissi " +"specifici del lato). Esempio: <literal>Unpacker = \"CompareMSExcelFiles\"</" +"literal> per visualizzare i file confrontati usando il decompressore di " +"Excel o <literal>Unpacker != \"\"</literal> per visualizzare tutti i file in " "cui è stato usato un decompressore." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> @@ -11721,13 +15406,19 @@ msgstr "<varname>Prediffer</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:685 msgid "" -"Returns the name of the prediffer plugin used for the file comparison, or an empty string if no prediffer was used. This is a global attribute (does " -"not support side-specific prefixes). Example: <literal>Prediffer = \"IgnoreColumns\"</literal> to show files compared using the IgnoreColumns " -"prediffer, or <literal>Prediffer != \"\"</literal> to show all files where a prediffer was used." +"Returns the name of the prediffer plugin used for the file comparison, or an " +"empty string if no prediffer was used. This is a global attribute (does not " +"support side-specific prefixes). Example: <literal>Prediffer = " +"\"IgnoreColumns\"</literal> to show files compared using the IgnoreColumns " +"prediffer, or <literal>Prediffer != \"\"</literal> to show all files where a " +"prediffer was used." msgstr "" -"Restituisce il nome del plugin prediffer usato per il confronto dei file o una stringa vuota se non è stato utilizzato alcun prediffer. Questo è un " -"attributo globale (non supporta prefissi specifici del lato). Esempio: <literal>Prediffer = \"IgnoreColumns\"</literal> per visualizzare i file " -"confrontati usando il prediffer IgnoreColumns, o <literal>Prediffer != \"\"</literal> per visualizzare tutti i file in cui è stato usato prediffer." +"Restituisce il nome del plugin prediffer usato per il confronto dei file o " +"una stringa vuota se non è stato utilizzato alcun prediffer. Questo è un " +"attributo globale (non supporta prefissi specifici del lato). Esempio: " +"<literal>Prediffer = \"IgnoreColumns\"</literal> per visualizzare i file " +"confrontati usando il prediffer IgnoreColumns, o <literal>Prediffer != \"\"</" +"literal> per visualizzare tutti i file in cui è stato usato prediffer." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:694 @@ -11737,13 +15428,18 @@ msgstr "<varname>Codepage</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:697 msgid "" -"Returns the file's codepage (character encoding) as an integer value. This attribute supports side-specific prefixes (e.g., <literal>LeftCodepage</" -"literal>, <literal>RightCodepage</literal>). Example: <literal>Codepage = 65001</literal> to show UTF-8 files, or <literal>allof(Codepage = 65001)</" +"Returns the file's codepage (character encoding) as an integer value. This " +"attribute supports side-specific prefixes (e.g., <literal>LeftCodepage</" +"literal>, <literal>RightCodepage</literal>). Example: <literal>Codepage = " +"65001</literal> to show UTF-8 files, or <literal>allof(Codepage = 65001)</" "literal> to show files that are UTF-8 on all sides." msgstr "" -"Restituisce la pagina codici del file (codifica dei caratteri) come valore intero. Questo attributo supporta prefissi specifici del lato (ad esempio, " -"<literal>LeftCodepage</literal>, <literal>RightCodepage</literal>). Esempio: <literal>Codepage = 65001</literal> per visualizzare file UTF-8 o " -"<literal>allof(Codepage = 65001)</literal> per visualizzare file UTF-8 in tutti i lati." +"Restituisce la pagina codici del file (codifica dei caratteri) come valore " +"intero. Questo attributo supporta prefissi specifici del lato (ad esempio, " +"<literal>LeftCodepage</literal>, <literal>RightCodepage</literal>). Esempio: " +"<literal>Codepage = 65001</literal> per visualizzare file UTF-8 o " +"<literal>allof(Codepage = 65001)</literal> per visualizzare file UTF-8 in " +"tutti i lati." #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:706 @@ -11753,13 +15449,18 @@ msgstr "<varname>HasBOM</varname>" #. type: Content of: <article><section><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:709 msgid "" -"Returns <literal>true</literal> if the file has a Byte Order Mark (BOM), <literal>false</literal> otherwise. This attribute supports side-specific " -"prefixes (e.g., <literal>LeftHasBOM</literal>, <literal>RightHasBOM</literal>). Example: <literal>HasBOM</literal> to show files with BOM, or " +"Returns <literal>true</literal> if the file has a Byte Order Mark (BOM), " +"<literal>false</literal> otherwise. This attribute supports side-specific " +"prefixes (e.g., <literal>LeftHasBOM</literal>, <literal>RightHasBOM</" +"literal>). Example: <literal>HasBOM</literal> to show files with BOM, or " "<literal>not HasBOM</literal> to show files without BOM." msgstr "" -"Restituisce <literal>true</literal> se il file ha un Byte Order Mark (BOM), <literal>false</literal> altrimenti. Questo attributo supporta prefissi " -"specifici del lato (ad esempio, <literal>LeftHasBOM</literal>, <literal>RightHasBOM</literal>). Esempio: <literal>HasBOM</literal> per visualizzare " -"file con BOM, o <literal>not HasBOM</literal> per visualizzare file senza BOM." +"Restituisce <literal>true</literal> se il file ha un Byte Order Mark (BOM), " +"<literal>false</literal> altrimenti. Questo attributo supporta prefissi " +"specifici del lato (ad esempio, <literal>LeftHasBOM</literal>, " +"<literal>RightHasBOM</literal>). Esempio: <literal>HasBOM</literal> per " +"visualizzare file con BOM, o <literal>not HasBOM</literal> per visualizzare " +"file senza BOM." #. type: Content of: <article><section><section><section><section><title> #: English/Filters.xml:721 @@ -11769,12 +15470,16 @@ msgstr "Valutazione della matrice" #. type: Content of: <article><section><section><section><section><para> #: English/Filters.xml:724 msgid "" -"Attributes without a side prefix (e.g., <literal>Size</literal>) return an array of values from all available sides (Left, Middle, Right). When " -"applying an operator to such arrays, behavior differs depending on whether the comparison is with a scalar or another array." +"Attributes without a side prefix (e.g., <literal>Size</literal>) return an " +"array of values from all available sides (Left, Middle, Right). When " +"applying an operator to such arrays, behavior differs depending on whether " +"the comparison is with a scalar or another array." msgstr "" -"Gli attributi senza prefisso laterale (ad esempio, <literal>Size</literal>) restituiscono un array di valori da tutti i lati disponibili (Sinistra, " -"Centro, Destra).Quando si applica un operatore a tali array, il comportamento varia a seconda che il confronto avvenga con un array scalare o con un " -"altro." +"Gli attributi senza prefisso laterale (ad esempio, <literal>Size</literal>) " +"restituiscono un array di valori da tutti i lati disponibili (Sinistra, " +"Centro, Destra).Quando si applica un operatore a tali array, il " +"comportamento varia a seconda che il confronto avvenga con un array scalare " +"o con un altro." #. type: Content of: <article><section><section><section><section><section><title> #: English/Filters.xml:730 @@ -11784,13 +15489,17 @@ msgstr "Array vs scalare" #. type: Content of: <article><section><section><section><section><section><para> #: English/Filters.xml:732 msgid "" -"When comparing an array to a scalar, the operation is applied to each array element individually. This results in a boolean array. If any element in " -"this boolean array is <literal>true</literal>, the overall expression evaluates to <literal>true</literal>. Otherwise, it evaluates to " +"When comparing an array to a scalar, the operation is applied to each array " +"element individually. This results in a boolean array. If any element in " +"this boolean array is <literal>true</literal>, the overall expression " +"evaluates to <literal>true</literal>. Otherwise, it evaluates to " "<literal>false</literal>." msgstr "" -"Quando si confronta un array con uno scalare, l'operazione viene applicata individualmente a ciascun elemento dell'array.Ciò si traduce in un array " -"booleano.Se qualsiasi elemento in questo array booleano è <literal>true</literal>, l'espressione complessiva restituisce <literal>true</" -"literal>.Altrimenti, restituisce <literal>false</literal>." +"Quando si confronta un array con uno scalare, l'operazione viene applicata " +"individualmente a ciascun elemento dell'array.Ciò si traduce in un array " +"booleano.Se qualsiasi elemento in questo array booleano è <literal>true</" +"literal>, l'espressione complessiva restituisce <literal>true</literal>." +"Altrimenti, restituisce <literal>false</literal>." #. type: Content of: <article><section><section><section><section><section><example><programlisting> #: English/Filters.xml:738 @@ -11806,29 +15515,39 @@ msgstr "Array contro array" #. type: Content of: <article><section><section><section><section><section><para> #: English/Filters.xml:745 msgid "When comparing two arrays, the behavior depends on the operator:" -msgstr "Quando si confrontano due array, il comportamento dipende dall'operatore:" +msgstr "" +"Quando si confrontano due array, il comportamento dipende dall'operatore:" #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:750 msgid "" -"For <literal>=</literal> and <literal>!=</literal>: The arrays must have the same length. The result is a single boolean value, not an array. " -"<literal>=</literal> returns <literal>true</literal> only if all elements are equal. <literal>!=</literal> returns <literal>true</literal> if any " +"For <literal>=</literal> and <literal>!=</literal>: The arrays must have the " +"same length. The result is a single boolean value, not an array. " +"<literal>=</literal> returns <literal>true</literal> only if all elements " +"are equal. <literal>!=</literal> returns <literal>true</literal> if any " "element differs." msgstr "" -"Per <literal>=</literal> e <literal>!=</literal>: gli array devono avere la stessa lunghezza.Il risultato è un singolo valore booleano, non un array." -"<literal>=</literal> restituisce <literal>true</literal> solo se tutti gli elementi sono uguali.<literal>!=</literal> restituisce <literal>true</" +"Per <literal>=</literal> e <literal>!=</literal>: gli array devono avere la " +"stessa lunghezza.Il risultato è un singolo valore booleano, non un array." +"<literal>=</literal> restituisce <literal>true</literal> solo se tutti gli " +"elementi sono uguali.<literal>!=</literal> restituisce <literal>true</" "literal> se qualche elemento è diverso." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:759 msgid "" -"For all other operators (e.g., <literal>></literal>, <literal><</literal>): the operation is applied element-wise, producing a boolean array. " -"The final result of the expression is <literal>true</literal> if any element in the boolean array is <literal>true</literal>, and <literal>false</" +"For all other operators (e.g., <literal>></literal>, <literal><</" +"literal>): the operation is applied element-wise, producing a boolean " +"array. The final result of the expression is <literal>true</literal> if any " +"element in the boolean array is <literal>true</literal>, and <literal>false</" "literal> if all elements are <literal>false</literal>." msgstr "" -"Per tutti gli altri operatori (ad esempio, <literal>></literal>, <literal><</literal>): l'operazione viene applicata per elemento, producendo " -"un array booleano.Il risultato finale dell'espressione è <literal>true</literal> se qualsiasi elemento nell'array booleano è <literal>true</literal> " -"e <literal>false</literal> se tutti gli elementi sono <literal>false</literal>." +"Per tutti gli altri operatori (ad esempio, <literal>></literal>, " +"<literal><</literal>): l'operazione viene applicata per elemento, " +"producendo un array booleano.Il risultato finale dell'espressione è " +"<literal>true</literal> se qualsiasi elemento nell'array booleano è " +"<literal>true</literal> e <literal>false</literal> se tutti gli elementi " +"sono <literal>false</literal>." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:768 English/Filters.xml:1266 @@ -11863,8 +15582,14 @@ msgstr "" #. type: Content of: <article><section><section><section><section><section><example> #: English/Filters.xml:769 -msgid "<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" id=\"2\"/>" -msgstr "<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" id=\"2\"/>" +msgid "" +"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder " +"type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" " +"id=\"2\"/>" +msgstr "" +"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder " +"type=\"programlisting\" id=\"1\"/> <placeholder type=\"programlisting\" " +"id=\"2\"/>" #. type: Content of: <article><section><section><section><section><section><title> #: English/Filters.xml:779 @@ -11874,23 +15599,31 @@ msgstr "Riepilogo" #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:783 msgid "" -"Array vs scalar comparisons produce a boolean array. The overall expression result is <literal>true</literal> if at least one element is " -"<literal>true</literal>." +"Array vs scalar comparisons produce a boolean array. The overall expression " +"result is <literal>true</literal> if at least one element is <literal>true</" +"literal>." msgstr "" -"I confronti tra array e scalari producono un array booleano.Il risultato complessivo dell'espressione è <literal>true</literal> se almeno un elemento " +"I confronti tra array e scalari producono un array booleano.Il risultato " +"complessivo dell'espressione è <literal>true</literal> se almeno un elemento " "è <literal>true</literal>." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:789 -msgid "Array vs array with <literal>=</literal> or <literal>!=</literal> returns a single boolean value." -msgstr "Array vs array con <literal>=</literal> o <literal>!=</literal> restituisce un singolo valore booleano." +msgid "" +"Array vs array with <literal>=</literal> or <literal>!=</literal> returns a " +"single boolean value." +msgstr "" +"Array vs array con <literal>=</literal> o <literal>!=</literal> restituisce " +"un singolo valore booleano." #. type: Content of: <article><section><section><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:794 msgid "" -"Array vs array with other operators produces a boolean array. The final result is <literal>true</literal> if any element is <literal>true</literal>." +"Array vs array with other operators produces a boolean array. The final " +"result is <literal>true</literal> if any element is <literal>true</literal>." msgstr "" -"Array vs array con altri operatori produce un array booleano.Il risultato finale è <literal>true</literal> se qualsiasi elemento è <literal>true</" +"Array vs array con altri operatori produce un array booleano.Il risultato " +"finale è <literal>true</literal> se qualsiasi elemento è <literal>true</" "literal>." #. type: Content of: <article><section><section><section><title> @@ -11901,20 +15634,30 @@ msgstr "Operatori" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:807 msgid "" -"By default, all string comparison operators (such as <literal>=</literal>, <literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " -"<literal>></literal>, <literal>>=</literal>, <literal>like</literal>, <literal>matches</literal>, <literal>contains</literal>, and " -"<literal>recontains</literal>) are case-insensitive. You can control this behavior using directives (see <xref " +"By default, all string comparison operators (such as <literal>=</literal>, " +"<literal>!=</literal>, <literal><</literal>, <literal><=</literal>, " +"<literal>></literal>, <literal>>=</literal>, <literal>like</literal>, " +"<literal>matches</literal>, <literal>contains</literal>, and " +"<literal>recontains</literal>) are case-insensitive. You can control this " +"behavior using directives (see <xref " "linkend=\"FilterExpression_CaseSensitivity\" />)." msgstr "" -"Per impostazione predefinita, tutti gli operatori di confronto di stringhe (come <literal>=</literal>, <literal>!=</literal>, <literal><</" -"literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>, <literal>like</literal>, <literal>match</literal>, " -"<literal>contains</literal> e<literal>recontains</literal>) non fanno distinzione tra maiuscole e minuscole.Puoi controllare questo comportamento " -"utilizzando le direttive (vedi <xref linkend=\"FilterExpression_CaseSensitivity\" />)." +"Per impostazione predefinita, tutti gli operatori di confronto di stringhe " +"(come <literal>=</literal>, <literal>!=</literal>, <literal><</literal>, " +"<literal><=</literal>, <literal>></literal>, <literal>>=</literal>, " +"<literal>like</literal>, <literal>match</literal>, <literal>contains</" +"literal> e<literal>recontains</literal>) non fanno distinzione tra maiuscole " +"e minuscole.Puoi controllare questo comportamento utilizzando le direttive " +"(vedi <xref linkend=\"FilterExpression_CaseSensitivity\" />)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:815 -msgid "<literal><</literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>" -msgstr "<literal><</literal>, <literal><=</literal>, <literal>></literal>, <literal>>=</literal>" +msgid "" +"<literal><</literal>, <literal><=</literal>, <literal>></literal>, " +"<literal>>=</literal>" +msgstr "" +"<literal><</literal>, <literal><=</literal>, <literal>></literal>, " +"<literal>>=</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:816 @@ -11943,17 +15686,25 @@ msgstr "Confronto delle disuguaglianze" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:827 -msgid "<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/</literal>, <literal>%</literal>" -msgstr "<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/</literal>, <literal>%</literal>" +msgid "" +"<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/" +"</literal>, <literal>%</literal>" +msgstr "" +"<literal>+</literal>, <literal>-</literal>, <literal>*</literal>, <literal>/" +"</literal>, <literal>%</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:830 msgid "" -"Arithmetic operators. <literal>+</literal> and <literal>-</literal> perform addition and subtraction. <literal>*</literal> and <literal>/</literal> " -"perform multiplication and division. <literal>%</literal> is the modulo operator (remainder)." +"Arithmetic operators. <literal>+</literal> and <literal>-</literal> perform " +"addition and subtraction. <literal>*</literal> and <literal>/</literal> " +"perform multiplication and division. <literal>%</literal> is the modulo " +"operator (remainder)." msgstr "" -"Operatori aritmetici.<literal>+</literal> e <literal>-</literal> eseguono addizioni e sottrazioni.<literal>*</literal> e <literal>/</literal> " -"eseguono moltiplicazioni e divisioni.<literal>%</literal> è l'operatore modulo (resto)." +"Operatori aritmetici.<literal>+</literal> e <literal>-</literal> eseguono " +"addizioni e sottrazioni.<literal>*</literal> e <literal>/</literal> eseguono " +"moltiplicazioni e divisioni.<literal>%</literal> è l'operatore modulo " +"(resto)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:835 @@ -11977,8 +15728,11 @@ msgstr "Corrispondenza di stringhe di caratteri jolly" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:842 -msgid "You can also use <literal>not like</literal> to perform the inverse match." -msgstr "Puoi anche usare <literal>not like</literal> per eseguire la corrispondenza inversa." +msgid "" +"You can also use <literal>not like</literal> to perform the inverse match." +msgstr "" +"Puoi anche usare <literal>not like</literal> per eseguire la corrispondenza " +"inversa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:846 @@ -11992,8 +15746,11 @@ msgstr "Corrisponde alle espressioni regolari" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:849 -msgid "You can also use <literal>not matches</literal> to perform the inverse match." -msgstr "Puoi anche usare <literal>notmatch</literal> per eseguire la corrispondenza inversa." +msgid "" +"You can also use <literal>not matches</literal> to perform the inverse match." +msgstr "" +"Puoi anche usare <literal>notmatch</literal> per eseguire la corrispondenza " +"inversa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:853 @@ -12007,8 +15764,12 @@ msgstr "Controlla se una stringa contiene una sottostringa" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:856 -msgid "You can also use <literal>not contains</literal> to check for absence of the substring." -msgstr "Puoi anche usare <literal>not contiene</literal> per verificare l'assenza della sottostringa." +msgid "" +"You can also use <literal>not contains</literal> to check for absence of the " +"substring." +msgstr "" +"Puoi anche usare <literal>not contiene</literal> per verificare l'assenza " +"della sottostringa." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:860 @@ -12018,12 +15779,16 @@ msgstr "<literal>contiene</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:862 msgid "Checks if any substring matches a regular expression" -msgstr "Controlla se qualche sottostringa corrisponde a un'espressione regolare" +msgstr "" +"Controlla se qualche sottostringa corrisponde a un'espressione regolare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:863 -msgid "You can also use <literal>not recontains</literal> to ensure no match exists." -msgstr "Puoi anche usare <literal>not recontains</literal> per assicurarti che non esista alcuna corrispondenza." +msgid "" +"You can also use <literal>not recontains</literal> to ensure no match exists." +msgstr "" +"Puoi anche usare <literal>not recontains</literal> per assicurarti che non " +"esista alcuna corrispondenza." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:870 @@ -12038,25 +15803,37 @@ msgstr "<function>lineCount<function>(<replaceable>contenuto</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:875 msgid "" -"Returns the number of lines in the file content or file content array as an <literal>Integer</literal>. If <replaceable>content</replaceable> is an " -"array, the result is an integer array. Example: <literal>lineCount(Content)</literal>" +"Returns the number of lines in the file content or file content array as an " +"<literal>Integer</literal>. If <replaceable>content</replaceable> is an " +"array, the result is an integer array. Example: <literal>lineCount(Content)</" +"literal>" msgstr "" -"Restituisce il numero di righe nel contenuto del file o nell'array del contenuto del file come <literal>Intero</literal>.Se <replaceable>content</" -"replaceable> è un array, il risultato è un array di numeri interi.Esempio: <literal>lineCount(Content)</literal>" +"Restituisce il numero di righe nel contenuto del file o nell'array del " +"contenuto del file come <literal>Intero</literal>.Se <replaceable>content</" +"replaceable> è un array, il risultato è un array di numeri interi.Esempio: " +"<literal>lineCount(Content)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:878 -msgid "<function>sublines</function>(<replaceable>content</replaceable>, <replaceable>start</replaceable>, <replaceable>count</replaceable>)" -msgstr "<function>sublines</function>(<replaceable>contenuto</replaceable>, <replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" +msgid "" +"<function>sublines</function>(<replaceable>content</replaceable>, " +"<replaceable>start</replaceable>, <replaceable>count</replaceable>)" +msgstr "" +"<function>sublines</function>(<replaceable>contenuto</replaceable>, " +"<replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:881 msgid "" -"Extracts the specified number of lines starting from the given line index in the file content or file content array, and returns them as a single " -"concatenated string. If <replaceable>content</replaceable> is an array, the result is an array of strings." +"Extracts the specified number of lines starting from the given line index in " +"the file content or file content array, and returns them as a single " +"concatenated string. If <replaceable>content</replaceable> is an array, the " +"result is an array of strings." msgstr "" -"Estrae il numero specificato di righe a partire dall'indice di riga specificato nel contenuto del file o nell'array del contenuto del file e li " -"restituisce come un'unica stringa concatenata.Se <replaceable>content</replaceable> è un array, il risultato è un array di stringhe." +"Estrae il numero specificato di righe a partire dall'indice di riga " +"specificato nel contenuto del file o nell'array del contenuto del file e li " +"restituisce come un'unica stringa concatenata.Se <replaceable>content</" +"replaceable> è un array, il risultato è un array di stringhe." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:887 @@ -12066,25 +15843,35 @@ msgstr "<function>strlen</function>(<replaceable>fonte</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:888 msgid "" -"Returns the length of the string as an <literal>Integer</literal>. If <replaceable>source</replaceable> is a string array, the result is an integer " -"array. Example: <literal>strlen(Name)</literal>" +"Returns the length of the string as an <literal>Integer</literal>. If " +"<replaceable>source</replaceable> is a string array, the result is an " +"integer array. Example: <literal>strlen(Name)</literal>" msgstr "" -"Restituisce la lunghezza della stringa come <literal>Intero</literal>.Se <replaceable>source</replaceable> è un array di stringhe, il risultato è un " +"Restituisce la lunghezza della stringa come <literal>Intero</literal>.Se " +"<replaceable>source</replaceable> è un array di stringhe, il risultato è un " "array di numeri interi.Esempio: <literal>strlen(Nome)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:891 -msgid "<function>substr</function>(<replaceable>source</replaceable>, <replaceable>start</replaceable>, <replaceable>count</replaceable>)" -msgstr "<function>substr</function>(<replaceable>sorgente</replaceable>, <replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" +msgid "" +"<function>substr</function>(<replaceable>source</replaceable>, " +"<replaceable>start</replaceable>, <replaceable>count</replaceable>)" +msgstr "" +"<function>substr</function>(<replaceable>sorgente</replaceable>, " +"<replaceable>inizio</replaceable>, <replaceable>conteggio</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:892 msgid "" -"Returns a specific range of text from the <emphasis>string or string array</emphasis> as a <literal>String</literal>. If <replaceable>source</" -"replaceable> is a string array, the result is a string array. Example: <literal>substr(Name, 0, 3)</literal>" +"Returns a specific range of text from the <emphasis>string or string array</" +"emphasis> as a <literal>String</literal>. If <replaceable>source</" +"replaceable> is a string array, the result is a string array. Example: " +"<literal>substr(Name, 0, 3)</literal>" msgstr "" -"Restituisce un intervallo specifico di testo dalla <emphasis>stringa o dall'array di stringhe</emphasis> come <literal>Stringa</literal>.Se " -"<replaceable>source</replaceable> è un array di stringhe, il risultato è un array di stringhe.Esempio: <literal>substr(Nome, 0, 3)</literal>" +"Restituisce un intervallo specifico di testo dalla <emphasis>stringa o " +"dall'array di stringhe</emphasis> come <literal>Stringa</literal>.Se " +"<replaceable>source</replaceable> è un array di stringhe, il risultato è un " +"array di stringhe.Esempio: <literal>substr(Nome, 0, 3)</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:895 @@ -12094,11 +15881,16 @@ msgstr "<function>replace</function> (da, a, in)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:898 msgid "" -"Replaces all occurrences of the string <replaceable>from</replaceable> with <replaceable>to</replaceable>. If <replaceable>str</replaceable> is an " -"array, the result is an array of strings with replacements applied. Example: <literal>replace(name, \".bak\", \".txt\")</literal>" +"Replaces all occurrences of the string <replaceable>from</replaceable> with " +"<replaceable>to</replaceable>. If <replaceable>str</replaceable> is an " +"array, the result is an array of strings with replacements applied. " +"Example: <literal>replace(name, \".bak\", \".txt\")</literal>" msgstr "" -"Sostituisce tutte le occorrenze della stringa <replaceable>from</replaceable> con <replaceable>to</replaceable>.Se <replaceable>str</replaceable> è " -"un array, il risultato è un array di stringhe a cui sono applicate le sostituzioni.Esempio: <literal>sostituisci(nome, \".bak\", \".txt\")</literal>" +"Sostituisce tutte le occorrenze della stringa <replaceable>from</" +"replaceable> con <replaceable>to</replaceable>.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe a cui sono " +"applicate le sostituzioni.Esempio: <literal>sostituisci(nome, \".bak\", \"." +"txt\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:905 @@ -12108,14 +15900,19 @@ msgstr "<function>regexReplace</function>(str, modello, sostituzione)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:908 msgid "" -"Replaces all matches of the regular expression pattern with the replacement string. Supports backreferences ($1, $2, etc.) in the replacement " -"string. If <replaceable>str</replaceable> is an array, the result is an array of strings with replacements applied. Example: " -"<literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> swaps words separated by underscore." +"Replaces all matches of the regular expression pattern with the replacement " +"string. Supports backreferences ($1, $2, etc.) in the replacement string. " +"If <replaceable>str</replaceable> is an array, the result is an array of " +"strings with replacements applied. Example: <literal>regexReplace(name, " +"\"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> swaps words separated by " +"underscore." msgstr "" -"Sostituisce tutte le corrispondenze del modello di espressione regolare con la stringa sostitutiva.Supporta i riferimenti all'indietro ($1, $2, ecc.) " -"nella stringa di sostituzione.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe a cui sono applicate le " -"sostituzioni.Esempio: <literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</literal> scambia le parole separate da un carattere di " -"sottolineatura." +"Sostituisce tutte le corrispondenze del modello di espressione regolare con " +"la stringa sostitutiva.Supporta i riferimenti all'indietro ($1, $2, ecc.) " +"nella stringa di sostituzione.Se <replaceable>str</replaceable> è un array, " +"il risultato è un array di stringhe a cui sono applicate le sostituzioni." +"Esempio: <literal>regexReplace(name, \"^(\\\\w+)_(\\\\w+)$\", \"$2_$1\")</" +"literal> scambia le parole separate da un carattere di sottolineatura." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:916 @@ -12125,15 +15922,22 @@ msgstr "<function>replaceWithList</function>(str, percorsofile)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:919 msgid "" -"Replaces multiple strings in <replaceable>str</replaceable> using replacement rules loaded from a tab-separated file. The file format is one " -"replacement rule per line: <literal>search_string<TAB>replacement_string</literal>. Lines starting with <literal>#</literal> are treated as " -"comments and ignored. Empty lines are also ignored. If <replaceable>str</replaceable> is an array, the result is an array of strings with " -"replacements applied." -msgstr "" -"Sostituisce più stringhe in <replaceable>str</replaceable> utilizzando le regole di sostituzione caricate da un file separato da tabulazioni.Il " -"formato del file è una regola di sostituzione per riga: <literal>search_string<TAB>replacement_string</literal>.Le righe che iniziano con " -"<literal>#</literal> vengono trattate come commenti e ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un array, il " -"risultato è un array di stringhe a cui sono applicate le sostituzioni." +"Replaces multiple strings in <replaceable>str</replaceable> using " +"replacement rules loaded from a tab-separated file. The file format is one " +"replacement rule per line: <literal>search_string<TAB>" +"replacement_string</literal>. Lines starting with <literal>#</literal> are " +"treated as comments and ignored. Empty lines are also ignored. If " +"<replaceable>str</replaceable> is an array, the result is an array of " +"strings with replacements applied." +msgstr "" +"Sostituisce più stringhe in <replaceable>str</replaceable> utilizzando le " +"regole di sostituzione caricate da un file separato da tabulazioni.Il " +"formato del file è una regola di sostituzione per riga: " +"<literal>search_string<TAB>replacement_string</literal>.Le righe che " +"iniziano con <literal>#</literal> vengono trattate come commenti e ignorate." +"Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un " +"array, il risultato è un array di stringhe a cui sono applicate le " +"sostituzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:925 English/Filters.xml:947 @@ -12155,15 +15959,20 @@ msgstr "" "vecchio nuovo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> -#: English/Filters.xml:930 English/Filters.xml:951 English/Filters.xml:1109 English/Filters.xml:1126 English/Filters.xml:1158 English/Filters.xml:1176 +#: English/Filters.xml:930 English/Filters.xml:951 English/Filters.xml:1109 +#: English/Filters.xml:1126 English/Filters.xml:1158 English/Filters.xml:1176 #: English/Filters.xml:1192 English/Filters.xml:1208 English/Filters.xml:1232 msgid "Examples:" msgstr "Esempi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:932 -msgid "<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> - applies replacements from file to file name" -msgstr "<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> - applica le sostituzioni dal file al nome del file" +msgid "" +"<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> " +"- applies replacements from file to file name" +msgstr "" +"<literal>replaceWithList(Name, \"C:\\Filters\\replacements.txt\")</literal> " +"- applica le sostituzioni dal file al nome del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:937 @@ -12173,16 +15982,24 @@ msgstr "<function>regexReplaceWithList</function>(str, percorsofile)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:940 msgid "" -"Replaces strings in <replaceable>str</replaceable> using regular expression patterns loaded from a tab-separated file. The file format is one " -"pattern per line: <literal>regex_pattern<TAB>replacement_string</literal>. The replacement string can include backreferences ($1, $2, etc.) to " -"captured groups. Lines starting with <literal>#</literal> are treated as comments and ignored. Empty lines are also ignored. If <replaceable>str</" -"replaceable> is an array, the result is an array of strings with replacements applied." +"Replaces strings in <replaceable>str</replaceable> using regular expression " +"patterns loaded from a tab-separated file. The file format is one pattern " +"per line: <literal>regex_pattern<TAB>replacement_string</literal>. " +"The replacement string can include backreferences ($1, $2, etc.) to captured " +"groups. Lines starting with <literal>#</literal> are treated as comments " +"and ignored. Empty lines are also ignored. If <replaceable>str</" +"replaceable> is an array, the result is an array of strings with " +"replacements applied." msgstr "" -"Sostituisce le stringhe in <replaceable>str</replaceable> utilizzando modelli di espressioni regolari caricati da un file separato da tabulazioni.Il " -"formato del file è un modello per riga: <literal>regex_pattern<TAB>replacement_string</literal>.La stringa di sostituzione può includere " -"riferimenti all'indietro ($1, $2 e così via) ai gruppi acquisiti.Le righe che iniziano con <literal>#</literal> vengono trattate come commenti e " -"ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe a cui sono applicate " -"le sostituzioni." +"Sostituisce le stringhe in <replaceable>str</replaceable> utilizzando " +"modelli di espressioni regolari caricati da un file separato da tabulazioni." +"Il formato del file è un modello per riga: <literal>regex_pattern<TAB>" +"replacement_string</literal>.La stringa di sostituzione può includere " +"riferimenti all'indietro ($1, $2 e così via) ai gruppi acquisiti.Le righe " +"che iniziano con <literal>#</literal> vengono trattate come commenti e " +"ignorate.Anche le righe vuote vengono ignorate.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe a cui sono " +"applicate le sostituzioni." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><screen> #: English/Filters.xml:948 @@ -12198,8 +16015,12 @@ msgstr "" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:953 -msgid "<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements.txt\")</literal> - applies regex replacements to file name" -msgstr "<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements.txt\")</literal> - applica sostituzioni regex al nome del file" +msgid "" +"<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements." +"txt\")</literal> - applies regex replacements to file name" +msgstr "" +"<literal>regexReplaceWithList(Name, \"C:\\Filters\\regex_replacements." +"txt\")</literal> - applica sostituzioni regex al nome del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:958 @@ -12209,13 +16030,19 @@ msgstr "<function>normalizeUnicode</function>(str[, modulo])" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:961 msgid "" -"Normalizes Unicode string. The optional form parameter specifies the normalization form: \"NFC\" or \"C\" (default), \"NFD\" or \"D\", \"NFKC\" or " -"\"KC\", \"NFKD\" or \"KD\". Can also use numeric forms: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD. If <replaceable>str</replaceable> is an array, the result is " -"an array of normalized strings. Example: <literal>normalizeUnicode(name, \"NFC\")</literal>" +"Normalizes Unicode string. The optional form parameter specifies the " +"normalization form: \"NFC\" or \"C\" (default), \"NFD\" or \"D\", \"NFKC\" " +"or \"KC\", \"NFKD\" or \"KD\". Can also use numeric forms: 1=NFC, 2=NFD, " +"5=NFKC, 6=NFKD. If <replaceable>str</replaceable> is an array, the result " +"is an array of normalized strings. Example: <literal>normalizeUnicode(name, " +"\"NFC\")</literal>" msgstr "" -"Normalizza la stringa Unicode.Il parametro facoltativo del modulo specifica il modulo di normalizzazione: \"NFC\" o \"C\" (predefinito), \"NFD\" o " -"\"D\", \"NFKC\" o \"KC\", \"NFKD\" o \"KD\".È possibile utilizzare anche forme numeriche: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD.Se <replaceable>str</" -"replaceable> è un array, il risultato è un array di stringhe normalizzate.Esempio: <literal>normalizeUnicode(name, \"NFC\")</literal>" +"Normalizza la stringa Unicode.Il parametro facoltativo del modulo specifica " +"il modulo di normalizzazione: \"NFC\" o \"C\" (predefinito), \"NFD\" o " +"\"D\", \"NFKC\" o \"KC\", \"NFKD\" o \"KD\".È possibile utilizzare anche " +"forme numeriche: 1=NFC, 2=NFD, 5=NFKC, 6=NFKD.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe normalizzate." +"Esempio: <literal>normalizeUnicode(name, \"NFC\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:971 @@ -12225,11 +16052,15 @@ msgstr "<function>toLower</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:975 msgid "" -"Converts all characters in the string to lowercase. If <replaceable>str</replaceable> is an array, the result is an array of lowercase strings. " -"Example: <literal>toLower(\"Hello World\")</literal> returns <literal>\"hello world\"</literal>" +"Converts all characters in the string to lowercase. If <replaceable>str</" +"replaceable> is an array, the result is an array of lowercase strings. " +"Example: <literal>toLower(\"Hello World\")</literal> returns " +"<literal>\"hello world\"</literal>" msgstr "" -"Converte tutti i caratteri della stringa in minuscolo.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe " -"minuscole.Esempio: <literal>toLower(\"Hello World\")</literal> restituisce <literal>\"hello world\"</literal>" +"Converte tutti i caratteri della stringa in minuscolo.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe minuscole." +"Esempio: <literal>toLower(\"Hello World\")</literal> restituisce " +"<literal>\"hello world\"</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:983 @@ -12239,11 +16070,15 @@ msgstr "<function>toUpper</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:987 msgid "" -"Converts all characters in the string to uppercase. If <replaceable>str</replaceable> is an array, the result is an array of uppercase strings. " -"Example: <literal>toUpper(\"Hello World\")</literal> returns <literal>\"HELLO WORLD\"</literal>" +"Converts all characters in the string to uppercase. If <replaceable>str</" +"replaceable> is an array, the result is an array of uppercase strings. " +"Example: <literal>toUpper(\"Hello World\")</literal> returns " +"<literal>\"HELLO WORLD\"</literal>" msgstr "" -"Converte tutti i caratteri della stringa in maiuscolo.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe " -"maiuscole.Esempio: <literal>toUpper(\"Hello World\")</literal> restituisce <literal>\"HELLO WORLD\"</literal>" +"Converte tutti i caratteri della stringa in maiuscolo.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe maiuscole." +"Esempio: <literal>toUpper(\"Hello World\")</literal> restituisce " +"<literal>\"HELLO WORLD\"</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:995 @@ -12253,11 +16088,15 @@ msgstr "<function>toHalfWidth</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:999 msgid "" -"Converts full-width characters to half-width characters. Primarily used for converting full-width alphanumeric and katakana characters to half-" -"width. If <replaceable>str</replaceable> is an array, the result is an array of converted strings." +"Converts full-width characters to half-width characters. Primarily used for " +"converting full-width alphanumeric and katakana characters to half-width. " +"If <replaceable>str</replaceable> is an array, the result is an array of " +"converted strings." msgstr "" -"Converte i caratteri a larghezza intera in caratteri a metà larghezza.Utilizzato principalmente per convertire caratteri alfanumerici e katakana a " -"larghezza intera in caratteri a metà larghezza.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." +"Converte i caratteri a larghezza intera in caratteri a metà larghezza." +"Utilizzato principalmente per convertire caratteri alfanumerici e katakana a " +"larghezza intera in caratteri a metà larghezza.Se <replaceable>str</" +"replaceable> è un array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1007 @@ -12267,11 +16106,15 @@ msgstr "<function>toFullWidth</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1011 msgid "" -"Converts half-width characters to full-width characters. Primarily used for converting half-width alphanumeric and katakana characters to full-" -"width. If <replaceable>str</replaceable> is an array, the result is an array of converted strings." +"Converts half-width characters to full-width characters. Primarily used for " +"converting half-width alphanumeric and katakana characters to full-width. " +"If <replaceable>str</replaceable> is an array, the result is an array of " +"converted strings." msgstr "" -"Converte i caratteri a mezza larghezza in caratteri a larghezza intera.Utilizzato principalmente per convertire caratteri alfanumerici e katakana da " -"metà larghezza a larghezza intera.Se <replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." +"Converte i caratteri a mezza larghezza in caratteri a larghezza intera." +"Utilizzato principalmente per convertire caratteri alfanumerici e katakana " +"da metà larghezza a larghezza intera.Se <replaceable>str</replaceable> è un " +"array, il risultato è un array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1019 @@ -12281,11 +16124,13 @@ msgstr "<function>toKatakana</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1023 msgid "" -"Converts hiragana characters to katakana. Non-hiragana characters remain unchanged. If <replaceable>str</replaceable> is an array, the result is an " +"Converts hiragana characters to katakana. Non-hiragana characters remain " +"unchanged. If <replaceable>str</replaceable> is an array, the result is an " "array of converted strings." msgstr "" -"Converte i caratteri hiragana in katakana.I caratteri non hiragana rimangono invariati.Se <replaceable>str</replaceable> è un array, il risultato è " -"un array di stringhe convertite." +"Converte i caratteri hiragana in katakana.I caratteri non hiragana rimangono " +"invariati.Se <replaceable>str</replaceable> è un array, il risultato è un " +"array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1031 @@ -12295,39 +16140,53 @@ msgstr "<function>toHiragana</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1035 msgid "" -"Converts katakana characters to hiragana. Non-katakana characters remain unchanged. If <replaceable>str</replaceable> is an array, the result is an " +"Converts katakana characters to hiragana. Non-katakana characters remain " +"unchanged. If <replaceable>str</replaceable> is an array, the result is an " "array of converted strings." msgstr "" -"Converte i caratteri katakana in hiragana.I caratteri non katakana rimangono invariati.Se <replaceable>str</replaceable> è un array, il risultato è " -"un array di stringhe convertite." +"Converte i caratteri katakana in hiragana.I caratteri non katakana rimangono " +"invariati.Se <replaceable>str</replaceable> è un array, il risultato è un " +"array di stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1043 -msgid "<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" -msgstr "<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" +msgid "" +"<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" +msgstr "" +"<function>toSimplifiedChinese</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1047 msgid "" -"Converts traditional Chinese characters to simplified Chinese characters. Characters that don't have a simplified form remain unchanged. If " -"<replaceable>str</replaceable> is an array, the result is an array of converted strings." +"Converts traditional Chinese characters to simplified Chinese characters. " +"Characters that don't have a simplified form remain unchanged. If " +"<replaceable>str</replaceable> is an array, the result is an array of " +"converted strings." msgstr "" -"Converte i caratteri cinesi tradizionali in caratteri cinesi semplificati.I caratteri che non hanno una forma semplificata rimangono invariati.Se " -"<replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." +"Converte i caratteri cinesi tradizionali in caratteri cinesi semplificati.I " +"caratteri che non hanno una forma semplificata rimangono invariati.Se " +"<replaceable>str</replaceable> è un array, il risultato è un array di " +"stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1055 -msgid "<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" -msgstr "<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" +msgid "" +"<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" +msgstr "" +"<function>toTraditionalChinese</function>(<replaceable>str</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1059 msgid "" -"Converts simplified Chinese characters to traditional Chinese characters. Characters that don't have a traditional form remain unchanged. If " -"<replaceable>str</replaceable> is an array, the result is an array of converted strings." +"Converts simplified Chinese characters to traditional Chinese characters. " +"Characters that don't have a traditional form remain unchanged. If " +"<replaceable>str</replaceable> is an array, the result is an array of " +"converted strings." msgstr "" -"Converte i caratteri cinesi semplificati in caratteri cinesi tradizionali.I personaggi che non hanno una forma tradizionale rimangono invariati.Se " -"<replaceable>str</replaceable> è un array, il risultato è un array di stringhe convertite." +"Converte i caratteri cinesi semplificati in caratteri cinesi tradizionali.I " +"personaggi che non hanno una forma tradizionale rimangono invariati.Se " +"<replaceable>str</replaceable> è un array, il risultato è un array di " +"stringhe convertite." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1066 @@ -12336,8 +16195,11 @@ msgstr "<function>now</function>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1067 -msgid "Returns the current date and time as a <literal>Timestamp</literal> value." -msgstr "Restituisce la data e l'ora correnti come valore <literal>Timestamp</literal>." +msgid "" +"Returns the current date and time as a <literal>Timestamp</literal> value." +msgstr "" +"Restituisce la data e l'ora correnti come valore <literal>Timestamp</" +"literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1070 @@ -12346,8 +16208,12 @@ msgstr "<function>today</function>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1071 -msgid "Returns today's date as a <literal>Timestamp</literal> value representing <literal>00:00:00.000</literal> at the start of the day." -msgstr "Restituisce la data odierna come valore <literal>Timestamp</literal> che rappresenta <literal>00:00:00.000</literal> all'inizio della giornata." +msgid "" +"Returns today's date as a <literal>Timestamp</literal> value representing " +"<literal>00:00:00.000</literal> at the start of the day." +msgstr "" +"Restituisce la data odierna come valore <literal>Timestamp</literal> che " +"rappresenta <literal>00:00:00.000</literal> all'inizio della giornata." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1074 @@ -12356,13 +16222,18 @@ msgstr "<function>startOfWeek</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1075 -msgid "Returns the first day of the week, which is always Sunday regardless of locale." -msgstr "Restituisce il primo giorno della settimana, che è sempre domenica, indipendentemente dalle impostazioni locali." +msgid "" +"Returns the first day of the week, which is always Sunday regardless of " +"locale." +msgstr "" +"Restituisce il primo giorno della settimana, che è sempre domenica, " +"indipendentemente dalle impostazioni locali." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1078 msgid "<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" -msgstr "<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" +msgstr "" +"<function>startOfMonth</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1079 @@ -12387,11 +16258,13 @@ msgstr "<function>toDateStr</function>(<replaceable>timestamp</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1087 msgid "" -"Converts the given timestamp to a date string in <literal>yyyy-MM-dd</literal> format. If <replaceable>timestamp</replaceable> is a timestamp array, " -"the result is a string array." +"Converts the given timestamp to a date string in <literal>yyyy-MM-dd</" +"literal> format. If <replaceable>timestamp</replaceable> is a timestamp " +"array, the result is a string array." msgstr "" -"Converte il timestamp specificato in una stringa di data nel formato <literal>aaaa-MM-gg</literal>.Se <replaceable>timestamp</replaceable> è un array " -"di timestamp, il risultato è un array di stringhe." +"Converte il timestamp specificato in una stringa di data nel formato " +"<literal>aaaa-MM-gg</literal>.Se <replaceable>timestamp</replaceable> è un " +"array di timestamp, il risultato è un array di stringhe." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1090 @@ -12401,11 +16274,13 @@ msgstr "<function>abs</function>(<replaceable>valore</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1091 msgid "" -"Returns the absolute value of the <emphasis>integer or integer array</emphasis>. If <replaceable>value</replaceable> is an integer array, the result " -"is an integer array." +"Returns the absolute value of the <emphasis>integer or integer array</" +"emphasis>. If <replaceable>value</replaceable> is an integer array, the " +"result is an integer array." msgstr "" -"Restituisce il valore assoluto dell'<emphasis>intero o dell'array di interi</emphasis>.Se <replaceable>value</replaceable> è un array di numeri " -"interi, il risultato è un array di numeri interi." +"Restituisce il valore assoluto dell'<emphasis>intero o dell'array di interi</" +"emphasis>.Se <replaceable>value</replaceable> è un array di numeri interi, " +"il risultato è un array di numeri interi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1094 @@ -12414,8 +16289,12 @@ msgstr "<function>allof</function>(<replaceable>booleani</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1095 -msgid "Returns <literal>true</literal> if all elements in the <emphasis>boolean array</emphasis> satisfy the condition." -msgstr "Restituisce <literal>true</literal> se tutti gli elementi nell'<emphasis>array booleano</emphasis> soddisfano la condizione." +msgid "" +"Returns <literal>true</literal> if all elements in the <emphasis>boolean " +"array</emphasis> satisfy the condition." +msgstr "" +"Restituisce <literal>true</literal> se tutti gli elementi " +"nell'<emphasis>array booleano</emphasis> soddisfano la condizione." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1098 @@ -12425,98 +16304,151 @@ msgstr "<function>allequal</function>(<replaceable>array</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1099 msgid "Returns <literal>true</literal> if all values in the array are equal." -msgstr "Restituisce <literal>true</literal> se tutti i valori nell'array sono uguali." +msgstr "" +"Restituisce <literal>true</literal> se tutti i valori nell'array sono uguali." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1102 -msgid "<function>isWithin</function>(<replaceable>value</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" -msgstr "<function>isWithin</function>(<replaceable>valore</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgid "" +"<function>isWithin</function>(<replaceable>value</replaceable>, " +"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgstr "" +"<function>isWithin</function>(<replaceable>valore</replaceable>, " +"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1105 msgid "" -"Returns <literal>true</literal> if <replaceable>value</replaceable> is within the range <literal>[min, max]</literal> (inclusive on both ends). " -"Supports integers, floating-point numbers, timestamps, and strings (case-insensitive comparison). If <replaceable>value</replaceable> is an array, " +"Returns <literal>true</literal> if <replaceable>value</replaceable> is " +"within the range <literal>[min, max]</literal> (inclusive on both ends). " +"Supports integers, floating-point numbers, timestamps, and strings (case-" +"insensitive comparison). If <replaceable>value</replaceable> is an array, " "the result is a boolean array with each element checked individually." msgstr "" -"Restituisce <literal>true</literal> se <replaceable>valore</replaceable> è compreso nell'intervallo <literal>[min, max]</literal> (incluso su " -"entrambe le estremità).Supporta numeri interi, numeri a virgola mobile, timestamp e stringhe (confronto senza distinzione tra maiuscole e " -"minuscole).Se <replaceable>value</replaceable> è un array, il risultato è un array booleano con ogni elemento controllato individualmente." +"Restituisce <literal>true</literal> se <replaceable>valore</replaceable> è " +"compreso nell'intervallo <literal>[min, max]</literal> (incluso su entrambe " +"le estremità).Supporta numeri interi, numeri a virgola mobile, timestamp e " +"stringhe (confronto senza distinzione tra maiuscole e minuscole).Se " +"<replaceable>value</replaceable> è un array, il risultato è un array " +"booleano con ogni elemento controllato individualmente." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1111 msgid "<literal>isWithin(5, 1, 10)</literal> returns <literal>true</literal>" -msgstr "<literal>isWithin(5, 1, 10)</literal> restituisce <literal>true</literal>" +msgstr "" +"<literal>isWithin(5, 1, 10)</literal> restituisce <literal>true</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1112 -msgid "<literal>isWithin(Size, 1KB, 10MB)</literal> checks if any file size is between 1KB and 10MB" -msgstr "<literal>isWithin(Size, 1KB, 10MB)</literal> controlla se la dimensione del file è compresa tra 1KB e 10MB" +msgid "" +"<literal>isWithin(Size, 1KB, 10MB)</literal> checks if any file size is " +"between 1KB and 10MB" +msgstr "" +"<literal>isWithin(Size, 1KB, 10MB)</literal> controlla se la dimensione del " +"file è compresa tra 1KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1113 -msgid "<literal>isWithin(Date, today() - 7days, today())</literal> checks if file was modified within the last week" -msgstr "<literal>isWithin(Date, today() - 7days, today())</literal> controlla se il file è stato modificato nell'ultima settimana" +msgid "" +"<literal>isWithin(Date, today() - 7days, today())</literal> checks if file " +"was modified within the last week" +msgstr "" +"<literal>isWithin(Date, today() - 7days, today())</literal> controlla se il " +"file è stato modificato nell'ultima settimana" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1114 -msgid "<literal>allof(isWithin(Size, 1KB, 10MB))</literal> checks if all file sizes are between 1KB and 10MB" -msgstr "<literal>allof(isWithin(Size, 1KB, 10MB))</literal> controlla se tutte le dimensioni dei file sono comprese tra 1KB e 10MB" +msgid "" +"<literal>allof(isWithin(Size, 1KB, 10MB))</literal> checks if all file sizes " +"are between 1KB and 10MB" +msgstr "" +"<literal>allof(isWithin(Size, 1KB, 10MB))</literal> controlla se tutte le " +"dimensioni dei file sono comprese tra 1KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1119 -msgid "<function>inRange</function>(<replaceable>value</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" -msgstr "<function>inRange</function>(<replaceable>valore</replaceable>, <replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgid "" +"<function>inRange</function>(<replaceable>value</replaceable>, " +"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" +msgstr "" +"<function>inRange</function>(<replaceable>valore</replaceable>, " +"<replaceable>min</replaceable>, <replaceable>max</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1122 msgid "" -"Returns <literal>true</literal> if <replaceable>value</replaceable> is within the range <literal>[min, max)</literal> (inclusive on the lower bound, " -"exclusive on the upper bound). Supports integers, floating-point numbers, timestamps, and strings (case-insensitive comparison). If " -"<replaceable>value</replaceable> is an array, the result is a boolean array with each element checked individually." +"Returns <literal>true</literal> if <replaceable>value</replaceable> is " +"within the range <literal>[min, max)</literal> (inclusive on the lower " +"bound, exclusive on the upper bound). Supports integers, floating-point " +"numbers, timestamps, and strings (case-insensitive comparison). If " +"<replaceable>value</replaceable> is an array, the result is a boolean array " +"with each element checked individually." msgstr "" -"Restituisce <literal>true</literal> se <replaceable>value</replaceable> è compreso nell'intervallo <literal>[min, max)</literal> (incluso nel limite " -"inferiore, escluso nel limite superiore).Supporta numeri interi, numeri a virgola mobile, timestamp e stringhe (confronto senza distinzione tra " -"maiuscole e minuscole).Se <replaceable>value</replaceable> è un array, il risultato è un array booleano con ogni elemento controllato individualmente." +"Restituisce <literal>true</literal> se <replaceable>value</replaceable> è " +"compreso nell'intervallo <literal>[min, max)</literal> (incluso nel limite " +"inferiore, escluso nel limite superiore).Supporta numeri interi, numeri a " +"virgola mobile, timestamp e stringhe (confronto senza distinzione tra " +"maiuscole e minuscole).Se <replaceable>value</replaceable> è un array, il " +"risultato è un array booleano con ogni elemento controllato individualmente." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1128 msgid "<literal>inRange(5, 1, 10)</literal> returns <literal>true</literal>" -msgstr "<literal>inRange(5, 1, 10)</literal> restituisce <literal>true</literal>" +msgstr "" +"<literal>inRange(5, 1, 10)</literal> restituisce <literal>true</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1129 msgid "<literal>inRange(10, 1, 10)</literal> returns <literal>false</literal>" -msgstr "<literal>inRange(10, 1, 10)</literal> restituisce <literal>false</literal>" +msgstr "" +"<literal>inRange(10, 1, 10)</literal> restituisce <literal>false</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1130 -msgid "<literal>inRange(Size, 0, 1MB)</literal> checks if any file size is less than 1MB" -msgstr "<literal>inRange(Size, 0, 1MB)</literal> controlla se la dimensione del file è inferiore a 1 MB" +msgid "" +"<literal>inRange(Size, 0, 1MB)</literal> checks if any file size is less " +"than 1MB" +msgstr "" +"<literal>inRange(Size, 0, 1MB)</literal> controlla se la dimensione del file " +"è inferiore a 1 MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1131 -msgid "<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> checks if any file was modified this month (excluding today)" -msgstr "<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> controlla se qualche file è stato modificato questo mese (escluso oggi)" +msgid "" +"<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> " +"checks if any file was modified this month (excluding today)" +msgstr "" +"<literal>anyof(inRange(Date, startOfMonth(today()), today()))</literal> " +"controlla se qualche file è stato modificato questo mese (escluso oggi)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1136 msgid "" -"<function>logError</function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...), <function>logWarn</" -"function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...), <function>logInfo</function>(<replaceable>value1</replaceable>, " -"<replaceable>value2</replaceable>, ...)" +"<function>logError</function>(<replaceable>value1</replaceable>, " +"<replaceable>value2</replaceable>, ...), <function>logWarn</" +"function>(<replaceable>value1</replaceable>, <replaceable>value2</" +"replaceable>, ...), <function>logInfo</function>(<replaceable>value1</" +"replaceable>, <replaceable>value2</replaceable>, ...)" msgstr "" -"<function>logError<function>(<replaceable>valore1</replaceable>, <replaceable>value2</replaceable>, ...), logWarn(<replaceable>value1</replaceable>, " -"<replaceable>value2</replaceable>, ...), logInfo(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>, ...)" +"<function>logError<function>(<replaceable>valore1</replaceable>, " +"<replaceable>value2</replaceable>, ...), logWarn(<replaceable>value1</" +"replaceable>, <replaceable>value2</replaceable>, ...), " +"logInfo(<replaceable>value1</replaceable>, <replaceable>value2</" +"replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1139 msgid "" -"Outputs the concatenated string representation of all arguments to the log (at error, warning, or information level respectively), separated by " -"spaces, and returns the last argument value. These functions are useful for debugging filter expressions." +"Outputs the concatenated string representation of all arguments to the log " +"(at error, warning, or information level respectively), separated by spaces, " +"and returns the last argument value. These functions are useful for " +"debugging filter expressions." msgstr "" -"Restituisce la rappresentazione di stringa concatenata di tutti gli argomenti nel log (rispettivamente a livello di errore, avviso o informazione), " -"separati da spazi, e restituisce il valore dell'ultimo argomento.Queste funzioni sono utili per il debug delle espressioni di filtro." +"Restituisce la rappresentazione di stringa concatenata di tutti gli " +"argomenti nel log (rispettivamente a livello di errore, avviso o " +"informazione), separati da spazi, e restituisce il valore dell'ultimo " +"argomento.Queste funzioni sono utili per il debug delle espressioni di " +"filtro." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1143 @@ -12525,165 +16457,260 @@ msgstr "Esempi (utilizzando il valore restituito):" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1145 -msgid "<literal>logInfo(\"File size:\", Size) > 1MB</literal> - logs the file size(s) and checks if greater than 1MB" -msgstr "<literal>logInfo(\"File size:\", Size) > 1MB</literal> - registra le dimensioni del file e controlla se maggiore di 1MB" +msgid "" +"<literal>logInfo(\"File size:\", Size) > 1MB</literal> - logs the file " +"size(s) and checks if greater than 1MB" +msgstr "" +"<literal>logInfo(\"File size:\", Size) > 1MB</literal> - registra le " +"dimensioni del file e controlla se maggiore di 1MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1146 -msgid "<literal>logWarn(\"Processing:\", Name) like \"*.tmp\"</literal> - logs the file name(s) and checks if it's a temporary file" -msgstr "<literal>logWarn(\"Processing:\", Name) come \"*.tmp\"</literal> - registra i nomi dei file e controlla se si tratta di un file temporaneo" +msgid "" +"<literal>logWarn(\"Processing:\", Name) like \"*.tmp\"</literal> - logs the " +"file name(s) and checks if it's a temporary file" +msgstr "" +"<literal>logWarn(\"Processing:\", Name) come \"*.tmp\"</literal> - registra " +"i nomi dei file e controlla se si tratta di un file temporaneo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1147 -msgid "<literal>Size > 1KB and logInfo(\"Large file:\", Name) contains \"test\"</literal> - logs only when size condition is true, then checks name" +msgid "" +"<literal>Size > 1KB and logInfo(\"Large file:\", Name) contains \"test\"</" +"literal> - logs only when size condition is true, then checks name" msgstr "" -"<literal>Dimensione > 1KB e logInfo(\"Large file:\", Name) contiene \"test\"</literal> - registra solo quando la condizione della dimensione è vera, " -"quindi controlla il nome" +"<literal>Dimensione > 1KB e logInfo(\"Large file:\", Name) contiene " +"\"test\"</literal> - registra solo quando la condizione della dimensione è " +"vera, quindi controlla il nome" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1152 -msgid "<function>if</function>(<replaceable>condition</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" -msgstr "<function>if</function>(<replaceable>condizione</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +msgid "" +"<function>if</function>(<replaceable>condition</replaceable>, " +"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +msgstr "" +"<function>if</function>(<replaceable>condizione</replaceable>, " +"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1155 msgid "" -"Returns <replaceable>trueValue</replaceable> if <replaceable>condition</replaceable> evaluates to true, otherwise returns <replaceable>falseValue</" -"replaceable>. This function performs short-circuit evaluation (it only evaluates the branch that will be returned)." +"Returns <replaceable>trueValue</replaceable> if <replaceable>condition</" +"replaceable> evaluates to true, otherwise returns <replaceable>falseValue</" +"replaceable>. This function performs short-circuit evaluation (it only " +"evaluates the branch that will be returned)." msgstr "" -"Restituisce <replaceable>trueValue</replaceable> se <replaceable>condizione</replaceable> restituisce true, altrimenti restituisce " -"<replaceable>falseValue</replaceable>.Questa funzione esegue la valutazione del cortocircuito (valuta solo il ramo che verrà restituito)." +"Restituisce <replaceable>trueValue</replaceable> se <replaceable>condizione</" +"replaceable> restituisce true, altrimenti restituisce " +"<replaceable>falseValue</replaceable>.Questa funzione esegue la valutazione " +"del cortocircuito (valuta solo il ramo che verrà restituito)." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1160 -msgid "<literal>if(Size > 1MB, \"large\", \"small\")</literal> - returns \"large\" or \"small\" based on file size" -msgstr "<literal>if(Size > 1MB, \"large\", \"small\")</literal> - restituisce \"large\" o \"small\" in base alla dimensione del file" +msgid "" +"<literal>if(Size > 1MB, \"large\", \"small\")</literal> - returns \"large\" " +"or \"small\" based on file size" +msgstr "" +"<literal>if(Size > 1MB, \"large\", \"small\")</literal> - restituisce " +"\"large\" o \"small\" in base alla dimensione del file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1161 -msgid "<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - classifies files by extension" -msgstr "<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - classifica i file per estensione" +msgid "" +"<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - " +"classifies files by extension" +msgstr "" +"<literal>if(Extension = \"txt\", \"text file\", \"other file\")</literal> - " +"classifica i file per estensione" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1162 -msgid "<literal>if(Exists, Size, 0)</literal> - returns file size or 0 if file doesn't exist" -msgstr "<literal>if(Exists, Size, 0)</literal> - restituisce la dimensione del file o 0 se il file non esiste" +msgid "" +"<literal>if(Exists, Size, 0)</literal> - returns file size or 0 if file " +"doesn't exist" +msgstr "" +"<literal>if(Exists, Size, 0)</literal> - restituisce la dimensione del file " +"o 0 se il file non esiste" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1167 msgid "" -"<function>ifEach</function>(<replaceable>conditionArray</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +"<function>ifEach</function>(<replaceable>conditionArray</replaceable>, " +"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" msgstr "" -"<function>ifEach<function>(<replaceable>conditionArray</replaceable>, <replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" +"<function>ifEach<function>(<replaceable>conditionArray</replaceable>, " +"<replaceable>trueValue</replaceable>, <replaceable>falseValue</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1170 msgid "" -"Element-wise conditional selection. For each element in <replaceable>conditionArray</replaceable>, returns the corresponding element from " -"<replaceable>trueValue</replaceable> if the condition is true, otherwise returns the corresponding element from <replaceable>falseValue</" -"replaceable>. If <replaceable>trueValue</replaceable> or <replaceable>falseValue</replaceable> is a scalar, it is broadcast to all elements." -msgstr "" -"Selezione condizionale per elemento.Per ogni elemento in <replaceable>conditionArray</replaceable>, restituisce l'elemento corrispondente da " -"<replaceable>trueValue</replaceable> se la condizione è vera, altrimenti restituisce l'elemento corrispondente da <replaceable>falseValue</" -"replaceable>.Se <replaceable>trueValue</replaceable> o <replaceable>falseValue</replaceable> è uno scalare, viene trasmesso a tutti gli elementi." +"Element-wise conditional selection. For each element in " +"<replaceable>conditionArray</replaceable>, returns the corresponding element " +"from <replaceable>trueValue</replaceable> if the condition is true, " +"otherwise returns the corresponding element from <replaceable>falseValue</" +"replaceable>. If <replaceable>trueValue</replaceable> or " +"<replaceable>falseValue</replaceable> is a scalar, it is broadcast to all " +"elements." +msgstr "" +"Selezione condizionale per elemento.Per ogni elemento in " +"<replaceable>conditionArray</replaceable>, restituisce l'elemento " +"corrispondente da <replaceable>trueValue</replaceable> se la condizione è " +"vera, altrimenti restituisce l'elemento corrispondente da " +"<replaceable>falseValue</replaceable>.Se <replaceable>trueValue</" +"replaceable> o <replaceable>falseValue</replaceable> è uno scalare, viene " +"trasmesso a tutti gli elementi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1178 -msgid "<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - returns array of \"large\"/\"small\" labels for each file" -msgstr "<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - restituisce un array di etichette \"grande\"/\"piccolo\" per ogni file" +msgid "" +"<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - returns " +"array of \"large\"/\"small\" labels for each file" +msgstr "" +"<literal>ifEach(Size > 1MB, \"large\", \"small\")</literal> - restituisce " +"un array di etichette \"grande\"/\"piccolo\" per ogni file" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1179 msgid "" -"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), array(\"x\", \"y\", \"z\"))</literal> - returns <literal>array(\"a\", \"y\", " +"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), " +"array(\"x\", \"y\", \"z\"))</literal> - returns <literal>array(\"a\", \"y\", " "\"c\")</literal>" msgstr "" -"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), array(\"x\", \"y\", \"z\"))</literal> - restituisce <literal>array(\"a\", " +"<literal>ifEach(array(true, false, true), array(\"a\", \"b\", \"c\"), " +"array(\"x\", \"y\", \"z\"))</literal> - restituisce <literal>array(\"a\", " "\"y\", \"c\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1180 -msgid "<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - checks if any file is between 100KB and 10MB" -msgstr "<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - controlla se qualche file è compreso tra 100KB e 10MB" +msgid "" +"<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - " +"checks if any file is between 100KB and 10MB" +msgstr "" +"<literal>anyof(ifEach(Size > 100KB, Size < 10MB, false))</literal> - " +"controlla se qualche file è compreso tra 100KB e 10MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1185 -msgid "<function>choose</function>(<replaceable>index</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" -msgstr "<function>choose</function>(<replaceable>indice</replaceable>, <replaceable>valore0</replaceable>, <replaceable>valore1</replaceable>, ...)" +msgid "" +"<function>choose</function>(<replaceable>index</replaceable>, " +"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +msgstr "" +"<function>choose</function>(<replaceable>indice</replaceable>, " +"<replaceable>valore0</replaceable>, <replaceable>valore1</replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1188 msgid "" -"Selects a value from the arguments based on <replaceable>index</replaceable>. If <replaceable>index</replaceable> is 0, returns <replaceable>value0</" -"replaceable>; if 1, returns <replaceable>value1</replaceable>, etc. Negative indices are clamped to 0. Indices beyond the last value return the last " -"value." +"Selects a value from the arguments based on <replaceable>index</" +"replaceable>. If <replaceable>index</replaceable> is 0, returns " +"<replaceable>value0</replaceable>; if 1, returns <replaceable>value1</" +"replaceable>, etc. Negative indices are clamped to 0. Indices beyond the " +"last value return the last value." msgstr "" -"Seleziona un valore dagli argomenti in base a <replaceable>index</replaceable>.Se <replaceable>index</replaceable> è 0, restituisce " -"<replaceable>value0</replaceable>;se 1, restituisce <replaceable>value1</replaceable>, ecc. Gli indici negativi sono limitati a 0. Gli indici oltre " +"Seleziona un valore dagli argomenti in base a <replaceable>index</" +"replaceable>.Se <replaceable>index</replaceable> è 0, restituisce " +"<replaceable>value0</replaceable>;se 1, restituisce <replaceable>value1</" +"replaceable>, ecc. Gli indici negativi sono limitati a 0. Gli indici oltre " "l'ultimo valore restituiscono l'ultimo valore." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1194 -msgid "<literal>choose(0, \"first\", \"second\", \"third\")</literal> - returns \"first\"" -msgstr "<literal>scegli(0, \"primo\", \"secondo\", \"terzo\")</literal> - restituisce \"primo\"" +msgid "" +"<literal>choose(0, \"first\", \"second\", \"third\")</literal> - returns " +"\"first\"" +msgstr "" +"<literal>scegli(0, \"primo\", \"secondo\", \"terzo\")</literal> - " +"restituisce \"primo\"" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1195 -msgid "<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</literal> - maps diff codes to labels" -msgstr "<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</literal> - mappa i codici diff sulle etichette" +msgid "" +"<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</" +"literal> - maps diff codes to labels" +msgstr "" +"<literal>choose(DiffCode % 3, \"equal\", \"different\", \"unique\")</" +"literal> - mappa i codici diff sulle etichette" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1196 -msgid "<literal>choose(5, \"a\", \"b\", \"c\")</literal> - returns \"c\" (out of bounds, returns last value)" -msgstr "<literal>scegli(5, \"a\", \"b\", \"c\")</literal> - restituisce \"c\" (fuori dai limiti, restituisce l'ultimo valore)" +msgid "" +"<literal>choose(5, \"a\", \"b\", \"c\")</literal> - returns \"c\" (out of " +"bounds, returns last value)" +msgstr "" +"<literal>scegli(5, \"a\", \"b\", \"c\")</literal> - restituisce \"c\" (fuori " +"dai limiti, restituisce l'ultimo valore)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1201 msgid "" -"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, " +"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" msgstr "" -"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, <replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" +"<function>chooseEach</function>(<replaceable>indexArray</replaceable>, " +"<replaceable>value0</replaceable>, <replaceable>value1</replaceable>, ...)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1204 msgid "" -"Element-wise value selection. For each index in <replaceable>indexArray</replaceable>, selects the corresponding value from the remaining arguments. " -"If <replaceable>indexArray</replaceable> is a scalar, behaves like <literal>choose</literal>." +"Element-wise value selection. For each index in <replaceable>indexArray</" +"replaceable>, selects the corresponding value from the remaining arguments. " +"If <replaceable>indexArray</replaceable> is a scalar, behaves like " +"<literal>choose</literal>." msgstr "" -"Selezione del valore in base agli elementi.Per ogni indice in <replaceable>indexArray</replaceable>, seleziona il valore corrispondente dagli " -"argomenti rimanenti.Se <replaceable>indexArray</replaceable> è uno scalare, si comporta come <literal>choose</literal>." +"Selezione del valore in base agli elementi.Per ogni indice in " +"<replaceable>indexArray</replaceable>, seleziona il valore corrispondente " +"dagli argomenti rimanenti.Se <replaceable>indexArray</replaceable> è uno " +"scalare, si comporta come <literal>choose</literal>." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1210 -msgid "<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - returns <literal>array(\"a\", \"b\", \"c\")</literal>" -msgstr "<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - restituisce <literal>array(\"a\", \"b\", \"c\")</literal>" +msgid "" +"<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - returns " +"<literal>array(\"a\", \"b\", \"c\")</literal>" +msgstr "" +"<literal>chooseEach(array(0, 1, 2), \"a\", \"b\", \"c\")</literal> - " +"restituisce <literal>array(\"a\", \"b\", \"c\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1211 -msgid "<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - returns <literal>array(\"x\", \"x\", \"y\")</literal>" -msgstr "<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - restituisce <literal>array(\"x\", \"x\", \"y\")</literal>" +msgid "" +"<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - returns " +"<literal>array(\"x\", \"x\", \"y\")</literal>" +msgstr "" +"<literal>chooseEach(array(0, 0, 1), \"x\", \"y\")</literal> - restituisce " +"<literal>array(\"x\", \"x\", \"y\")</literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1212 msgid "" -"<literal>chooseEach(array(2, 0, 1), \"first\", \"second\", \"third\")</literal> - returns <literal>array(\"third\", \"first\", \"second\")</literal>" +"<literal>chooseEach(array(2, 0, 1), \"first\", \"second\", \"third\")</" +"literal> - returns <literal>array(\"third\", \"first\", \"second\")</literal>" msgstr "" -"<literal>chooseEach(array(2, 0, 1), \"primo\", \"secondo\", \"terzo\")</literal> - restituisce <literal>array(\"terzo\", \"primo\", \"secondo\")</" +"<literal>chooseEach(array(2, 0, 1), \"primo\", \"secondo\", \"terzo\")</" +"literal> - restituisce <literal>array(\"terzo\", \"primo\", \"secondo\")</" "literal>" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1217 msgid "" -"<function>andEach</function>(<replaceable>value1</replaceable>, <replaceable>value2</replaceable>), <function>orEach</function>(<replaceable>value1</" -"replaceable>, <replaceable>value2</replaceable>), <function>notEach</function>(<replaceable>value</replaceable>)" +"<function>andEach</function>(<replaceable>value1</replaceable>, " +"<replaceable>value2</replaceable>), <function>orEach</" +"function>(<replaceable>value1</replaceable>, <replaceable>value2</" +"replaceable>), <function>notEach</function>(<replaceable>value</replaceable>)" msgstr "" -"<function>andEach</function>(<replaceable>valore1</replaceable>, <replaceable>valore2</replaceable>), orEach(<replaceable>valore1</replaceable>, " -"<replaceable>valore2</replaceable>), notEach(<replaceable>valore</replaceable>)" +"<function>andEach</function>(<replaceable>valore1</replaceable>, " +"<replaceable>valore2</replaceable>), orEach(<replaceable>valore1</" +"replaceable>, <replaceable>valore2</replaceable>), " +"notEach(<replaceable>valore</replaceable>)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1220 -msgid "Element-wise logical operations. These functions operate on booleans, boolean arrays, or a combination of both:" -msgstr "Operazioni logiche per elementi.Queste funzioni operano su booleani, array booleani o una combinazione di entrambi:" +msgid "" +"Element-wise logical operations. These functions operate on booleans, " +"boolean arrays, or a combination of both:" +msgstr "" +"Operazioni logiche per elementi.Queste funzioni operano su booleani, array " +"booleani o una combinazione di entrambi:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1223 @@ -12703,21 +16730,32 @@ msgstr "<literal>notEach</literal> - Operazione logica NOT (argomento singolo)" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1228 msgid "" -"When arguments are scalars, returns a scalar boolean result. When one argument is an array and the other is a scalar, the scalar is broadcast to all " -"elements. When both arguments are arrays, performs element-wise operation." +"When arguments are scalars, returns a scalar boolean result. When one " +"argument is an array and the other is a scalar, the scalar is broadcast to " +"all elements. When both arguments are arrays, performs element-wise " +"operation." msgstr "" -"Quando gli argomenti sono scalari, restituisce un risultato booleano scalare.Quando un argomento è un array e l'altro è uno scalare, lo scalare viene " -"trasmesso a tutti gli elementi.Quando entrambi gli argomenti sono array, esegue l'operazione a livello di elemento." +"Quando gli argomenti sono scalari, restituisce un risultato booleano scalare." +"Quando un argomento è un array e l'altro è uno scalare, lo scalare viene " +"trasmesso a tutti gli elementi.Quando entrambi gli argomenti sono array, " +"esegue l'operazione a livello di elemento." #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1234 -msgid "<literal>andEach(Size > 1KB, Size < 1MB)</literal> - files between 1KB and 1MB" -msgstr "<literal>andEach(Size > 1KB, Size < 1MB)</literal> - file tra 1KB e 1MB" +msgid "" +"<literal>andEach(Size > 1KB, Size < 1MB)</literal> - files between 1KB " +"and 1MB" +msgstr "" +"<literal>andEach(Size > 1KB, Size < 1MB)</literal> - file tra 1KB e 1MB" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1235 -msgid "<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - txt or log files" -msgstr "<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - file txt o di registro" +msgid "" +"<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - txt or " +"log files" +msgstr "" +"<literal>orEach(Extension = \"txt\", Extension = \"log\")</literal> - file " +"txt o di registro" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1236 @@ -12726,13 +16764,20 @@ msgstr "<literal>notEach(Exists)</literal> - file che non esistono" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1237 -msgid "<literal>allof(andEach(Exists, Size > 0))</literal> - all files exist with non-zero size" -msgstr "<literal>allof(andEach(Exists, Size > 0))</literal> - tutti i file esistono con dimensione diversa da zero" +msgid "" +"<literal>allof(andEach(Exists, Size > 0))</literal> - all files exist " +"with non-zero size" +msgstr "" +"<literal>allof(andEach(Exists, Size > 0))</literal> - tutti i file " +"esistono con dimensione diversa da zero" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: English/Filters.xml:1238 -msgid "<literal>anyof(notEach(Size > 1MB))</literal> - any file 1MB or smaller" -msgstr "<literal>anyof(notEach(Size > 1MB))</literal> - qualsiasi file di 1 MB o inferiore" +msgid "" +"<literal>anyof(notEach(Size > 1MB))</literal> - any file 1MB or smaller" +msgstr "" +"<literal>anyof(notEach(Size > 1MB))</literal> - qualsiasi file di 1 MB o " +"inferiore" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1246 @@ -12882,47 +16927,74 @@ msgstr "ms" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1268 msgid "<literal>Size < 10KB</literal> - Any side's size is less than 10KB" -msgstr "<literal>Dimensione <10KB</literal>: la dimensione di qualsiasi lato è inferiore a 10KB" +msgstr "" +"<literal>Dimensione <10KB</literal>: la dimensione di qualsiasi lato è " +"inferiore a 10KB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1269 -msgid "<literal>LeftSize >= 10MB</literal> - Left side file is at least 10MB" -msgstr "<literal>LeftSize >= 10MB</literal> - Il file del lato sinistro è di almeno 10MB" +msgid "" +"<literal>LeftSize >= 10MB</literal> - Left side file is at least 10MB" +msgstr "" +"<literal>LeftSize >= 10MB</literal> - Il file del lato sinistro è di " +"almeno 10MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1270 msgid "<literal>allof(Size < 1MB)</literal> - All sides are under 1MB" -msgstr "<literal>allof(Size < 1MB)</literal> - Tutti i lati sono inferiori a 1 MB" +msgstr "" +"<literal>allof(Size < 1MB)</literal> - Tutti i lati sono inferiori a 1 MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1271 -msgid "<literal>abs(LeftSize - RightSize) < 1KB</literal> - Size difference is small" -msgstr "<literal>abs(LeftSize - RightSize) <1KB</literal> - La differenza di dimensioni è piccola" +msgid "" +"<literal>abs(LeftSize - RightSize) < 1KB</literal> - Size difference is " +"small" +msgstr "" +"<literal>abs(LeftSize - RightSize) <1KB</literal> - La differenza di " +"dimensioni è piccola" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1272 -msgid "<literal>DateStr = \"2025-07-20\"</literal> - File was last modified on that date" -msgstr "<literal>DateStr = \"2025-07-20\"</literal> - Il file è stato modificato l'ultima volta in quella data" +msgid "" +"<literal>DateStr = \"2025-07-20\"</literal> - File was last modified on that " +"date" +msgstr "" +"<literal>DateStr = \"2025-07-20\"</literal> - Il file è stato modificato " +"l'ultima volta in quella data" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1273 msgid "<literal>Date >= today()</literal> - Modified today or later" -msgstr "<literal>Data >= today()</literal> - Modificato oggi o successivamente" +msgstr "" +"<literal>Data >= today()</literal> - Modificato oggi o successivamente" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1274 -msgid "<literal>isWithin(Date, today() - 7days, today())</literal> - File modified within the last week" -msgstr "<literal>is Within(Date, today() - 7 days, today())</literal> - File modificato nell'ultima settimana" +msgid "" +"<literal>isWithin(Date, today() - 7days, today())</literal> - File modified " +"within the last week" +msgstr "" +"<literal>is Within(Date, today() - 7 days, today())</literal> - File " +"modificato nell'ultima settimana" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1275 -msgid "<literal>inRange(Size, 1KB, 10MB)</literal> - File size is between 1KB (inclusive) and 10MB (exclusive)" -msgstr "<literal>inRange(Size, 1KB, 10MB)</literal>: la dimensione del file è compresa tra 1 KB (incluso) e 10 MB (escluso)" +msgid "" +"<literal>inRange(Size, 1KB, 10MB)</literal> - File size is between 1KB " +"(inclusive) and 10MB (exclusive)" +msgstr "" +"<literal>inRange(Size, 1KB, 10MB)</literal>: la dimensione del file è " +"compresa tra 1 KB (incluso) e 10 MB (escluso)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1276 -msgid "<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - All file sizes are between 100KB and 1MB" -msgstr "<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - Tutte le dimensioni dei file sono comprese tra 100KB e 1MB" +msgid "" +"<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - All file sizes are " +"between 100KB and 1MB" +msgstr "" +"<literal>allof(isWithin(Size, 100KB, 1MB))</literal> - Tutte le dimensioni " +"dei file sono comprese tra 100KB e 1MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1277 @@ -12932,82 +17004,132 @@ msgstr "<literal>AttrStr contiene \"R\"</literal> - Il file è di sola lettura" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1278 msgid "<literal>Name matches \"file[0-9]\\.txt\"</literal> - Regex on filename" -msgstr "<literal>Il nome corrisponde a \"file[0-9]\\.txt\"</literal> - Regex sul nome file" +msgstr "" +"<literal>Il nome corrisponde a \"file[0-9]\\.txt\"</literal> - Regex sul " +"nome file" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1279 -msgid "<literal>Content contains \"Test\"</literal> - File content includes keyword" -msgstr "<literal>Il contenuto contiene \"Test\"</literal> - Il contenuto del file include la parola chiave" +msgid "" +"<literal>Content contains \"Test\"</literal> - File content includes keyword" +msgstr "" +"<literal>Il contenuto contiene \"Test\"</literal> - Il contenuto del file " +"include la parola chiave" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1280 -msgid "<literal>sublines(Content, 0, 1) contains \"XML\"</literal> - First line contains \"XML\"" -msgstr "<literal>sublines(Content, 0, 1) contiene \"XML\"</literal> - La prima riga contiene \"XML\"" +msgid "" +"<literal>sublines(Content, 0, 1) contains \"XML\"</literal> - First line " +"contains \"XML\"" +msgstr "" +"<literal>sublines(Content, 0, 1) contiene \"XML\"</literal> - La prima riga " +"contiene \"XML\"" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1281 -msgid "<literal>(Extension = \"log\" and Size > 10MB) or (Date < today() - 7days)</literal> - Large log files or files older than a week" +msgid "" +"<literal>(Extension = \"log\" and Size > 10MB) or (Date < today() - " +"7days)</literal> - Large log files or files older than a week" msgstr "" -"<literal>(Estensione = \"log\" e dimensione > 10 MB) o (Data < oggi() - 7 giorni)</literal> - File di registro di grandi dimensioni o file più " -"vecchi di una settimana" +"<literal>(Estensione = \"log\" e dimensione > 10 MB) o (Data < oggi() - 7 " +"giorni)</literal> - File di registro di grandi dimensioni o file più vecchi " +"di una settimana" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1282 -msgid "<literal>AttrStr not contains \"H\" and Name like \"*.tmp\"</literal> - Non-hidden temporary files" -msgstr "<literal>AttrStr non contiene \"H\" e nome come \"*.tmp\"</literal> - File temporanei non nascosti" +msgid "" +"<literal>AttrStr not contains \"H\" and Name like \"*.tmp\"</literal> - Non-" +"hidden temporary files" +msgstr "" +"<literal>AttrStr non contiene \"H\" e nome come \"*.tmp\"</literal> - File " +"temporanei non nascosti" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1283 -msgid "<literal>isWithin(Extension, \"a\", \"m\") and inRange(Size, 0, 1MB)</literal> - Files with extensions from 'a' to 'm' and size less than 1MB" -msgstr "<literal>isWithin(Extension, \"a\", \"m\") e inRange(Size, 0, 1MB)</literal> - File con estensioni da 'a' a 'm' e dimensioni inferiori a 1 MB" +msgid "" +"<literal>isWithin(Extension, \"a\", \"m\") and inRange(Size, 0, 1MB)</" +"literal> - Files with extensions from 'a' to 'm' and size less than 1MB" +msgstr "" +"<literal>isWithin(Extension, \"a\", \"m\") e inRange(Size, 0, 1MB)</literal> " +"- File con estensioni da 'a' a 'm' e dimensioni inferiori a 1 MB" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1284 -msgid "<literal>toLower(Name) = \"readme.txt\"</literal> - Case-insensitive filename matching" -msgstr "<literal>toLower(Name) = \"readme.txt\"</literal> - Corrispondenza del nome file senza distinzione tra maiuscole e minuscole" +msgid "" +"<literal>toLower(Name) = \"readme.txt\"</literal> - Case-insensitive " +"filename matching" +msgstr "" +"<literal>toLower(Name) = \"readme.txt\"</literal> - Corrispondenza del nome " +"file senza distinzione tra maiuscole e minuscole" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1285 -msgid "<literal>toHalfWidth(Name) like \"*.txt\"</literal> - Match after converting full-width to half-width" -msgstr "<literal>toHalfWidth(Name) come \"*.txt\"</literal> - Corrisponde dopo la conversione da larghezza intera a mezza larghezza" +msgid "" +"<literal>toHalfWidth(Name) like \"*.txt\"</literal> - Match after converting " +"full-width to half-width" +msgstr "" +"<literal>toHalfWidth(Name) come \"*.txt\"</literal> - Corrisponde dopo la " +"conversione da larghezza intera a mezza larghezza" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1286 -msgid "<literal>Different</literal> - Show only files/folders that are different (Display filter only)" -msgstr "<literal>Different</literal>: visualizza solo file/cartelle differenti (solo filtro di visualizzazione)" +msgid "" +"<literal>Different</literal> - Show only files/folders that are different " +"(Display filter only)" +msgstr "" +"<literal>Different</literal>: visualizza solo file/cartelle differenti (solo " +"filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1287 -msgid "<literal>Identical</literal> - Show only files/folders that are identical (Display filter only)" -msgstr "<literal>Identical</literal>: visualizza solo file/cartelle identici (solo filtro di visualizzazione)" +msgid "" +"<literal>Identical</literal> - Show only files/folders that are identical " +"(Display filter only)" +msgstr "" +"<literal>Identical</literal>: visualizza solo file/cartelle identici (solo " +"filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1288 -msgid "<literal>allof(Binary)</literal> - Show only files that are binary on all sides (Display filter only)" -msgstr "<literal>allof(Binary)</literal> - Visualizza solo i file binari su tutti i lati (solo filtro di visualizzazione)" +msgid "" +"<literal>allof(Binary)</literal> - Show only files that are binary on all " +"sides (Display filter only)" +msgstr "" +"<literal>allof(Binary)</literal> - Visualizza solo i file binari su tutti i " +"lati (solo filtro di visualizzazione)" #. type: Content of: <article><section><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1289 msgid "" -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - In 3-way comparison, show files where only left-middle pair differs (Display " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - In 3-" +"way comparison, show files where only left-middle pair differs (Display " "filter only)" msgstr "" -"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - Nel confronto a 3 vie visualizza i file in cui differisce solo la coppia " +"<literal>DifferentLeftMiddle and not DifferentMiddleRight</literal> - Nel " +"confronto a 3 vie visualizza i file in cui differisce solo la coppia " "sinistra-centrale (solo filtro di visualizzazione)" #. type: Content of: <article><section><title> #: English/Filters.xml:1296 -msgid "Using file filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Utilizzo dei filtri file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Using file filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Utilizzo dei filtri file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1306 msgid "" -"<glossterm>File filters</glossterm> are text files with an extension of <filename>flt</filename>. They enable you to apply multiple filtering rules " -"to a folder comparison. Unlike file masks, file filters can either include or exclude matches." +"<glossterm>File filters</glossterm> are text files with an extension of " +"<filename>flt</filename>. They enable you to apply multiple filtering rules " +"to a folder comparison. Unlike file masks, file filters can either include " +"or exclude matches." msgstr "" -"I <glossterm>filtri file</glossterm> sono file di testo con estensione <filename>flt</filename>.Consentono di applicare più regole di filtro a un " -"confronto di cartelle.A differenza delle maschere di file, i filtri di file possono includere o escludere corrispondenze." +"I <glossterm>filtri file</glossterm> sono file di testo con estensione " +"<filename>flt</filename>.Consentono di applicare più regole di filtro a un " +"confronto di cartelle.A differenza delle maschere di file, i filtri di file " +"possono includere o escludere corrispondenze." #. type: Content of: <article><section><para><indexterm><secondary> #: English/Filters.xml:1314 @@ -13017,15 +17139,22 @@ msgstr "modello" #. type: Content of: <article><section><para> #: English/Filters.xml:1311 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installs a number of predefined file filters. If these file filters do not provide the filtering " -"you need, you can create your own. To make that task easier, WinMerge also provides a template file named <filename>FileFilter.tmpl</filename>. This " -"section describes how to apply file filters to comparisons, and documents the file filter syntax. <xref linkend=\"Filters_dlg\" /> describes how to " +"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installs a number of " +"predefined file filters. If these file filters do not provide the filtering " +"you need, you can create your own. To make that task easier, WinMerge also " +"provides a template file named <filename>FileFilter.tmpl</filename>. This " +"section describes how to apply file filters to comparisons, and documents " +"the file filter syntax. <xref linkend=\"Filters_dlg\" /> describes how to " "add, edit, and manage filters." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installa una serie di filtri di file predefiniti.Se questi filtri di file non forniscono il " -"filtraggio necessario, puoi crearne uno tuo.Per semplificare questo compito, WinMerge fornisce anche un file modello denominato " -"<filename>FileFilter.tmpl</filename>.Questa sezione descrive come applicare i filtri di file ai confronti e documenta la sintassi del filtro di file." -"<xref linkend=\"Filters_dlg\" /> descrive come aggiungere, modificare e gestire i filtri." +"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge installa una serie di " +"filtri di file predefiniti.Se questi filtri di file non forniscono il " +"filtraggio necessario, puoi crearne uno tuo.Per semplificare questo compito, " +"WinMerge fornisce anche un file modello denominato <filename>FileFilter." +"tmpl</filename>.Questa sezione descrive come applicare i filtri di file ai " +"confronti e documenta la sintassi del filtro di file.<xref " +"linkend=\"Filters_dlg\" /> descrive come aggiungere, modificare e gestire i " +"filtri." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1327 English/Filters.xml:1331 @@ -13034,8 +17163,12 @@ msgstr "posizioni" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1324 -msgid "File filter locations<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Posizioni filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"File filter locations<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Posizioni filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1334 @@ -13050,20 +17183,26 @@ msgstr "Sottocartella Filtri nella cartella di installazione di WinMerge" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1342 msgid "" -"This is where the predefined file filters are installed. For example, <filename>C:\\Program Files\\WinMerge\\Filters</filename>. You can create or " -"copy filter files in this location to make them available to all users on your system." +"This is where the predefined file filters are installed. For example, " +"<filename>C:\\Program Files\\WinMerge\\Filters</filename>. You can create or " +"copy filter files in this location to make them available to all users on " +"your system." msgstr "" -"Qui è dove vengono installati i filtri di file predefiniti.Ad esempio, <filename>C:\\Programmi\\WinMerge\\Filters</filename>.Puoi creare o copiare " -"file di filtro in questa posizione per renderli disponibili a tutti gli utenti del tuo sistema." +"Qui è dove vengono installati i filtri di file predefiniti.Ad esempio, " +"<filename>C:\\Programmi\\WinMerge\\Filters</filename>.Puoi creare o copiare " +"file di filtro in questa posizione per renderli disponibili a tutti gli " +"utenti del tuo sistema." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1347 msgid "" -"Before creating a new file filter, see if the predefined ones already contain what you need. If not, you might find useful rule examples in the " +"Before creating a new file filter, see if the predefined ones already " +"contain what you need. If not, you might find useful rule examples in the " "existing files." msgstr "" -"Prima di creare un nuovo filtro file, verifica se quelli predefiniti contengono già ciò che ti serve.In caso contrario, potresti trovare utili esempi " -"di regole nei file esistenti." +"Prima di creare un nuovo filtro file, verifica se quelli predefiniti " +"contengono già ciò che ti serve.In caso contrario, potresti trovare utili " +"esempi di regole nei file esistenti." #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1354 @@ -13073,18 +17212,27 @@ msgstr "Cartella di filtro privata predefinita" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1357 msgid "" -"The location of this folder is defined in the System page of WinMerge options. By default, it is specified as a subfolder in your user profile folder " -"(for example, <filename>Documents</filename> in Windows 10). Filters that are created or copied here are normally visible only to you. If you create " -"new file filters, you can copy them here to keep them private." +"The location of this folder is defined in the System page of WinMerge " +"options. By default, it is specified as a subfolder in your user profile " +"folder (for example, <filename>Documents</filename> in Windows 10). Filters " +"that are created or copied here are normally visible only to you. If you " +"create new file filters, you can copy them here to keep them private." msgstr "" -"La posizione di questa cartella è definita nella pagina Sistema delle opzioni WinMerge.Per impostazione predefinita, è specificata come sottocartella " -"nella cartella del profilo utente (ad esempio, <filename>Documents</filename> in Windows 10).I filtri creati o copiati qui sono normalmente visibili " -"solo a te.Se crei nuovi filtri di file, puoi copiarli qui per mantenerli privati." +"La posizione di questa cartella è definita nella pagina Sistema delle " +"opzioni WinMerge.Per impostazione predefinita, è specificata come " +"sottocartella nella cartella del profilo utente (ad esempio, " +"<filename>Documents</filename> in Windows 10).I filtri creati o copiati qui " +"sono normalmente visibili solo a te.Se crei nuovi filtri di file, puoi " +"copiarli qui per mantenerli privati." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1367 -msgid "Before you can apply file filters that exist in any other folder, you must first install them." -msgstr "Prima di poter applicare i filtri di file esistenti in qualsiasi altra cartella, devi prima installarli." +msgid "" +"Before you can apply file filters that exist in any other folder, you must " +"first install them." +msgstr "" +"Prima di poter applicare i filtri di file esistenti in qualsiasi altra " +"cartella, devi prima installarli." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1375 @@ -13094,7 +17242,8 @@ msgstr "applicando" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1372 msgid "Applying file filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Applicazione dei filtri ai file<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Applicazione dei filtri ai file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1378 @@ -13103,59 +17252,87 @@ msgstr "Puoi applicare un filtro file utilizzando uno di questi metodi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1382 -msgid "When you launch a folder compare from the Select Files or Folders dialog:" -msgstr "Quando avvii un confronto di cartelle dalla finestra di dialogo Seleziona file o cartelle:" +msgid "" +"When you launch a folder compare from the Select Files or Folders dialog:" +msgstr "" +"Quando avvii un confronto di cartelle dalla finestra di dialogo Seleziona " +"file o cartelle:" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1387 msgid "" -"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> folders, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" +"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> " +"folders, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" "guilabel> field." msgstr "" -"Dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " +"Dopo aver scelto le cartelle <guilabel >1a</guilabel > e <guilabel >2a</" +"guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " "<guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1394 -msgid "In the Filters dialog, use the File Filters tab to choose a file filter and load it in the <guilabel>Filter</guilabel> field." +msgid "" +"In the Filters dialog, use the File Filters tab to choose a file filter and " +"load it in the <guilabel>Filter</guilabel> field." msgstr "" -"Nella finestra di dialogo Filtri, usa la scheda Filtri di file per scegliere un filtro di file e caricarlo nel campo <guilabel >Filtro</guilabel >." +"Nella finestra di dialogo Filtri, usa la scheda Filtri di file per scegliere " +"un filtro di file e caricarlo nel campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><note><para> #: English/Filters.xml:1399 -msgid "If a file filter is currently enabled, the selected file filter is already loaded in the <guilabel>Filter</guilabel> field." -msgstr "Se un filtro file è attualmente abilitato, il filtro file selezionato è già caricato nel campo <guilabel >Filtro</guilabel >." +msgid "" +"If a file filter is currently enabled, the selected file filter is already " +"loaded in the <guilabel>Filter</guilabel> field." +msgstr "" +"Se un filtro file è attualmente abilitato, il filtro file selezionato è già " +"caricato nel campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1407 -msgid "Proceed with the compare operation. The file in the <guilabel>Filter</guilabel> field is applied when you start the operation." -msgstr "Procedere con l'operazione di confronto.Il file nel campo <guilabel >Filtro</guilabel > viene applicato quando avvii l'operazione." +msgid "" +"Proceed with the compare operation. The file in the <guilabel>Filter</" +"guilabel> field is applied when you start the operation." +msgstr "" +"Procedere con l'operazione di confronto.Il file nel campo <guilabel >Filtro</" +"guilabel > viene applicato quando avvii l'operazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1415 msgid "" -"To change file filtering after you have already launched a folder compare operation (for example, applying a different filter or disabling filtering):" +"To change file filtering after you have already launched a folder compare " +"operation (for example, applying a different filter or disabling filtering):" msgstr "" -"Per modificare il filtro dei file dopo aver già avviato un'operazione di confronto delle cartelle (ad esempio, applicando un filtro diverso o " +"Per modificare il filtro dei file dopo aver già avviato un'operazione di " +"confronto delle cartelle (ad esempio, applicando un filtro diverso o " "disabilitando il filtro):" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1421 English/Filters.xml:1689 -msgid "Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>." -msgstr "Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >." +msgid "" +"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" +"guimenuitem> </menuchoice>." +msgstr "" +"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" +"guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1429 -msgid "In the Filters dialog, configure your new file filter setting, and click <guibutton>OK</guibutton>." -msgstr "Nella finestra di dialogo Filtri, configura la nuova impostazione del filtro file e fai clic su <guibutton >OK</guibutton >." +msgid "" +"In the Filters dialog, configure your new file filter setting, and click " +"<guibutton>OK</guibutton>." +msgstr "" +"Nella finestra di dialogo Filtri, configura la nuova impostazione del filtro " +"file e fai clic su <guibutton >OK</guibutton >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1434 msgid "" -"The new filtering is not automatically applied when you close the Filters dialog: press <keycap>F5</keycap> to see the new results in the Folder " +"The new filtering is not automatically applied when you close the Filters " +"dialog: press <keycap>F5</keycap> to see the new results in the Folder " "Compare window." msgstr "" -"Il nuovo filtro non viene applicato automaticamente quando chiudi la finestra di dialogo Filtri: premi <keycap>F5</keycap> per vedere i nuovi " +"Il nuovo filtro non viene applicato automaticamente quando chiudi la " +"finestra di dialogo Filtri: premi <keycap>F5</keycap> per vedere i nuovi " "risultati nella finestra Confronto cartelle." #. type: Content of: <article><section><section><itemizedlist><listitem><para><indexterm><secondary> @@ -13166,10 +17343,12 @@ msgstr "applicare filtri ai file" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1442 msgid "" -"<placeholder type=\"indexterm\" id=\"0\"/>When you launch a folder compare from the WinMerge command line, use the <option>-f</option> flag to " -"specify a file filter." +"<placeholder type=\"indexterm\" id=\"0\"/>When you launch a folder compare " +"from the WinMerge command line, use the <option>-f</option> flag to specify " +"a file filter." msgstr "" -"<placeholder type=\"indexterm\" id=\"0\"/>Quando avvii un confronto di cartelle dalla riga di comando di WinMerge, utilizza il flag <option>-f</" +"<placeholder type=\"indexterm\" id=\"0\"/>Quando avvii un confronto di " +"cartelle dalla riga di comando di WinMerge, utilizza il flag <option>-f</" "option> per specificare un filtro file." #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -13184,24 +17363,37 @@ msgstr "sintassi" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1454 -msgid "File filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Sintassi del filtro file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"File filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Sintassi del filtro file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1464 -msgid "This section describes the syntax of WinMerge file filters and provides guidelines for writing them." -msgstr "Questa sezione descrive la sintassi dei filtri di file WinMerge e fornisce linee guida per scriverli." +msgid "" +"This section describes the syntax of WinMerge file filters and provides " +"guidelines for writing them." +msgstr "" +"Questa sezione descrive la sintassi dei filtri di file WinMerge e fornisce " +"linee guida per scriverli." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1467 msgid "" -"The comment delimiter is <code>##</code>. After a comment delimiter, all characters in a line are ignored. WinMerge ignores most whitespace " -"characters in rules. However, a comment must always be preceded by one or more whitespace (space or tab) characters. To use <code>##</code> as " +"The comment delimiter is <code>##</code>. After a comment delimiter, all " +"characters in a line are ignored. WinMerge ignores most whitespace " +"characters in rules. However, a comment must always be preceded by one or " +"more whitespace (space or tab) characters. To use <code>##</code> as " "characters in a rule, omit the whitespace prefix." msgstr "" -"Il delimitatore del commento è <code>##</code>.Dopo un delimitatore di commento, tutti i caratteri in una riga vengono ignorati.WinMerge ignora la " -"maggior parte dei caratteri di spazio bianco nelle regole.Tuttavia, un commento deve essere sempre preceduto da uno o più caratteri di spazio bianco " -"(spazio o tabulazione).Per utilizzare <code>##</code> come caratteri in una regola, ometti il ​​prefisso dello spazio bianco." +"Il delimitatore del commento è <code>##</code>.Dopo un delimitatore di " +"commento, tutti i caratteri in una riga vengono ignorati.WinMerge ignora la " +"maggior parte dei caratteri di spazio bianco nelle regole.Tuttavia, un " +"commento deve essere sempre preceduto da uno o più caratteri di spazio " +"bianco (spazio o tabulazione).Per utilizzare <code>##</code> come caratteri " +"in una regola, ometti il ​​prefisso dello spazio bianco." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1473 @@ -13236,7 +17428,8 @@ msgstr "includere" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1496 msgid "Includes everything except items matching the specified rule." -msgstr "Include tutto tranne gli elementi che corrispondono alla regola specificata." +msgstr "" +"Include tutto tranne gli elementi che corrispondono alla regola specificata." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><term> #: English/Filters.xml:1502 @@ -13246,15 +17439,18 @@ msgstr "escludere" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1505 msgid "Excludes everything except items matching the specified rule." -msgstr "Esclude tutto tranne gli elementi che corrispondono alla regola specificata." +msgstr "" +"Esclude tutto tranne gli elementi che corrispondono alla regola specificata." #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1508 msgid "" -"When you choose the exclude method, you must also add a <guilabel>d</guilabel> (directory) rule that specifies the subfolders. It's usually a good " -"idea to specify all subfolders, like this:" +"When you choose the exclude method, you must also add a <guilabel>d</" +"guilabel> (directory) rule that specifies the subfolders. It's usually a " +"good idea to specify all subfolders, like this:" msgstr "" -"Quando scegli il metodo di esclusione, devi anche aggiungere una regola <guilabel >d</guilabel > (cartella) che specifichi le sottocartelle. Di " +"Quando scegli il metodo di esclusione, devi anche aggiungere una regola " +"<guilabel >d</guilabel > (cartella) che specifichi le sottocartelle. Di " "solito è una buona idea specificare tutte le sottocartelle, in questo modo:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><variablelist><varlistentry><listitem><screen> @@ -13266,22 +17462,31 @@ msgstr "d: \\\\*$ ## Sottocartelle" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><tip><para> #: English/Filters.xml:1519 msgid "" -"Don't confuse these terms. Remember, in file filters, an <guilabel>include</guilabel> rule does not specify what to include, it specifies what " -"<emphasis>not</emphasis> to include. Similarly, <guilabel>exclude</guilabel> does not specify what to exclude, it specifies what not to exclude." +"Don't confuse these terms. Remember, in file filters, an <guilabel>include</" +"guilabel> rule does not specify what to include, it specifies what " +"<emphasis>not</emphasis> to include. Similarly, <guilabel>exclude</" +"guilabel> does not specify what to exclude, it specifies what not to exclude." msgstr "" -"Non confondere questi termini.Ricorda, nei filtri dei file, una regola <guilabel >include</guilabel > non specifica cosa includere, specifica cosa " -"<emphasis >non</emphasis > includere.Allo stesso modo, <guilabel >exclude</guilabel > non specifica cosa escludere, specifica cosa non escludere." +"Non confondere questi termini.Ricorda, nei filtri dei file, una regola " +"<guilabel >include</guilabel > non specifica cosa includere, specifica cosa " +"<emphasis >non</emphasis > includere.Allo stesso modo, <guilabel >exclude</" +"guilabel > non specifica cosa escludere, specifica cosa non escludere." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1529 msgid "" -"Next, your file should contain one or more filter rules. You can add as many rules as you like. There must be one rule per line, and each rule must " -"be entirely on one line (no line breaks are allowed in a rule). A rule begins with a type designator, followed by either a regular expression or a " -"filter expression. The supported type designators are:" +"Next, your file should contain one or more filter rules. You can add as many " +"rules as you like. There must be one rule per line, and each rule must be " +"entirely on one line (no line breaks are allowed in a rule). A rule begins " +"with a type designator, followed by either a regular expression or a filter " +"expression. The supported type designators are:" msgstr "" -"Successivamente, il file dovrebbe contenere una o più regole di filtro.Puoi aggiungere tutte le regole che desideri.Deve esserci una regola per riga " -"e ciascuna regola deve essere interamente su una riga (in una regola non sono consentite interruzioni di riga).Una regola inizia con un " -"identificatore di tipo, seguito da un'espressione regolare o da un'espressione di filtro.I designatori di tipo supportati sono:" +"Successivamente, il file dovrebbe contenere una o più regole di filtro.Puoi " +"aggiungere tutte le regole che desideri.Deve esserci una regola per riga e " +"ciascuna regola deve essere interamente su una riga (in una regola non sono " +"consentite interruzioni di riga).Una regola inizia con un identificatore di " +"tipo, seguito da un'espressione regolare o da un'espressione di filtro.I " +"designatori di tipo supportati sono:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1537 @@ -13291,7 +17496,8 @@ msgstr "Abbina i nomi dei file utilizzando le espressioni regolari" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1538 msgid "Exclude files matching regex (Available since 2.16.19)" -msgstr "Escludi file corrispondenti a regex (disponibile dalla versione 2.16.19)" +msgstr "" +"Escludi file corrispondenti a regex (disponibile dalla versione 2.16.19)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1539 @@ -13310,8 +17516,12 @@ msgstr "e: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1545 -msgid "Filter expression applied to both files and folders (e.g. e:Name like \"Common*.*\") (Available since 2.16.56)" -msgstr "Espressione di filtro applicata sia a file che a cartelle (ad esempio e:Nome come \"Comune*.*\") (disponibile dalla 2.16.56)" +msgid "" +"Filter expression applied to both files and folders (e.g. e:Name like " +"\"Common*.*\") (Available since 2.16.56)" +msgstr "" +"Espressione di filtro applicata sia a file che a cartelle (ad esempio e:Nome " +"come \"Comune*.*\") (disponibile dalla 2.16.56)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1546 @@ -13320,8 +17530,11 @@ msgstr "e!: <replaceable>espressione</replaceable>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1546 -msgid "Filter expression to exclude both files and folders (Available since 2.16.56)" -msgstr "Espressione di filtro per escludere sia file che cartelle (disponibile dalla 2.16.56)" +msgid "" +"Filter expression to exclude both files and folders (Available since 2.16.56)" +msgstr "" +"Espressione di filtro per escludere sia file che cartelle (disponibile dalla " +"2.16.56)" #. type: Content of: <article><section><section><para><indexterm><secondary> #: English/Filters.xml:1553 @@ -13336,10 +17549,12 @@ msgstr "nei filtri dei file" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1549 msgid "" -"Among the many regexp special characters, the following are particularly important in file filter rules:<placeholder type=\"indexterm\" id=\"0\"/" +"Among the many regexp special characters, the following are particularly " +"important in file filter rules:<placeholder type=\"indexterm\" id=\"0\"/" "><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Tra i tanti caratteri speciali regexp, i seguenti sono particolarmente importanti nelle regole di filtro dei file:<placeholder type=\"indexterm\" " +"Tra i tanti caratteri speciali regexp, i seguenti sono particolarmente " +"importanti nelle regole di filtro dei file:<placeholder type=\"indexterm\" " "id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -13360,7 +17575,8 @@ msgstr "$ (fine riga)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1573 msgid "Frequently required for rules to work correctly. For example:" -msgstr "Spesso richiesto affinché le regole funzionino correttamente.Per esempio:" +msgstr "" +"Spesso richiesto affinché le regole funzionino correttamente.Per esempio:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: English/Filters.xml:1576 @@ -13380,25 +17596,35 @@ msgstr "\\ (fuga)" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1585 msgid "" -"Forces special characters to match normal characters. For example, to match a folder name, precede the folder backslash delimiter with a backslash " -"(<code>\\\\</code>). To match the dot in a file name, specify a backslash followed by a dot (<code>\\.</code>)." +"Forces special characters to match normal characters. For example, to match " +"a folder name, precede the folder backslash delimiter with a backslash " +"(<code>\\\\</code>). To match the dot in a file name, specify a backslash " +"followed by a dot (<code>\\.</code>)." msgstr "" -"Forza i caratteri speciali a corrispondere ai caratteri normali.Ad esempio, per abbinare il nome di una cartella, anteporre al delimitatore della " -"barra rovesciata della cartella una barra rovesciata (<code>\\\\</code>).Per far corrispondere il punto nel nome di un file, specificare una barra " -"rovesciata seguita da un punto (<code>\\.</code>)." +"Forza i caratteri speciali a corrispondere ai caratteri normali.Ad esempio, " +"per abbinare il nome di una cartella, anteporre al delimitatore della barra " +"rovesciata della cartella una barra rovesciata (<code>\\\\</code>).Per far " +"corrispondere il punto nel nome di un file, specificare una barra rovesciata " +"seguita da un punto (<code>\\.</code>)." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1594 -msgid "No special characters or wildcards are used to match file names. To match all filenames of a certain type, simply omit the filename." +msgid "" +"No special characters or wildcards are used to match file names. To match " +"all filenames of a certain type, simply omit the filename." msgstr "" -"Non vengono utilizzati caratteri speciali o caratteri jolly per abbinare i nomi dei file.Per abbinare tutti i nomi di file di un certo tipo, ometti " +"Non vengono utilizzati caratteri speciali o caratteri jolly per abbinare i " +"nomi dei file.Per abbinare tutti i nomi di file di un certo tipo, ometti " "semplicemente il nome del file." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1597 -msgid "Rules are case-insensitive. For example, <code>f: \\.bat$</code> matches <filename>winmerge.bat</filename> and <filename>compare.BAT</filename>." +msgid "" +"Rules are case-insensitive. For example, <code>f: \\.bat$</code> matches " +"<filename>winmerge.bat</filename> and <filename>compare.BAT</filename>." msgstr "" -"Le regole non fanno distinzione tra maiuscole e minuscole.Ad esempio, <code>f: \\.bat$</code> corrisponde a <filename>winmerge.bat</filename> e " +"Le regole non fanno distinzione tra maiuscole e minuscole.Ad esempio, " +"<code>f: \\.bat$</code> corrisponde a <filename>winmerge.bat</filename> e " "<filename>compare.BAT</filename>." #. type: Content of: <article><section><section><example><title> @@ -13466,23 +17692,35 @@ msgstr "nei confronti dei file" #. type: Content of: <article><section><title> #: English/Filters.xml:1627 -msgid "Using line filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Utilizzo dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Using line filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Utilizzo dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1637 msgid "" -"In a file comparison, you can use line filters to ignore single lines. For example, you might use line filters to ignore comments or certain type of " -"generated code, like version control system timestamps. Each line filter is a rule, and you can apply any number of line filters to a file comparison." +"In a file comparison, you can use line filters to ignore single lines. For " +"example, you might use line filters to ignore comments or certain type of " +"generated code, like version control system timestamps. Each line filter is " +"a rule, and you can apply any number of line filters to a file comparison." msgstr "" -"In un confronto di file è possibile utilizzare i filtri di riga per ignorare singole righe.Ad esempio, potresti utilizzare filtri di riga per " -"ignorare i commenti o determinati tipi di codice generato, come i timestamp del sistema di controllo della versione.Ogni filtro di linea è una regola " -"ed è possibile applicare un numero qualsiasi di filtri di linea a un confronto di file." +"In un confronto di file è possibile utilizzare i filtri di riga per ignorare " +"singole righe.Ad esempio, potresti utilizzare filtri di riga per ignorare i " +"commenti o determinati tipi di codice generato, come i timestamp del sistema " +"di controllo della versione.Ogni filtro di linea è una regola ed è possibile " +"applicare un numero qualsiasi di filtri di linea a un confronto di file." #. type: Content of: <article><section><para> #: English/Filters.xml:1643 -msgid "To learn how to add, edit, and manage filters, see <xref linkend=\"Filters_dlg\" />." -msgstr "Per informazioni su come aggiungere, modificare e gestire i filtri, vedi <xref linkend=\"Filters_dlg\" />." +msgid "" +"To learn how to add, edit, and manage filters, see <xref " +"linkend=\"Filters_dlg\" />." +msgstr "" +"Per informazioni su come aggiungere, modificare e gestire i filtri, vedi " +"<xref linkend=\"Filters_dlg\" />." #. type: Content of: <article><section><section><title> #: English/Filters.xml:1647 @@ -13492,45 +17730,63 @@ msgstr "Applicazione di filtri di linea" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1649 msgid "You can apply line filters using any of these methods:" -msgstr "È possibile applicare filtri di linea utilizzando uno di questi metodi:" +msgstr "" +"È possibile applicare filtri di linea utilizzando uno di questi metodi:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1653 msgid "When you launch a file compare from the Select Files or Folders dialog" -msgstr "Quando si avvia un confronto di file dalla finestra di dialogo Seleziona file o cartelle" +msgstr "" +"Quando si avvia un confronto di file dalla finestra di dialogo Seleziona " +"file o cartelle" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1658 msgid "" -"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> files, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" +"After choosing the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> " +"files, click <guibutton>Select</guibutton> next to the <guilabel>Filter</" "guilabel> field." msgstr "" -"Dopo aver scelto il file <guilabel >primo</guilabel > e <guilabel >secondo</guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al " -"campo <guilabel >Filtro</guilabel >." +"Dopo aver scelto il file <guilabel >primo</guilabel > e <guilabel >secondo</" +"guilabel >, fai clic su <guibutton >Seleziona</guibutton > accanto al campo " +"<guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1665 msgid "" -"In the Filters dialog, use the Line Filters tab to enable the line filters you want to use (if any), or to see what line filters are currently " -"enabled." +"In the Filters dialog, use the Line Filters tab to enable the line filters " +"you want to use (if any), or to see what line filters are currently enabled." msgstr "" -"Nella finestra di dialogo Filtri, utilizzare la scheda Filtri di linea per abilitare i filtri di linea che si desidera utilizzare (se presenti) o per " +"Nella finestra di dialogo Filtri, utilizzare la scheda Filtri di linea per " +"abilitare i filtri di linea che si desidera utilizzare (se presenti) o per " "vedere quali filtri di linea sono attualmente abilitati." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><note><para> #: English/Filters.xml:1670 -msgid "The <guilabel>Filter</guilabel> field does not indicate what line filters are enabled." -msgstr "Il campo <guilabel >Filtro</guilabel > non indica quali filtri di linea sono abilitati." +msgid "" +"The <guilabel>Filter</guilabel> field does not indicate what line filters " +"are enabled." +msgstr "" +"Il campo <guilabel >Filtro</guilabel > non indica quali filtri di linea sono " +"abilitati." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1677 -msgid "Proceed with the file compare operation. The enabled line filters are applied when you start the operation." -msgstr "Procedere con l'operazione di confronto dei file.I filtri di linea abilitati vengono applicati all'avvio dell'operazione." +msgid "" +"Proceed with the file compare operation. The enabled line filters are " +"applied when you start the operation." +msgstr "" +"Procedere con l'operazione di confronto dei file.I filtri di linea abilitati " +"vengono applicati all'avvio dell'operazione." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1684 -msgid "After you have already launched a file compare operation (for example, to apply different filters or disabling filtering)" -msgstr "Dopo aver già avviato un'operazione di confronto dei file (ad esempio, per applicare filtri diversi o disabilitare i filtri)" +msgid "" +"After you have already launched a file compare operation (for example, to " +"apply different filters or disabling filtering)" +msgstr "" +"Dopo aver già avviato un'operazione di confronto dei file (ad esempio, per " +"applicare filtri diversi o disabilitare i filtri)" #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1697 @@ -13539,34 +17795,49 @@ msgstr "Apri la scheda Filtri file." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1701 -msgid "Check the individual line filters you want to apply, and uncheck filters that you don't want to apply." -msgstr "Seleziona i singoli filtri di linea che desideri applicare e deseleziona i filtri che non desideri applicare." +msgid "" +"Check the individual line filters you want to apply, and uncheck filters " +"that you don't want to apply." +msgstr "" +"Seleziona i singoli filtri di linea che desideri applicare e deseleziona i " +"filtri che non desideri applicare." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1704 msgid "" -"You can also add, edit, and remove filters from the list by using the <guibutton>New</guibutton>, <guibutton>Edit</guibutton>, and <guibutton>Remove</" -"guibutton> buttons." +"You can also add, edit, and remove filters from the list by using the " +"<guibutton>New</guibutton>, <guibutton>Edit</guibutton>, and " +"<guibutton>Remove</guibutton> buttons." msgstr "" -"Puoi anche aggiungere, modificare e rimuovere filtri dall'elenco utilizzando i pulsanti <guibutton >Nuovo</guibutton >, <guibutton >Modifica</" -"guibutton > e <guibutton >Rimuovi</guibutton >." +"Puoi anche aggiungere, modificare e rimuovere filtri dall'elenco utilizzando " +"i pulsanti <guibutton >Nuovo</guibutton >, <guibutton >Modifica</guibutton > " +"e <guibutton >Rimuovi</guibutton >." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1710 -msgid "To turn on line filtering, check the <guilabel>Enable Line Filters</guilabel>. To turn line filtering off, uncheck the option." +msgid "" +"To turn on line filtering, check the <guilabel>Enable Line Filters</" +"guilabel>. To turn line filtering off, uncheck the option." msgstr "" -"Per attivare i filtri di linea, seleziona <guilabel >Abilita filtri di linea</guilabel >.Per disattivare il filtraggio della linea, deseleziona " +"Per attivare i filtri di linea, seleziona <guilabel >Abilita filtri di " +"linea</guilabel >.Per disattivare il filtraggio della linea, deseleziona " "l'opzione." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1716 msgid "Click <guibutton>OK</guibutton> to dismiss the File Filters dialog." -msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri file." +msgstr "" +"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " +"Filtri file." #. type: Content of: <article><section><section><itemizedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:1721 -msgid "Click <keycap>F5</keycap> to apply your changes and refresh the File Compare window." -msgstr "Fai clic su <keycap>F5</keycap> per applicare le modifiche e aggiornare la finestra Confronta file." +msgid "" +"Click <keycap>F5</keycap> to apply your changes and refresh the File Compare " +"window." +msgstr "" +"Fai clic su <keycap>F5</keycap> per applicare le modifiche e aggiornare la " +"finestra Confronta file." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1733 @@ -13580,43 +17851,58 @@ msgstr "filtri in linea" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1730 -msgid "Line filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" +msgid "" +"Line filter syntax<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/>" msgstr "" -"Sintassi del filtro di linea<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " +"Sintassi del filtro di linea<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>><placeholder type=\"indexterm\" " "id=\"2\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1744 msgid "" -"A line filter is a rule that is evaluated against each single-line difference in your compared files, if line filter rules are enabled. When a rule " -"matches a single-line difference, the difference is ignored." +"A line filter is a rule that is evaluated against each single-line " +"difference in your compared files, if line filter rules are enabled. When a " +"rule matches a single-line difference, the difference is ignored." msgstr "" -"Un filtro di riga è una regola che viene valutata rispetto a ogni differenza di riga singola nei file confrontati, se le regole di filtro di riga " -"sono abilitate.Quando una regola corrisponde a una differenza di riga singola, la differenza viene ignorata." +"Un filtro di riga è una regola che viene valutata rispetto a ogni differenza " +"di riga singola nei file confrontati, se le regole di filtro di riga sono " +"abilitate.Quando una regola corrisponde a una differenza di riga singola, la " +"differenza viene ignorata." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1748 msgid "" -"Ignored differences are marked in the File Compare window with the <guilabel>Ignored Difference</guilabel> color (as defined in the Colors page of " -"WinMerge Options). This enables you to distinguish ignored differences from other types. However, you cannot select or merge ignored difference." +"Ignored differences are marked in the File Compare window with the " +"<guilabel>Ignored Difference</guilabel> color (as defined in the Colors page " +"of WinMerge Options). This enables you to distinguish ignored differences " +"from other types. However, you cannot select or merge ignored difference." msgstr "" -"Le differenze ignorate sono contrassegnate nella finestra Confronta file con il colore <guilabel >Differenza ignorata</guilabel > (come definito " -"nella pagina Colori delle Opzioni di WinMerge).Ciò consente di distinguere le differenze ignorate da altri tipi.Tuttavia, non è possibile selezionare " -"o unire la differenza ignorata." +"Le differenze ignorate sono contrassegnate nella finestra Confronta file con " +"il colore <guilabel >Differenza ignorata</guilabel > (come definito nella " +"pagina Colori delle Opzioni di WinMerge).Ciò consente di distinguere le " +"differenze ignorate da altri tipi.Tuttavia, non è possibile selezionare o " +"unire la differenza ignorata." #. type: Content of: <article><section><section><para> #: English/Filters.xml:1754 msgid "Line filter matching can be described in terms of two ideas:" -msgstr "La corrispondenza del filtro di linea può essere descritta in termini di due idee:" +msgstr "" +"La corrispondenza del filtro di linea può essere descritta in termini di due " +"idee:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1758 msgid "" -"When a rule matches any part of the line, the entire difference is ignored. Therefore, you cannot filter just part of a line. For example, suppose " -"two files have the following single-line difference:" +"When a rule matches any part of the line, the entire difference is ignored. " +"Therefore, you cannot filter just part of a line. For example, suppose two " +"files have the following single-line difference:" msgstr "" -"Quando una regola corrisponde a qualsiasi parte della linea, l'intera differenza viene ignorata.Pertanto non è possibile filtrare solo parte di una " -"riga.Ad esempio, supponiamo che due file abbiano la seguente differenza di una sola riga:" +"Quando una regola corrisponde a qualsiasi parte della linea, l'intera " +"differenza viene ignorata.Pertanto non è possibile filtrare solo parte di " +"una riga.Ad esempio, supponiamo che due file abbiano la seguente differenza " +"di una sola riga:" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><title> #: English/Filters.xml:1764 English/Filters.xml:1786 English/Intro_diffs.xml:60 @@ -13643,17 +17929,24 @@ msgstr "#Janne Sibelius" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1775 msgid "" -"With no filtering, the line is detected as a difference. But if we apply a line filter rule with the expression, <code>^#</code>, the lines are " -"reported as identical, because the expression specifies only the first character, which matches in both files." +"With no filtering, the line is detected as a difference. But if we apply a " +"line filter rule with the expression, <code>^#</code>, the lines are " +"reported as identical, because the expression specifies only the first " +"character, which matches in both files." msgstr "" -"Senza filtraggio, la linea viene rilevata come differenza.Ma se applichiamo una regola di filtro di riga con l'espressione <code>^#</code>, le righe " -"vengono riportate come identiche, poiché l'espressione specifica solo il primo carattere, che corrisponde in entrambi i file." +"Senza filtraggio, la linea viene rilevata come differenza.Ma se applichiamo " +"una regola di filtro di riga con l'espressione <code>^#</code>, le righe " +"vengono riportate come identiche, poiché l'espressione specifica solo il " +"primo carattere, che corrisponde in entrambi i file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1782 -msgid "A rule is applied to a multi-line difference only if all the lines match. For example, consider this two-line difference:" +msgid "" +"A rule is applied to a multi-line difference only if all the lines match. " +"For example, consider this two-line difference:" msgstr "" -"Una regola viene applicata a una differenza su più righe solo se tutte le righe corrispondono.Ad esempio, considera questa differenza di due righe:" +"Una regola viene applicata a una differenza su più righe solo se tutte le " +"righe corrispondono.Ad esempio, considera questa differenza di due righe:" #. type: Content of: <article><section><section><itemizedlist><listitem><formalpara><para><screen> #: English/Filters.xml:1788 @@ -13677,17 +17970,25 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Filters.xml:1799 -msgid "The same <code>^#</code> rule matches the first line, but not the second line. Therefore, the difference is not ignored." -msgstr "La stessa regola <code>^#</code> corrisponde alla prima riga, ma non alla seconda riga.Pertanto, la differenza non viene ignorata." +msgid "" +"The same <code>^#</code> rule matches the first line, but not the second " +"line. Therefore, the difference is not ignored." +msgstr "" +"La stessa regola <code>^#</code> corrisponde alla prima riga, ma non alla " +"seconda riga.Pertanto, la differenza non viene ignorata." #. type: Content of: <article><section><section><tip><para> #: English/Filters.xml:1805 msgid "" -"It's usually good practice to use the beginning of line ( <code>^</code> ) and end of line ( <code>$</code> ) markers to control your patterns " -"precisely, because the rule is applied if any part of a line matches the expression." +"It's usually good practice to use the beginning of line ( <code>^</code> ) " +"and end of line ( <code>$</code> ) markers to control your patterns " +"precisely, because the rule is applied if any part of a line matches the " +"expression." msgstr "" -"Di solito è buona norma utilizzare i marcatori di inizio riga ( <code>^</code> ) e di fine riga ( <code>$</code> ) per controllare con precisione i " -"modelli, poiché la regola viene applicata se qualsiasi parte di una riga corrisponde all'espressione." +"Di solito è buona norma utilizzare i marcatori di inizio riga ( <code>^</" +"code> ) e di fine riga ( <code>$</code> ) per controllare con precisione i " +"modelli, poiché la regola viene applicata se qualsiasi parte di una riga " +"corrisponde all'espressione." #. type: Content of: <article><section><section><example><title> #: English/Filters.xml:1812 @@ -13703,7 +18004,8 @@ msgstr "^IL MIOTAG$" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:1816 msgid "Filters lines that exactly match <literal>MYTAG</literal>" -msgstr "Filtra le righe che corrispondono esattamente a <literal>MYTAG</literal>" +msgstr "" +"Filtra le righe che corrispondono esattamente a <literal>MYTAG</literal>" #. type: Content of: <article><section><section><example><screen> #: English/Filters.xml:1818 @@ -13724,8 +18026,12 @@ msgstr "^/\\*.*\\*/$" #. type: Content of: <article><section><section><example><para> #: English/Filters.xml:1824 -msgid "Filters lines beginning with <literal><constant>/*</constant></literal> and ending with <literal>*/</literal>" -msgstr "Filtra le righe che iniziano con <literal><constant>/*</constant></literal> e finiscono con <literal>*/</literal>" +msgid "" +"Filters lines beginning with <literal><constant>/*</constant></literal> and " +"ending with <literal>*/</literal>" +msgstr "" +"Filtra le righe che iniziano con <literal><constant>/*</constant></literal> " +"e finiscono con <literal>*/</literal>" #. type: Content of: <article><section><section><example><screen> #: English/Filters.xml:1828 @@ -13794,8 +18100,12 @@ msgstr "sostituzione" #. type: Content of: <article><section><title> #: English/Filters.xml:1861 -msgid "Using substitution filters<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Utilizzo dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Using substitution filters<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Utilizzo dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><title><indexterm><primary> #: English/Filters.xml:1876 @@ -13809,41 +18119,58 @@ msgstr "gestire e abilitare" #. type: Content of: <article><section><title> #: English/Filters.xml:1875 -msgid "Using the Filters dialog<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Utilizzo della finestra di dialogo Filtri<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Using the Filters dialog<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Utilizzo della finestra di dialogo Filtri<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:1883 -msgid "This section describes the Filters dialog, which provides functions to create and manage file filters and line filters." -msgstr "Questa sezione descrive la finestra di dialogo Filtri, che fornisce funzioni per creare e gestire filtri di file e filtri di linea." +msgid "" +"This section describes the Filters dialog, which provides functions to " +"create and manage file filters and line filters." +msgstr "" +"Questa sezione descrive la finestra di dialogo Filtri, che fornisce funzioni " +"per creare e gestire filtri di file e filtri di linea." #. type: Content of: <article><section><para> #: English/Filters.xml:1886 msgid "To open the Filters dialog, use either of these methods:" -msgstr "Per aprire la finestra di dialogo Filtri, utilizzare uno di questi metodi:" +msgstr "" +"Per aprire la finestra di dialogo Filtri, utilizzare uno di questi metodi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Filters.xml:1890 msgid "" -"In the Select Files or Folders dialog, click <guibutton>Select</guibutton> to the right of the <guilabel>Filter</guilabel> field. You use this method " +"In the Select Files or Folders dialog, click <guibutton>Select</guibutton> " +"to the right of the <guilabel>Filter</guilabel> field. You use this method " "when you want to apply a file filter to a folder compare operation." msgstr "" -"Nella finestra di dialogo Seleziona file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel " -">.Utilizzare questo metodo quando si desidera applicare un filtro di file a un'operazione di confronto di cartelle." +"Nella finestra di dialogo Seleziona file o cartelle, fai clic su <guibutton " +">Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel >." +"Utilizzare questo metodo quando si desidera applicare un filtro di file a " +"un'operazione di confronto di cartelle." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Filters.xml:1897 msgid "" -"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>. This method can be used at any time except when the " -"Select Files or Folders dialog is open." +"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" +"guimenuitem> </menuchoice>. This method can be used at any time except when " +"the Select Files or Folders dialog is open." msgstr "" -"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >.Questo metodo può essere utilizzato in " -"qualsiasi momento, tranne quando è aperta la finestra di dialogo Seleziona file o cartelle." +"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" +"guimenuitem > </menuchoice >.Questo metodo può essere utilizzato in " +"qualsiasi momento, tranne quando è aperta la finestra di dialogo Seleziona " +"file o cartelle." #. type: Content of: <article><section><para> #: English/Filters.xml:1906 msgid "The Filters dialog has a tab for each type of WinMerge filter:" -msgstr "La finestra di dialogo Filtri dispone di una scheda per ciascun tipo di filtro WinMerge:" +msgstr "" +"La finestra di dialogo Filtri dispone di una scheda per ciascun tipo di " +"filtro WinMerge:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1910 @@ -13852,8 +18179,11 @@ msgstr "Filtri di file" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1913 -msgid "Choose this tab to work with file filters for folder compare operations." -msgstr "Scegli questa scheda per utilizzare i filtri dei file per le operazioni di confronto delle cartelle." +msgid "" +"Choose this tab to work with file filters for folder compare operations." +msgstr "" +"Scegli questa scheda per utilizzare i filtri dei file per le operazioni di " +"confronto delle cartelle." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1919 @@ -13863,7 +18193,9 @@ msgstr "Filtri di linea" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1922 msgid "Choose this tab to work with line filters for file compare operations." -msgstr "Scegli questa scheda per lavorare con i filtri di riga per le operazioni di confronto dei file." +msgstr "" +"Scegli questa scheda per lavorare con i filtri di riga per le operazioni di " +"confronto dei file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:1928 @@ -13872,8 +18204,12 @@ msgstr "Filtri di sostituzione" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1931 -msgid "Choose this tab to work with substitution filters for file compare operations." -msgstr "Scegli questa scheda per lavorare con i filtri di sostituzione per le operazioni di confronto dei file." +msgid "" +"Choose this tab to work with substitution filters for file compare " +"operations." +msgstr "" +"Scegli questa scheda per lavorare con i filtri di sostituzione per le " +"operazioni di confronto dei file." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Filters.xml:1941 English/Filters.xml:2207 English/Filters.xml:2299 @@ -13883,16 +18219,21 @@ msgstr "abilitante" #. type: Content of: <article><section><section><title> #: English/Filters.xml:1938 msgid "Using the File Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzando la scheda Filtri file<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Utilizzando la scheda Filtri file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:1944 msgid "" -"The main part of this tab is a list of file filters that are available for folder compare operations. The list includes shared, private, and " -"installed file filters that WinMerge knows about, as described in <xref linkend=\"Filters_FileFilterLoc\" />." +"The main part of this tab is a list of file filters that are available for " +"folder compare operations. The list includes shared, private, and installed " +"file filters that WinMerge knows about, as described in <xref " +"linkend=\"Filters_FileFilterLoc\" />." msgstr "" -"La parte principale di questa scheda è un elenco di filtri di file disponibili per le operazioni di confronto delle cartelle.L'elenco include filtri " -"di file condivisi, privati ​​e installati conosciuti da WinMerge, come descritto in <xref linkend=\"Filters_FileFilterLoc\" />." +"La parte principale di questa scheda è un elenco di filtri di file " +"disponibili per le operazioni di confronto delle cartelle.L'elenco include " +"filtri di file condivisi, privati ​​e installati conosciuti da WinMerge, come " +"descritto in <xref linkend=\"Filters_FileFilterLoc\" />." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1950 @@ -13901,9 +18242,12 @@ msgstr "Abilitazione e disabilitazione dei filtri file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1952 -msgid "You must enable a file filter to make it available in a folder comparison operation, or to disable a current filter to stop it from being used:" +msgid "" +"You must enable a file filter to make it available in a folder comparison " +"operation, or to disable a current filter to stop it from being used:" msgstr "" -"È necessario abilitare un filtro file per renderlo disponibile in un'operazione di confronto di cartelle o disabilitare un filtro corrente per " +"È necessario abilitare un filtro file per renderlo disponibile in " +"un'operazione di confronto di cartelle o disabilitare un filtro corrente per " "impedirne l'utilizzo:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> @@ -13913,18 +18257,28 @@ msgstr "Apri la finestra di dialogo Filtri, se non è già aperta." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:1962 -msgid "Select a file filter or <guimenuitem><None></guimenuitem> from the list." -msgstr "Seleziona un filtro file o <guimenuitem ><Nessuno></guimenuitem> dall'elenco." +msgid "" +"Select a file filter or <guimenuitem><None></guimenuitem> from the " +"list." +msgstr "" +"Seleziona un filtro file o <guimenuitem ><Nessuno></guimenuitem> " +"dall'elenco." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:1967 msgid "Click <guibutton>OK</guibutton> to dismiss the Filters dialog." -msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri." +msgstr "" +"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " +"Filtri." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1972 -msgid "There are several ways to apply file filters after enabling them. For details, see <xref linkend=\"Filters_FileFilterApply\" />." -msgstr "Esistono diversi modi per applicare i filtri dei file dopo averli abilitati.Per i dettagli, vedi <xref linkend=\"Filters_FileFilterApply\" />." +msgid "" +"There are several ways to apply file filters after enabling them. For " +"details, see <xref linkend=\"Filters_FileFilterApply\" />." +msgstr "" +"Esistono diversi modi per applicare i filtri dei file dopo averli abilitati." +"Per i dettagli, vedi <xref linkend=\"Filters_FileFilterApply\" />." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:1977 @@ -13933,8 +18287,12 @@ msgstr "Configurazione dei filtri dei file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:1979 -msgid "Use these buttons to manage your <guilabel>File Filters</guilabel> list and create new file filters:" -msgstr "Usa questi pulsanti per gestire l'elenco dei <guilabel >filtri file</guilabel > e creare nuovi filtri file:" +msgid "" +"Use these buttons to manage your <guilabel>File Filters</guilabel> list and " +"create new file filters:" +msgstr "" +"Usa questi pulsanti per gestire l'elenco dei <guilabel >filtri file</" +"guilabel > e creare nuovi filtri file:" #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:1984 @@ -13944,10 +18302,12 @@ msgstr "Test" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1987 msgid "" -"Select a file filter in the list and click <guibutton>Test</guibutton> to quickly see how the filter works. See <xref " -"linkend=\"Filters_TestingDlg\" /> for details." +"Select a file filter in the list and click <guibutton>Test</guibutton> to " +"quickly see how the filter works. See <xref linkend=\"Filters_TestingDlg\" /" +"> for details." msgstr "" -"Seleziona un filtro di file nell'elenco e fai clic su <guibutton >Prova</guibutton > per vedere rapidamente come funziona il filtro.Vedi <xref " +"Seleziona un filtro di file nell'elenco e fai clic su <guibutton >Prova</" +"guibutton > per vedere rapidamente come funziona il filtro.Vedi <xref " "linkend=\"Filters_TestingDlg\" /> per i dettagli." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -13958,10 +18318,12 @@ msgstr "Installare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:1997 msgid "" -"Enables you to locate a file filter and adds it to the Filters list. File filters that are not in either the shared or default private folder are not " +"Enables you to locate a file filter and adds it to the Filters list. File " +"filters that are not in either the shared or default private folder are not " "detected unless you install them." msgstr "" -"Consente di individuare un filtro file e di aggiungerlo all'elenco Filtri.I filtri dei file che non si trovano nella cartella condivisa o privata " +"Consente di individuare un filtro file e di aggiungerlo all'elenco Filtri.I " +"filtri dei file che non si trovano nella cartella condivisa o privata " "predefinita non vengono rilevati a meno che non li installi." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> @@ -13972,11 +18334,14 @@ msgstr "Nuovo" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2008 msgid "" -"Creates a new copy of a file template in either the shared or private filter folders, and opens it in your default editor. Edit the template and add " +"Creates a new copy of a file template in either the shared or private filter " +"folders, and opens it in your default editor. Edit the template and add " "your rules, as described in <xref linkend=\"Filters_CreatingFile\" />." msgstr "" -"Crea una nuova copia di un modello di file nelle cartelle dei filtri condivise o private e la apre nell'editor predefinito.Modifica il modello e " -"aggiungi le tue regole, come descritto in <xref linkend=\"Filters_CreatingFile\" />." +"Crea una nuova copia di un modello di file nelle cartelle dei filtri " +"condivise o private e la apre nell'editor predefinito.Modifica il modello e " +"aggiungi le tue regole, come descritto in <xref " +"linkend=\"Filters_CreatingFile\" />." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:2016 @@ -13985,8 +18350,12 @@ msgstr "Modificare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2019 -msgid "Select a file filter in the list and click <guibutton>Edit</guibutton> to open the file in your default editor." -msgstr "Seleziona un filtro file nell'elenco e fai clic su <guibutton >Modifica</guibutton > per aprire il file nel tuo editor predefinito." +msgid "" +"Select a file filter in the list and click <guibutton>Edit</guibutton> to " +"open the file in your default editor." +msgstr "" +"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Modifica</" +"guibutton > per aprire il file nel tuo editor predefinito." #. type: Content of: <article><section><section><section><variablelist><varlistentry><term> #: English/Filters.xml:2026 @@ -13996,18 +18365,22 @@ msgstr "Eliminare" #. type: Content of: <article><section><section><section><variablelist><varlistentry><listitem><para> #: English/Filters.xml:2029 msgid "" -"Select a file filter in the list and click <guibutton>Delete</guibutton> to delete the file and remove it from the list. Yes, the file is really " -"deleted!" +"Select a file filter in the list and click <guibutton>Delete</guibutton> to " +"delete the file and remove it from the list. Yes, the file is really deleted!" msgstr "" -"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Elimina</guibutton > per eliminare il file e rimuoverlo dall'elenco.Sì, il file è " +"Seleziona un filtro file nell'elenco e fai clic su <guibutton >Elimina</" +"guibutton > per eliminare il file e rimuoverlo dall'elenco.Sì, il file è " "stato davvero eliminato!" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2036 -msgid "Your changes are saved when you click <guibutton>OK</guibutton> to dismiss the Filters dialog. Line filters are stored in the Windows registry." +msgid "" +"Your changes are saved when you click <guibutton>OK</guibutton> to dismiss " +"the Filters dialog. Line filters are stored in the Windows registry." msgstr "" -"Le tue modifiche vengono salvate quando fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri.I filtri di linea sono " -"memorizzati nel registro di Windows." +"Le tue modifiche vengono salvate quando fai clic su <guibutton >OK</" +"guibutton > per chiudere la finestra di dialogo Filtri.I filtri di linea " +"sono memorizzati nel registro di Windows." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2042 @@ -14016,113 +18389,159 @@ msgstr "Creazione di un filtro di file" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2044 -msgid "If the file filters that are installed with WinMerge do not provide the filtering you need, you can create your own:" -msgstr "Se i filtri file installati con WinMerge non forniscono il filtro necessario, puoi crearne uno tuo:" +msgid "" +"If the file filters that are installed with WinMerge do not provide the " +"filtering you need, you can create your own:" +msgstr "" +"Se i filtri file installati con WinMerge non forniscono il filtro " +"necessario, puoi crearne uno tuo:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2049 msgid "" -"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </menuchoice>. Or, from the Select Files or Folders dialog, click " -"<guibutton>Select</guibutton> to the right of the <guilabel>Filter</guilabel> field." +"Click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</" +"guimenuitem> </menuchoice>. Or, from the Select Files or Folders dialog, " +"click <guibutton>Select</guibutton> to the right of the <guilabel>Filter</" +"guilabel> field." msgstr "" -"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</guimenuitem > </menuchoice >.Oppure, dalla finestra di dialogo Seleziona " -"file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del campo <guilabel >Filtro</guilabel >." +"Fai clic su <menuchoice> <guimenu >Strumenti</guimenu> <guimenuitem >Filtri</" +"guimenuitem > </menuchoice >.Oppure, dalla finestra di dialogo Seleziona " +"file o cartelle, fai clic su <guibutton >Seleziona</guibutton > a destra del " +"campo <guilabel >Filtro</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2059 -msgid "In the Filters dialog File Filters tab, click <guibutton>New</guibutton>." -msgstr "Nella scheda Filtri file della finestra di dialogo Filtri, fai clic su <guibutton >Nuovo</guibutton >." +msgid "" +"In the Filters dialog File Filters tab, click <guibutton>New</guibutton>." +msgstr "" +"Nella scheda Filtri file della finestra di dialogo Filtri, fai clic su " +"<guibutton >Nuovo</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2064 msgid "" -"In the Shared or Private Filter dialog, choose <guilabel>Shared Filter</guilabel> or <guilabel>Private Filter</guilabel> (see <xref " -"linkend=\"Filters_FileFilterLoc\" /> for their uses) and click <keycap>OK</keycap>." +"In the Shared or Private Filter dialog, choose <guilabel>Shared Filter</" +"guilabel> or <guilabel>Private Filter</guilabel> (see <xref " +"linkend=\"Filters_FileFilterLoc\" /> for their uses) and click <keycap>OK</" +"keycap>." msgstr "" -"Nella finestra di dialogo Filtro condiviso o privato, scegli <guilabel >Filtro condiviso</guilabel > o <guilabel >Filtro privato</guilabel > (vedi " -"<xref linkend=\"Filters_FileFilterLoc\" /> per i loro usi) e fai clic su <keycap >OK</keycap >." +"Nella finestra di dialogo Filtro condiviso o privato, scegli <guilabel " +">Filtro condiviso</guilabel > o <guilabel >Filtro privato</guilabel > (vedi " +"<xref linkend=\"Filters_FileFilterLoc\" /> per i loro usi) e fai clic su " +"<keycap >OK</keycap >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2069 msgid "" -"The Select Filename for New Filter dialog opens in the shared or private files folder on your system (if the private folder does not exist, WinMerge " +"The Select Filename for New Filter dialog opens in the shared or private " +"files folder on your system (if the private folder does not exist, WinMerge " "creates it)." msgstr "" -"La finestra di dialogo Seleziona nome file per nuovo filtro si apre nella cartella dei file condivisi o privati ​​sul sistema (se la cartella privata " +"La finestra di dialogo Seleziona nome file per nuovo filtro si apre nella " +"cartella dei file condivisi o privati ​​sul sistema (se la cartella privata " "non esiste, WinMerge la crea)." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2075 -msgid "In the Select Filename for New Filter dialog, enter a new file name and click <guibutton>Save</guibutton>." -msgstr "Nella finestra di dialogo Seleziona nome file per nuovo filtro, inserisci un nuovo nome file e fai clic su <guibutton >Salva</guibutton >." +msgid "" +"In the Select Filename for New Filter dialog, enter a new file name and " +"click <guibutton>Save</guibutton>." +msgstr "" +"Nella finestra di dialogo Seleziona nome file per nuovo filtro, inserisci un " +"nuovo nome file e fai clic su <guibutton >Salva</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><note><para> #: English/Filters.xml:2079 msgid "" -"Don't choose an existing file name: to edit an existing file, go back to Step <xref linkend=\"Filters_New_step\" /> and click Edit instead of New." +"Don't choose an existing file name: to edit an existing file, go back to " +"Step <xref linkend=\"Filters_New_step\" /> and click Edit instead of New." msgstr "" -"Non scegliere un nome di file esistente: per modificare un file esistente, torna al passaggio <xref linkend=\"Filters_New_step\" /> e fai clic su " +"Non scegliere un nome di file esistente: per modificare un file esistente, " +"torna al passaggio <xref linkend=\"Filters_New_step\" /> e fai clic su " "Modifica invece che su Nuovo." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2084 msgid "" -"WinMerge initializes the new file with the contents of the <filename>FileFilter.tmpl</filename> template, and opens it in your default text editor." +"WinMerge initializes the new file with the contents of the " +"<filename>FileFilter.tmpl</filename> template, and opens it in your default " +"text editor." msgstr "" -"WinMerge inizializza il nuovo file con il contenuto del modello <filename>FileFilter.tmpl</filename> e lo apre nel tuo editor di testo predefinito." +"WinMerge inizializza il nuovo file con il contenuto del modello " +"<filename>FileFilter.tmpl</filename> e lo apre nel tuo editor di testo " +"predefinito." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2090 msgid "" -"Follow the template instructions to edit the template, updating the placeholder name and description and adding filter rules as described in <xref " -"linkend=\"Filters_FileFilterSyntax\" />. Save the file in your text editor." +"Follow the template instructions to edit the template, updating the " +"placeholder name and description and adding filter rules as described in " +"<xref linkend=\"Filters_FileFilterSyntax\" />. Save the file in your text " +"editor." msgstr "" -"Segui le istruzioni del modello per modificare il modello, aggiornando il nome e la descrizione del segnaposto e aggiungendo regole di filtro come " -"descritto in <xref linkend=\"Filters_FileFilterSyntax\" />.Salva il file nel tuo editor di testo." +"Segui le istruzioni del modello per modificare il modello, aggiornando il " +"nome e la descrizione del segnaposto e aggiungendo regole di filtro come " +"descritto in <xref linkend=\"Filters_FileFilterSyntax\" />.Salva il file nel " +"tuo editor di testo." #. type: Content of: <article><section><section><section><orderedlist><listitem><tip><para> #: English/Filters.xml:2096 msgid "" -"If you want to quickly test a rule that you are defining, try clicking Test in the Filters dialog. See <xref linkend=\"Filters_TestingDlg\" /> for " +"If you want to quickly test a rule that you are defining, try clicking Test " +"in the Filters dialog. See <xref linkend=\"Filters_TestingDlg\" /> for " "details." msgstr "" -"Se desideri testare rapidamente una regola che stai definendo, prova a fare clic su Test nella finestra di dialogo Filtri.Vedi <xref " +"Se desideri testare rapidamente una regola che stai definendo, prova a fare " +"clic su Test nella finestra di dialogo Filtri.Vedi <xref " "linkend=\"Filters_TestingDlg\" /> per i dettagli." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2104 msgid "" -"If you created your file filter in one of the standard <filename>Filters</filename> folders, and the Filters dialog does not list your new file " -"filter, try clicking <guibutton>OK</guibutton> to close it, then click <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </" -"menuchoice> again to reopen it. The <guilabel>File Filters</guilabel> list should now include the new file filter." -msgstr "" -"Se hai creato il tuo filtro di file in una delle cartelle standard <filename>Filtri</filename> e la finestra di dialogo Filtri non elenca il tuo " -"nuovo filtro di file, prova a fare clic su <guibutton >OK</guibutton > per chiuderlo, quindi fai di nuovo clic su <menuchoice > <guimenu >Strumenti</" -"guimenu > <guimenuitem >Filtri</guimenuitem > </menuchoice > per riaprirlo.L'elenco <guilabel >Filtri file</guilabel > ora dovrebbe includere il " -"nuovo filtro file." +"If you created your file filter in one of the standard <filename>Filters</" +"filename> folders, and the Filters dialog does not list your new file " +"filter, try clicking <guibutton>OK</guibutton> to close it, then click " +"<menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Filters</guimenuitem> </" +"menuchoice> again to reopen it. The <guilabel>File Filters</guilabel> list " +"should now include the new file filter." +msgstr "" +"Se hai creato il tuo filtro di file in una delle cartelle standard " +"<filename>Filtri</filename> e la finestra di dialogo Filtri non elenca il " +"tuo nuovo filtro di file, prova a fare clic su <guibutton >OK</guibutton > " +"per chiuderlo, quindi fai di nuovo clic su <menuchoice > <guimenu " +">Strumenti</guimenu > <guimenuitem >Filtri</guimenuitem > </menuchoice > per " +"riaprirlo.L'elenco <guilabel >Filtri file</guilabel > ora dovrebbe includere " +"il nuovo filtro file." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2115 msgid "" -"If you saved the file in an alternate location on your file system), WinMerge cannot detect it unless you install it. To make a file filter " +"If you saved the file in an alternate location on your file system), " +"WinMerge cannot detect it unless you install it. To make a file filter " "detectable anywhere on your system:" msgstr "" -"Se hai salvato il file in una posizione alternativa sul tuo file system), WinMerge non potrà rilevarlo a meno che non lo installi.Per rendere un " +"Se hai salvato il file in una posizione alternativa sul tuo file system), " +"WinMerge non potrà rilevarlo a meno che non lo installi.Per rendere un " "filtro file rilevabile ovunque sul tuo sistema:" #. type: Content of: <article><section><section><section><orderedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:2121 msgid "Click <guibutton>Install</guibutton> in the Filters dialog." -msgstr "Fai clic su <guibutton >Installa</guibutton > nella finestra di dialogo Filtri." +msgstr "" +"Fai clic su <guibutton >Installa</guibutton > nella finestra di dialogo " +"Filtri." #. type: Content of: <article><section><section><section><orderedlist><listitem><orderedlist><listitem><para> #: English/Filters.xml:2126 msgid "" -"In the Locate Filter File to Install dialog, navigate to the <filename>flt</filename> file on your system, and click <guibutton>Open</guibutton>. The " +"In the Locate Filter File to Install dialog, navigate to the <filename>flt</" +"filename> file on your system, and click <guibutton>Open</guibutton>. The " "File Filters list should now include the installed file filter." msgstr "" -"Nella finestra di dialogo Individua il file del filtro da installare, vai al file <filename >flt</filename > sul tuo sistema e fai clic su <guibutton " -">Apri</guibutton >.L'elenco Filtri file ora dovrebbe includere il filtro file installato." +"Nella finestra di dialogo Individua il file del filtro da installare, vai al " +"file <filename >flt</filename > sul tuo sistema e fai clic su <guibutton " +">Apri</guibutton >.L'elenco Filtri file ora dovrebbe includere il filtro " +"file installato." #. type: Content of: <article><section><section><section><title><indexterm><secondary> #: English/Filters.xml:2140 @@ -14136,17 +18555,24 @@ msgstr "testare i filtri dei file" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2137 -msgid "Testing file filter rules<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Test delle regole di filtro dei file<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Testing file filter rules<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Test delle regole di filtro dei file<placeholder type=\"indexterm\" id=\"0\"/" +">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2145 msgid "" -"Use the Test Filter dialog to quickly test a file filter against sample data, to help you develop new rules or to understand how existing rules work. " -"It can be easier than running a full compare operation." +"Use the Test Filter dialog to quickly test a file filter against sample " +"data, to help you develop new rules or to understand how existing rules " +"work. It can be easier than running a full compare operation." msgstr "" -"Utilizza la finestra di dialogo Prova filtro per testare rapidamente un filtro di file rispetto a dati di esempio, per sviluppare nuove regole o per " -"comprendere come funzionano le regole esistenti.Può essere più semplice che eseguire un'operazione di confronto completa." +"Utilizza la finestra di dialogo Prova filtro per testare rapidamente un " +"filtro di file rispetto a dati di esempio, per sviluppare nuove regole o per " +"comprendere come funzionano le regole esistenti.Può essere più semplice che " +"eseguire un'operazione di confronto completa." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2150 @@ -14161,10 +18587,12 @@ msgstr "Nella scheda Filtri file, scegli il filtro file che desideri testare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2159 msgid "" -"If you want to see the rules you will be testing, click <guibutton>Edit</guibutton> now to open the file so that you can view it during the next " +"If you want to see the rules you will be testing, click <guibutton>Edit</" +"guibutton> now to open the file so that you can view it during the next " "steps." msgstr "" -"Se vuoi vedere le regole che testerai, fai clic su <guibutton >Modifica</guibutton > ora per aprire il file in modo da poterlo visualizzare durante i " +"Se vuoi vedere le regole che testerai, fai clic su <guibutton >Modifica</" +"guibutton > ora per aprire il file in modo da poterlo visualizzare durante i " "passaggi successivi." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> @@ -14175,17 +18603,26 @@ msgstr "Fai clic su <guibutton >Prova</guibutton >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2169 msgid "In the Test Filter dialog, choose the type of rule to test:" -msgstr "Nella finestra di dialogo Filtro test, scegli il tipo di regola da testare:" +msgstr "" +"Nella finestra di dialogo Filtro test, scegli il tipo di regola da testare:" #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Filters.xml:2174 -msgid "To test an <guilabel>f:</guilabel> file rule in your file filter, uncheck the <guilabel>Folder Name</guilabel> option." -msgstr "Per testare una regola di file <guilabel >f:</guilabel > nel tuo filtro file, deseleziona l'opzione <guilabel >Nome cartella</guilabel >." +msgid "" +"To test an <guilabel>f:</guilabel> file rule in your file filter, uncheck " +"the <guilabel>Folder Name</guilabel> option." +msgstr "" +"Per testare una regola di file <guilabel >f:</guilabel > nel tuo filtro " +"file, deseleziona l'opzione <guilabel >Nome cartella</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Filters.xml:2180 -msgid "To test a <guilabel>d:</guilabel> folder rule, check the <guilabel>Folder Name</guilabel> option." -msgstr "Per testare una regola della cartella <guilabel >d:</guilabel >, seleziona l'opzione <guilabel >Nome cartella</guilabel >." +msgid "" +"To test a <guilabel>d:</guilabel> folder rule, check the <guilabel>Folder " +"Name</guilabel> option." +msgstr "" +"Per testare una regola della cartella <guilabel >d:</guilabel >, seleziona " +"l'opzione <guilabel >Nome cartella</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2187 @@ -14195,35 +18632,44 @@ msgstr "Inserisci il testo da testare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2189 msgid "" -"The text should be appropriate for the type of rule you are testing. For example, if you have checked the <guilabel>Folder Name</guilabel> option, " +"The text should be appropriate for the type of rule you are testing. For " +"example, if you have checked the <guilabel>Folder Name</guilabel> option, " "you probably want to enter a folder name, such as \\temp." msgstr "" -"Il testo deve essere appropriato per il tipo di regola che stai testando.Ad esempio, se hai selezionato l'opzione <guilabel >Nome cartella</guilabel " -">, probabilmente vorrai inserire il nome di una cartella, come \\temp." +"Il testo deve essere appropriato per il tipo di regola che stai testando.Ad " +"esempio, se hai selezionato l'opzione <guilabel >Nome cartella</guilabel >, " +"probabilmente vorrai inserire il nome di una cartella, come \\temp." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2194 msgid "" -"The <guilabel>Result</guilabel> box displays your entry, followed by its status: either <computeroutput>passed</computeroutput> or " +"The <guilabel>Result</guilabel> box displays your entry, followed by its " +"status: either <computeroutput>passed</computeroutput> or " "<computeroutput>failed</computeroutput>." msgstr "" -"La casella <guilabel >Risultato</guilabel > mostra la tua voce, seguita dal suo stato: <computeroutput >superato</computeroutput > o <computeroutput " +"La casella <guilabel >Risultato</guilabel > mostra la tua voce, seguita dal " +"suo stato: <computeroutput >superato</computeroutput > o <computeroutput " ">non riuscito</computeroutput >." #. type: Content of: <article><section><section><title> #: English/Filters.xml:2204 msgid "Using the Line Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzando la scheda Filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Utilizzando la scheda Filtri di linea<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Filters.xml:2210 msgid "" -"Use this tab to configure and enable line filters for file compare operations. The tab features a list of rules. Each rule contains a single regular " -"expression. You can apply any combination of rules from the list to a file comparison." +"Use this tab to configure and enable line filters for file compare " +"operations. The tab features a list of rules. Each rule contains a single " +"regular expression. You can apply any combination of rules from the list to " +"a file comparison." msgstr "" -"Utilizzare questa scheda per configurare e abilitare i filtri di riga per le operazioni di confronto dei file.La scheda presenta un elenco di " -"regole.Ogni regola contiene una singola espressione regolare.È possibile applicare qualsiasi combinazione di regole dall'elenco a un confronto di " -"file." +"Utilizzare questa scheda per configurare e abilitare i filtri di riga per le " +"operazioni di confronto dei file.La scheda presenta un elenco di regole.Ogni " +"regola contiene una singola espressione regolare.È possibile applicare " +"qualsiasi combinazione di regole dall'elenco a un confronto di file." #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2216 @@ -14233,10 +18679,12 @@ msgstr "Configurazione dei filtri di linea" #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2218 msgid "" -"Below the <guilabel>Regular Expressions</guilabel> list is an edit box and buttons that you can use to maintain the list at any time by adding, " +"Below the <guilabel>Regular Expressions</guilabel> list is an edit box and " +"buttons that you can use to maintain the list at any time by adding, " "editing, and removing rules." msgstr "" -"Sotto l'elenco delle <guilabel >Espressioni regolari</guilabel > c'è una casella di modifica e dei pulsanti che puoi utilizzare per mantenere " +"Sotto l'elenco delle <guilabel >Espressioni regolari</guilabel > c'è una " +"casella di modifica e dei pulsanti che puoi utilizzare per mantenere " "l'elenco in qualsiasi momento aggiungendo, modificando e rimuovendo regole." #. type: Content of: <article><section><section><section><para> @@ -14246,18 +18694,30 @@ msgstr "Per aggiungere una nuova regola:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2226 -msgid "Click <guibutton>New</guibutton>. Your edit cursor is automatically enabled in the edit box." -msgstr "Fai clic su <guibutton >Nuovo</guibutton >.Il cursore di modifica viene automaticamente abilitato nella casella di modifica." +msgid "" +"Click <guibutton>New</guibutton>. Your edit cursor is automatically enabled " +"in the edit box." +msgstr "" +"Fai clic su <guibutton >Nuovo</guibutton >.Il cursore di modifica viene " +"automaticamente abilitato nella casella di modifica." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2231 -msgid "Enter an expression in the edit box below the <guilabel>Regular Expressions</guilabel> list." -msgstr "Inserisci un'espressione nella casella di modifica sotto l'elenco <guilabel >Espressioni regolari</guilabel >." +msgid "" +"Enter an expression in the edit box below the <guilabel>Regular Expressions</" +"guilabel> list." +msgstr "" +"Inserisci un'espressione nella casella di modifica sotto l'elenco <guilabel " +">Espressioni regolari</guilabel >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2236 -msgid "Click <guibutton>Save</guibutton> to load the expression in a new line in the list." -msgstr "Fai clic su <guibutton >Salva</guibutton > per caricare l'espressione in una nuova riga nell'elenco." +msgid "" +"Click <guibutton>Save</guibutton> to load the expression in a new line in " +"the list." +msgstr "" +"Fai clic su <guibutton >Salva</guibutton > per caricare l'espressione in una " +"nuova riga nell'elenco." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2241 @@ -14276,13 +18736,20 @@ msgstr "Modifica l'espressione nella casella di modifica." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2253 -msgid "Click <guibutton>Save</guibutton><guibutton> </guibutton>when you're done." -msgstr "Fai clic su <guibutton >Salva</guibutton ><guibutton > </guibutton >quando hai finito." +msgid "" +"Click <guibutton>Save</guibutton><guibutton> </guibutton>when you're done." +msgstr "" +"Fai clic su <guibutton >Salva</guibutton ><guibutton > </guibutton >quando " +"hai finito." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2258 -msgid "To delete an existing rule, select (check) the rule and click <guibutton>Remove</guibutton>." -msgstr "Per eliminare una regola esistente, seleziona (seleziona) la regola e fai clic su <guibutton >Rimuovi</guibutton >." +msgid "" +"To delete an existing rule, select (check) the rule and click " +"<guibutton>Remove</guibutton>." +msgstr "" +"Per eliminare una regola esistente, seleziona (seleziona) la regola e fai " +"clic su <guibutton >Rimuovi</guibutton >." #. type: Content of: <article><section><section><section><title><indexterm><secondary> #: English/Filters.xml:2266 English/Filters.xml:2315 @@ -14291,41 +18758,61 @@ msgstr "elenco dei disponibili" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2263 -msgid "Enabling and disabling line filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Abilitazione e disabilitazione dei filtri di linea<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Enabling and disabling line filters<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Abilitazione e disabilitazione dei filtri di linea<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2271 msgid "" -"In the <guilabel>Regular Expressions</guilabel> list, check just the filters that you want to apply, and uncheck any filters you do not want to apply." +"In the <guilabel>Regular Expressions</guilabel> list, check just the filters " +"that you want to apply, and uncheck any filters you do not want to apply." msgstr "" -"Nell'elenco <guilabel >Espressioni regolari</guilabel >, seleziona solo i filtri che vuoi applicare e deseleziona tutti i filtri che non vuoi " +"Nell'elenco <guilabel >Espressioni regolari</guilabel >, seleziona solo i " +"filtri che vuoi applicare e deseleziona tutti i filtri che non vuoi " "applicare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2277 msgid "" -"Check or uncheck the <guilabel>Enable Line Filters</guilabel> option. If you turn filtering on, all the rules that are currently checked in the " -"<guilabel>Regular Expression</guilabel> list are used. If filtering is off, no rules are used even if they are checked." +"Check or uncheck the <guilabel>Enable Line Filters</guilabel> option. If you " +"turn filtering on, all the rules that are currently checked in the " +"<guilabel>Regular Expression</guilabel> list are used. If filtering is off, " +"no rules are used even if they are checked." msgstr "" -"Seleziona o deseleziona l'opzione <guilabel >Abilita filtri di linea</guilabel >.Se attivi il filtro, verranno utilizzate tutte le regole attualmente " -"selezionate nell'elenco <guilabel >Espressione regolare</guilabel >.Se il filtro è disattivato, non verrà utilizzata alcuna regola anche se " -"selezionata." +"Seleziona o deseleziona l'opzione <guilabel >Abilita filtri di linea</" +"guilabel >.Se attivi il filtro, verranno utilizzate tutte le regole " +"attualmente selezionate nell'elenco <guilabel >Espressione regolare</" +"guilabel >.Se il filtro è disattivato, non verrà utilizzata alcuna regola " +"anche se selezionata." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Filters.xml:2285 -msgid "Click <guibutton>OK</guibutton> to dismiss the Filters dialog and save your settings." -msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Filtri e salvare le tue impostazioni." +msgid "" +"Click <guibutton>OK</guibutton> to dismiss the Filters dialog and save your " +"settings." +msgstr "" +"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " +"Filtri e salvare le tue impostazioni." #. type: Content of: <article><section><section><section><para> #: English/Filters.xml:2290 -msgid "There are several ways to apply file filters after enabling them. For details, see <xref linkend=\"Filters_LineFilterApply\" />." -msgstr "Esistono diversi modi per applicare i filtri dei file dopo averli abilitati.Per i dettagli, vedi <xref linkend=\"Filters_LineFilterApply\" />." +msgid "" +"There are several ways to apply file filters after enabling them. For " +"details, see <xref linkend=\"Filters_LineFilterApply\" />." +msgstr "" +"Esistono diversi modi per applicare i filtri dei file dopo averli abilitati." +"Per i dettagli, vedi <xref linkend=\"Filters_LineFilterApply\" />." #. type: Content of: <article><section><section><title> #: English/Filters.xml:2296 -msgid "Using the Substitution Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzando la scheda Filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Using the Substitution Filters tab<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Utilizzando la scheda Filtri di sostituzione<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2305 @@ -14334,8 +18821,12 @@ msgstr "Configurazione dei filtri di sostituzione" #. type: Content of: <article><section><section><section><title> #: English/Filters.xml:2312 -msgid "Enabling and disabling substitution filters<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Abilitazione e disabilitazione dei filtri di sostituzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Enabling and disabling substitution filters<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Abilitazione e disabilitazione dei filtri di sostituzione<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><secondary> #: English/Filters.xml:2327 @@ -14344,22 +18835,34 @@ msgstr "ottenere aiuto" #. type: Content of: <article><section><title> #: English/Filters.xml:2324 -msgid "Getting help with regular expressions<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ottieni assistenza con le espressioni regolari<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Getting help with regular expressions<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Ottieni assistenza con le espressioni regolari<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Filters.xml:2330 msgid "" -"Regular expressions can be very complex. Fortunately, most file filters in WinMerge involve simple extension expressions, as shown in the examples in " -"this topic. The filter files installed with WinMerge include many other useful examples." +"Regular expressions can be very complex. Fortunately, most file filters in " +"WinMerge involve simple extension expressions, as shown in the examples in " +"this topic. The filter files installed with WinMerge include many other " +"useful examples." msgstr "" -"Le espressioni regolari possono essere molto complesse.Fortunatamente, la maggior parte dei filtri di file in WinMerge coinvolge semplici espressioni " -"di estensione, come mostrato negli esempi in questo argomento.I file filtro installati con WinMerge includono molti altri esempi utili." +"Le espressioni regolari possono essere molto complesse.Fortunatamente, la " +"maggior parte dei filtri di file in WinMerge coinvolge semplici espressioni " +"di estensione, come mostrato negli esempi in questo argomento.I file filtro " +"installati con WinMerge includono molti altri esempi utili." #. type: Content of: <article><section><para> #: English/Filters.xml:2335 -msgid "Finally, there are lots of resources on the Web for help with regexps, including these sites:" -msgstr "Infine, ci sono molte risorse sul Web per assistenza con le espressioni regolari, inclusi questi siti:" +msgid "" +"Finally, there are lots of resources on the Web for help with regexps, " +"including these sites:" +msgstr "" +"Infine, ci sono molte risorse sul Web per assistenza con le espressioni " +"regolari, inclusi questi siti:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2340 @@ -14368,8 +18871,12 @@ msgstr "Buon sito dedicato alle espressioni regolari:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2343 -msgid "<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-expressions.info/</ulink>" -msgstr "<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-expressions.info/</ulink>" +msgid "" +"<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-" +"expressions.info/</ulink>" +msgstr "" +"<ulink url=\"https://www.regular-expressions.info/\">https://www.regular-" +"expressions.info/</ulink>" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2349 @@ -14378,8 +18885,12 @@ msgstr "Esercitazione:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2352 -msgid "<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon.org/comp/r/tut-Regexp.html</ulink>" -msgstr "<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon.org/comp/r/tut-Regexp.html</ulink>" +msgid "" +"<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon." +"org/comp/r/tut-Regexp.html</ulink>" +msgstr "" +"<ulink url=\"http://www.zvon.org/comp/r/tut-Regexp.html\">http://www.zvon." +"org/comp/r/tut-Regexp.html</ulink>" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Filters.xml:2358 @@ -14389,11 +18900,13 @@ msgstr "Riferimento rapido PDF:" #. type: Content of: <article><section><variablelist><varlistentry><listitem><simpara> #: English/Filters.xml:2361 msgid "" -"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/" -"regex.pdf</ulink>" +"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex." +"pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf</" +"ulink>" msgstr "" -"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/" -"regex.pdf</ulink>" +"<ulink url=\"https://github.com/GordonMcKinney/gist-assets/raw/master/regex." +"pdf\"> https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf</" +"ulink>" #. type: Content of: <book><bookinfo><title> #: English/Index.xml:31 @@ -14412,17 +18925,24 @@ msgstr "<emphasis>Revisione &ManualRevision;</emphasis>" #. type: Content of: <book><bookinfo> #: English/Index.xml:37 -msgid "<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> </copyright>" -msgstr "<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> </copyright>" +msgid "" +"<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> " +"</copyright>" +msgstr "" +"<copyright> <year>&CopyrightYears;</year> <holder>&CopyrightHolder;</holder> " +"</copyright>" #. type: Content of: <book><bookinfo><legalnotice><para> #: English/Index.xml:44 msgid "" -"Information in this document is subject to change without notice. Other products and companies referred to herein are trademarks or registered " +"Information in this document is subject to change without notice. Other " +"products and companies referred to herein are trademarks or registered " "trademarks of their respective companies or mark holders." msgstr "" -"Le informazioni contenute in questo documento sono soggette a modifiche senza preavviso.Altri prodotti e società a cui si fa riferimento nel presente " -"documento sono marchi o marchi registrati delle rispettive società o titolari del marchio." +"Le informazioni contenute in questo documento sono soggette a modifiche " +"senza preavviso.Altri prodotti e società a cui si fa riferimento nel " +"presente documento sono marchi o marchi registrati delle rispettive società " +"o titolari del marchio." #. type: Content of: <book><bookinfo><authorgroup><author><surname> #: English/Index.xml:52 @@ -14506,14 +19026,19 @@ msgstr "installazione di WinMerge" #. type: Content of: <article><title> #: English/Install.xml:3 -msgid "Getting and installing WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Ottenere e installare WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Getting and installing WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Ottenere e installare WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Install.xml:7 -msgid "WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method." +msgid "" +"WinMerge can be installed using the installer or by unzipping files from an " +"archive. Using the installer is the recommended method." msgstr "" -"WinMerge può essere installato utilizzando il programma di installazione o decomprimendo i file da un archivio.L'utilizzo del programma di " +"WinMerge può essere installato utilizzando il programma di installazione o " +"decomprimendo i file da un archivio.L'utilizzo del programma di " "installazione è il metodo consigliato." #. type: Content of: <article><section><title> @@ -14524,13 +19049,19 @@ msgstr "Ottenere file" #. type: Content of: <article><section><para> #: English/Install.xml:13 msgid "" -"The latest release can be always downloaded from the WinMerge home page: <ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>. Note that delays " -"can occur in updating home pages for the latest releases, but the project status page at <ulink url=\"https://sourceforge.net/projects/winmerge/" -"\">SourceForge.net</ulink> shows the latest files. Stable releases are also available in several file download sites." -msgstr "" -"L'ultima versione può essere sempre scaricata dalla home page di WinMerge: <ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>.Tieni presente " -"che possono verificarsi ritardi nell'aggiornamento delle home page per le ultime versioni, ma la pagina di stato del progetto su <ulink url=\"https://" -"sourceforge.net/projects/winmerge/\">SourceForge.net</ulink> mostra i file più recenti.Le versioni stabili sono disponibili anche in diversi siti di " +"The latest release can be always downloaded from the WinMerge home page: " +"<ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>. Note that delays " +"can occur in updating home pages for the latest releases, but the project " +"status page at <ulink url=\"https://sourceforge.net/projects/winmerge/" +"\">SourceForge.net</ulink> shows the latest files. Stable releases are also " +"available in several file download sites." +msgstr "" +"L'ultima versione può essere sempre scaricata dalla home page di WinMerge: " +"<ulink url=\"https://winmerge.org/\">WinMerge.org</ulink>.Tieni presente che " +"possono verificarsi ritardi nell'aggiornamento delle home page per le ultime " +"versioni, ma la pagina di stato del progetto su <ulink url=\"https://" +"sourceforge.net/projects/winmerge/\">SourceForge.net</ulink> mostra i file " +"più recenti.Le versioni stabili sono disponibili anche in diversi siti di " "download di file." #. type: Content of: <article><section><title> @@ -14541,39 +19072,50 @@ msgstr "Compatibilità" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:27 msgid "WinMerge 2.16.8 and later (64 bit) require Windows 7 or later." -msgstr "WinMerge 2.16.8 e versioni successive (64 bit) richiedono Windows 7 o versioni successive." +msgstr "" +"WinMerge 2.16.8 e versioni successive (64 bit) richiedono Windows 7 o " +"versioni successive." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:30 -msgid "WinMerge (32 bit) supports Windows XP SP3 and later, including the latest versions. It runs on both 32 bit and 64 bit Windows." +msgid "" +"WinMerge (32 bit) supports Windows XP SP3 and later, including the latest " +"versions. It runs on both 32 bit and 64 bit Windows." msgstr "" -"WinMerge (32 bit) supporta Windows XP SP3 e versioni successive, comprese le versioni più recenti.Funziona sia su Windows a 32 bit che su Windows a " -"64 bit." +"WinMerge (32 bit) supporta Windows XP SP3 e versioni successive, comprese le " +"versioni più recenti.Funziona sia su Windows a 32 bit che su Windows a 64 " +"bit." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:34 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/\">WinMerge 2.16.6 (64 bit)</ulink> was the last 64-bit version to support " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/" +"\">WinMerge 2.16.6 (64 bit)</ulink> was the last 64-bit version to support " "Windows XP 64 bit." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/\">WinMerge 2.16.6 (64 bit)</ulink> è stata l'ultima versione a 64 bit a " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.16.6/" +"\">WinMerge 2.16.6 (64 bit)</ulink> è stata l'ultima versione a 64 bit a " "supportare Windows XP a 64 bit." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:38 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/\">WinMerge 2.14.0</ulink> was the last version to support Windows 2000." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/" +"\">WinMerge 2.14.0</ulink> was the last version to support Windows 2000." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/\">WinMerge 2.14.0</ulink> è stata l'ultima versione a supportare Windows " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.14.0/" +"\">WinMerge 2.14.0</ulink> è stata l'ultima versione a supportare Windows " "2000." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Install.xml:42 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/\">WinMerge 2.12.4</ulink> was the last version to support Windows 95, 98, " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/" +"\">WinMerge 2.12.4</ulink> was the last version to support Windows 95, 98, " "ME and NT." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/\">WinMerge 2.12.4</ulink> è stata l'ultima versione a supportare Windows " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/2.12.4/" +"\">WinMerge 2.12.4</ulink> è stata l'ultima versione a supportare Windows " "95, 98, ME e NT." #. type: Content of: <article><section><itemizedlist><listitem><para> @@ -14589,54 +19131,74 @@ msgstr "Utilizzo del programma di installazione (consigliato)" #. type: Content of: <article><section><note><para> #: English/Install.xml:55 msgid "" -"The installer requires Administrator user privileges. If you don't have admin user privileges, you can install WinMerge by unzipping from an archive " -"file (see <xref linkend=\"InstallFromArchive\" />) or by using per-user installer (WinMerge-x.x.x-x64-PerUser-Setup.exe)." +"The installer requires Administrator user privileges. If you don't have " +"admin user privileges, you can install WinMerge by unzipping from an archive " +"file (see <xref linkend=\"InstallFromArchive\" />) or by using per-user " +"installer (WinMerge-x.x.x-x64-PerUser-Setup.exe)." msgstr "" -"Il programma di installazione richiede i privilegi utente di amministratore.Se non disponi dei privilegi di amministratore, puoi installare WinMerge " -"decomprimendolo da un file di archivio (vedi <xref linkend=\"InstallFromArchive\" />) o utilizzando il programma di installazione per utente " -"(WinMerge-x.x.x-x64-PerUser-Setup.exe)." +"Il programma di installazione richiede i privilegi utente di amministratore." +"Se non disponi dei privilegi di amministratore, puoi installare WinMerge " +"decomprimendolo da un file di archivio (vedi <xref " +"linkend=\"InstallFromArchive\" />) o utilizzando il programma di " +"installazione per utente (WinMerge-x.x.x-x64-PerUser-Setup.exe)." #. type: Content of: <article><section><para> #: English/Install.xml:60 msgid "" -"Using the installer is recommended for most users. The installer prompts for the location where WinMerge is installed. It then installs the files, " -"configures the shell integration, and adds WinMerge to the Start menu. To install WinMerge:" +"Using the installer is recommended for most users. The installer prompts for " +"the location where WinMerge is installed. It then installs the files, " +"configures the shell integration, and adds WinMerge to the Start menu. To " +"install WinMerge:" msgstr "" -"L'utilizzo del programma di installazione è consigliato per la maggior parte degli utenti.Il programma di installazione richiede il percorso in cui è " -"installato WinMerge.Quindi installa i file, configura l'integrazione della shell e aggiunge WinMerge al menu Start.Per installare WinMerge:" +"L'utilizzo del programma di installazione è consigliato per la maggior parte " +"degli utenti.Il programma di installazione richiede il percorso in cui è " +"installato WinMerge.Quindi installa i file, configura l'integrazione della " +"shell e aggiunge WinMerge al menu Start.Per installare WinMerge:" #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:67 -msgid "Start the installer executable (usually named <filename>WinMerge-<replaceable>version</replaceable>-setup.exe</filename>)." +msgid "" +"Start the installer executable (usually named <filename>WinMerge-" +"<replaceable>version</replaceable>-setup.exe</filename>)." msgstr "" -"Avviare l'eseguibile del programma di installazione (solitamente denominato <filename>WinMerge-<replaceable>versione</replaceable>-setup.exe</" -"filename>)." +"Avviare l'eseguibile del programma di installazione (solitamente denominato " +"<filename>WinMerge-<replaceable>versione</replaceable>-setup.exe</filename>)." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:72 msgid "Click <guibutton>Next</guibutton> in the License Agreement screen." -msgstr "Fai clic su <guibutton >Avanti</guibutton > nella schermata del contratto di licenza." +msgstr "" +"Fai clic su <guibutton >Avanti</guibutton > nella schermata del contratto di " +"licenza." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:77 msgid "" -"In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge " +"In the Select Destination Location page, accept the location for WinMerge " +"or, if you choose another location, we recommend that you install WinMerge " "in its own folder. Click <guibutton>Next</guibutton>." msgstr "" -"Nella pagina Seleziona percorso di destinazione, accetta il percorso per WinMerge o, se scegli un altro percorso, ti consigliamo di installare " +"Nella pagina Seleziona percorso di destinazione, accetta il percorso per " +"WinMerge o, se scegli un altro percorso, ti consigliamo di installare " "WinMerge nella sua cartella.Fai clic su <guibutton >Avanti</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:84 msgid "" -"In the Select Components page, choose one of the preconfigured installations in the top control. We recommend the <guilabel>Typical</guilabel> " -"configuration for most users. The lower box shows all the available components. You can modify the default configuration by checking or unchecking " -"components. For example, if you want to use a WinMerge localization for a different language than English, select the <guilabel>Languages</guilabel> " -"component." -msgstr "" -"Nella pagina Seleziona componenti, scegli una delle installazioni preconfigurate nel controllo superiore.Raccomandiamo la configurazione <guilabel " -">Tipica</guilabel > per la maggior parte degli utenti.Il riquadro inferiore mostra tutti i componenti disponibili.È possibile modificare la " -"configurazione predefinita selezionando o deselezionando i componenti.Ad esempio, se desideri utilizzare una localizzazione WinMerge per una lingua " +"In the Select Components page, choose one of the preconfigured installations " +"in the top control. We recommend the <guilabel>Typical</guilabel> " +"configuration for most users. The lower box shows all the available " +"components. You can modify the default configuration by checking or " +"unchecking components. For example, if you want to use a WinMerge " +"localization for a different language than English, select the " +"<guilabel>Languages</guilabel> component." +msgstr "" +"Nella pagina Seleziona componenti, scegli una delle installazioni " +"preconfigurate nel controllo superiore.Raccomandiamo la configurazione " +"<guilabel >Tipica</guilabel > per la maggior parte degli utenti.Il riquadro " +"inferiore mostra tutti i componenti disponibili.È possibile modificare la " +"configurazione predefinita selezionando o deselezionando i componenti.Ad " +"esempio, se desideri utilizzare una localizzazione WinMerge per una lingua " "diversa dall'inglese, seleziona il componente <guilabel >Lingue</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> @@ -14652,7 +19214,9 @@ msgstr "File principali di WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:99 msgid "WinMerge executable, Help, and other needed files. Cannot be unchecked." -msgstr "Eseguibile WinMerge, Guida e altri file necessari.Non può essere deselezionato." +msgstr "" +"Eseguibile WinMerge, Guida e altri file necessari.Non può essere " +"deselezionato." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:106 @@ -14661,13 +19225,19 @@ msgstr "Estensione della shell" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:105 -msgid "32-bit WinMerge ShellExtension<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "WinMerge ShellExtension a 32 bit<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"32-bit WinMerge ShellExtension<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"WinMerge ShellExtension a 32 bit<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:110 -msgid "The option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected there." -msgstr "L'opzione ti consente di avviare WinMerge direttamente da Esplora risorse, confrontando gli elementi selezionati lì." +msgid "" +"The option enables you to launch WinMerge directly from Windows Explorer, " +"comparing items that you have selected there." +msgstr "" +"L'opzione ti consente di avviare WinMerge direttamente da Esplora risorse, " +"confrontando gli elementi selezionati lì." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:115 @@ -14686,8 +19256,12 @@ msgstr "Plugin" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:127 -msgid "WinMerge plugins are custom dlls or scriptlets, written in the COM API, that you can use to preprocess data before a comparison." -msgstr "I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, che puoi utilizzare per preelaborare i dati prima di un confronto." +msgid "" +"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that " +"you can use to preprocess data before a comparison." +msgstr "" +"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, " +"che puoi utilizzare per preelaborare i dati prima di un confronto." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:134 @@ -14697,35 +19271,52 @@ msgstr "Lingue" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:137 msgid "" -"WinMerge translation files. If you want to configure WinMerge to use a different language than English, expand this item and choose one or more " -"available translations. The installer creates a Languages subfolder in the WinMerge folder, containing a *.po translation file for each of your " -"selections. After installation, you can open WinMerge and change its localization to one of the translation file languages. See <xref " +"WinMerge translation files. If you want to configure WinMerge to use a " +"different language than English, expand this item and choose one or more " +"available translations. The installer creates a Languages subfolder in the " +"WinMerge folder, containing a *.po translation file for each of your " +"selections. After installation, you can open WinMerge and change its " +"localization to one of the translation file languages. See <xref " "linkend=\"Locales\" /> for details." msgstr "" -"File di traduzione WinMerge.Se desideri configurare WinMerge per utilizzare una lingua diversa dall'inglese, espandi questa voce e scegli una o più " -"traduzioni disponibili.Il programma di installazione crea una sottocartella Lingue nella cartella WinMerge, contenente un file di traduzione *.po per " -"ciascuna delle selezioni.Dopo l'installazione, puoi aprire WinMerge e modificarne la localizzazione in una delle lingue del file di traduzione.Vedi " -"<xref linkend=\"Locales\" /> per i dettagli." +"File di traduzione WinMerge.Se desideri configurare WinMerge per utilizzare " +"una lingua diversa dall'inglese, espandi questa voce e scegli una o più " +"traduzioni disponibili.Il programma di installazione crea una sottocartella " +"Lingue nella cartella WinMerge, contenente un file di traduzione *.po per " +"ciascuna delle selezioni.Dopo l'installazione, puoi aprire WinMerge e " +"modificarne la localizzazione in una delle lingue del file di traduzione." +"Vedi <xref linkend=\"Locales\" /> per i dettagli." #. type: Content of: <article><section><orderedlist><listitem><para> -#: English/Install.xml:149 English/Install.xml:168 English/Install.xml:253 English/Install.xml:307 +#: English/Install.xml:149 English/Install.xml:168 English/Install.xml:253 +#: English/Install.xml:307 msgid "Click <guibutton>Next</guibutton>." msgstr "Fai clic su <guibutton >Avanti</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:153 msgid "In the Select Start Menu Folder page, configure WinMerge shortcuts." -msgstr "Nella pagina Seleziona cartella del menu Start, configurare i collegamenti WinMerge." +msgstr "" +"Nella pagina Seleziona cartella del menu Start, configurare i collegamenti " +"WinMerge." #. type: Content of: <article><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Install.xml:158 -msgid "Accept the default setting to create a program shortcut, or specify a different folder." -msgstr "Accettare l'impostazione predefinita per creare un collegamento al programma o specificare una cartella diversa." +msgid "" +"Accept the default setting to create a program shortcut, or specify a " +"different folder." +msgstr "" +"Accettare l'impostazione predefinita per creare un collegamento al programma " +"o specificare una cartella diversa." #. type: Content of: <article><section><orderedlist><listitem><itemizedlist><listitem><para> #: English/Install.xml:163 -msgid "Optionally, check the option <guilabel>Don't create a Start Menu folder</guilabel>." -msgstr "Facoltativamente, seleziona l'opzione <guilabel >Non creare una cartella nel menu Start</guilabel >." +msgid "" +"Optionally, check the option <guilabel>Don't create a Start Menu folder</" +"guilabel>." +msgstr "" +"Facoltativamente, seleziona l'opzione <guilabel >Non creare una cartella nel " +"menu Start</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><para><indexterm><secondary> #: English/Install.xml:176 @@ -14740,9 +19331,12 @@ msgstr "VCS" #. type: Content of: <article><section><orderedlist><listitem><para> #: English/Install.xml:172 msgid "" -"In the Select Additional Tasks page, specify any additional tasks:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +"In the Select Additional Tasks page, specify any additional tasks:" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>" msgstr "" -"Nella pagina Seleziona attività aggiuntive, specifica eventuali attività aggiuntive:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"Nella pagina Seleziona attività aggiuntive, specifica eventuali attività " +"aggiuntive:<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> @@ -14758,11 +19352,13 @@ msgstr "Integrazione della shell di Windows" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:198 msgid "" -"Enables you to <link linkend=\"OpenPaths_shell-integ\">launch WinMerge compare operations from Windows Explorer</link> (this integration can be " +"Enables you to <link linkend=\"OpenPaths_shell-integ\">launch WinMerge " +"compare operations from Windows Explorer</link> (this integration can be " "enabled or disabled later in WinMerge options)." msgstr "" -"Ti consente di <link linkend=\"OpenPaths_shell-integ\">avviare le operazioni di confronto di WinMerge da Esplora risorse</link> (questa integrazione " -"può essere abilitata o disabilitata in seguito nelle opzioni di WinMerge)." +"Ti consente di <link linkend=\"OpenPaths_shell-integ\">avviare le operazioni " +"di confronto di WinMerge da Esplora risorse</link> (questa integrazione può " +"essere abilitata o disabilitata in seguito nelle opzioni di WinMerge)." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:206 @@ -14771,8 +19367,12 @@ msgstr "Aggiungi la cartella WinMerge al percorso di sistema" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:209 -msgid "Adds the WinMerge installation folder to your system's Path environment variable." -msgstr "Aggiunge la cartella di installazione di WinMerge alla variabile di ambiente Path del sistema." +msgid "" +"Adds the WinMerge installation folder to your system's Path environment " +"variable." +msgstr "" +"Aggiunge la cartella di installazione di WinMerge alla variabile di ambiente " +"Path del sistema." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:216 @@ -14790,7 +19390,8 @@ msgid "Sets WinMerge to be the TortoiseCVS diff application." msgstr "Imposta WinMerge come applicazione diff TortoiseCVS." #. type: Content of: <article><section><section><example><title> -#: English/Install.xml:226 English/Version_control.xml:65 English/Version_control.xml:74 +#: English/Install.xml:226 English/Version_control.xml:65 +#: English/Version_control.xml:74 msgid "TortoiseSVN integration" msgstr "Integrazione TortoiseSVN" @@ -14831,8 +19432,12 @@ msgstr "Aggiunge il collegamento WinMerge al desktop di Windows." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:257 -msgid "In the 3-way merge wizard page, register WinMerge as 3-way merge tool for TortoiseSVN/Git." -msgstr "Nella pagina della procedura guidata di unione a 3 vie registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." +msgid "" +"In the 3-way merge wizard page, register WinMerge as 3-way merge tool for " +"TortoiseSVN/Git." +msgstr "" +"Nella pagina della procedura guidata di unione a 3 vie registra WinMerge " +"come strumento di unione a 3 vie per TortoiseSVN/Git." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term><indexterm><primary> #: English/Install.xml:263 @@ -14841,13 +19446,18 @@ msgstr "Strumento unione a 3 vie" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:262 -msgid "Register WinMerge as a 3-way merge tool<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Registra WinMerge come strumento di unione a 3 vie<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Register WinMerge as a 3-way merge tool<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Registra WinMerge come strumento di unione a 3 vie<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:267 msgid "Register WinMerge as 3-way merge tool for TortoiseSVN/Git." -msgstr "Registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." +msgstr "" +"Registra WinMerge come strumento di unione a 3 vie per TortoiseSVN/Git." #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Install.xml:273 @@ -14886,26 +19496,37 @@ msgstr "Unione automatica all'avvio" #. type: Content of: <article><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Install.xml:301 -msgid "Optionally, disable the option <guilabel>Auto-merge at startup time</guilabel>." -msgstr "Facoltativamente, disabilita l'opzione <guilabel >Unisci automaticamente all'avvio</guilabel >." +msgid "" +"Optionally, disable the option <guilabel>Auto-merge at startup time</" +"guilabel>." +msgstr "" +"Facoltativamente, disabilita l'opzione <guilabel >Unisci automaticamente " +"all'avvio</guilabel >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:311 msgid "" -"In the Ready to Install page, verify your install selections. If necessary, click <guibutton>Back</guibutton> to change anything in a previous page. " -"When you are sure that you are ready to proceed, click <guibutton>Install</guibutton>." +"In the Ready to Install page, verify your install selections. If necessary, " +"click <guibutton>Back</guibutton> to change anything in a previous page. " +"When you are sure that you are ready to proceed, click <guibutton>Install</" +"guibutton>." msgstr "" -"Nella pagina Pronto per l'installazione, verifica le selezioni di installazione.Se necessario, fai clic su <guibutton >Indietro</guibutton > per " -"modificare qualcosa nella pagina precedente.Quando sei sicuro di essere pronto per procedere, fai clic su <guibutton >Installa</guibutton >." +"Nella pagina Pronto per l'installazione, verifica le selezioni di " +"installazione.Se necessario, fai clic su <guibutton >Indietro</guibutton > " +"per modificare qualcosa nella pagina precedente.Quando sei sicuro di essere " +"pronto per procedere, fai clic su <guibutton >Installa</guibutton >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Install.xml:319 msgid "" -"After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder " +"After the installer has copied files, the final screen appears. Using the " +"two check boxes, confirm whether the created WinMerge Start menu folder " "should be opened, and whether the WinMerge application should be started." msgstr "" -"Dopo che il programma di installazione ha copiato i file, viene visualizzata la schermata finale.Utilizzando le due caselle di controllo, confermare " -"se la cartella del menu Start WinMerge creata deve essere aperta e se l'applicazione WinMerge deve essere avviata." +"Dopo che il programma di installazione ha copiato i file, viene visualizzata " +"la schermata finale.Utilizzando le due caselle di controllo, confermare se " +"la cartella del menu Start WinMerge creata deve essere aperta e se " +"l'applicazione WinMerge deve essere avviata." #. type: Content of: <article><section><title><indexterm><primary> #: English/Install.xml:329 @@ -14919,61 +19540,87 @@ msgstr "Installazione da un archivio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Install.xml:332 -msgid "WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs." -msgstr "WinMerge è praticamente indipendente dagli altri componenti del sistema.Non è strettamente integrato con Windows e non utilizza molte DLL." +msgid "" +"WinMerge is pretty much independent of other system components. It is not " +"tightly integrated with Windows, and does not use many DLLs." +msgstr "" +"WinMerge è praticamente indipendente dagli altri componenti del sistema.Non " +"è strettamente integrato con Windows e non utilizza molte DLL." #. type: Content of: <article><section><para> #: English/Install.xml:335 msgid "" -"Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, " -"the root folder created under <filename class=\"directory\">C:\\Program Files\\</filename> has the name, <filename class=\"directory\">WinMerge-" -"<replaceable>version</replaceable></filename> (for example, <filename class=\"directory\">WinMerge-2.6.0</filename>). You can rename this folder or " -"copy its files to another folder (preserving the folder structure!)." -msgstr "" -"I file di archivio hanno la struttura di cartelle corretta.WinMerge dovrebbe essere decompresso preservando questa struttura di cartelle nella " -"cartella di destinazione. Ad esempio, la cartella principale creata in <filename class=\"directory\">C:\\Programmi\\</filename> ha il nome <filename " -"class=\"directory\">WinMerge-<replaceable>versione</replaceable></filename> (ad esempio, <filename class=\"directory\">WinMerge-2.6.0</filename>). " -"Puoi rinominare questa cartella o copiare i suoi file in un'altra cartella (preservando la struttura delle cartelle!)." +"Archive files have the correct folder structure. WinMerge should be unzipped " +"preserving this folder structure in the destination folder. For example, the " +"root folder created under <filename class=\"directory\">C:\\Program Files\\</" +"filename> has the name, <filename class=\"directory\">WinMerge-" +"<replaceable>version</replaceable></filename> (for example, <filename " +"class=\"directory\">WinMerge-2.6.0</filename>). You can rename this folder " +"or copy its files to another folder (preserving the folder structure!)." +msgstr "" +"I file di archivio hanno la struttura di cartelle corretta.WinMerge dovrebbe " +"essere decompresso preservando questa struttura di cartelle nella cartella " +"di destinazione. Ad esempio, la cartella principale creata in <filename " +"class=\"directory\">C:\\Programmi\\</filename> ha il nome <filename " +"class=\"directory\">WinMerge-<replaceable>versione</replaceable></filename> " +"(ad esempio, <filename class=\"directory\">WinMerge-2.6.0</filename>). Puoi " +"rinominare questa cartella o copiare i suoi file in un'altra cartella " +"(preservando la struttura delle cartelle!)." #. type: Content of: <article><section><para> #: English/Install.xml:344 msgid "" -"After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next " +"After the files are unzipped, WinMerge is ready to run! Shell integration " +"and archive integration may need additional steps, as described in the next " "section." msgstr "" -"Dopo che i file sono stati decompressi, WinMerge è pronto per essere eseguito!L'integrazione della shell e l'integrazione dell'archivio potrebbero " -"richiedere passaggi aggiuntivi, come descritto nella sezione successiva." +"Dopo che i file sono stati decompressi, WinMerge è pronto per essere " +"eseguito!L'integrazione della shell e l'integrazione dell'archivio " +"potrebbero richiedere passaggi aggiuntivi, come descritto nella sezione " +"successiva." #. type: Content of: <article><section><title> #: English/Install.xml:350 msgid "" -"Enabling Windows Explorer shell integration without the installer <placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +"Enabling Windows Explorer shell integration without the installer " +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>" msgstr "" -"Abilitazione dell'integrazione della shell di Esplora risorse senza il programma di installazione <placeholder type=\"indexterm\" id=\"0\"/" +"Abilitazione dell'integrazione della shell di Esplora risorse senza il " +"programma di installazione <placeholder type=\"indexterm\" id=\"0\"/" ">><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> #: English/Install.xml:359 msgid "" -"If you do not use the install program and you want to enable Windows Explorer shell integration, you must register the shell integration DLL " +"If you do not use the install program and you want to enable Windows " +"Explorer shell integration, you must register the shell integration DLL " "(<filename>ShellExtension*.dll</filename>) separately." msgstr "" -"Se non si utilizza il programma di installazione e si desidera abilitare l'integrazione della shell di Windows Explorer, è necessario registrare " -"separatamente la DLL di integrazione della shell (<filename>ShellExtension*.dll</filename>)." +"Se non si utilizza il programma di installazione e si desidera abilitare " +"l'integrazione della shell di Windows Explorer, è necessario registrare " +"separatamente la DLL di integrazione della shell (<filename>ShellExtension*." +"dll</filename>)." #. type: Content of: <article><section><note><para> #: English/Install.xml:364 msgid "Installing shell integration requires Administrator user privileges." -msgstr "L'installazione dell'integrazione della shell richiede i privilegi utente di amministratore." +msgstr "" +"L'installazione dell'integrazione della shell richiede i privilegi utente di " +"amministratore." #. type: Content of: <article><section><para> #: English/Install.xml:368 msgid "" -"Open WinMerge and using the <xref linkend=\"Configuration_shell-integ\" /> in the Options window. In the Options window use the <guibutton>Register " -"shell extension</guibutton> or <guibutton>Unregister shell extension</guibutton> buttons." +"Open WinMerge and using the <xref linkend=\"Configuration_shell-integ\" /> " +"in the Options window. In the Options window use the <guibutton>Register " +"shell extension</guibutton> or <guibutton>Unregister shell extension</" +"guibutton> buttons." msgstr "" -"Apri WinMerge e utilizza <xref linkend=\"Configuration_shell-integ\" /> nella finestra Opzioni.Nella finestra Opzioni usa i pulsanti <guibutton " -">Registra estensione della shell</guibutton > o <guibutton >Annulla registrazione estensione della shell</guibutton >." +"Apri WinMerge e utilizza <xref linkend=\"Configuration_shell-integ\" /> " +"nella finestra Opzioni.Nella finestra Opzioni usa i pulsanti <guibutton " +">Registra estensione della shell</guibutton > o <guibutton >Annulla " +"registrazione estensione della shell</guibutton >." #. type: Content of: <article><title> #: English/Intro_diffs.xml:3 @@ -14983,11 +19630,14 @@ msgstr "Panoramica del confronto e dell'unione dei file" #. type: Content of: <article><para> #: English/Intro_diffs.xml:5 msgid "" -"This topic describes how WinMerge detects and displays differences within text files, and demonstrates simple file comparing and merging operations. " +"This topic describes how WinMerge detects and displays differences within " +"text files, and demonstrates simple file comparing and merging operations. " "See <xref linkend=\"Compare_bin\" /> for related information about hex files." msgstr "" -"Questo argomento descrive il modo in cui WinMerge rileva e visualizza le differenze all'interno dei file di testo e illustra semplici operazioni di " -"confronto e unione dei file.Vedi <xref linkend=\"Compare_bin\" /> per informazioni correlate sui file esadecimali." +"Questo argomento descrive il modo in cui WinMerge rileva e visualizza le " +"differenze all'interno dei file di testo e illustra semplici operazioni di " +"confronto e unione dei file.Vedi <xref linkend=\"Compare_bin\" /> per " +"informazioni correlate sui file esadecimali." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Intro_diffs.xml:14 @@ -15002,50 +19652,73 @@ msgstr "Confronto di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:17 msgid "" -"We usually compare two files that are related in some way, such as two versions that were edited at different times, or by different people. If you " -"examine two such files you can usually see some similar areas, and also identify several types of differences: different characters and words, " -"different lines, even entire blocks of text that are different. But trying to understanding all the differences between two files by scanning them in " -"your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge are designed make this work more systematic " -"and efficient." -msgstr "" -"Di solito confrontiamo due file che sono in qualche modo correlati, ad esempio due versioni modificate in momenti diversi o da persone diverse.Se " -"esamini due di questi file puoi solitamente vedere alcune aree simili e identificare anche diversi tipi di differenze: caratteri e parole diversi, " -"righe diverse, persino interi blocchi di testo diversi.Ma cercare di comprendere tutte le differenze tra due file scansionandoli nel tuo editor " -"preferito può essere noioso e soggetto a errori.Strumenti specializzati di differenza/unione come WinMerge sono progettati per rendere questo lavoro " +"We usually compare two files that are related in some way, such as two " +"versions that were edited at different times, or by different people. If you " +"examine two such files you can usually see some similar areas, and also " +"identify several types of differences: different characters and words, " +"different lines, even entire blocks of text that are different. But trying " +"to understanding all the differences between two files by scanning them in " +"your favorite editor can be tedious and error-prone. Specialized difference/" +"merging tools like WinMerge are designed make this work more systematic and " +"efficient." +msgstr "" +"Di solito confrontiamo due file che sono in qualche modo correlati, ad " +"esempio due versioni modificate in momenti diversi o da persone diverse.Se " +"esamini due di questi file puoi solitamente vedere alcune aree simili e " +"identificare anche diversi tipi di differenze: caratteri e parole diversi, " +"righe diverse, persino interi blocchi di testo diversi.Ma cercare di " +"comprendere tutte le differenze tra due file scansionandoli nel tuo editor " +"preferito può essere noioso e soggetto a errori.Strumenti specializzati di " +"differenza/unione come WinMerge sono progettati per rendere questo lavoro " "più sistematico ed efficiente." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:27 msgid "" -"A simple difference utility that most people have used is a spell checker: it systematically steps you through a document, highlights words that are " -"different from those in its dictionary, and helps you resolve each spelling problem. However, looking only at characters and words is not an " -"effective way to understand differences between multiple files. For this reason, many difference utilities use lines as the basic unit of comparison " -"instead." -msgstr "" -"Una semplice utilità di differenza utilizzata dalla maggior parte delle persone è un controllo ortografico: ti guida sistematicamente attraverso un " -"documento, evidenzia le parole diverse da quelle presenti nel dizionario e ti aiuta a risolvere ogni problema di ortografia.Tuttavia, guardare solo i " -"caratteri e le parole non è un modo efficace per comprendere le differenze tra più file.Per questo motivo, molte utilità di differenza utilizzano " +"A simple difference utility that most people have used is a spell checker: " +"it systematically steps you through a document, highlights words that are " +"different from those in its dictionary, and helps you resolve each spelling " +"problem. However, looking only at characters and words is not an effective " +"way to understand differences between multiple files. For this reason, many " +"difference utilities use lines as the basic unit of comparison instead." +msgstr "" +"Una semplice utilità di differenza utilizzata dalla maggior parte delle " +"persone è un controllo ortografico: ti guida sistematicamente attraverso un " +"documento, evidenzia le parole diverse da quelle presenti nel dizionario e " +"ti aiuta a risolvere ogni problema di ortografia.Tuttavia, guardare solo i " +"caratteri e le parole non è un modo efficace per comprendere le differenze " +"tra più file.Per questo motivo, molte utilità di differenza utilizzano " "invece le linee come unità di confronto di base." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:35 msgid "" -"WinMerge also uses lines as its basic unit of difference. Words and characters are not treated individually in comparing and merging operations. To " -"illustrate, consider two files that are identical except for one line that is different. If the two versions of the line have four words that are " -"different and one version has an extra space, then we say that the file has one difference, not five." +"WinMerge also uses lines as its basic unit of difference. Words and " +"characters are not treated individually in comparing and merging " +"operations. To illustrate, consider two files that are identical except for " +"one line that is different. If the two versions of the line have four words " +"that are different and one version has an extra space, then we say that the " +"file has one difference, not five." msgstr "" -"WinMerge utilizza anche le linee come unità di differenza di base.Parole e caratteri non vengono trattati individualmente nelle operazioni di " -"confronto e unione.Per illustrare, considera due file identici tranne che per una riga diversa.Se le due versioni della riga hanno quattro parole " -"diverse e una versione ha uno spazio extra, allora diciamo che il file ha una differenza, non cinque." +"WinMerge utilizza anche le linee come unità di differenza di base.Parole e " +"caratteri non vengono trattati individualmente nelle operazioni di confronto " +"e unione.Per illustrare, considera due file identici tranne che per una riga " +"diversa.Se le due versioni della riga hanno quattro parole diverse e una " +"versione ha uno spazio extra, allora diciamo che il file ha una differenza, " +"non cinque." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:42 msgid "" -"If it's quicker to compare lines than words, sometimes it's also useful to treat an entire block of lines as a single difference, instead of " -"comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too." +"If it's quicker to compare lines than words, sometimes it's also useful to " +"treat an entire block of lines as a single difference, instead of comparing " +"one line at a time. As we will see later, detecting multiple-line " +"differences makes merging more efficient too." msgstr "" -"Se è più veloce confrontare le righe che le parole, a volte è anche utile trattare un intero blocco di righe come un'unica differenza, invece di " -"confrontare una riga alla volta.Come vedremo più avanti, il rilevamento delle differenze su più righe rende anche la fusione più efficiente." +"Se è più veloce confrontare le righe che le parole, a volte è anche utile " +"trattare un intero blocco di righe come un'unica differenza, invece di " +"confrontare una riga alla volta.Come vedremo più avanti, il rilevamento " +"delle differenze su più righe rende anche la fusione più efficiente." #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:48 @@ -15054,14 +19727,21 @@ msgstr "Operazione di confronto semplice" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:50 -msgid "This section offers a simple example that demonstrates how to compare line differences between two files in WinMerge:" -msgstr "Questa sezione offre un semplice esempio che dimostra come confrontare le differenze di riga tra due file in WinMerge:" +msgid "" +"This section offers a simple example that demonstrates how to compare line " +"differences between two files in WinMerge:" +msgstr "" +"Questa sezione offre un semplice esempio che dimostra come confrontare le " +"differenze di riga tra due file in WinMerge:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:55 -msgid "Using a text editor, create two files with the names and contents shown here, being careful to preserve the words and line breaks exactly:" +msgid "" +"Using a text editor, create two files with the names and contents shown " +"here, being careful to preserve the words and line breaks exactly:" msgstr "" -"Utilizzando un editor di testo, crea due file con i nomi e i contenuti mostrati qui, facendo attenzione a preservare esattamente le parole e le " +"Utilizzando un editor di testo, crea due file con i nomi e i contenuti " +"mostrati qui, facendo attenzione a preservare esattamente le parole e le " "interruzioni di riga:" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para><screen> @@ -15092,8 +19772,12 @@ msgstr "" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> #: English/Intro_diffs.xml:79 -msgid "<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon." +"png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"32\" fileref=\"screenshots/wm_icon." +"png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Intro_diffs.xml:84 @@ -15102,24 +19786,36 @@ msgstr "Collegamento sul desktop di WinMerge" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:78 -msgid "Start WinMerge. For example, double-click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> WinMerge desktop shortcut." -msgstr "Avvia WinMerge.Ad esempio, fai doppio clic sul <placeholder type=\"inlinemediaobject\" id=\"0\"/> collegamento sul desktop WinMerge." +msgid "" +"Start WinMerge. For example, double-click the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> WinMerge desktop shortcut." +msgstr "" +"Avvia WinMerge.Ad esempio, fai doppio clic sul <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> collegamento sul desktop WinMerge." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:90 msgid "" -"In the Select Files and Folders dialog, specify <filename>File1</filename> as the <guilabel>1st</guilabel> file and <filename>File2</filename> as the " -"<guilabel>2nd</guilabel> file, then click <guibutton>Compare</guibutton>. The File Compare window displays the two files in the left and right File " +"In the Select Files and Folders dialog, specify <filename>File1</filename> " +"as the <guilabel>1st</guilabel> file and <filename>File2</filename> as the " +"<guilabel>2nd</guilabel> file, then click <guibutton>Compare</guibutton>. " +"The File Compare window displays the two files in the left and right File " "pane, like this:" msgstr "" -"Nella finestra di dialogo Seleziona file e cartelle, specifica <filename>File1</filename> come <guilabel>primo</guilabel> file e <filename>File2</" -"filename> come <guilabel>2°</guilabel> file, quindi fai clic su <guibutton >Confronta</guibutton >.La finestra Confronto file visualizza i due file " -"nel riquadro File sinistro e destro, in questo modo:" +"Nella finestra di dialogo Seleziona file e cartelle, specifica " +"<filename>File1</filename> come <guilabel>primo</guilabel> file e " +"<filename>File2</filename> come <guilabel>2°</guilabel> file, quindi fai " +"clic su <guibutton >Confronta</guibutton >.La finestra Confronto file " +"visualizza i due file nel riquadro File sinistro e destro, in questo modo:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:97 -msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/missing_lines.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/missing_lines.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"missing_lines.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"missing_lines.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Intro_diffs.xml:103 @@ -15128,9 +19824,14 @@ msgstr "Schermata Confronta file" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:107 -msgid "The elements are described in more detail in <xref linkend=\"Compare_files\" />. Here are some features you should notice in this example:" +msgid "" +"The elements are described in more detail in <xref " +"linkend=\"Compare_files\" />. Here are some features you should notice in " +"this example:" msgstr "" -"Gli elementi sono descritti più dettagliatamente in <xref linkend=\"Compare_files\" />.Ecco alcune funzionalità che dovresti notare in questo esempio:" +"Gli elementi sono descritti più dettagliatamente in <xref " +"linkend=\"Compare_files\" />.Ecco alcune funzionalità che dovresti notare in " +"questo esempio:" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:113 @@ -15139,8 +19840,12 @@ msgstr "Numero di differenze" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:116 -msgid "The message in the status bar at the bottom of the WinMerge window tells you that two differences were detected." -msgstr "Il messaggio nella barra di stato nella parte inferiore della finestra WinMerge informa che sono state rilevate due differenze." +msgid "" +"The message in the status bar at the bottom of the WinMerge window tells you " +"that two differences were detected." +msgstr "" +"Il messaggio nella barra di stato nella parte inferiore della finestra " +"WinMerge informa che sono state rilevate due differenze." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:123 @@ -15149,20 +19854,31 @@ msgstr "Colori di differenza" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:126 -msgid "Difference blocks are marked with the difference background color (gold, by default)." -msgstr "I blocchi di differenza sono contrassegnati con il colore di sfondo della differenza (oro, per impostazione predefinita)." +msgid "" +"Difference blocks are marked with the difference background color (gold, by " +"default)." +msgstr "" +"I blocchi di differenza sono contrassegnati con il colore di sfondo della " +"differenza (oro, per impostazione predefinita)." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:129 -msgid "Line differences can be enabled to mark changed text within differences blocks, using the word background color (light yellow, by default)." +msgid "" +"Line differences can be enabled to mark changed text within differences " +"blocks, using the word background color (light yellow, by default)." msgstr "" -"È possibile abilitare le differenze di linea per contrassegnare il testo modificato all'interno dei blocchi di differenze, utilizzando il colore di " +"È possibile abilitare le differenze di linea per contrassegnare il testo " +"modificato all'interno dei blocchi di differenze, utilizzando il colore di " "sfondo della parola (giallo chiaro, per impostazione predefinita)." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:133 -msgid "Identical lines are unmarked: they have white backgrounds, like the third line in the example." -msgstr "Le linee identiche non sono contrassegnate: hanno lo sfondo bianco, come la terza linea nell'esempio." +msgid "" +"Identical lines are unmarked: they have white backgrounds, like the third " +"line in the example." +msgstr "" +"Le linee identiche non sono contrassegnate: hanno lo sfondo bianco, come la " +"terza linea nell'esempio." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><term> #: English/Intro_diffs.xml:139 @@ -15172,69 +19888,99 @@ msgstr "Righe vuote" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:142 msgid "" -"Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does " -"not exist in the <filename>File2</filename> source file, so what is it doing in WinMerge?" +"Notice that in the left comparison pane, the second line has text: the other " +"pane has a blank gray line in the same location. This blank line does not " +"exist in the <filename>File2</filename> source file, so what is it doing in " +"WinMerge?" msgstr "" -"Si noti che nel riquadro di confronto sinistro la seconda riga contiene del testo: l'altro riquadro presenta una riga grigia vuota nella stessa " -"posizione.Questa riga vuota non esiste nel file sorgente <filename>File2</filename>, quindi cosa ci fa in WinMerge?" +"Si noti che nel riquadro di confronto sinistro la seconda riga contiene del " +"testo: l'altro riquadro presenta una riga grigia vuota nella stessa " +"posizione.Questa riga vuota non esiste nel file sorgente <filename>File2</" +"filename>, quindi cosa ci fa in WinMerge?" #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><para> #: English/Intro_diffs.xml:148 msgid "" -"WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not " -"represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right " -"versions of differences vertically aligned. Thus in our example, the text, <computeroutput>WinMerge compares lines</computeroutput>, appears side by " -"side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge " +"WinMerge inserts one or more gray blank lines in one version of a difference " +"when the other version has more lines. These empty gray lines do not " +"represent blank lines in the source file; they are only placeholders in the " +"display. The purpose of placeholder lines is to keep the left and right " +"versions of differences vertically aligned. Thus in our example, the text, " +"<computeroutput>WinMerge compares lines</computeroutput>, appears side by " +"side in the Comparison window, even though they are on different lines in " +"the source files. This makes it easier to compare differences in WinMerge " "than in a conventional editor." msgstr "" -"WinMerge inserisce una o più righe vuote grigie in una versione di una differenza quando l'altra versione ha più righe.Queste linee grigie vuote non " -"rappresentano righe vuote nel file di origine;sono solo segnaposto nel display.Lo scopo delle linee segnaposto è mantenere allineate verticalmente le " -"versioni sinistra e destra delle differenze.Pertanto, nel nostro esempio, il testo <computeroutput>WinMerge confronta le righe</computeroutput>, " -"appare fianco a fianco nella finestra di confronto, anche se si trovano su righe diverse nei file di origine.Ciò rende più semplice confrontare le " +"WinMerge inserisce una o più righe vuote grigie in una versione di una " +"differenza quando l'altra versione ha più righe.Queste linee grigie vuote " +"non rappresentano righe vuote nel file di origine;sono solo segnaposto nel " +"display.Lo scopo delle linee segnaposto è mantenere allineate verticalmente " +"le versioni sinistra e destra delle differenze.Pertanto, nel nostro esempio, " +"il testo <computeroutput>WinMerge confronta le righe</computeroutput>, " +"appare fianco a fianco nella finestra di confronto, anche se si trovano su " +"righe diverse nei file di origine.Ciò rende più semplice confrontare le " "differenze in WinMerge rispetto a un editor convenzionale." #. type: Content of: <article><section><section><orderedlist><listitem><variablelist><varlistentry><listitem><tip><para> #: English/Intro_diffs.xml:161 msgid "" -"One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source " +"One consequence of the blank lines is that both panes in the File Compare " +"window always display the same total number of lines, even if their source " "files do not." msgstr "" -"Una conseguenza delle righe vuote è che entrambi i riquadri della finestra Confronto file visualizzano sempre lo stesso numero totale di righe, anche " +"Una conseguenza delle righe vuote è che entrambi i riquadri della finestra " +"Confronto file visualizzano sempre lo stesso numero totale di righe, anche " "se i file di origine non lo fanno." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:169 msgid "" -"Now that you understand how WinMerge detects and displays differences, you can use the comparing functions effectively, as shown in the next steps." +"Now that you understand how WinMerge detects and displays differences, you " +"can use the comparing functions effectively, as shown in the next steps." msgstr "" -"Ora che hai compreso come WinMerge rileva e visualizza le differenze, puoi utilizzare le funzioni di confronto in modo efficace, come mostrato nei " +"Ora che hai compreso come WinMerge rileva e visualizza le differenze, puoi " +"utilizzare le funzioni di confronto in modo efficace, come mostrato nei " "passaggi successivi." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:175 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current Difference</guibutton> in the toolbar (or press <keycombo> <keycap>Alt</" -"keycap> <keycap>Enter</keycap> </keycombo>). If this button is not enabled (for example, if your cursor is in a different line), click <placeholder " -"type=\"inlinemediaobject\" id=\"1\"/> First Difference (or press <keycombo> <keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>) instead." -msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza corrente</guibutton > nella barra degli strumenti (o premi " -"<keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >).Se questo pulsante non è abilitato (ad esempio, se il cursore si trova su una " -"riga diversa), fai clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> Prima differenza (o premi <keycombo> <keycap>Alt</keycap> <keycap>Home</" +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current " +"Difference</guibutton> in the toolbar (or press <keycombo> <keycap>Alt</" +"keycap> <keycap>Enter</keycap> </keycombo>). If this button is not enabled " +"(for example, if your cursor is in a different line), click <placeholder " +"type=\"inlinemediaobject\" id=\"1\"/> First Difference (or press <keycombo> " +"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>) instead." +msgstr "" +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Differenza corrente</guibutton > nella barra degli strumenti (o premi " +"<keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo >).Se " +"questo pulsante non è abilitato (ad esempio, se il cursore si trova su una " +"riga diversa), fai clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/" +"> Prima differenza (o premi <keycombo> <keycap>Alt</keycap> <keycap>Home</" "keycap> </keycombo>)." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:205 msgid "" -"When you select a difference, the two versions are loaded in the Diff pane. The Diff pane confirms which lines are included in a difference, and lets " -"you examine them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines." +"When you select a difference, the two versions are loaded in the Diff pane. " +"The Diff pane confirms which lines are included in a difference, and lets " +"you examine them in isolation from the rest of the file. In our example, " +"Difference 1 clearly has two lines." msgstr "" -"Quando selezioni una differenza, le due versioni vengono caricate nel riquadro Diff.Il riquadro Diff conferma quali righe sono incluse in una " -"differenza e consente di esaminarle isolandole dal resto del file.Nel nostro esempio, la Differenza 1 ha chiaramente due linee." +"Quando selezioni una differenza, le due versioni vengono caricate nel " +"riquadro Diff.Il riquadro Diff conferma quali righe sono incluse in una " +"differenza e consente di esaminarle isolandole dal resto del file.Nel nostro " +"esempio, la Differenza 1 ha chiaramente due linee." #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:211 -msgid "<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/filecomp_diffpane1.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/filecomp_diffpane1.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/" +"filecomp_diffpane1.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"588\" fileref=\"screenshots/" +"filecomp_diffpane1.png\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject><textobject><phrase> #: English/Intro_diffs.xml:217 @@ -15244,21 +19990,29 @@ msgstr "Riquadro differenze file Confronta" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:224 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next Difference</guibutton> in the toolbar (or click <keycombo> <keycap>Alt</" -"keycap> <keycap>Enter</keycap> </keycombo>). This jumps over the identical line (which is not a difference) and selects the last line." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next " +"Difference</guibutton> in the toolbar (or click <keycombo> <keycap>Alt</" +"keycap> <keycap>Enter</keycap> </keycombo>). This jumps over the identical " +"line (which is not a difference) and selects the last line." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza successiva</guibutton > nella barra degli strumenti (o fai clic " -"su <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo>).Questo salta sulla riga identica (che non è una differenza) e seleziona " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Differenza successiva</guibutton > nella barra degli strumenti (o fai clic " +"su <keycombo> <keycap >Alt</keycap> <keycap >Invio</keycap> </keycombo>)." +"Questo salta sulla riga identica (che non è una differenza) e seleziona " "l'ultima riga." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:241 msgid "" -"You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences — and " -"there are other ways to compare differences in WinMerge. But it demonstrates the efficiency of using the WinMerge navigation controls." +"You have reached the end of the file and had a chance to examine every " +"difference. This was a trivial example — there were only two differences — " +"and there are other ways to compare differences in WinMerge. But it " +"demonstrates the efficiency of using the WinMerge navigation controls." msgstr "" -"Hai raggiunto la fine del file e hai avuto la possibilità di esaminare ogni differenza.Questo era un esempio banale – c'erano solo due differenze – e " -"ci sono altri modi per confrontare le differenze in WinMerge.Ma dimostra l'efficienza dell'utilizzo dei controlli di navigazione WinMerge." +"Hai raggiunto la fine del file e hai avuto la possibilità di esaminare ogni " +"differenza.Questo era un esempio banale – c'erano solo due differenze – e ci " +"sono altri modi per confrontare le differenze in WinMerge.Ma dimostra " +"l'efficienza dell'utilizzo dei controlli di navigazione WinMerge." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Intro_diffs.xml:255 @@ -15273,52 +20027,79 @@ msgstr "Unione di file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:258 msgid "" -"The purpose of merging is to combine changes from two files into one file. Merging extends the concepts and functions used in comparing operation: " -"please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the " -"differences and save the result in a single <glossterm>target</glossterm> version." +"The purpose of merging is to combine changes from two files into one file. " +"Merging extends the concepts and functions used in comparing operation: " +"please read the preceding section before beginning this section. In " +"addition to detecting differences between two file versions, we resolve the " +"differences and save the result in a single <glossterm>target</glossterm> " +"version." msgstr "" -"Lo scopo dell'unione è combinare le modifiche di due file in un unico file.L'unione estende i concetti e le funzioni utilizzate nell'operazione di " -"confronto: leggere la sezione precedente prima di iniziare questa sezione.Oltre a rilevare le differenze tra due versioni di file, risolviamo le " -"differenze e salviamo il risultato in un'unica versione <glossterm>target</glossterm>." +"Lo scopo dell'unione è combinare le modifiche di due file in un unico file." +"L'unione estende i concetti e le funzioni utilizzate nell'operazione di " +"confronto: leggere la sezione precedente prima di iniziare questa sezione." +"Oltre a rilevare le differenze tra due versioni di file, risolviamo le " +"differenze e salviamo il risultato in un'unica versione <glossterm>target</" +"glossterm>." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:265 msgid "" -"Merging files makes concurrent development possible, and it is a common task in team environments. For example, suppose you and another person want " -"to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate " -"versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor." -msgstr "" -"L'unione di file rende possibile lo sviluppo simultaneo ed è un'attività comune negli ambienti di team.Ad esempio, supponiamo che tu e un'altra " -"persona vogliate aggiungere codice allo stesso file di programma contemporaneamente.Entrambi iniziate con una copia identica del file, ma durante lo " -"sviluppo create versioni separate che non sono identiche.Ad un certo punto, le due versioni devono essere unite in un'unica versione che preservi le " -"modifiche di ciascun contributore." +"Merging files makes concurrent development possible, and it is a common task " +"in team environments. For example, suppose you and another person want to " +"add code to the same program file at the same time. You both begin with an " +"identical copy of the file, but during development you create separate " +"versions that are not identical. At some point, the two versions must be " +"merged into one version that preserves the changes from each contributor." +msgstr "" +"L'unione di file rende possibile lo sviluppo simultaneo ed è un'attività " +"comune negli ambienti di team.Ad esempio, supponiamo che tu e un'altra " +"persona vogliate aggiungere codice allo stesso file di programma " +"contemporaneamente.Entrambi iniziate con una copia identica del file, ma " +"durante lo sviluppo create versioni separate che non sono identiche.Ad un " +"certo punto, le due versioni devono essere unite in un'unica versione che " +"preservi le modifiche di ciascun contributore." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:273 msgid "" -"Merging can be prompted (or even initiated) by version control systems like Subversion and Git. For example, your version control system might " -"prevent you from submitting changes to its repository because of merge conflicts. A conflict can occur if someone else checked in a different version " -"of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When " -"that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated " -"difference and merge tools, but you might prefer to use WinMerge instead." -msgstr "" -"L'unione può essere richiesta (o addirittura avviata) da sistemi di controllo della versione come Subversion e Git.Ad esempio, il tuo sistema di " -"controllo della versione potrebbe impedirti di inviare modifiche al suo repository a causa di conflitti di unione.Può verificarsi un conflitto se " -"qualcun altro ha archiviato una versione diversa dello stesso file mentre stavi lavorando sulla tua versione e il sistema di controllo della versione " -"non è stato in grado di unire automaticamente le differenze.Quando ciò accade, potresti dover unire le versioni in conflitto prima di riprovare a " -"contribuire con la tua versione.Molti sistemi dispongono di strumenti integrati per la differenza e l'unione, ma potresti preferire utilizzare " +"Merging can be prompted (or even initiated) by version control systems like " +"Subversion and Git. For example, your version control system might prevent " +"you from submitting changes to its repository because of merge conflicts. A " +"conflict can occur if someone else checked in a different version of the " +"same file while you were working on your version, and the version control " +"system was not able to automatically merge the differences. When that " +"happens, you might need to merge the conflicting versions before trying " +"again to contribute your version. Many systems have integrated difference " +"and merge tools, but you might prefer to use WinMerge instead." +msgstr "" +"L'unione può essere richiesta (o addirittura avviata) da sistemi di " +"controllo della versione come Subversion e Git.Ad esempio, il tuo sistema di " +"controllo della versione potrebbe impedirti di inviare modifiche al suo " +"repository a causa di conflitti di unione.Può verificarsi un conflitto se " +"qualcun altro ha archiviato una versione diversa dello stesso file mentre " +"stavi lavorando sulla tua versione e il sistema di controllo della versione " +"non è stato in grado di unire automaticamente le differenze.Quando ciò " +"accade, potresti dover unire le versioni in conflitto prima di riprovare a " +"contribuire con la tua versione.Molti sistemi dispongono di strumenti " +"integrati per la differenza e l'unione, ma potresti preferire utilizzare " "WinMerge." #. type: Content of: <article><section><para> #: English/Intro_diffs.xml:284 msgid "" -"Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through the differences. Resolve each " -"difference by copying either its left or right <glossterm>candidate</glossterm> to the other side. When you have resolved all the differences, " -"WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging." +"Just as with comparing, you use WinMerge's toolbar controls (or keyboard " +"shortcuts) to systematically step through the differences. Resolve each " +"difference by copying either its left or right <glossterm>candidate</" +"glossterm> to the other side. When you have resolved all the differences, " +"WinMerge lets you know that all differences are resolved (the versions are " +"identical), and you are done merging." msgstr "" -"Proprio come per il confronto, utilizzi i controlli della barra degli strumenti di WinMerge (o le scorciatoie da tastiera) per esaminare " -"sistematicamente le differenze.Risolvi ogni differenza copiando il <glossterm>candidato</glossterm> sinistro o destro sull'altro lato.Una volta " -"risolte tutte le differenze, WinMerge ti informa che tutte le differenze sono state risolte (le versioni sono identiche) e che l'unione è terminata." +"Proprio come per il confronto, utilizzi i controlli della barra degli " +"strumenti di WinMerge (o le scorciatoie da tastiera) per esaminare " +"sistematicamente le differenze.Risolvi ogni differenza copiando il " +"<glossterm>candidato</glossterm> sinistro o destro sull'altro lato.Una volta " +"risolte tutte le differenze, WinMerge ti informa che tutte le differenze " +"sono state risolte (le versioni sono identiche) e che l'unione è terminata." #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:292 @@ -15327,83 +20108,114 @@ msgstr "Semplice operazione di unione" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:294 -msgid "This short exercise demonstrates how to use the controls in the File Compare window in a systematic way to merge the simple files shown earlier:" +msgid "" +"This short exercise demonstrates how to use the controls in the File Compare " +"window in a systematic way to merge the simple files shown earlier:" msgstr "" -"Questo breve esercizio dimostra come utilizzare i controlli nella finestra Confronta file in modo sistematico per unire i file semplici mostrati in " +"Questo breve esercizio dimostra come utilizzare i controlli nella finestra " +"Confronta file in modo sistematico per unire i file semplici mostrati in " "precedenza:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:300 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current Difference</guibutton> in the toolbar to select the first difference. If " -"this button is not enabled, click <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton>First Difference</guibutton> instead." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Current " +"Difference</guibutton> in the toolbar to select the first difference. If " +"this button is not enabled, click <placeholder type=\"inlinemediaobject\" " +"id=\"1\"/> <guibutton>First Difference</guibutton> instead." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza corrente</guibutton > nella barra degli strumenti per " -"selezionare la prima differenza.Se questo pulsante non è abilitato, fai invece clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Differenza corrente</guibutton > nella barra degli strumenti per " +"selezionare la prima differenza.Se questo pulsante non è abilitato, fai " +"invece clic su <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guibutton " ">Prima differenza</guibutton >." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:325 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Right</guibutton> to merge Difference 1 from <filename>File1</filename> to " -"<filename>File2</filename>. In <filename>File</filename>2, notice that the single difference line is replaced by the two lines from <filename>File1</" +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy " +"Right</guibutton> to merge Difference 1 from <filename>File1</filename> to " +"<filename>File2</filename>. In <filename>File</filename>2, notice that the " +"single difference line is replaced by the two lines from <filename>File1</" "filename>, and the gray blank line is now gone." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a destra</guibutton > per unire la Differenza 1 da <filename>File1</" -"filename> a <filename>File2</filename>.In <filename>File</filename>2, nota che la singola riga di differenza è sostituita dalle due righe di " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Copia a destra</guibutton > per unire la Differenza 1 da <filename>File1</" +"filename> a <filename>File2</filename>.In <filename>File</filename>2, nota " +"che la singola riga di differenza è sostituita dalle due righe di " "<filename>File1</filename>, e la riga grigia vuota ora è scomparsa." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:343 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next Difference</guibutton> to select Difference 2. This is easier than finding " -"and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any." +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Next " +"Difference</guibutton> to select Difference 2. This is easier than finding " +"and selecting the difference yourself. It's especially useful if you want to " +"step through all differences without accidentally missing any." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Differenza successiva</guibutton > per selezionare Differenza 2. Questo è " -"più semplice che trovare e selezionare la differenza da solo.È particolarmente utile se desideri esaminare tutte le differenze senza tralasciarne " -"nessuna accidentalmente." +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Differenza successiva</guibutton > per selezionare Differenza 2. Questo è " +"più semplice che trovare e selezionare la differenza da solo.È " +"particolarmente utile se desideri esaminare tutte le differenze senza " +"tralasciarne nessuna accidentalmente." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:359 msgid "" -"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy Left</guibutton> to merge Difference 2 from <filename>File2</filename> to " +"Click <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Copy " +"Left</guibutton> to merge Difference 2 from <filename>File2</filename> to " "<filename>File1</filename>." msgstr "" -"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton >Copia a sinistra</guibutton > per unire la differenza 2 da <filename " +"Fai clic su <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton " +">Copia a sinistra</guibutton > per unire la differenza 2 da <filename " ">File2</filename > a <filename >File1</filename >." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:372 -msgid "The message that the files are identical tells you that the merge is complete:" +msgid "" +"The message that the files are identical tells you that the merge is " +"complete:" msgstr "Il messaggio che i file sono identici ti dice che l'unione è completa:" #. type: Content of: <article><section><section><orderedlist><listitem><mediaobject> #: English/Intro_diffs.xml:376 -msgid "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filemerged1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/filemerged1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"filemerged1.png\" format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"600\" fileref=\"screenshots/" +"filemerged1.png\" format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:385 msgid "" -"Click <guibutton>OK</guibutton> to dismiss the message. The status Difference message changes from <computeroutput>Difference 1 of 1</computeroutput> " -"to <computeroutput>identical</computeroutput>." +"Click <guibutton>OK</guibutton> to dismiss the message. The status " +"Difference message changes from <computeroutput>Difference 1 of 1</" +"computeroutput> to <computeroutput>identical</computeroutput>." msgstr "" -"Fai clic su <guibutton >OK</guibutton > per chiudere il messaggio.Il messaggio di differenza di stato cambia da <computeroutput>Differenza 1 di 1</" -"computeroutput> a <computeroutput>identico</computeroutput>." +"Fai clic su <guibutton >OK</guibutton > per chiudere il messaggio.Il " +"messaggio di differenza di stato cambia da <computeroutput>Differenza 1 di " +"1</computeroutput> a <computeroutput>identico</computeroutput>." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Intro_diffs.xml:392 -msgid "Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to save your changes." -msgstr "Premi <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> per salvare le modifiche." +msgid "" +"Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> to " +"save your changes." +msgstr "" +"Premi <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> per " +"salvare le modifiche." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:400 msgid "" -"While very simple, this example demonstrates a basic methodology that you can use to step through a comparison of any length, merging each difference " +"While very simple, this example demonstrates a basic methodology that you " +"can use to step through a comparison of any length, merging each difference " "one by one until you have the result that you want." msgstr "" -"Sebbene sia molto semplice, questo esempio dimostra una metodologia di base che puoi utilizzare per eseguire un confronto di qualsiasi lunghezza, " -"unendo ciascuna differenza una per una finché non ottieni il risultato desiderato." +"Sebbene sia molto semplice, questo esempio dimostra una metodologia di base " +"che puoi utilizzare per eseguire un confronto di qualsiasi lunghezza, unendo " +"ciascuna differenza una per una finché non ottieni il risultato desiderato." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Intro_diffs.xml:411 @@ -15412,43 +20224,63 @@ msgstr "file dei risultati, in unione" #. type: Content of: <article><section><section><title> #: English/Intro_diffs.xml:406 -msgid "Choosing a merge result file <placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Scelta di un file dei risultati dell'unione <placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Choosing a merge result file <placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Scelta di un file dei risultati dell'unione <placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:414 msgid "" -"You control where your merge result is preserved. The WinMerge File Compare window does not have a separate result pane, as some merge tools do. So " -"the simplest strategy is to save your changes to one, two or three source files. Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </" -"keycombo> at any time to save the current changes to all files; alternatively, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Left</" -"guimenuitem> </menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Middle</guimenuitem> </menuchoice> or <menuchoice> <guimenu>File</" -"guimenu> <guimenuitem>Save Right</guimenuitem> </menuchoice> to save only one file." -msgstr "" -"Sei tu a controllare dove viene conservato il risultato dell'unione.La finestra Confronto file WinMerge non dispone di un riquadro dei risultati " -"separato, come fanno alcuni strumenti di unione.Quindi la strategia più semplice è salvare le modifiche su uno, due o tre file sorgente.Premi " -"<keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> in qualsiasi momento per salvare le modifiche correnti su tutti i file;in " -"alternativa, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva a sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu " -">File</guimenu > <guimenuitem >Salva a destra</guimenuitem > </menuchoice > o <menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva a destra</" +"You control where your merge result is preserved. The WinMerge File Compare " +"window does not have a separate result pane, as some merge tools do. So the " +"simplest strategy is to save your changes to one, two or three source files. " +"Press <keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> at any " +"time to save the current changes to all files; alternatively, click " +"<menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Left</guimenuitem> </" +"menuchoice>, <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Middle</" +"guimenuitem> </menuchoice> or <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Save Right</guimenuitem> </menuchoice> to save only one file." +msgstr "" +"Sei tu a controllare dove viene conservato il risultato dell'unione.La " +"finestra Confronto file WinMerge non dispone di un riquadro dei risultati " +"separato, come fanno alcuni strumenti di unione.Quindi la strategia più " +"semplice è salvare le modifiche su uno, due o tre file sorgente.Premi " +"<keycombo> <keycap>Ctrl</keycap> <keycap>S</keycap> </keycombo> in qualsiasi " +"momento per salvare le modifiche correnti su tutti i file;in alternativa, " +"fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva a " +"sinistra</guimenuitem > </menuchoice >, <menuchoice > <guimenu >File</" +"guimenu > <guimenuitem >Salva a destra</guimenuitem > </menuchoice > o " +"<menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva a destra</" "guimenuitem > </menuchoice > per salvare soloun file." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:436 msgid "" -"To write to a third file instead of either source file, use <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>. " -"For example, your target file might be the difference or conflict file generated by a version control system." +"To write to a third file instead of either source file, use <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Save As</guimenuitem> </menuchoice>. " +"For example, your target file might be the difference or conflict file " +"generated by a version control system." msgstr "" -"Per scrivere su un terzo file invece che su uno dei file sorgente, usa <menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva con nome</" -"guimenuitem > </menuchoice >.Ad esempio, il file di destinazione potrebbe essere il file delle differenze o dei conflitti generato da un sistema di " +"Per scrivere su un terzo file invece che su uno dei file sorgente, usa " +"<menuchoice > <guimenu >File</guimenu > <guimenuitem >Salva con nome</" +"guimenuitem > </menuchoice >.Ad esempio, il file di destinazione potrebbe " +"essere il file delle differenze o dei conflitti generato da un sistema di " "controllo della versione." #. type: Content of: <article><section><section><para> #: English/Intro_diffs.xml:444 msgid "" -"Similarly, in the WinMerge command line, you can leave both or all three source versions unchanged by using the optional <option>outputfile </option> " +"Similarly, in the WinMerge command line, you can leave both or all three " +"source versions unchanged by using the optional <option>outputfile </option> " "argument, as described in <xref linkend=\"Command_line\" />." msgstr "" -"Allo stesso modo, nella riga di comando di WinMerge, puoi lasciare entrambe o tutte e tre le versioni sorgente invariate utilizzando l'argomento " -"facoltativo <option>outputfile </option>, come descritto in <xref linkend=\"Command_line\" />." +"Allo stesso modo, nella riga di comando di WinMerge, puoi lasciare entrambe " +"o tutte e tre le versioni sorgente invariate utilizzando l'argomento " +"facoltativo <option>outputfile </option>, come descritto in <xref " +"linkend=\"Command_line\" />." #. type: Content of: <article><title> #: English/Introduction.xml:3 @@ -15458,69 +20290,94 @@ msgstr "Introduzione a WinMerge" #. type: Content of: <article><para> #: English/Introduction.xml:5 msgid "" -"WinMerge is an <ulink url=\"https://opensource.org/\">Open Source</ulink> differencing and merging tool for Windows. WinMerge can compare two or " -"three folders and files, presenting differences in a visual text format that is easy to understand and handle." +"WinMerge is an <ulink url=\"https://opensource.org/\">Open Source</ulink> " +"differencing and merging tool for Windows. WinMerge can compare two or three " +"folders and files, presenting differences in a visual text format that is " +"easy to understand and handle." msgstr "" -"WinMerge è uno strumento di differenziazione e fusione <ulink url=\"https://opensource.org/\">Open Source</ulink> per Windows.WinMerge può " -"confrontare due o tre cartelle e file, presentando le differenze in un formato di testo visivo facile da comprendere e gestire." +"WinMerge è uno strumento di differenziazione e fusione <ulink url=\"https://" +"opensource.org/\">Open Source</ulink> per Windows.WinMerge può confrontare " +"due o tre cartelle e file, presentando le differenze in un formato di testo " +"visivo facile da comprendere e gestire." #. type: Content of: <article><para> #: English/Introduction.xml:10 msgid "" -"WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used " -"as an external differencing/merging tool or as a standalone application." +"WinMerge is highly useful for determining what has changed between project " +"versions, and then merging changes between versions. WinMerge can be used as " +"an external differencing/merging tool or as a standalone application." msgstr "" -"WinMerge è molto utile per determinare cosa è cambiato tra le versioni del progetto e quindi unire le modifiche tra le versioni.WinMerge può essere " -"utilizzato come strumento di differenziazione/unione esterno o come applicazione autonoma." +"WinMerge è molto utile per determinare cosa è cambiato tra le versioni del " +"progetto e quindi unire le modifiche tra le versioni.WinMerge può essere " +"utilizzato come strumento di differenziazione/unione esterno o come " +"applicazione autonoma." #. type: Content of: <article><para> #: English/Introduction.xml:15 msgid "" -"In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible. Several " -"programming languages and other file formats are syntax-highlighted." +"In addition, WinMerge has many helpful supporting features that make " +"comparing, synchronising, and merging as easy and useful as possible. " +"Several programming languages and other file formats are syntax-highlighted." msgstr "" -"Inoltre, WinMerge dispone di molte utili funzionalità di supporto che rendono il confronto, la sincronizzazione e l'unione il più semplice e utile " -"possibile.Diversi linguaggi di programmazione e altri formati di file sono evidenziati dalla sintassi." +"Inoltre, WinMerge dispone di molte utili funzionalità di supporto che " +"rendono il confronto, la sincronizzazione e l'unione il più semplice e utile " +"possibile.Diversi linguaggi di programmazione e altri formati di file sono " +"evidenziati dalla sintassi." #. type: Content of: <article><para> #: English/Introduction.xml:19 msgid "" -"WinMerge is not a hex editor. WinMerge can show binary files contents and differences between them. But the information is meant for viewing only: " +"WinMerge is not a hex editor. WinMerge can show binary files contents and " +"differences between them. But the information is meant for viewing only: " "editing binary files with WinMerge can break the files." msgstr "" -"WinMerge non è un editor esadecimale.WinMerge può mostrare il contenuto dei file binari e le differenze tra loro.Ma le informazioni sono destinate " -"solo alla visualizzazione: la modifica di file binari con WinMerge può danneggiare i file." +"WinMerge non è un editor esadecimale.WinMerge può mostrare il contenuto dei " +"file binari e le differenze tra loro.Ma le informazioni sono destinate solo " +"alla visualizzazione: la modifica di file binari con WinMerge può " +"danneggiare i file." #. type: Content of: <article><para> #: English/Introduction.xml:23 msgid "" -"The goal of WinMerge development is to make comparing, synchronizing, and merging folders and files easy and fast, while maintaining maximum " +"The goal of WinMerge development is to make comparing, synchronizing, and " +"merging folders and files easy and fast, while maintaining maximum " "reliability. Ease of use is of key importance for reducing errors." msgstr "" -"L'obiettivo dello sviluppo di WinMerge è rendere il confronto, la sincronizzazione e l'unione di cartelle e file facili e veloci, mantenendo la " -"massima affidabilità.La facilità d’uso è di fondamentale importanza per ridurre gli errori." +"L'obiettivo dello sviluppo di WinMerge è rendere il confronto, la " +"sincronizzazione e l'unione di cartelle e file facili e veloci, mantenendo " +"la massima affidabilità.La facilità d’uso è di fondamentale importanza per " +"ridurre gli errori." #. type: Content of: <article><para> #: English/Introduction.xml:27 -msgid "The latest version &WinMergeVersion; is considered a stable and reliable program to use." -msgstr "L'ultima versione &WinMergeVersion;è considerato un programma stabile e affidabile da utilizzare." +msgid "" +"The latest version &WinMergeVersion; is considered a stable and reliable " +"program to use." +msgstr "" +"L'ultima versione &WinMergeVersion;è considerato un programma stabile e " +"affidabile da utilizzare." #. type: Content of: <article><note><para> #: English/Introduction.xml:31 msgid "" -"WinMerge is not freeware (as many sites on the Web have stated): It is <ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> licensed." +"WinMerge is not freeware (as many sites on the Web have stated): It is " +"<ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> " +"licensed." msgstr "" -"WinMerge non è freeware (come hanno affermato molti siti sul Web): è concesso in licenza <ulink url=\"https://www.gnu.org/licenses/" -"gpl-2.0.html\">GPL</ulink>." +"WinMerge non è freeware (come hanno affermato molti siti sul Web): è " +"concesso in licenza <ulink url=\"https://www.gnu.org/licenses/gpl-2.0." +"html\">GPL</ulink>." #. type: Content of: <article><note><para> #: English/Introduction.xml:33 msgid "" -"We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving " +"We provide you with a good tool for free, so please honor your license " +"agreement and submit improvements to us. We are happy to get help improving " "WinMerge, to the advantage of all WinMerge users." msgstr "" -"Ti forniamo un buon strumento gratuitamente, quindi rispetta il tuo contratto di licenza e inviaci miglioramenti.Siamo felici di ricevere aiuto per " -"migliorare WinMerge, a vantaggio di tutti gli utenti WinMerge." +"Ti forniamo un buon strumento gratuitamente, quindi rispetta il tuo " +"contratto di licenza e inviaci miglioramenti.Siamo felici di ricevere aiuto " +"per migliorare WinMerge, a vantaggio di tutti gli utenti WinMerge." #. type: Content of: <article><section><title><indexterm><primary> #: English/Introduction.xml:40 @@ -15534,8 +20391,12 @@ msgstr "Versioni WinMerge<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Introduction.xml:43 -msgid "There are two kind of versions available in the <ulink url=\"https://sourceforge.net/projects/winmerge/files/\">downloads</ulink> page." -msgstr "Sono disponibili due tipi di versioni nella pagina <ulink url=\"https://sourceforge.net/projects/winmerge/files/\">download</ulink>." +msgid "" +"There are two kind of versions available in the <ulink url=\"https://" +"sourceforge.net/projects/winmerge/files/\">downloads</ulink> page." +msgstr "" +"Sono disponibili due tipi di versioni nella pagina <ulink url=\"https://" +"sourceforge.net/projects/winmerge/files/\">download</ulink>." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Introduction.xml:49 @@ -15550,12 +20411,16 @@ msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Versioni stabili" #. type: Content of: <article><section><section><para> #: English/Introduction.xml:52 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Stable versions</ulink> are recommended for most users. If you are unsure " -"about what version to use, use the latest stable version. Stable versions have an even last number, for example, 2.14.0, 2.16.2 and 2.16.4." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/" +"\">Stable versions</ulink> are recommended for most users. If you are unsure " +"about what version to use, use the latest stable version. Stable versions " +"have an even last number, for example, 2.14.0, 2.16.2 and 2.16.4." msgstr "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Le versioni stabili</ulink> sono consigliate per la maggior parte degli " -"utenti.Se non sei sicuro di quale versione utilizzare, utilizza l'ultima versione stabile.Le versioni stabili hanno un ultimo numero pari, ad esempio " -"2.14.0, 2.16.2 e 2.16.4." +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/stable/\">Le " +"versioni stabili</ulink> sono consigliate per la maggior parte degli utenti." +"Se non sei sicuro di quale versione utilizzare, utilizza l'ultima versione " +"stabile.Le versioni stabili hanno un ultimo numero pari, ad esempio 2.14.0, " +"2.16.2 e 2.16.4." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Introduction.xml:61 @@ -15570,17 +20435,26 @@ msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Versioni beta" #. type: Content of: <article><section><section><para> #: English/Introduction.xml:64 msgid "" -"<ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">Beta versions</ulink> are for people who want to test latest features and " -"improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta " -"versions have an odd last number, for example 2.16.3 and 2.16.5. Beta versions can be used in production, because they are not expected to have major " -"bugs. But there is always a risk with using beta-level releases, so consider it carefully. We have tried to release a new stable series once a year, " -"so it may be worth waiting for few months for the next stable release..." -msgstr "" -"Le <ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">versioni beta</ulink> sono per le persone che desiderano testare le ultime " -"funzionalità e i miglioramenti apportati dopo l'ultima versione stabile.Le versioni beta non sono testate così estesamente come le versioni stabili e " -"probabilmente presentano alcuni bug.Le versioni beta hanno un ultimo numero dispari, ad esempio 2.16.3 e 2.16.5.Le versioni beta possono essere " -"utilizzate in produzione perché non si prevede che presentino bug importanti.Ma c'è sempre un rischio nell'usare versioni di livello beta, quindi " -"consideralo attentamente.Abbiamo provato a rilasciare una nuova serie stabile una volta all'anno, quindi potrebbe valere la pena aspettare qualche " +"<ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/\">Beta " +"versions</ulink> are for people who want to test latest features and " +"improvements made after last stable version. Beta versions are not tested as " +"extensively as stable versions and probably have some bugs. Beta versions " +"have an odd last number, for example 2.16.3 and 2.16.5. Beta versions can be " +"used in production, because they are not expected to have major bugs. But " +"there is always a risk with using beta-level releases, so consider it " +"carefully. We have tried to release a new stable series once a year, so it " +"may be worth waiting for few months for the next stable release..." +msgstr "" +"Le <ulink url=\"https://sourceforge.net/projects/winmerge/files/beta/" +"\">versioni beta</ulink> sono per le persone che desiderano testare le " +"ultime funzionalità e i miglioramenti apportati dopo l'ultima versione " +"stabile.Le versioni beta non sono testate così estesamente come le versioni " +"stabili e probabilmente presentano alcuni bug.Le versioni beta hanno un " +"ultimo numero dispari, ad esempio 2.16.3 e 2.16.5.Le versioni beta possono " +"essere utilizzate in produzione perché non si prevede che presentino bug " +"importanti.Ma c'è sempre un rischio nell'usare versioni di livello beta, " +"quindi consideralo attentamente.Abbiamo provato a rilasciare una nuova serie " +"stabile una volta all'anno, quindi potrebbe valere la pena aspettare qualche " "mese per la prossima versione stabile..." #. type: Content of: <article><section><title><indexterm><secondary> @@ -15590,13 +20464,18 @@ msgstr "segnalazione bug" #. type: Content of: <article><section><title> #: English/Introduction.xml:79 -msgid "<placeholder type=\"indexterm\" id=\"0\"/>Getting support and reporting bugs" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Ottenere supporto e segnalare bug" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/>Getting support and reporting bugs" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>Ottenere supporto e segnalare bug" #. type: Content of: <article><section><para> #: English/Introduction.xml:85 -msgid "The <emphasis>Discussion forums</emphasis> are the fastest way to get help:" -msgstr "I <emphasis>Forum di discussione</emphasis> sono il modo più veloce per ottenere aiuto:" +msgid "" +"The <emphasis>Discussion forums</emphasis> are the fastest way to get help:" +msgstr "" +"I <emphasis>Forum di discussione</emphasis> sono il modo più veloce per " +"ottenere aiuto:" #. type: Content of: <article><section><itemizedlist><listitem><ulink> #: English/Introduction.xml:88 @@ -15616,24 +20495,34 @@ msgstr "Discussioni sul sito web" #. type: Content of: <article><section><para> #: English/Introduction.xml:98 msgid "" -"If you find a bug, please submit it as a <ulink url=\"https://github.com/WinMerge/winmerge/issues\">bug report</ulink>. Please attach as much " -"information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can " -"display by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>Configuration</guimenuitem> </menuchoice> in the WinMerge window. Good " -"information in a bug report makes it more likely that your bug will be fixed quickly." -msgstr "" -"Se trovi un bug, invialo come <ulink url=\"https://github.com/WinMerge/winmerge/issues\">segnalazione di bug</ulink>.Allega quante più informazioni " -"possibili: come minimo il numero di versione di WinMerge che stai utilizzando.Se puoi, allega anche un registro di configurazione che puoi " -"visualizzare facendo clic su <menuchoice> <guimenu >Aiuto</guimenu > <guimenuitem >Configurazione</guimenuitem > </menuchoice > nella finestra di " -"WinMerge.Buone informazioni in una segnalazione di bug aumentano le probabilità che il bug venga risolto rapidamente." +"If you find a bug, please submit it as a <ulink url=\"https://github.com/" +"WinMerge/winmerge/issues\">bug report</ulink>. Please attach as much " +"information as you can: at a minimum, the version number of WinMerge that " +"you are using. If you can, also attach a configuration log which, you can " +"display by clicking <menuchoice> <guimenu>Help</guimenu> " +"<guimenuitem>Configuration</guimenuitem> </menuchoice> in the WinMerge " +"window. Good information in a bug report makes it more likely that your bug " +"will be fixed quickly." +msgstr "" +"Se trovi un bug, invialo come <ulink url=\"https://github.com/WinMerge/" +"winmerge/issues\">segnalazione di bug</ulink>.Allega quante più informazioni " +"possibili: come minimo il numero di versione di WinMerge che stai " +"utilizzando.Se puoi, allega anche un registro di configurazione che puoi " +"visualizzare facendo clic su <menuchoice> <guimenu >Aiuto</guimenu > " +"<guimenuitem >Configurazione</guimenuitem > </menuchoice > nella finestra di " +"WinMerge.Buone informazioni in una segnalazione di bug aumentano le " +"probabilità che il bug venga risolto rapidamente." #. type: Content of: <article><section><important><para> #: English/Introduction.xml:110 msgid "" -"Include the version number in bug reports. You can check the version number by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>About " +"Include the version number in bug reports. You can check the version number " +"by clicking <menuchoice> <guimenu>Help</guimenu> <guimenuitem>About " "WinMerge</guimenuitem> </menuchoice>." msgstr "" -"Includere il numero di versione nelle segnalazioni di bug.Puoi controllare il numero di versione facendo clic su <menuchoice> <guimenu >Aiuto</" -"guimenu > <guimenuitem >Informazioni su WinMerge</guimenuitem > </menuchoice >." +"Includere il numero di versione nelle segnalazioni di bug.Puoi controllare " +"il numero di versione facendo clic su <menuchoice> <guimenu >Aiuto</guimenu " +"> <guimenuitem >Informazioni su WinMerge</guimenuitem > </menuchoice >." #. type: Content of: <article><section><title><indexterm><primary> #: English/Introduction.xml:121 @@ -15642,35 +20531,51 @@ msgstr "Sviluppo WinMerge" #. type: Content of: <article><section><title> #: English/Introduction.xml:120 -msgid "<placeholder type=\"indexterm\" id=\"0\"/>WinMerge source code and development" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Codice sorgente e sviluppo di WinMerge" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/>WinMerge source code and " +"development" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>Codice sorgente e sviluppo di " +"WinMerge" #. type: Content of: <article><section><para> #: English/Introduction.xml:124 msgid "" -"WinMerge source code is available on our <ulink url=\"https://winmerge.org/source-code/\">website</ulink> and from the <ulink url=\"https://" -"github.com/WinMerge/\">GitHub</ulink> project pages. Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, " -"improve something, and so on, please submit your changes to us as patches or pull requests and help improve this product! If you publish your altered " -"version, you are required to publish the changes to source code too. This is what the <ulink url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</" -"ulink> license is about: please respect it." -msgstr "" -"Il codice sorgente WinMerge è disponibile sul nostro <ulink url=\"https://winmerge.org/source-code/\">sito web</ulink> e dalle pagine del progetto " -"<ulink url=\"https://github.com/WinMerge/\">GitHub</ulink>.Chiunque può scaricare i sorgenti, studiarli e modificarli.Se trovi (e risolvi) bug, " -"migliori qualcosa e così via, inviaci le tue modifiche come patch o richieste pull e aiutaci a migliorare questo prodotto!Se pubblichi la versione " -"modificata, sei tenuto a pubblicare anche le modifiche al codice sorgente.Questo è ciò che riguarda la licenza <ulink url=\"https://www.gnu.org/" -"licenses/gpl-2.0.html\">GPL</ulink>: rispettala." +"WinMerge source code is available on our <ulink url=\"https://winmerge.org/" +"source-code/\">website</ulink> and from the <ulink url=\"https://github.com/" +"WinMerge/\">GitHub</ulink> project pages. Anyone can download the sources, " +"study them, and alter them. If you find (and fix) bugs, improve something, " +"and so on, please submit your changes to us as patches or pull requests and " +"help improve this product! If you publish your altered version, you are " +"required to publish the changes to source code too. This is what the <ulink " +"url=\"https://www.gnu.org/licenses/gpl-2.0.html\">GPL</ulink> license is " +"about: please respect it." +msgstr "" +"Il codice sorgente WinMerge è disponibile sul nostro <ulink url=\"https://" +"winmerge.org/source-code/\">sito web</ulink> e dalle pagine del progetto " +"<ulink url=\"https://github.com/WinMerge/\">GitHub</ulink>.Chiunque può " +"scaricare i sorgenti, studiarli e modificarli.Se trovi (e risolvi) bug, " +"migliori qualcosa e così via, inviaci le tue modifiche come patch o " +"richieste pull e aiutaci a migliorare questo prodotto!Se pubblichi la " +"versione modificata, sei tenuto a pubblicare anche le modifiche al codice " +"sorgente.Questo è ciò che riguarda la licenza <ulink url=\"https://www.gnu." +"org/licenses/gpl-2.0.html\">GPL</ulink>: rispettala." #. type: Content of: <article><section><para> #: English/Introduction.xml:135 msgid "" -"WinMerge development work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when " -"somebody reports them to us. We really try - we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any " -"help with WinMerge, be it testing, documenting, translating, or coding." +"WinMerge development work is done by people in their spare time. Nobody " +"gets paid for improving WinMerge. We try to fix bugs as we find them or when " +"somebody reports them to us. We really try - we use WinMerge too. But there " +"are absolutely no promises for new features. We always appreciate any help " +"with WinMerge, be it testing, documenting, translating, or coding." msgstr "" -"Il lavoro di sviluppo di WinMerge viene svolto dalle persone nel loro tempo libero.Nessuno viene pagato per migliorare WinMerge.Cerchiamo di " -"correggere i bug non appena li troviamo o quando qualcuno ce li segnala.Ci proviamo davvero: usiamo anche WinMerge.Ma non ci sono assolutamente " -"promesse per nuove funzionalità.Apprezziamo sempre qualsiasi aiuto con WinMerge, sia che si tratti di testare, documentare, tradurre o scrivere " -"codice." +"Il lavoro di sviluppo di WinMerge viene svolto dalle persone nel loro tempo " +"libero.Nessuno viene pagato per migliorare WinMerge.Cerchiamo di correggere " +"i bug non appena li troviamo o quando qualcuno ce li segnala.Ci proviamo " +"davvero: usiamo anche WinMerge.Ma non ci sono assolutamente promesse per " +"nuove funzionalità.Apprezziamo sempre qualsiasi aiuto con WinMerge, sia che " +"si tratti di testare, documentare, tradurre o scrivere codice." #. type: Content of: <article><title><indexterm><primary> #: English/Locales.xml:4 @@ -15685,38 +20590,56 @@ msgstr "Supporto locale<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Locales.xml:7 msgid "" -"The WinMerge user interface is in English by default, but you can localize your installation to other languages for which translations have been " -"contributed. Localizing WinMerge changes text strings that are displayed in the interface, including menus, dialogs, tooltips, and messages, to the " +"The WinMerge user interface is in English by default, but you can localize " +"your installation to other languages for which translations have been " +"contributed. Localizing WinMerge changes text strings that are displayed in " +"the interface, including menus, dialogs, tooltips, and messages, to the " "language you choose." msgstr "" -"L'interfaccia utente di WinMerge è in inglese per impostazione predefinita, ma è possibile localizzare l'installazione in altre lingue per le quali " -"sono state fornite traduzioni.La localizzazione di WinMerge modifica le stringhe di testo visualizzate nell'interfaccia, inclusi menu, finestre di " -"dialogo, descrizioni comandi e messaggi, nella lingua scelta." +"L'interfaccia utente di WinMerge è in inglese per impostazione predefinita, " +"ma è possibile localizzare l'installazione in altre lingue per le quali sono " +"state fornite traduzioni.La localizzazione di WinMerge modifica le stringhe " +"di testo visualizzate nell'interfaccia, inclusi menu, finestre di dialogo, " +"descrizioni comandi e messaggi, nella lingua scelta." #. type: Content of: <article><para> #: English/Locales.xml:13 msgid "" -"Note that localization does not extend beyond the translation of strings. For example, it does not affect how numbers are divided or how words are " -"alphabetized. (Those issues should be addressed in the conventional Windows manner by using the Regional settings in the Control Panel.)" +"Note that localization does not extend beyond the translation of strings. " +"For example, it does not affect how numbers are divided or how words are " +"alphabetized. (Those issues should be addressed in the conventional Windows " +"manner by using the Regional settings in the Control Panel.)" msgstr "" -"Tieni presente che la localizzazione non si estende oltre la traduzione delle stringhe.Ad esempio, non influisce sulla suddivisione dei numeri o " -"sull'ordine alfabetico delle parole.(Questi problemi dovrebbero essere risolti nel modo convenzionale di Windows utilizzando le impostazioni " +"Tieni presente che la localizzazione non si estende oltre la traduzione " +"delle stringhe.Ad esempio, non influisce sulla suddivisione dei numeri o " +"sull'ordine alfabetico delle parole.(Questi problemi dovrebbero essere " +"risolti nel modo convenzionale di Windows utilizzando le impostazioni " "internazionali nel Pannello di controllo.)" #. type: Content of: <article><para> #: English/Locales.xml:18 msgid "Localizing your WinMerge installation involves these two basic steps:" -msgstr "La localizzazione dell'installazione di WinMerge prevede questi due passaggi fondamentali:" +msgstr "" +"La localizzazione dell'installazione di WinMerge prevede questi due passaggi " +"fondamentali:" #. type: Content of: <article><orderedlist><listitem><para> #: English/Locales.xml:23 -msgid "<xref linkend=\"Locales_config_files\" />: Make one or more language files available to WinMerge." -msgstr "<xref linkend=\"Locales_config_files\" />: rende disponibili uno o più file di lingua per WinMerge." +msgid "" +"<xref linkend=\"Locales_config_files\" />: Make one or more language files " +"available to WinMerge." +msgstr "" +"<xref linkend=\"Locales_config_files\" />: rende disponibili uno o più file " +"di lingua per WinMerge." #. type: Content of: <article><orderedlist><listitem><para> #: English/Locales.xml:28 -msgid "<xref linkend=\"Locales_changing\" />: Choose one of the configured language files." -msgstr "<xref linkend=\"Locales_changing\" />: Scegli uno dei file di lingua configurati." +msgid "" +"<xref linkend=\"Locales_changing\" />: Choose one of the configured language " +"files." +msgstr "" +"<xref linkend=\"Locales_changing\" />: Scegli uno dei file di lingua " +"configurati." #. type: Content of: <article><section><title> #: English/Locales.xml:34 @@ -15725,60 +20648,81 @@ msgstr "Configurazione della localizzazione" #. type: Content of: <article><section><para> #: English/Locales.xml:36 -msgid "Configuring a localization simply involves making its translation file available to WinMerge, either during or after the installation." -msgstr "Configurare una localizzazione implica semplicemente rendere disponibile il file di traduzione a WinMerge, durante o dopo l'installazione." +msgid "" +"Configuring a localization simply involves making its translation file " +"available to WinMerge, either during or after the installation." +msgstr "" +"Configurare una localizzazione implica semplicemente rendere disponibile il " +"file di traduzione a WinMerge, durante o dopo l'installazione." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:41 msgid "" -"It's easiest to configure a language file during WinMerge installation. The instructions in <xref linkend=\"Installing_usinginstaller\" /> describe " -"how to use the Select Components page to install one or more translation files." +"It's easiest to configure a language file during WinMerge installation. The " +"instructions in <xref linkend=\"Installing_usinginstaller\" /> describe how " +"to use the Select Components page to install one or more translation files." msgstr "" -"È più semplice configurare un file di lingua durante l'installazione di WinMerge.Le istruzioni in <xref linkend=\"Installing_usinginstaller\" /> " -"descrivono come utilizzare la pagina Seleziona componenti per installare uno o più file di traduzione." +"È più semplice configurare un file di lingua durante l'installazione di " +"WinMerge.Le istruzioni in <xref linkend=\"Installing_usinginstaller\" /> " +"descrivono come utilizzare la pagina Seleziona componenti per installare uno " +"o più file di traduzione." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:48 msgid "" -"If you did not configure a language file when you installed WinMerge (or did not use the installer at all), there is no need to re-install WinMerge. " -"You can get the latest translation files from the WinMerge site and configure it yourself:" +"If you did not configure a language file when you installed WinMerge (or did " +"not use the installer at all), there is no need to re-install WinMerge. You " +"can get the latest translation files from the WinMerge site and configure it " +"yourself:" msgstr "" -"Se non hai configurato un file di lingua quando hai installato WinMerge (o non hai utilizzato affatto il programma di installazione), non è " -"necessario reinstallare WinMerge.Puoi ottenere i file di traduzione più recenti dal sito WinMerge e configurarli tu stesso:" +"Se non hai configurato un file di lingua quando hai installato WinMerge (o " +"non hai utilizzato affatto il programma di installazione), non è necessario " +"reinstallare WinMerge.Puoi ottenere i file di traduzione più recenti dal " +"sito WinMerge e configurarli tu stesso:" #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:55 msgid "" -"Create a folder named <filename class=\"directory\" >Languages</filename> under the WinMerge installation directory (where <filename>WinMergeU.exe</" +"Create a folder named <filename class=\"directory\" >Languages</filename> " +"under the WinMerge installation directory (where <filename>WinMergeU.exe</" "filename> is located), if it does not already exist." msgstr "" -"Crea una cartella denominata <filename class=\"cartella\" >Languages</filename> nella cartella di installazione di WinMerge (dove si trova " +"Crea una cartella denominata <filename class=\"cartella\" >Languages</" +"filename> nella cartella di installazione di WinMerge (dove si trova " "<filename>WinMergeU.exe</filename>), se non esiste già." #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:62 msgid "" -"Go to the <ulink url=\"https://winmerge.org/downloads/\">WinMerge download</ulink> site. Download one of the archived binary files (either Zip or 7z " +"Go to the <ulink url=\"https://winmerge.org/downloads/\">WinMerge download</" +"ulink> site. Download one of the archived binary files (either Zip or 7z " "format) for the current WinMerge version, and save it to your file system." msgstr "" -"Vai al sito di <ulink url=\"https://winmerge.org/downloads/\">download di WinMerge</ulink>.Scarica uno dei file binari archiviati (in formato Zip o " +"Vai al sito di <ulink url=\"https://winmerge.org/downloads/\">download di " +"WinMerge</ulink>.Scarica uno dei file binari archiviati (in formato Zip o " "7z) per la versione corrente di WinMerge e salvalo nel tuo file system." #. type: Content of: <article><section><itemizedlist><listitem><orderedlist><listitem><simpara> #: English/Locales.xml:70 msgid "" -"Open the downloaded archive, and locate the <filename>*.po</filename> files, where * is a language (for example, <filename>Swedish.po</filename> for " -"the Swedish translation). Extract the language files you want to the <filename>Languages</filename> subfolder in your WinMerge installation " +"Open the downloaded archive, and locate the <filename>*.po</filename> files, " +"where * is a language (for example, <filename>Swedish.po</filename> for the " +"Swedish translation). Extract the language files you want to the " +"<filename>Languages</filename> subfolder in your WinMerge installation " "directory." msgstr "" -"Apri l'archivio scaricato e individua i file <filename>*.po</filename>, dove * è una lingua (ad esempio, <filename>Swedish.po</filename> per la " -"traduzione svedese).Estrai i file della lingua che desideri nella sottocartella <filename>Languages</filename> nella cartella di installazione di " -"WinMerge." +"Apri l'archivio scaricato e individua i file <filename>*.po</filename>, dove " +"* è una lingua (ad esempio, <filename>Swedish.po</filename> per la " +"traduzione svedese).Estrai i file della lingua che desideri nella " +"sottocartella <filename>Languages</filename> nella cartella di installazione " +"di WinMerge." #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Locales.xml:79 msgid "The language files are now available the next time you run WinMerge." -msgstr "I file della lingua saranno ora disponibili alla successiva esecuzione di WinMerge." +msgstr "" +"I file della lingua saranno ora disponibili alla successiva esecuzione di " +"WinMerge." #. type: Content of: <article><section><title> #: English/Locales.xml:86 @@ -15788,10 +20732,12 @@ msgstr "Modifica della lingua dell'interfaccia di WinMerge" #. type: Content of: <article><section><para> #: English/Locales.xml:88 msgid "" -"If you have configured one or more translation files, as described in the preceding section, you can change the localization of WinMerge to any of " +"If you have configured one or more translation files, as described in the " +"preceding section, you can change the localization of WinMerge to any of " "them:" msgstr "" -"Se hai configurato uno o più file di traduzione, come descritto nella sezione precedente, puoi modificare la localizzazione di WinMerge in uno " +"Se hai configurato uno o più file di traduzione, come descritto nella " +"sezione precedente, puoi modificare la localizzazione di WinMerge in uno " "qualsiasi di essi:" #. type: Content of: <article><section><orderedlist><listitem><simpara> @@ -15801,18 +20747,27 @@ msgstr "Esegui WinMerge." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Locales.xml:98 -msgid "Select <guimenuitem>Options</guimenuitem> from the <guimenu>Edit</guimenu> menu." -msgstr "Seleziona <guimenuitem >Opzioni</guimenuitem > dal menu <guimenu >Modifica</guimenu >." +msgid "" +"Select <guimenuitem>Options</guimenuitem> from the <guimenu>Edit</guimenu> " +"menu." +msgstr "" +"Seleziona <guimenuitem >Opzioni</guimenuitem > dal menu <guimenu >Modifica</" +"guimenu >." #. type: Content of: <article><section><orderedlist><listitem><simpara> #: English/Locales.xml:103 -msgid "Select your language and click <guibutton>OK</guibutton> in the Options dialog General page." -msgstr "Seleziona la tua lingua e fai clic su <guibutton >OK</guibutton > nella pagina Generale della finestra di dialogo Opzioni." +msgid "" +"Select your language and click <guibutton>OK</guibutton> in the Options " +"dialog General page." +msgstr "" +"Seleziona la tua lingua e fai clic su <guibutton >OK</guibutton > nella " +"pagina Generale della finestra di dialogo Opzioni." #. type: Content of: <article><section><para> #: English/Locales.xml:108 msgid "The language of the WinMerge user interface is instantly updated." -msgstr "La lingua dell'interfaccia utente WinMerge viene aggiornata immediatamente." +msgstr "" +"La lingua dell'interfaccia utente WinMerge viene aggiornata immediatamente." #. type: Content of: <article><section><title><indexterm><primary> #: English/Locales.xml:114 @@ -15821,13 +20776,19 @@ msgstr "localizzazioni, disponibili" #. type: Content of: <article><section><title> #: English/Locales.xml:113 -msgid "Available WinMerge localizations<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Localizzazioni WinMerge disponibili<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Available WinMerge localizations<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Localizzazioni WinMerge disponibili<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:117 -msgid "WinMerge localizations contributed to date include the following translations:" -msgstr "Le localizzazioni WinMerge fornite fino ad oggi includono le seguenti traduzioni:" +msgid "" +"WinMerge localizations contributed to date include the following " +"translations:" +msgstr "" +"Le localizzazioni WinMerge fornite fino ad oggi includono le seguenti " +"traduzioni:" #. type: Content of: <article><section><itemizedlist><listitem><simpara> #: English/Locales.xml:122 @@ -16026,17 +20987,23 @@ msgstr "traduzioni, segnalazione errori" #. type: Content of: <article><section><title> #: English/Locales.xml:276 -msgid "Reporting errors in translation<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Segnalazione errori di traduzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Reporting errors in translation<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Segnalazione errori di traduzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:280 msgid "" -"Please submit any errors you find in translations as bugs to our <ulink url=\"https://github.com/WinMerge/winmerge/issues\">bug-list</ulink>. It " -"would be great if you also provide a corrected version of the translated text." +"Please submit any errors you find in translations as bugs to our <ulink " +"url=\"https://github.com/WinMerge/winmerge/issues\">bug-list</ulink>. It " +"would be great if you also provide a corrected version of the translated " +"text." msgstr "" -"Ti preghiamo di inviare eventuali errori che trovi nelle traduzioni come bug al nostro <ulink url=\"https://github.com/WinMerge/winmerge/" -"issues\">elenco dei bug</ulink>.Sarebbe fantastico se fornissi anche una versione corretta del testo tradotto." +"Ti preghiamo di inviare eventuali errori che trovi nelle traduzioni come bug " +"al nostro <ulink url=\"https://github.com/WinMerge/winmerge/issues\">elenco " +"dei bug</ulink>.Sarebbe fantastico se fornissi anche una versione corretta " +"del testo tradotto." #. type: Content of: <article><section><title><indexterm><primary> #: English/Locales.xml:289 @@ -16046,21 +21013,31 @@ msgstr "invio di traduzioni" #. type: Content of: <article><section><title> #: English/Locales.xml:288 msgid "Submitting a new translation<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Invio di una nuova traduzione<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Invio di una nuova traduzione<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Locales.xml:292 msgid "" -"If you would like to add your language to the list, then please read the <ulink url=\"https://winmerge.org/translations/\">translation documentation</" -"ulink> on the WinMerge Web site to learn how. Most of the translations are incomplete, so your help improving them would be appreciated. Translating " -"(or improving translation) does not require you to have all the compile tools or to know about WinMerge internals. You just need to follow the " -"instructions in the preceding link. And if you have problems, ask for help from us in one of the <ulink url=\"https://forums.winmerge.org/\">WinMerge " +"If you would like to add your language to the list, then please read the " +"<ulink url=\"https://winmerge.org/translations/\">translation documentation</" +"ulink> on the WinMerge Web site to learn how. Most of the translations are " +"incomplete, so your help improving them would be appreciated. Translating " +"(or improving translation) does not require you to have all the compile " +"tools or to know about WinMerge internals. You just need to follow the " +"instructions in the preceding link. And if you have problems, ask for help " +"from us in one of the <ulink url=\"https://forums.winmerge.org/\">WinMerge " "forums</ulink>." msgstr "" -"Se desideri aggiungere la tua lingua all'elenco, leggi la <ulink url=\"https://winmerge.org/translations/\">documentazione di traduzione</ulink> sul " -"sito Web WinMerge per sapere come.La maggior parte delle traduzioni sono incomplete, quindi il tuo aiuto per migliorarle sarebbe apprezzato.Tradurre " -"(o migliorare la traduzione) non richiede di avere tutti gli strumenti di compilazione o di conoscere gli interni di WinMerge.Devi solo seguire le " -"istruzioni nel link precedente.E se hai problemi, chiedi aiuto a noi in uno dei <ulink url=\"https://forums.winmerge.org/\">forum WinMerge</ulink>." +"Se desideri aggiungere la tua lingua all'elenco, leggi la <ulink " +"url=\"https://winmerge.org/translations/\">documentazione di traduzione</" +"ulink> sul sito Web WinMerge per sapere come.La maggior parte delle " +"traduzioni sono incomplete, quindi il tuo aiuto per migliorarle sarebbe " +"apprezzato.Tradurre (o migliorare la traduzione) non richiede di avere tutti " +"gli strumenti di compilazione o di conoscere gli interni di WinMerge.Devi " +"solo seguire le istruzioni nel link precedente.E se hai problemi, chiedi " +"aiuto a noi in uno dei <ulink url=\"https://forums.winmerge.org/\">forum " +"WinMerge</ulink>." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:4 English/Quick_start.xml:207 @@ -16080,10 +21057,12 @@ msgstr "file" #. type: Content of: <article><para> #: English/Open_paths.xml:7 msgid "" -"WinMerge provides several ways to specify paths and open files or folders:<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"WinMerge provides several ways to specify paths and open files or folders:" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " "id=\"1\"/>" msgstr "" -"WinMerge offre diversi modi per specificare percorsi e aprire file o cartelle:<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"WinMerge offre diversi modi per specificare percorsi e aprire file o " +"cartelle:<placeholder type=\"indexterm\" id=\"0\"/><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><itemizedlist><listitem><para> @@ -16108,17 +21087,23 @@ msgstr "<xref linkend=\"OpenPaths_project\" />" #. type: Content of: <article><section><title> #: English/Open_paths.xml:37 -msgid "Select Files or Folders dialog<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Seleziona la finestra di dialogo File o Cartelle<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Select Files or Folders dialog<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Seleziona la finestra di dialogo File o Cartelle<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Open_paths.xml:41 msgid "" -"<xref linkend=\"Quick_start\" /> describes the Select Files or Folders dialog. This section provides more details, and some tips for using the Select " -"Files or Folders dialog more efficiently." +"<xref linkend=\"Quick_start\" /> describes the Select Files or Folders " +"dialog. This section provides more details, and some tips for using the " +"Select Files or Folders dialog more efficiently." msgstr "" -"<xref linkend=\"Quick_start\" /> descrive la finestra di dialogo Seleziona file o cartelle.Questa sezione fornisce ulteriori dettagli e alcuni " -"suggerimenti per utilizzare la finestra di dialogo Seleziona file o cartelle in modo più efficiente." +"<xref linkend=\"Quick_start\" /> descrive la finestra di dialogo Seleziona " +"file o cartelle.Questa sezione fornisce ulteriori dettagli e alcuni " +"suggerimenti per utilizzare la finestra di dialogo Seleziona file o cartelle " +"in modo più efficiente." #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Open_paths.xml:47 @@ -16128,18 +21113,26 @@ msgstr "variabili di ambiente, nel confronto dei percorsi target" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:46 msgid "Using environment variables<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzo delle variabili di ambiente<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Utilizzo delle variabili di ambiente<placeholder type=\"indexterm\" id=\"0\"/" +">" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:50 msgid "" -"You can use environment variables in your paths. Windows expands the variable name between % (percent) delimiters. For example, if an environment " -"variable named <envar>WORKDIR</envar> has the value <filename class=\"directory\">c:\\workfiles</filename>, then the path <envar>%WORKDIR%\\project1</" -"envar> is expanded to <filename class=\"directory\">c:\\workfiles\\project1</filename> ." +"You can use environment variables in your paths. Windows expands the " +"variable name between % (percent) delimiters. For example, if an environment " +"variable named <envar>WORKDIR</envar> has the value <filename " +"class=\"directory\">c:\\workfiles</filename>, then the path <envar>%WORKDIR%" +"\\project1</envar> is expanded to <filename class=\"directory\">c:" +"\\workfiles\\project1</filename> ." msgstr "" -"Puoi utilizzare variabili di ambiente nei tuoi percorsi. Windows espande il nome della variabile tra i delimitatori % (percentuale).Ad esempio, se " -"una variabile di ambiente denominata <envar>WORKDIR</envar> ha il valore <filename class=\"directory\">c:\\workfiles</filename>, il percorso " -"<envar>%WORKDIR%\\project1</envar> viene espanso in <filename class=\"directory\">c:\\workfiles\\project1</filename> ." +"Puoi utilizzare variabili di ambiente nei tuoi percorsi. Windows espande il " +"nome della variabile tra i delimitatori % (percentuale).Ad esempio, se una " +"variabile di ambiente denominata <envar>WORKDIR</envar> ha il valore " +"<filename class=\"directory\">c:\\workfiles</filename>, il percorso " +"<envar>%WORKDIR%\\project1</envar> viene espanso in <filename " +"class=\"directory\">c:\\workfiles\\project1</filename> ." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:62 @@ -16149,43 +21142,61 @@ msgstr "apertura" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:59 msgid "Opening archive files<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Apertura dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Apertura dei file di archivio<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:65 -msgid "WinMerge archive support is provided in the 7-Zip plugin. See <xref linkend=\"Install\" /> to install this plugin." -msgstr "Il supporto per l'archivio WinMerge è fornito nel plugin 7-Zip.Vedi <xref linkend=\"Install\" /> per installare questo plugin." +msgid "" +"WinMerge archive support is provided in the 7-Zip plugin. See <xref " +"linkend=\"Install\" /> to install this plugin." +msgstr "" +"Il supporto per l'archivio WinMerge è fornito nel plugin 7-Zip.Vedi <xref " +"linkend=\"Install\" /> per installare questo plugin." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:68 msgid "" -"Opening two archive files is similar to opening normal files: specify two archive files in the Open-dialog's <guilabel>1st</guilabel> and " -"<guilabel>2nd</guilabel> fields. If WinMerge recognizes the archive format, it opens the contents of the archive files in the Folder Compare window." +"Opening two archive files is similar to opening normal files: specify two " +"archive files in the Open-dialog's <guilabel>1st</guilabel> and " +"<guilabel>2nd</guilabel> fields. If WinMerge recognizes the archive format, " +"it opens the contents of the archive files in the Folder Compare window." msgstr "" -"L'apertura di due file di archivio è simile all'apertura di file normali: specifica due file di archivio nei campi <guilabel >1°</guilabel > e " -"<guilabel >2°</guilabel > della finestra di dialogo Apri.Se WinMerge riconosce il formato di archivio, apre il contenuto dei file di archivio nella " -"finestra Confronto cartelle." +"L'apertura di due file di archivio è simile all'apertura di file normali: " +"specifica due file di archivio nei campi <guilabel >1°</guilabel > e " +"<guilabel >2°</guilabel > della finestra di dialogo Apri.Se WinMerge " +"riconosce il formato di archivio, apre il contenuto dei file di archivio " +"nella finestra Confronto cartelle." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:74 msgid "" -"The <xref linkend=\"Compare_dirs\" /> topic describes how to work with archive files. For example, if an archive file contains two subfolders named " -"<filename class=\"directory\">Original/</filename> and <filename class=\"directory\">Altered/</filename>, you can compare the contents of the two " -"subfolders by specifying the same archive file in both sides in the Select Files or Folders dialog or WinMerge command line." -msgstr "" -"L'argomento <xref linkend=\"Compare_dirs\" /> descrive come lavorare con i file di archivio. Ad esempio, se un file di archivio contiene due " -"sottocartelle denominate <filename class=\"directory\">Originale/</filename> e <filename class=\"directory\">Altered/</filename>, è possibile " -"confrontare il contenuto delle due sottocartelle specificando lo stesso file di archivio su entrambi i lati nella finestra di dialogo Seleziona file " -"o cartelle o nella riga di comando di WinMerge." +"The <xref linkend=\"Compare_dirs\" /> topic describes how to work with " +"archive files. For example, if an archive file contains two subfolders named " +"<filename class=\"directory\">Original/</filename> and <filename " +"class=\"directory\">Altered/</filename>, you can compare the contents of the " +"two subfolders by specifying the same archive file in both sides in the " +"Select Files or Folders dialog or WinMerge command line." +msgstr "" +"L'argomento <xref linkend=\"Compare_dirs\" /> descrive come lavorare con i " +"file di archivio. Ad esempio, se un file di archivio contiene due " +"sottocartelle denominate <filename class=\"directory\">Originale/</filename> " +"e <filename class=\"directory\">Altered/</filename>, è possibile confrontare " +"il contenuto delle due sottocartelle specificando lo stesso file di archivio " +"su entrambi i lati nella finestra di dialogo Seleziona file o cartelle o " +"nella riga di comando di WinMerge." #. type: Content of: <article><section><section><tip><para> #: English/Open_paths.xml:82 msgid "" -"When you drag an archive file to the WinMerge window, press <keycap>Shift</keycap> when dropping the file: WinMerge automatically copies the same " +"When you drag an archive file to the WinMerge window, press <keycap>Shift</" +"keycap> when dropping the file: WinMerge automatically copies the same " "filename to both sides and opens the archive file." msgstr "" -"Quando trascini un file di archivio nella finestra WinMerge, premi <keycap>Shift</keycap> quando rilasci il file: WinMerge copia automaticamente lo " -"stesso nome file su entrambi i lati e apre il file di archivio." +"Quando trascini un file di archivio nella finestra WinMerge, premi " +"<keycap>Shift</keycap> quando rilasci il file: WinMerge copia " +"automaticamente lo stesso nome file su entrambi i lati e apre il file di " +"archivio." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:93 @@ -16200,20 +21211,25 @@ msgstr "Applicazione dei filtri<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:96 msgid "" -"The <guilabel>Filter</guilabel> edit field enables you to restrict the files to be included in your folder compare. You can specify one or more file " +"The <guilabel>Filter</guilabel> edit field enables you to restrict the files " +"to be included in your folder compare. You can specify one or more file " "masks, or a single file filter (not both)." msgstr "" -"Il campo di modifica <guilabel >Filtro</guilabel > ti consente di limitare i file da includere nel confronto delle cartelle.È possibile specificare " -"una o più maschere di file o un singolo filtro di file (non entrambi)." +"Il campo di modifica <guilabel >Filtro</guilabel > ti consente di limitare i " +"file da includere nel confronto delle cartelle.È possibile specificare una o " +"più maschere di file o un singolo filtro di file (non entrambi)." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:100 msgid "" -"A mask is a simple expression based on file extensions. For example, this list of file masks includes only files with the specified extensions; all " +"A mask is a simple expression based on file extensions. For example, this " +"list of file masks includes only files with the specified extensions; all " "others are excluded from the selection when the compare operation starts:" msgstr "" -"Una maschera è una semplice espressione basata sulle estensioni dei file.Ad esempio, questo elenco di maschere di file include solo i file con le " -"estensioni specificate;tutti gli altri vengono esclusi dalla selezione all'avvio dell'operazione di confronto:" +"Una maschera è una semplice espressione basata sulle estensioni dei file.Ad " +"esempio, questo elenco di maschere di file include solo i file con le " +"estensioni specificate;tutti gli altri vengono esclusi dalla selezione " +"all'avvio dell'operazione di confronto:" #. type: Content of: <article><section><section><screen> #: English/Open_paths.xml:105 @@ -16224,27 +21240,39 @@ msgstr "*.h;*.cpp;*.txt,*.ini" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:107 msgid "" -"File masks are practical for simple filtering; for more advanced selecting, use filter files. Filter files are collections of regular expressions " -"that can either include or exclude files. WinMerge installs a number of predefined filter files in its <filename>Filters</filename> folder, and you " +"File masks are practical for simple filtering; for more advanced selecting, " +"use filter files. Filter files are collections of regular expressions that " +"can either include or exclude files. WinMerge installs a number of " +"predefined filter files in its <filename>Filters</filename> folder, and you " "can create your own, too." msgstr "" -"Le maschere dei file sono pratiche per un semplice filtraggio;per una selezione più avanzata, utilizzare i file filtro.I file filtro sono raccolte di " -"espressioni regolari che possono includere o escludere file.WinMerge installa una serie di file di filtro predefiniti nella sua cartella " +"Le maschere dei file sono pratiche per un semplice filtraggio;per una " +"selezione più avanzata, utilizzare i file filtro.I file filtro sono raccolte " +"di espressioni regolari che possono includere o escludere file.WinMerge " +"installa una serie di file di filtro predefiniti nella sua cartella " "<filename>Filters</filename> e puoi anche crearne di tuoi." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:113 msgid "" -"To specify a filter, click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</guilabel> field to choose from a list of available " -"filters. Or, click the Filter drop-down list and choose a recently-used filter file." +"To specify a filter, click the <guibutton>Select</guibutton> button next to " +"the <guilabel>Filters</guilabel> field to choose from a list of available " +"filters. Or, click the Filter drop-down list and choose a recently-used " +"filter file." msgstr "" -"Per specificare un filtro, fai clic sul pulsante <guibutton >Seleziona</guibutton > accanto al campo <guilabel >Filtri</guilabel > per scegliere da " -"un elenco di filtri disponibili.Oppure fai clic sull'elenco a discesa Filtro e scegli un file di filtro utilizzato di recente." +"Per specificare un filtro, fai clic sul pulsante <guibutton >Seleziona</" +"guibutton > accanto al campo <guilabel >Filtri</guilabel > per scegliere da " +"un elenco di filtri disponibili.Oppure fai clic sull'elenco a discesa Filtro " +"e scegli un file di filtro utilizzato di recente." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:118 -msgid "For full information about filter masks and filter files, see <xref linkend=\"Filters\" />." -msgstr "Per informazioni complete sulle maschere di filtro e sui file di filtro, vedi <xref linkend=\"Filters\" />." +msgid "" +"For full information about filter masks and filter files, see <xref " +"linkend=\"Filters\" />." +msgstr "" +"Per informazioni complete sulle maschere di filtro e sui file di filtro, " +"vedi <xref linkend=\"Filters\" />." #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> #: English/Open_paths.xml:124 English/Plugins.xml:54 @@ -16253,36 +21281,49 @@ msgstr "plugin di decompressione" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:123 -msgid "Selecting an unpacker for file comparisons<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Selezione di un programma di decompressione per i confronti di file<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Selecting an unpacker for file comparisons<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Selezione di un programma di decompressione per i confronti di " +"file<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:127 msgid "" -"Unpackers are plugins that are installed with WinMerge to provide functionality that is not used by default. Plugins that can be used to preprocess " -"certain types of files before comparing them. For example, WinMerge cannot normally compare MS Word doc files, but by unpacking them, you can compare " -"just the text contents. See <xref linkend=\"Plugins\" /> for details." +"Unpackers are plugins that are installed with WinMerge to provide " +"functionality that is not used by default. Plugins that can be used to " +"preprocess certain types of files before comparing them. For example, " +"WinMerge cannot normally compare MS Word doc files, but by unpacking them, " +"you can compare just the text contents. See <xref linkend=\"Plugins\" /> for " +"details." msgstr "" -"Gli unpacker sono plugin installati con WinMerge per fornire funzionalità non utilizzate per impostazione predefinita.Plugin che possono essere " -"utilizzati per preelaborare determinati tipi di file prima di confrontarli.Ad esempio, WinMerge normalmente non può confrontare i file doc di MS " -"Word, ma decomprimendoli è possibile confrontare solo il contenuto del testo.Vedi <xref linkend=\"Plugins\" /> per i dettagli." +"Gli unpacker sono plugin installati con WinMerge per fornire funzionalità " +"non utilizzate per impostazione predefinita.Plugin che possono essere " +"utilizzati per preelaborare determinati tipi di file prima di confrontarli." +"Ad esempio, WinMerge normalmente non può confrontare i file doc di MS Word, " +"ma decomprimendoli è possibile confrontare solo il contenuto del testo.Vedi " +"<xref linkend=\"Plugins\" /> per i dettagli." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:134 msgid "" -"To apply a plugin to your file comparison, click the <guibutton>Select</guibutton> button for the <guilabel>Unpacker</guilabel> option. In the Select " -"Unpacker dialog:" +"To apply a plugin to your file comparison, click the <guibutton>Select</" +"guibutton> button for the <guilabel>Unpacker</guilabel> option. In the " +"Select Unpacker dialog:" msgstr "" -"Per applicare un plugin al confronto dei file, fai clic sul pulsante <guibutton >Seleziona</guibutton > per l'opzione <guilabel >Unpacker</guilabel " -">.Nella finestra di dialogo Seleziona decompressore:" +"Per applicare un plugin al confronto dei file, fai clic sul pulsante " +"<guibutton >Seleziona</guibutton > per l'opzione <guilabel >Unpacker</" +"guilabel >.Nella finestra di dialogo Seleziona decompressore:" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:142 msgid "" -"Your choice is displayed in the <guilabel>Unpacker</guilabel> field. Note that you cannot select an unpacker when launching a Folder Compare " -"operation." +"Your choice is displayed in the <guilabel>Unpacker</guilabel> field. Note " +"that you cannot select an unpacker when launching a Folder Compare operation." msgstr "" -"La tua scelta verrà visualizzata nel campo <guilabel >Unpacker</guilabel >.Tieni presente che non è possibile selezionare un programma di " +"La tua scelta verrà visualizzata nel campo <guilabel >Unpacker</guilabel >." +"Tieni presente che non è possibile selezionare un programma di " "decompressione quando si avvia un'operazione di confronto cartelle." #. type: Content of: <article><section><title><indexterm><primary> @@ -16292,17 +21333,23 @@ msgstr "menu contestuale, scorciatoie WinMerge in Esplora risorse" #. type: Content of: <article><section><title> #: English/Open_paths.xml:149 -msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Launching WinMerge operations in Windows Explorer" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Avvio delle operazioni WinMerge in Esplora risorse" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>Launching WinMerge operations in Windows Explorer" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"id=\"1\"/>Avvio delle operazioni WinMerge in Esplora risorse" #. type: Content of: <article><section><para> #: English/Open_paths.xml:155 msgid "" -"The optional Windows shell integration enables you to run WinMerge compare operations directly from Windows Explorer, using WinMerge shortcuts in the " +"The optional Windows shell integration enables you to run WinMerge compare " +"operations directly from Windows Explorer, using WinMerge shortcuts in the " "context menu." msgstr "" -"L'integrazione opzionale della shell di Windows consente di eseguire operazioni di confronto WinMerge direttamente da Esplora risorse, utilizzando i " -"collegamenti WinMerge nel menu contestuale." +"L'integrazione opzionale della shell di Windows consente di eseguire " +"operazioni di confronto WinMerge direttamente da Esplora risorse, " +"utilizzando i collegamenti WinMerge nel menu contestuale." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:162 @@ -16312,13 +21359,20 @@ msgstr "Abilitazione dell'integrazione di Esplora risorse" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:164 msgid "" -"The Windows Explorer shell integration is available only if enabled. You can enable it either <link linkend=\"Installing_usinginstaller\">during " -"WinMerge installation</link> or later, using the <xref linkend=\"Configuration_shell-integ\" /> in the Options window. In the Options window, " -"configure the <option>Add to context menu</option> option, including its suboptions if you like." -msgstr "" -"L'integrazione della shell di Windows Explorer è disponibile solo se abilitata.Puoi abilitarlo <link linkend=\"Installing_usinginstaller\">durante " -"l'installazione di WinMerge</link> o successivamente, utilizzando <xref linkend=\"Configuration_shell-integ\" /> nella finestra Opzioni.Nella " -"finestra Opzioni, configura l'opzione <option>Aggiungi al menu contestuale</option>, incluse le sue opzioni secondarie, se lo desideri." +"The Windows Explorer shell integration is available only if enabled. You " +"can enable it either <link linkend=\"Installing_usinginstaller\">during " +"WinMerge installation</link> or later, using the <xref " +"linkend=\"Configuration_shell-integ\" /> in the Options window. In the " +"Options window, configure the <option>Add to context menu</option> option, " +"including its suboptions if you like." +msgstr "" +"L'integrazione della shell di Windows Explorer è disponibile solo se " +"abilitata.Puoi abilitarlo <link " +"linkend=\"Installing_usinginstaller\">durante l'installazione di WinMerge</" +"link> o successivamente, utilizzando <xref linkend=\"Configuration_shell-" +"integ\" /> nella finestra Opzioni.Nella finestra Opzioni, configura " +"l'opzione <option>Aggiungi al menu contestuale</option>, incluse le sue " +"opzioni secondarie, se lo desideri." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:173 @@ -16328,25 +21382,33 @@ msgstr "Utilizzando il collegamento WinMerge" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:175 msgid "" -"If you enable <option>Add to context menu</option> without the advanced menu suboption, the <guimenuitem>WinMerge</guimenuitem> shortcut is added to " -"the Explorer context menu. For example:" +"If you enable <option>Add to context menu</option> without the advanced menu " +"suboption, the <guimenuitem>WinMerge</guimenuitem> shortcut is added to the " +"Explorer context menu. For example:" msgstr "" -"Se abiliti <option >Aggiungi al menu contestuale</option > senza l'opzione secondaria del menu avanzato, la scorciatoia <guimenuitem >WinMerge</" +"Se abiliti <option >Aggiungi al menu contestuale</option > senza l'opzione " +"secondaria del menu avanzato, la scorciatoia <guimenuitem >WinMerge</" "guimenuitem > verrà aggiunta al menu contestuale di Explorer.Per esempio:" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:179 msgid "" -"To use the basic shell integration, begin by selecting two paths in Windows Explorer. Then, right-click and choose WinMerge in the context menu. For " +"To use the basic shell integration, begin by selecting two paths in Windows " +"Explorer. Then, right-click and choose WinMerge in the context menu. For " "example:" msgstr "" -"Per utilizzare l'integrazione di base della shell, iniziare selezionando due percorsi in Esplora risorse.Quindi, fai clic con il pulsante destro del " +"Per utilizzare l'integrazione di base della shell, iniziare selezionando due " +"percorsi in Esplora risorse.Quindi, fai clic con il pulsante destro del " "mouse e scegli WinMerge nel menu contestuale.Per esempio:" #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:184 -msgid "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_simple.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:189 @@ -16355,37 +21417,55 @@ msgstr "Comando WinMerge nel menu contestuale di Windows Explorer" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:193 -msgid "WinMerge opens the paths directly in the File Compare or Folder Compare window." -msgstr "WinMerge apre i percorsi direttamente nella finestra Confronta file o Confronta cartelle." +msgid "" +"WinMerge opens the paths directly in the File Compare or Folder Compare " +"window." +msgstr "" +"WinMerge apre i percorsi direttamente nella finestra Confronta file o " +"Confronta cartelle." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:196 msgid "" -"The left and right sides are determined by the sort order in Windows Explorer. In the preceding screenshot, the Windows Explorer file list is in " -"ascending order, so WinMerge opens with <filename>File2</filename> on the 1st side and <filename>File1</filename> on the 2nd.." +"The left and right sides are determined by the sort order in Windows " +"Explorer. In the preceding screenshot, the Windows Explorer file list is in " +"ascending order, so WinMerge opens with <filename>File2</filename> on the " +"1st side and <filename>File1</filename> on the 2nd.." msgstr "" -"I lati sinistro e destro sono determinati dall'ordinamento in Esplora risorse.Nello screenshot precedente, l'elenco dei file di Esplora risorse è in " -"ordine crescente, quindi WinMerge si apre con <filename>File2</filename> sul 1° lato e <filename>File1</filename> sul 2°." +"I lati sinistro e destro sono determinati dall'ordinamento in Esplora " +"risorse.Nello screenshot precedente, l'elenco dei file di Esplora risorse è " +"in ordine crescente, quindi WinMerge si apre con <filename>File2</filename> " +"sul 1° lato e <filename>File1</filename> sul 2°." #. type: Content of: <article><section><section><note><para> #: English/Open_paths.xml:202 msgid "" -"If either path cannot be opened for any reason, WinMerge opens the Select Files or Folders dialog, where you can specify new paths. Similarly, if " -"you select only a single path, the Select Files or Folders dialog opens with the selected file or folder in the <guilabel>1st</guilabel> field, " -"leaving the <guilabel>2nd</guilabel> path for you to specify." +"If either path cannot be opened for any reason, WinMerge opens the Select " +"Files or Folders dialog, where you can specify new paths. Similarly, if you " +"select only a single path, the Select Files or Folders dialog opens with the " +"selected file or folder in the <guilabel>1st</guilabel> field, leaving the " +"<guilabel>2nd</guilabel> path for you to specify." msgstr "" -"Se per qualsiasi motivo non è possibile aprire uno dei percorsi, WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " -"specificare nuovi percorsi.Allo stesso modo, se selezioni un solo percorso, la finestra di dialogo Seleziona file o cartelle si apre con il file o la " -"cartella selezionati nel campo <guilabel >1°</guilabel >, lasciando il percorso <guilabel >2°</guilabel > da specificare." +"Se per qualsiasi motivo non è possibile aprire uno dei percorsi, WinMerge " +"apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " +"specificare nuovi percorsi.Allo stesso modo, se selezioni un solo percorso, " +"la finestra di dialogo Seleziona file o cartelle si apre con il file o la " +"cartella selezionati nel campo <guilabel >1°</guilabel >, lasciando il " +"percorso <guilabel >2°</guilabel > da specificare." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:210 msgid "" -"The <guimenuitem>WinMerge</guimenuitem> shortcut is quick and easy to use, but you can compare only files or folders that you are able to select " -"concurrently in Windows Explorer. For more flexible selections, consider enabling the advanced menu, described in the next section." +"The <guimenuitem>WinMerge</guimenuitem> shortcut is quick and easy to use, " +"but you can compare only files or folders that you are able to select " +"concurrently in Windows Explorer. For more flexible selections, consider " +"enabling the advanced menu, described in the next section." msgstr "" -"La scorciatoia <guimenuitem >WinMerge</guimenuitem > è veloce e facile da usare, ma puoi confrontare solo i file o le cartelle che puoi selezionare " -"contemporaneamente in Esplora risorse.Per selezioni più flessibili, considera l'attivazione del menu avanzato, descritto nella sezione successiva." +"La scorciatoia <guimenuitem >WinMerge</guimenuitem > è veloce e facile da " +"usare, ma puoi confrontare solo i file o le cartelle che puoi selezionare " +"contemporaneamente in Esplora risorse.Per selezioni più flessibili, " +"considera l'attivazione del menu avanzato, descritto nella sezione " +"successiva." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:217 @@ -16395,16 +21475,22 @@ msgstr "Utilizzando il menu avanzato" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:219 msgid "" -"If you choose the <option>Enable advanced menu</option>, the <guimenuitem>WinMerge</guimenuitem> shortcut is replaced with two <guimenuitem>Compare</" -"guimenuitem> shortcuts:" +"If you choose the <option>Enable advanced menu</option>, the " +"<guimenuitem>WinMerge</guimenuitem> shortcut is replaced with two " +"<guimenuitem>Compare</guimenuitem> shortcuts:" msgstr "" -"Se scegli <option >Abilita menu avanzato</option >, la scorciatoia <guimenuitem >WinMerge</guimenuitem > sarà sostituita con due scorciatoie " +"Se scegli <option >Abilita menu avanzato</option >, la scorciatoia " +"<guimenuitem >WinMerge</guimenuitem > sarà sostituita con due scorciatoie " "<guimenuitem >Confronta</guimenuitem >:" #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:224 -msgid "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/ctx_menu_advanced.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:229 @@ -16414,67 +21500,96 @@ msgstr "Menu contestuale avanzato di WinMerge" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:233 msgid "Use the <guimenuitem>Compare</guimenuitem> shortcuts in this order:" -msgstr "Usa le scorciatoie <guimenuitem >Confronta</guimenuitem > in questo ordine:" +msgstr "" +"Usa le scorciatoie <guimenuitem >Confronta</guimenuitem > in questo ordine:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:238 msgid "" -"Right-click the first path and choose <guimenuitem>Compare To</guimenuitem>. WinMerge stores the path in memory until you select the second path." +"Right-click the first path and choose <guimenuitem>Compare To</guimenuitem>. " +"WinMerge stores the path in memory until you select the second path." msgstr "" -"Fai clic con il pulsante destro del mouse sul primo percorso e scegli <guimenuitem >Confronta con</guimenuitem >.WinMerge memorizza il percorso in " +"Fai clic con il pulsante destro del mouse sul primo percorso e scegli " +"<guimenuitem >Confronta con</guimenuitem >.WinMerge memorizza il percorso in " "memoria finché non si seleziona il secondo percorso." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:244 -msgid "If you decide that you have chosen the wrong first path, you can change it before choosing the second path:" -msgstr "Se decidi di aver scelto la prima strada sbagliata, puoi cambiarla prima di scegliere la seconda strada:" +msgid "" +"If you decide that you have chosen the wrong first path, you can change it " +"before choosing the second path:" +msgstr "" +"Se decidi di aver scelto la prima strada sbagliata, puoi cambiarla prima di " +"scegliere la seconda strada:" #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:247 msgid "" -"Right-click the new path and choose the <guimenuitem>Re-select First</guimenuitem> shortcut. The new selection overrides your previous path, and you " -"can go on to the next step." +"Right-click the new path and choose the <guimenuitem>Re-select First</" +"guimenuitem> shortcut. The new selection overrides your previous path, and " +"you can go on to the next step." msgstr "" -"Fai clic con il pulsante destro del mouse sul nuovo percorso e scegli la scorciatoia <guimenuitem >Riseleziona primo</guimenuitem >.La nuova " -"selezione sovrascrive il percorso precedente e puoi procedere al passaggio successivo." +"Fai clic con il pulsante destro del mouse sul nuovo percorso e scegli la " +"scorciatoia <guimenuitem >Riseleziona primo</guimenuitem >.La nuova " +"selezione sovrascrive il percorso precedente e puoi procedere al passaggio " +"successivo." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:253 msgid "" -"Navigate to the second file or folder that you want to compare. The second path can be in any folder, or even in a different Windows Explorer window " -"from the first path. Right-click the second path and choose <guimenuitem>Compare</guimenuitem>." +"Navigate to the second file or folder that you want to compare. The second " +"path can be in any folder, or even in a different Windows Explorer window " +"from the first path. Right-click the second path and choose " +"<guimenuitem>Compare</guimenuitem>." msgstr "" -"Passare al secondo file o cartella che si desidera confrontare.Il secondo percorso può trovarsi in qualsiasi cartella o anche in una finestra di " -"Esplora risorse diversa dal primo percorso.Fai clic con il pulsante destro del mouse sul secondo percorso e scegli <guimenuitem >Confronta</" -"guimenuitem >." +"Passare al secondo file o cartella che si desidera confrontare.Il secondo " +"percorso può trovarsi in qualsiasi cartella o anche in una finestra di " +"Esplora risorse diversa dal primo percorso.Fai clic con il pulsante destro " +"del mouse sul secondo percorso e scegli <guimenuitem >Confronta</guimenuitem " +">." #. type: Content of: <article><section><section><orderedlist><listitem><para> #: English/Open_paths.xml:258 -msgid "WinMerge opens the File Compare or Folder Compare window, loading the first and second paths in the 1st and 2nd sides, respectively." -msgstr "WinMerge apre la finestra Confronta file o Confronta cartelle, caricando il primo e il secondo percorso rispettivamente nel 1° e nel 2° lato." +msgid "" +"WinMerge opens the File Compare or Folder Compare window, loading the first " +"and second paths in the 1st and 2nd sides, respectively." +msgstr "" +"WinMerge apre la finestra Confronta file o Confronta cartelle, caricando il " +"primo e il secondo percorso rispettivamente nel 1° e nel 2° lato." #. type: Content of: <article><section><section><note><para> #: English/Open_paths.xml:265 msgid "" -"If you click <guimenuitem>Compare</guimenuitem> before designating the first path, the Select Files or Folders dialog is opened, with your selection " -"as the first (<guilabel>1st</guilabel>) path. Specify the second path in the <guilabel>2nd</guilabel> field to continue with the comparison." +"If you click <guimenuitem>Compare</guimenuitem> before designating the first " +"path, the Select Files or Folders dialog is opened, with your selection as " +"the first (<guilabel>1st</guilabel>) path. Specify the second path in the " +"<guilabel>2nd</guilabel> field to continue with the comparison." msgstr "" -"Se fai clic su <guimenuitem >Confronta</guimenuitem > prima di designare il primo percorso, si aprirà la finestra di dialogo Seleziona file o " -"cartelle, con la tua selezione come primo (<guilabel >1°</guilabel >) percorso.Specifica il secondo percorso nel campo <guilabel >2°</guilabel > per " +"Se fai clic su <guimenuitem >Confronta</guimenuitem > prima di designare il " +"primo percorso, si aprirà la finestra di dialogo Seleziona file o cartelle, " +"con la tua selezione come primo (<guilabel >1°</guilabel >) percorso." +"Specifica il secondo percorso nel campo <guilabel >2°</guilabel > per " "continuare con il confronto." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:276 msgid "" -"The <guimenuitem>Compare To</guimenuitem> paths is stored in memory until WinMerge is opened. As a result, you don't need to select both files at the " -"same time or even using the same Windows Explorer view: you can choose one, open a different directory, and choose the other one. Both paths are " -"discarded from memory after a compare operation. This means that you cannot select one <guimenuitem>Compare To</guimenuitem> path and compare it " -"against several paths." -msgstr "" -"I percorsi <guimenuitem >Confronta con</guimenuitem > vengono archiviati in memoria fino all'apertura di WinMerge. Di conseguenza, non è necessario " -"selezionare entrambi i file contemporaneamente o addirittura utilizzare la stessa visualizzazione di Esplora risorse: puoi sceglierne uno, apri una " -"cartella diversa e scegliere l'altra. Entrambi i percorsi vengono eliminati dalla memoria dopo un'operazione di confronto. Ciò significa che non puoi " -"selezionare un percorso <guimenuitem >Confronta con</guimenuitem > e confrontarlo con diversi percorsi." +"The <guimenuitem>Compare To</guimenuitem> paths is stored in memory until " +"WinMerge is opened. As a result, you don't need to select both files at the " +"same time or even using the same Windows Explorer view: you can choose one, " +"open a different directory, and choose the other one. Both paths are " +"discarded from memory after a compare operation. This means that you cannot " +"select one <guimenuitem>Compare To</guimenuitem> path and compare it against " +"several paths." +msgstr "" +"I percorsi <guimenuitem >Confronta con</guimenuitem > vengono archiviati in " +"memoria fino all'apertura di WinMerge. Di conseguenza, non è necessario " +"selezionare entrambi i file contemporaneamente o addirittura utilizzare la " +"stessa visualizzazione di Esplora risorse: puoi sceglierne uno, apri una " +"cartella diversa e scegliere l'altra. Entrambi i percorsi vengono eliminati " +"dalla memoria dopo un'operazione di confronto. Ciò significa che non puoi " +"selezionare un percorso <guimenuitem >Confronta con</guimenuitem > e " +"confrontarlo con diversi percorsi." #. type: Content of: <article><section><section><title><indexterm><secondary> #: English/Open_paths.xml:290 @@ -16484,33 +21599,47 @@ msgstr "specificando nella finestra di dialogo Seleziona file o cartelle" #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:286 msgid "" -"Including subfolders when using the Windows Explorer integration<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" +"Including subfolders when using the Windows Explorer integration<placeholder " +"type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" -"Inclusione delle sottocartelle quando si utilizza l'integrazione di Esplora risorse<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"Inclusione delle sottocartelle quando si utilizza l'integrazione di Esplora " +"risorse<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:297 msgid "" -"By default, folder compares that you do using the <guimenuitem>WinMerge</guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut are recursive. " -"There is a way to launch non-recursive compares with the Windows Explorer integration:" +"By default, folder compares that you do using the <guimenuitem>WinMerge</" +"guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut are recursive. " +"There is a way to launch non-recursive compares with the Windows Explorer " +"integration:" msgstr "" -"Per impostazione predefinita, i confronti di cartelle che fai usando la scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</" -"guimenuitem > sono ricorsivi.Esiste un modo per avviare confronti non ricorsivi con l'integrazione di Windows Explorer:" +"Per impostazione predefinita, i confronti di cartelle che fai usando la " +"scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</" +"guimenuitem > sono ricorsivi.Esiste un modo per avviare confronti non " +"ricorsivi con l'integrazione di Windows Explorer:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Open_paths.xml:305 -msgid "Disable <guilabel>Include subfolders</guilabel> in the Folder page of the WinMerge Options dialog." -msgstr "Disabilita <guilabel >Includi sottocartelle</guilabel > nella pagina Cartella della finestra di dialogo Opzioni di WinMerge." +msgid "" +"Disable <guilabel>Include subfolders</guilabel> in the Folder page of the " +"WinMerge Options dialog." +msgstr "" +"Disabilita <guilabel >Includi sottocartelle</guilabel > nella pagina " +"Cartella della finestra di dialogo Opzioni di WinMerge." #. type: Content of: <article><section><section><tip><para> #: English/Open_paths.xml:311 msgid "" -"Press <keycap>Ctrl</keycap> while selecting the <guimenuitem>WinMerge</guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut in the Windows " -"Explorer context menu to force a reverse comparison with the current 'Include subfolders' settings." +"Press <keycap>Ctrl</keycap> while selecting the <guimenuitem>WinMerge</" +"guimenuitem> or <guimenuitem>Compare</guimenuitem> shortcut in the Windows " +"Explorer context menu to force a reverse comparison with the current " +"'Include subfolders' settings." msgstr "" -"Premi <keycap >Ctrl</keycap > mentre selezioni la scorciatoia <guimenuitem >WinMerge</guimenuitem > o <guimenuitem >Confronta</guimenuitem > nel menu " -"contestuale di Esplora risorse per forzare un confronto inverso con le attuali impostazioni 'Includi sottocartelle'." +"Premi <keycap >Ctrl</keycap > mentre selezioni la scorciatoia <guimenuitem " +">WinMerge</guimenuitem > o <guimenuitem >Confronta</guimenuitem > nel menu " +"contestuale di Esplora risorse per forzare un confronto inverso con le " +"attuali impostazioni 'Includi sottocartelle'." #. type: Content of: <article><section><title><indexterm><primary> #: English/Open_paths.xml:321 @@ -16520,41 +21649,60 @@ msgstr "trascina e rilascia, nella finestra WinMerge" #. type: Content of: <article><section><title> #: English/Open_paths.xml:320 msgid "<placeholder type=\"indexterm\" id=\"0\"/>Using Drag and drop" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>Utilizzo del trascinamento della selezione" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>Utilizzo del trascinamento della " +"selezione" #. type: Content of: <article><section><para> #: English/Open_paths.xml:324 msgid "" -"From any Windows source that allows you to drag objects, such as Windows Explorer or the Desktop, you can drag and drop one or two paths into the " -"WinMerge window. If you drop only one path into WinMerge, the Select Files or Folders dialog opens for you to select the second path. If the single " +"From any Windows source that allows you to drag objects, such as Windows " +"Explorer or the Desktop, you can drag and drop one or two paths into the " +"WinMerge window. If you drop only one path into WinMerge, the Select Files " +"or Folders dialog opens for you to select the second path. If the single " "path specifies a project file, then the project file is opened." msgstr "" -"Da qualsiasi origine Windows che ti consenta di trascinare oggetti, come Esplora risorse o il desktop, puoi trascinare e rilasciare uno o due " -"percorsi nella finestra WinMerge.Se si rilascia un solo percorso in WinMerge, si apre la finestra di dialogo Seleziona file o cartelle per " -"selezionare il secondo percorso.Se il percorso singolo specifica un file di progetto, viene aperto il file di progetto." +"Da qualsiasi origine Windows che ti consenta di trascinare oggetti, come " +"Esplora risorse o il desktop, puoi trascinare e rilasciare uno o due " +"percorsi nella finestra WinMerge.Se si rilascia un solo percorso in " +"WinMerge, si apre la finestra di dialogo Seleziona file o cartelle per " +"selezionare il secondo percorso.Se il percorso singolo specifica un file di " +"progetto, viene aperto il file di progetto." #. type: Content of: <article><section><para> #: English/Open_paths.xml:331 msgid "" -"By default, WinMerge does include subfolders in compare operations. To not include subfolders, press and hold <keycap>Ctrl</keycap> while dropping " -"paths. Another useful key when dropping paths is <keycap>Shift</keycap>: To open the same path in both sides of a Compare window, press and hold " -"<keycap>Shift</keycap> while dropping only one path. This is a handy way to open archive files (see <xref linkend=\"OpeningArchives\" />)." -msgstr "" -"Per impostazione predefinita, WinMerge include le sottocartelle nelle operazioni di confronto.Per non includere sottocartelle, tieni premuto " -"<keycap>Ctrl</keycap> mentre trascini i percorsi.Un altro tasto utile quando si eliminano i percorsi è <keycap>Maiusc</keycap>: per aprire lo stesso " -"percorso su entrambi i lati di una finestra di confronto, premere e tenere premuto <keycap>Maiusc</keycap> mentre si rilascia solo un percorso.Questo " -"è un modo pratico per aprire i file di archivio (vedi <xref linkend=\"OpeningArchives\" />)." +"By default, WinMerge does include subfolders in compare operations. To not " +"include subfolders, press and hold <keycap>Ctrl</keycap> while dropping " +"paths. Another useful key when dropping paths is <keycap>Shift</keycap>: To " +"open the same path in both sides of a Compare window, press and hold " +"<keycap>Shift</keycap> while dropping only one path. This is a handy way to " +"open archive files (see <xref linkend=\"OpeningArchives\" />)." +msgstr "" +"Per impostazione predefinita, WinMerge include le sottocartelle nelle " +"operazioni di confronto.Per non includere sottocartelle, tieni premuto " +"<keycap>Ctrl</keycap> mentre trascini i percorsi.Un altro tasto utile quando " +"si eliminano i percorsi è <keycap>Maiusc</keycap>: per aprire lo stesso " +"percorso su entrambi i lati di una finestra di confronto, premere e tenere " +"premuto <keycap>Maiusc</keycap> mentre si rilascia solo un percorso.Questo è " +"un modo pratico per aprire i file di archivio (vedi <xref " +"linkend=\"OpeningArchives\" />)." #. type: Content of: <article><section><para> #: English/Open_paths.xml:339 msgid "" -"You can drop paths into the Select Files or Folders dialog. A typical procedure is to drag and drop the first path into the WinMerge window, and then " -"drag and drop the second path into the Select Files or Folders dialog. When a path is dropped into the Select Files or Folders dialog, it is loaded " +"You can drop paths into the Select Files or Folders dialog. A typical " +"procedure is to drag and drop the first path into the WinMerge window, and " +"then drag and drop the second path into the Select Files or Folders dialog. " +"When a path is dropped into the Select Files or Folders dialog, it is loaded " "into either the 1st or 2nd path field:" msgstr "" -"È possibile trascinare i percorsi nella finestra di dialogo Seleziona file o cartelle.Una procedura tipica consiste nel trascinare e rilasciare il " -"primo percorso nella finestra WinMerge, quindi trascinare e rilasciare il secondo percorso nella finestra di dialogo Seleziona file o cartelle.Quando " -"un percorso viene rilasciato nella finestra di dialogo Seleziona file o cartelle, viene caricato nel primo o nel secondo campo del percorso:" +"È possibile trascinare i percorsi nella finestra di dialogo Seleziona file o " +"cartelle.Una procedura tipica consiste nel trascinare e rilasciare il primo " +"percorso nella finestra WinMerge, quindi trascinare e rilasciare il secondo " +"percorso nella finestra di dialogo Seleziona file o cartelle.Quando un " +"percorso viene rilasciato nella finestra di dialogo Seleziona file o " +"cartelle, viene caricato nel primo o nel secondo campo del percorso:" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Open_paths.xml:347 @@ -16564,7 +21712,9 @@ msgstr "1°" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Open_paths.xml:350 msgid "If the 1st field is empty or both path fields already contain paths" -msgstr "Se il primo campo è vuoto o entrambi i campi del percorso contengono già percorsi" +msgstr "" +"Se il primo campo è vuoto o entrambi i campi del percorso contengono già " +"percorsi" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Open_paths.xml:356 @@ -16583,17 +21733,24 @@ msgstr "specificando i file di progetto" #. type: Content of: <article><section><title> #: English/Open_paths.xml:366 -msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Project files" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>File di progetto" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>Project files" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"id=\"1\"/>File di progetto" #. type: Content of: <article><section><para> #: English/Open_paths.xml:374 msgid "" -"You can save the currently open paths and filters in a project file. Then, you can easily open the project later to compare the same files. Project " +"You can save the currently open paths and filters in a project file. Then, " +"you can easily open the project later to compare the same files. Project " "files are handy if you compare the same files repeatedly." msgstr "" -"È possibile salvare i percorsi e i filtri attualmente aperti in un file di progetto.Quindi, puoi facilmente aprire il progetto in un secondo momento " -"per confrontare gli stessi file.I file di progetto sono utili se si confrontano ripetutamente gli stessi file." +"È possibile salvare i percorsi e i filtri attualmente aperti in un file di " +"progetto.Quindi, puoi facilmente aprire il progetto in un secondo momento " +"per confrontare gli stessi file.I file di progetto sono utili se si " +"confrontano ripetutamente gli stessi file." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:379 @@ -16603,42 +21760,62 @@ msgstr "Utilizzo dei file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:381 msgid "" -"To use a project file In the WinMerge window, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </menuchoice>. " -"WinMerge reads the paths from the project file. If the project file has two or three paths, two or three paths are opened. If only one path is given " -"or one of the paths is invalid, WinMerge opens the Select Files or Folders dialog, where you can add or correct the path information. Here are a few " -"things to consider:" -msgstr "" -"Per usare un file di progetto Nella finestra WinMerge, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</guimenuitem > " -"</menuchoice >.WinMerge legge i percorsi dal file di progetto.Se il file di progetto ha due o tre percorsi, verranno aperti due o tre percorsi.Se " -"viene fornito un solo percorso o uno dei percorsi non è valido, WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è possibile " -"aggiungere o correggere le informazioni sul percorso.Ecco alcune cose da considerare:" +"To use a project file In the WinMerge window, click <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </" +"menuchoice>. WinMerge reads the paths from the project file. If the project " +"file has two or three paths, two or three paths are opened. If only one path " +"is given or one of the paths is invalid, WinMerge opens the Select Files or " +"Folders dialog, where you can add or correct the path information. Here are " +"a few things to consider:" +msgstr "" +"Per usare un file di progetto Nella finestra WinMerge, fai clic su " +"<menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</" +"guimenuitem > </menuchoice >.WinMerge legge i percorsi dal file di progetto." +"Se il file di progetto ha due o tre percorsi, verranno aperti due o tre " +"percorsi.Se viene fornito un solo percorso o uno dei percorsi non è valido, " +"WinMerge apre la finestra di dialogo Seleziona file o cartelle, in cui è " +"possibile aggiungere o correggere le informazioni sul percorso.Ecco alcune " +"cose da considerare:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:393 -msgid "If you specify two project files, the project files themselves are compared." -msgstr "Se si specificano due file di progetto, vengono confrontati i file di progetto stessi." +msgid "" +"If you specify two project files, the project files themselves are compared." +msgstr "" +"Se si specificano due file di progetto, vengono confrontati i file di " +"progetto stessi." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:398 msgid "" -"If you specify a project file as the left file but do not specify a right file, the single project file is opened as if you had used the <menuchoice> " -"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </menuchoice> command." +"If you specify a project file as the left file but do not specify a right " +"file, the single project file is opened as if you had used the <menuchoice> " +"<guimenu>File</guimenu> <guimenuitem>Open Project</guimenuitem> </" +"menuchoice> command." msgstr "" -"Se specifichi un file di progetto come file di sinistra ma non specifichi un file di destra, il singolo file di progetto viene aperto come se avessi " -"usato il comando <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri progetto</guimenuitem > </menuchoice >." +"Se specifichi un file di progetto come file di sinistra ma non specifichi un " +"file di destra, il singolo file di progetto viene aperto come se avessi " +"usato il comando <menuchoice> <guimenu >File</guimenu > <guimenuitem >Apri " +"progetto</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Open_paths.xml:408 msgid "" -"If you specify a project file as the left file and any other file on the right side, the contents of the project file and the other file are compared." +"If you specify a project file as the left file and any other file on the " +"right side, the contents of the project file and the other file are compared." msgstr "" -"Se specifichi un file di progetto come file di sinistra e qualsiasi altro file sul lato destro, vengono confrontati i contenuti del file di progetto " -"e dell'altro file." +"Se specifichi un file di progetto come file di sinistra e qualsiasi altro " +"file sul lato destro, vengono confrontati i contenuti del file di progetto e " +"dell'altro file." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:414 -msgid "To specify a project file on the command line, simply enter it as a single file path." -msgstr "Per specificare un file di progetto sulla riga di comando, è sufficiente inserirlo come percorso di file singolo." +msgid "" +"To specify a project file on the command line, simply enter it as a single " +"file path." +msgstr "" +"Per specificare un file di progetto sulla riga di comando, è sufficiente " +"inserirlo come percorso di file singolo." #. type: Content of: <article><section><section><title> #: English/Open_paths.xml:419 @@ -16648,26 +21825,43 @@ msgstr "Modifica e salvataggio dei file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:421 msgid "" -"To save a project file, click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Save Project</guimenuitem> </menuchoice>. The <guilabel>Project File</" -"guilabel> dialog provides fields and options that you can easily edit to build a project file. If a compare window is currently open, the " -"<guilabel>Project File</guilabel> dialog is initialized with values from the current compare; otherwise, you provide the values yourself. To use an " -"existing project, click <guibutton>Open</guibutton> and select a project to load its values (any existing values are overwritten in the dialog)." -msgstr "" -"Per salvare un file di progetto, fai clic su <menuchoice> <guimenu >File</guimenu > <guimenuitem >Salva progetto</guimenuitem > </menuchoice >.La " -"finestra di dialogo <guilabel >File di progetto</guilabel > fornisce campi e opzioni che puoi modificare facilmente per creare un file di progetto.Se " -"una finestra di confronto è attualmente aperta, la finestra di dialogo <guilabel >File di progetto</guilabel > viene inizializzata con i valori del " -"confronto corrente;in caso contrario, fornisci tu stesso i valori.Per utilizzare un progetto esistente, fai clic su <guibutton >Apri</guibutton > e " -"seleziona un progetto per caricarne i valori (tutti i valori esistenti verranno sovrascritti nella finestra di dialogo)." +"To save a project file, click <menuchoice> <guimenu>File</guimenu> " +"<guimenuitem>Save Project</guimenuitem> </menuchoice>. The <guilabel>Project " +"File</guilabel> dialog provides fields and options that you can easily edit " +"to build a project file. If a compare window is currently open, the " +"<guilabel>Project File</guilabel> dialog is initialized with values from the " +"current compare; otherwise, you provide the values yourself. To use an " +"existing project, click <guibutton>Open</guibutton> and select a project to " +"load its values (any existing values are overwritten in the dialog)." +msgstr "" +"Per salvare un file di progetto, fai clic su <menuchoice> <guimenu >File</" +"guimenu > <guimenuitem >Salva progetto</guimenuitem > </menuchoice >.La " +"finestra di dialogo <guilabel >File di progetto</guilabel > fornisce campi e " +"opzioni che puoi modificare facilmente per creare un file di progetto.Se una " +"finestra di confronto è attualmente aperta, la finestra di dialogo <guilabel " +">File di progetto</guilabel > viene inizializzata con i valori del confronto " +"corrente;in caso contrario, fornisci tu stesso i valori.Per utilizzare un " +"progetto esistente, fai clic su <guibutton >Apri</guibutton > e seleziona un " +"progetto per caricarne i valori (tutti i valori esistenti verranno " +"sovrascritti nella finestra di dialogo)." #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:433 -msgid "When you finished editing, click <guibutton>Save</guibutton> to store the file." -msgstr "Una volta terminata la modifica, fai clic su <guibutton >Salva</guibutton > per archiviare il file." +msgid "" +"When you finished editing, click <guibutton>Save</guibutton> to store the " +"file." +msgstr "" +"Una volta terminata la modifica, fai clic su <guibutton >Salva</guibutton > " +"per archiviare il file." #. type: Content of: <article><section><section><mediaobject> #: English/Open_paths.xml:437 -msgid "<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/projfile_save.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><mediaobject><textobject><phrase> #: English/Open_paths.xml:442 @@ -16681,8 +21875,12 @@ msgstr "Formato del file di progetto" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:450 -msgid "Project files are simple XML files with <filename class=\"extension\">a .WinMerge</filename> extension. For example:" -msgstr "I file di progetto sono semplici file XML con estensione <filename class=\"extension\">.WinMerge</filename>.Per esempio:" +msgid "" +"Project files are simple XML files with <filename class=\"extension\">a ." +"WinMerge</filename> extension. For example:" +msgstr "" +"I file di progetto sono semplici file XML con estensione <filename " +"class=\"extension\">.WinMerge</filename>.Per esempio:" #. type: Content of: <article><section><section><screen> #: English/Open_paths.xml:453 @@ -16718,8 +21916,12 @@ msgstr "" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:467 -msgid "A project file contains a <sgmltag>paths</sgmltag> element that can contain one of each of these elements:" -msgstr "Un file di progetto contiene un elemento <sgmltag>paths</sgmltag> che può contenere uno di ciascuno di questi elementi:" +msgid "" +"A project file contains a <sgmltag>paths</sgmltag> element that can contain " +"one of each of these elements:" +msgstr "" +"Un file di progetto contiene un elemento <sgmltag>paths</sgmltag> che può " +"contenere uno di ciascuno di questi elementi:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Open_paths.xml:472 @@ -16747,12 +21949,14 @@ msgid "<sgmltag>left-readonly</sgmltag>" msgstr "<sgmltag>sola lettura a sinistra</sgmltag>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Open_paths.xml:491 English/Open_paths.xml:517 English/Open_paths.xml:543 +#: English/Open_paths.xml:491 English/Open_paths.xml:517 +#: English/Open_paths.xml:543 msgid "1 = Open read only" msgstr "1 = Aperto in sola lettura" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Open_paths.xml:493 English/Open_paths.xml:519 English/Open_paths.xml:545 +#: English/Open_paths.xml:493 English/Open_paths.xml:519 +#: English/Open_paths.xml:545 msgid "0 = Open normally" msgstr "0 = Aperto normalmente" @@ -17068,8 +22272,12 @@ msgstr "5 = Dimensione" #. type: Content of: <article><section><section><para> #: English/Open_paths.xml:718 -msgid "None of the fields is required, and they can be empty (<literal>for example, <left></left> or <left/></literal>)." -msgstr "Nessuno dei campi è obbligatorio e possono essere vuoti (<literal>ad esempio, <left></left> o <left/></literal>)." +msgid "" +"None of the fields is required, and they can be empty (<literal>for example, " +"<left></left> or <left/></literal>)." +msgstr "" +"Nessuno dei campi è obbligatorio e possono essere vuoti (<literal>ad " +"esempio, <left></left> o <left/></literal>)." #. type: Content of: <article><section><title><indexterm><primary> #: English/Plugins.xml:4 English/Plugins.xml:378 English/Plugins.xml:2717 @@ -17084,11 +22292,14 @@ msgstr "Plugin<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> #: English/Plugins.xml:7 msgid "" -"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that preprocess data before a comparison. For example, you can use a plugin " -"to extract text data from MS Word files for WinMerge to compare." +"WinMerge plugins are custom dlls or scriptlets, written in the COM API, that " +"preprocess data before a comparison. For example, you can use a plugin to " +"extract text data from MS Word files for WinMerge to compare." msgstr "" -"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, che preelaborano i dati prima di un confronto.Ad esempio, puoi " -"utilizzare un plug-in per estrarre dati di testo da file MS Word affinché WinMerge possa confrontarli." +"I plugin WinMerge sono DLL o scriptlet personalizzati, scritti nell'API COM, " +"che preelaborano i dati prima di un confronto.Ad esempio, puoi utilizzare un " +"plug-in per estrarre dati di testo da file MS Word affinché WinMerge possa " +"confrontarli." #. type: Content of: <article><para><indexterm><primary> #: English/Plugins.xml:12 @@ -17102,24 +22313,36 @@ msgstr "Ogni plug-in è:<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:17 -msgid "A single dll or a scriptlet (<filename class=\"extension\">sct</filename>) file" -msgstr "Un singolo file dll o scriptlet (<filename class=\"extension\">sct</filename>)" +msgid "" +"A single dll or a scriptlet (<filename class=\"extension\">sct</filename>) " +"file" +msgstr "" +"Un singolo file dll o scriptlet (<filename class=\"extension\">sct</" +"filename>)" #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:22 -msgid "Installed in the <filename class=\"directory\">MergePlugins</filename> subfolder. A number of plugins can be installed for you by WinMerge." -msgstr "Installato nella sottocartella <filename class=\"directory\">MergePlugins</filename>. WinMerge può installare numerosi plugin." +msgid "" +"Installed in the <filename class=\"directory\">MergePlugins</filename> " +"subfolder. A number of plugins can be installed for you by WinMerge." +msgstr "" +"Installato nella sottocartella <filename class=\"directory\">MergePlugins</" +"filename>. WinMerge può installare numerosi plugin." #. type: Content of: <article><itemizedlist><listitem><para> #: English/Plugins.xml:27 msgid "" -"Easy to install: To install a plugin that is not included in the WinMerge installation, just copy the plugin file to <filename " -"class=\"directory\">MergePlugins</filename>. The plugin is available the next time you open WinMerge. You can find more plugins on the web, written " +"Easy to install: To install a plugin that is not included in the WinMerge " +"installation, just copy the plugin file to <filename " +"class=\"directory\">MergePlugins</filename>. The plugin is available the " +"next time you open WinMerge. You can find more plugins on the web, written " "by other developers." msgstr "" -"Facile da installare: per installare un plugin che non è incluso nell'installazione di WinMerge, basta copiare il file del plugin in <filename " -"class=\"directory\">MergePlugins</filename>.Il plugin sarà disponibile la prossima volta che apri WinMerge. Puoi trovare altri plugin sul web, " -"scritti da altri sviluppatori." +"Facile da installare: per installare un plugin che non è incluso " +"nell'installazione di WinMerge, basta copiare il file del plugin in " +"<filename class=\"directory\">MergePlugins</filename>.Il plugin sarà " +"disponibile la prossima volta che apri WinMerge. Puoi trovare altri plugin " +"sul web, scritti da altri sviluppatori." #. type: Content of: <article><section><title> #: English/Plugins.xml:36 @@ -17143,63 +22366,88 @@ msgstr "Complemento dell'editor<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:47 -msgid "This type of plugin performs custom operations on selected text in the active editor (File pane) of the File Compare window." -msgstr "Questo tipo di plugin esegue operazioni personalizzate sul testo selezionato nell'editor attivo (pannello File) della finestra Confronta file." +msgid "" +"This type of plugin performs custom operations on selected text in the " +"active editor (File pane) of the File Compare window." +msgstr "" +"Questo tipo di plugin esegue operazioni personalizzate sul testo selezionato " +"nell'editor attivo (pannello File) della finestra Confronta file." #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Plugins.xml:53 -msgid "Unpacker: transform a file to a text format<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Unpacker: trasforma un file in un formato testo<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Unpacker: transform a file to a text format<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Unpacker: trasforma un file in un formato testo<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:58 msgid "" -"This type of plugin transforms a compressed file to a viewable format by decompressing it. The original file is not changed: a temporary transformed " +"This type of plugin transforms a compressed file to a viewable format by " +"decompressing it. The original file is not changed: a temporary transformed " "file is created and loaded in WinMerge." msgstr "" -"Questo tipo di plugin trasforma un file compresso in un formato visualizzabile decomprimendolo.Il file originale non viene modificato: viene creato e " -"caricato in WinMerge un file trasformato temporaneo." +"Questo tipo di plugin trasforma un file compresso in un formato " +"visualizzabile decomprimendolo.Il file originale non viene modificato: viene " +"creato e caricato in WinMerge un file trasformato temporaneo." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:62 msgid "" -"Unpacker plugins operate on entire files, not to selected text or diffs within files. Therefore, they are available only when you launch file " -"comparisons, from either the Folder Compare window or the Select Files or Folders dialog. Unpacker plugins are not available in the File Compare " +"Unpacker plugins operate on entire files, not to selected text or diffs " +"within files. Therefore, they are available only when you launch file " +"comparisons, from either the Folder Compare window or the Select Files or " +"Folders dialog. Unpacker plugins are not available in the File Compare " "window." msgstr "" -"I plugin di unpacker operano su interi file, non sul testo selezionato o sulle differenze all'interno dei file.Pertanto, sono disponibili solo quando " -"si avviano i confronti di file, dalla finestra Confronto cartelle o dalla finestra di dialogo Seleziona file o cartelle.I plugin di decompressione " -"non sono disponibili nella finestra Confronto file." +"I plugin di unpacker operano su interi file, non sul testo selezionato o " +"sulle differenze all'interno dei file.Pertanto, sono disponibili solo quando " +"si avviano i confronti di file, dalla finestra Confronto cartelle o dalla " +"finestra di dialogo Seleziona file o cartelle.I plugin di decompressione non " +"sono disponibili nella finestra Confronto file." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:68 msgid "" -"Sometimes the unpacked file can be repacked (see the details in <xref linkend=\"Plugins_available\" /> to check whether a plugin supports repacking). " -"Then, you can merge and save the transformed file. The packing is done automatically in this case. To be safe, we suggest that you rename the " -"transformed file when you save it." +"Sometimes the unpacked file can be repacked (see the details in <xref " +"linkend=\"Plugins_available\" /> to check whether a plugin supports " +"repacking). Then, you can merge and save the transformed file. The packing " +"is done automatically in this case. To be safe, we suggest that you rename " +"the transformed file when you save it." msgstr "" -"A volte il file decompresso può essere recompresso (vedi i dettagli in <xref linkend=\"Plugins_available\" /> per verificare se un plugin supporta la " -"recompressione).Quindi, puoi unire e salvare il file trasformato.In questo caso l'imballaggio viene effettuato automaticamente.Per sicurezza, ti " +"A volte il file decompresso può essere recompresso (vedi i dettagli in <xref " +"linkend=\"Plugins_available\" /> per verificare se un plugin supporta la " +"recompressione).Quindi, puoi unire e salvare il file trasformato.In questo " +"caso l'imballaggio viene effettuato automaticamente.Per sicurezza, ti " "suggeriamo di rinominare il file trasformato quando lo salvi." #. type: Content of: <article><section><variablelist><varlistentry><listitem><note><para> #: English/Plugins.xml:75 msgid "" -"When you compare folders, WinMerge can give different results for compressed and uncompressed files. For example, files that are identical when " -"uncompressed might be different if they include the creation date. WinMerge applies the unpacker in all situations, and you are sure to have the same " +"When you compare folders, WinMerge can give different results for compressed " +"and uncompressed files. For example, files that are identical when " +"uncompressed might be different if they include the creation date. WinMerge " +"applies the unpacker in all situations, and you are sure to have the same " "result when you compare a folder, or when you merge two versions of a file." msgstr "" -"Quando confronti le cartelle, WinMerge può fornire risultati diversi per i file compressi e non compressi.Ad esempio, i file identici quando non " -"compressi potrebbero essere diversi se includono la data di creazione.WinMerge applica l'unpacker in tutte le situazioni e sarai sicuro di ottenere " -"lo stesso risultato quando confronti una cartella o quando unisci due versioni di un file." +"Quando confronti le cartelle, WinMerge può fornire risultati diversi per i " +"file compressi e non compressi.Ad esempio, i file identici quando non " +"compressi potrebbero essere diversi se includono la data di creazione." +"WinMerge applica l'unpacker in tutte le situazioni e sarai sicuro di " +"ottenere lo stesso risultato quando confronti una cartella o quando unisci " +"due versioni di un file." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:83 msgid "" -"Example plugin: <xref linkend=\"CompareMSExcelFiles\" /> displays the text contents of a <trademark class=\"registered\">Microsoft</trademark> " +"Example plugin: <xref linkend=\"CompareMSExcelFiles\" /> displays the text " +"contents of a <trademark class=\"registered\">Microsoft</trademark> " "<application>Excel</application> file." msgstr "" -"Plugin di esempio: <xref linkend=\"CompareMSExcelFiles\" /> visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</" +"Plugin di esempio: <xref linkend=\"CompareMSExcelFiles\" /> visualizza il " +"contenuto testuale di un file <trademark class=\"registered\">Microsoft</" "trademark> <application>Excel</application>." #. type: Content of: <article><section><variablelist><varlistentry><term><indexterm><primary> @@ -17209,24 +22457,32 @@ msgstr "plugin prediletti" #. type: Content of: <article><section><variablelist><varlistentry><term> #: English/Plugins.xml:91 -msgid "Prediffer: preprocess files to hide some differences<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Prediffer: preelabora i file per nascondere alcune differenze<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Prediffer: preprocess files to hide some differences<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Prediffer: preelabora i file per nascondere alcune differenze<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:96 msgid "" -"This type of plugin does not operate on the source files displayed in the Compare window. It operates instead on temporary copies of the files, and " +"This type of plugin does not operate on the source files displayed in the " +"Compare window. It operates instead on temporary copies of the files, and " "the copies are then scanned to create the difference list." msgstr "" -"Questo tipo di plugin non funziona sui file sorgente visualizzati nella finestra Confronta.Funziona invece su copie temporanee dei file e le copie " +"Questo tipo di plugin non funziona sui file sorgente visualizzati nella " +"finestra Confronta.Funziona invece su copie temporanee dei file e le copie " "vengono quindi scansionate per creare l'elenco delle differenze." #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:101 msgid "" -"Example plugin: <xref linkend=\"IgnoreColumns\" /> ignores the differences inside specified columns, while displaying the characters in these columns." +"Example plugin: <xref linkend=\"IgnoreColumns\" /> ignores the differences " +"inside specified columns, while displaying the characters in these columns." msgstr "" -"Plugin di esempio: <xref linkend=\"IgnoreColumns\" /> ignora le differenze all'interno delle colonne specificate, mentre visualizza i caratteri in " +"Plugin di esempio: <xref linkend=\"IgnoreColumns\" /> ignora le differenze " +"all'interno delle colonne specificate, mentre visualizza i caratteri in " "queste colonne." #. type: Content of: <article><section><title> @@ -17237,34 +22493,49 @@ msgstr "Plugin consigliati e modalità automatiche" #. type: Content of: <article><section><para> #: English/Plugins.xml:112 msgid "" -"How is WinMerge able to apply the right plugin for a given file? Each plugin specifies a list of file extensions (also listed in each plugin's <xref " -"linkend=\"Plugins_available\" /> section, under <citetitle>File filter</citetitle>). The extensions are used to associate one or more file types with " -"the plugin: when a compared file's extension matches an extension in the plugin's list, the plugin is considered to be a <firstterm>suggested plugin. " -"</firstterm>" -msgstr "" -"In che modo WinMerge è in grado di applicare il plug-in giusto per un determinato file?Ogni plugin specifica un elenco di estensioni di file " -"(elencate anche nella sezione <xref linkend=\"Plugins_available\" /> di ogni plugin, sotto <citetitle>Filtro file</citetitle>).Le estensioni vengono " -"utilizzate per associare uno o più tipi di file al plugin: quando l'estensione di un file confrontato corrisponde a un'estensione nell'elenco del " -"plugin, il plugin è considerato un plugin <firstterm>suggerito.</firstterm>" +"How is WinMerge able to apply the right plugin for a given file? Each plugin " +"specifies a list of file extensions (also listed in each plugin's <xref " +"linkend=\"Plugins_available\" /> section, under <citetitle>File filter</" +"citetitle>). The extensions are used to associate one or more file types " +"with the plugin: when a compared file's extension matches an extension in " +"the plugin's list, the plugin is considered to be a <firstterm>suggested " +"plugin. </firstterm>" +msgstr "" +"In che modo WinMerge è in grado di applicare il plug-in giusto per un " +"determinato file?Ogni plugin specifica un elenco di estensioni di file " +"(elencate anche nella sezione <xref linkend=\"Plugins_available\" /> di ogni " +"plugin, sotto <citetitle>Filtro file</citetitle>).Le estensioni vengono " +"utilizzate per associare uno o più tipi di file al plugin: quando " +"l'estensione di un file confrontato corrisponde a un'estensione nell'elenco " +"del plugin, il plugin è considerato un plugin <firstterm>suggerito.</" +"firstterm>" #. type: Content of: <article><section><para> #: English/Plugins.xml:120 msgid "" -"There are separate WinMerge options for the unpacking and prediffer types, described later in this topic, that enable you to apply the plugins either " -"manually or automatically. There is no automatic mode for editor complement plugins." +"There are separate WinMerge options for the unpacking and prediffer types, " +"described later in this topic, that enable you to apply the plugins either " +"manually or automatically. There is no automatic mode for editor complement " +"plugins." msgstr "" -"Sono disponibili opzioni WinMerge separate per i tipi di decompressione e prediffer, descritti più avanti in questo argomento, che consentono di " -"applicare i plug-in manualmente o automaticamente.Non esiste una modalità automatica per i plugin di complemento dell'editor." +"Sono disponibili opzioni WinMerge separate per i tipi di decompressione e " +"prediffer, descritti più avanti in questo argomento, che consentono di " +"applicare i plug-in manualmente o automaticamente.Non esiste una modalità " +"automatica per i plugin di complemento dell'editor." #. type: Content of: <article><section><para> #: English/Plugins.xml:125 msgid "" -"When you apply plugins to a selected file using automatic mode, WinMerge searches its list of suggested plugins for that file type, and applies the " -"first plugin whose name matches. The search is performed in alphabetical order, so if there are multiple suggested plugins for a file type, only the " +"When you apply plugins to a selected file using automatic mode, WinMerge " +"searches its list of suggested plugins for that file type, and applies the " +"first plugin whose name matches. The search is performed in alphabetical " +"order, so if there are multiple suggested plugins for a file type, only the " "first one found is applied." msgstr "" -"Quando applichi plug-in a un file selezionato utilizzando la modalità automatica, WinMerge cerca nell'elenco dei plug-in suggeriti per quel tipo di " -"file e applica il primo plug-in il cui nome corrisponde.La ricerca viene eseguita in ordine alfabetico, quindi se sono presenti più plugin suggeriti " +"Quando applichi plug-in a un file selezionato utilizzando la modalità " +"automatica, WinMerge cerca nell'elenco dei plug-in suggeriti per quel tipo " +"di file e applica il primo plug-in il cui nome corrisponde.La ricerca viene " +"eseguita in ordine alfabetico, quindi se sono presenti più plugin suggeriti " "per un tipo di file, verrà applicato solo il primo trovato." #. type: Content of: <article><section><title> @@ -17275,25 +22546,30 @@ msgstr "Applicazione dei plugin" #. type: Content of: <article><section><para> #: English/Plugins.xml:135 msgid "" -"The following subsections describe how to apply each type of plugin. The methods are different for each type of plugin, and also vary depending on " +"The following subsections describe how to apply each type of plugin. The " +"methods are different for each type of plugin, and also vary depending on " "whether you are comparing folders or files." msgstr "" -"Le seguenti sottosezioni descrivono come applicare ciascun tipo di plugin.I metodi sono diversi per ogni tipo di plugin e variano anche a seconda che " -"si stia confrontando cartelle o file." +"Le seguenti sottosezioni descrivono come applicare ciascun tipo di plugin.I " +"metodi sono diversi per ogni tipo di plugin e variano anche a seconda che si " +"stia confrontando cartelle o file." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:140 msgid "Applying editor complement plugins in the File Compare window" -msgstr "Applicazione dei plugin complemento dell'editor nella finestra Confronta file" +msgstr "" +"Applicazione dei plugin complemento dell'editor nella finestra Confronta file" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:143 msgid "" -"With your cursor in either File pane of the File Compare window, click <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </" +"With your cursor in either File pane of the File Compare window, click " +"<menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </" "menuchoice> and choose one of these functions:" msgstr "" -"Con il cursore nel pannello File della finestra Confronta file, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu " -"> </menuchoice > e scegli una di queste funzioni:" +"Con il cursore nel pannello File della finestra Confronta file, fai clic su " +"<menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </" +"menuchoice > e scegli una di queste funzioni:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:152 @@ -17378,47 +22654,66 @@ msgstr "<function>Insert Time</function>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:216 msgid "" -"The functions are contributed to the <guisubmenu>Scripts</guisubmenu> menu by the <xref linkend=\"EditorAddin\" /> and <xref " +"The functions are contributed to the <guisubmenu>Scripts</guisubmenu> menu " +"by the <xref linkend=\"EditorAddin\" /> and <xref " "linkend=\"Plugins_datetime\" /> plugins." msgstr "" -"Le funzioni vengono fornite al menu <guisubmenu >Script</guisubmenu > dai plugin <xref linkend=\"EditorAddin\" /> e <xref " +"Le funzioni vengono fornite al menu <guisubmenu >Script</guisubmenu > dai " +"plugin <xref linkend=\"EditorAddin\" /> e <xref " "linkend=\"Plugins_datetime\" />." #. type: Content of: <article><section><section><note><para> #: English/Plugins.xml:222 -msgid "Editor complement plugins are not available in the Folder Compare window." -msgstr "I plugin di complemento dell'editor non sono disponibili nella finestra Confronto cartelle." +msgid "" +"Editor complement plugins are not available in the Folder Compare window." +msgstr "" +"I plugin di complemento dell'editor non sono disponibili nella finestra " +"Confronto cartelle." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:228 msgid "Applying unpacker plugins in the Folder Compare window" -msgstr "Applicazione dei plugin di decompressione nella finestra Confronto cartelle" +msgstr "" +"Applicazione dei plugin di decompressione nella finestra Confronto cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:230 -msgid "Before applying unpacker plugins, you can set its mode to either automatic or manual mode." -msgstr "Prima di applicare i plugin di decompressione, puoi impostarne la modalità su automatica o manuale." +msgid "" +"Before applying unpacker plugins, you can set its mode to either automatic " +"or manual mode." +msgstr "" +"Prima di applicare i plugin di decompressione, puoi impostarne la modalità " +"su automatica o manuale." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:235 msgid "" -"To set automatic mode for this type of plugin, click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Automatic Unpacking</guimenuitem> </" +"To set automatic mode for this type of plugin, click <menuchoice> " +"<guimenu>Plugins</guimenu> <guimenuitem>Automatic Unpacking</guimenuitem> </" "menuchoice>." msgstr "" -"Per impostare la modalità automatica per questo tipo di plugin, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione " +"Per impostare la modalità automatica per questo tipo di plugin, fai clic su " +"<menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione " "automatica</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:243 -msgid "To set manual mode, click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Manual Unpacking</guimenuitem> </menuchoice>." +msgid "" +"To set manual mode, click <menuchoice> <guimenu>Plugins</guimenu> " +"<guimenuitem>Manual Unpacking</guimenuitem> </menuchoice>." msgstr "" -"Per impostare la modalità manuale, fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Decompressione manuale</guimenuitem > </" +"Per impostare la modalità manuale, fai clic su <menuchoice> <guimenu " +">Plugin</guimenu > <guimenuitem >Decompressione manuale</guimenuitem > </" "menuchoice >." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:251 -msgid "Remember to click <keycap>F5</keycap> to reload the Folder Compare window using the new setting." -msgstr "Ricordati di fare clic su <keycap>F5</keycap> per ricaricare la finestra Confronto cartelle utilizzando la nuova impostazione." +msgid "" +"Remember to click <keycap>F5</keycap> to reload the Folder Compare window " +"using the new setting." +msgstr "" +"Ricordati di fare clic su <keycap>F5</keycap> per ricaricare la finestra " +"Confronto cartelle utilizzando la nuova impostazione." #. type: Content of: <article><section><section><section><title> #: English/Plugins.xml:255 @@ -17428,23 +22723,32 @@ msgstr "Utilizzando la modalità automatica" #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:257 msgid "" -"To apply plugins when automatic unpacking is set, simply launch a compare operation on a file in the Folder Compare window. If the file's type " -"suggested unpacker plugin (if any) preprocesses the file before WinMerge opens it in the File Compare window." +"To apply plugins when automatic unpacking is set, simply launch a compare " +"operation on a file in the Folder Compare window. If the file's type " +"suggested unpacker plugin (if any) preprocesses the file before WinMerge " +"opens it in the File Compare window." msgstr "" -"Per applicare i plugin quando è impostata la decompressione automatica, è sufficiente avviare un'operazione di confronto su un file nella finestra " -"Confronto cartelle.Se il tipo di file suggerisce il plug-in di decompressione (se presente), preelabora il file prima che WinMerge lo apra nella " -"finestra Confronta file." +"Per applicare i plugin quando è impostata la decompressione automatica, è " +"sufficiente avviare un'operazione di confronto su un file nella finestra " +"Confronto cartelle.Se il tipo di file suggerisce il plug-in di " +"decompressione (se presente), preelabora il file prima che WinMerge lo apra " +"nella finestra Confronta file." #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:262 msgid "" -"For example, suppose you right-click an MS Word <filename>doc</filename> file and choose <guimenuitem>Compare</guimenuitem> (also assume that the " -"<xref linkend=\"Plugins_msword\" /> plugin is available). WinMerge converts the doc file (or rather, a copy of it ) to a plain text file and opens it " -"in the File Compare window." -msgstr "" -"Ad esempio, supponiamo di fare clic con il pulsante destro del mouse su un file <filename>doc</filename> di MS Word e scegliere <guimenuitem " -">Confronta</guimenuitem > (assumendo anche che il plugin <xref linkend=\"Plugins_msword\" /> sia disponibile).WinMerge converte il file doc (o " -"meglio, una sua copia) in un file di testo semplice e lo apre nella finestra Confronta file." +"For example, suppose you right-click an MS Word <filename>doc</filename> " +"file and choose <guimenuitem>Compare</guimenuitem> (also assume that the " +"<xref linkend=\"Plugins_msword\" /> plugin is available). WinMerge converts " +"the doc file (or rather, a copy of it ) to a plain text file and opens it in " +"the File Compare window." +msgstr "" +"Ad esempio, supponiamo di fare clic con il pulsante destro del mouse su un " +"file <filename>doc</filename> di MS Word e scegliere <guimenuitem " +">Confronta</guimenuitem > (assumendo anche che il plugin <xref " +"linkend=\"Plugins_msword\" /> sia disponibile).WinMerge converte il file doc " +"(o meglio, una sua copia) in un file di testo semplice e lo apre nella " +"finestra Confronta file." #. type: Content of: <article><section><section><section><title> #: English/Plugins.xml:271 @@ -17454,10 +22758,12 @@ msgstr "Utilizzo della modalità manuale" #. type: Content of: <article><section><section><section><para> #: English/Plugins.xml:273 msgid "" -"Manual mode enables you to choose a different unpacker plugin than the one that is selected for you in automatic mode. You can also launch the " -"compare using no plugin." +"Manual mode enables you to choose a different unpacker plugin than the one " +"that is selected for you in automatic mode. You can also launch the compare " +"using no plugin." msgstr "" -"La modalità manuale ti consente di scegliere un plug-in di decompressione diverso da quello selezionato per te in modalità automatica.Puoi anche " +"La modalità manuale ti consente di scegliere un plug-in di decompressione " +"diverso da quello selezionato per te in modalità automatica.Puoi anche " "avviare il confronto senza plug-in." #. type: Content of: <article><section><section><section><para> @@ -17472,13 +22778,21 @@ msgstr "Seleziona il file che vuoi confrontare." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:285 -msgid "Click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Edit with Unpacker</guimenuitem> </menuchoice>." -msgstr "Fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Modifica con Unpacker</guimenuitem > </menuchoice >." +msgid "" +"Click <menuchoice> <guimenu>Plugins</guimenu> <guimenuitem>Edit with " +"Unpacker</guimenuitem> </menuchoice>." +msgstr "" +"Fai clic su <menuchoice> <guimenu >Plugin</guimenu > <guimenuitem >Modifica " +"con Unpacker</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:291 -msgid "This menu item is enabled only if the selected file's type is supported by an available unpacking plugin." -msgstr "Questa voce di menu è abilitata solo se il tipo di file selezionato è supportato da un plug-in di decompressione disponibile." +msgid "" +"This menu item is enabled only if the selected file's type is supported by " +"an available unpacking plugin." +msgstr "" +"Questa voce di menu è abilitata solo se il tipo di file selezionato è " +"supportato da un plug-in di decompressione disponibile." #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:296 @@ -17487,58 +22801,83 @@ msgstr "Nella finestra di dialogo Seleziona decompressore:" #. type: Content of: <article><section><section><section><orderedlist><listitem><para> #: English/Plugins.xml:304 -msgid "Click <guibutton>OK</guibutton> to close the Select Unpacker dialog and launch the file comparison." -msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Seleziona Unpacker e avviare il confronto dei file." +msgid "" +"Click <guibutton>OK</guibutton> to close the Select Unpacker dialog and " +"launch the file comparison." +msgstr "" +"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " +"Seleziona Unpacker e avviare il confronto dei file." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:312 msgid "Applying unpacker plugins in the Select Files or Folders dialog" -msgstr "Applicazione dei plugin di decompressione nella finestra di dialogo Seleziona file o cartelle" +msgstr "" +"Applicazione dei plugin di decompressione nella finestra di dialogo " +"Seleziona file o cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:315 msgid "" -"You can use the Select Unpacker dialog to apply a plugin when you launch a file comparison from the Select Files or Folders dialog. See <xref " +"You can use the Select Unpacker dialog to apply a plugin when you launch a " +"file comparison from the Select Files or Folders dialog. See <xref " "linkend=\"Open_paths_unpacker\" /> for details." msgstr "" -"È possibile utilizzare la finestra di dialogo Seleziona Unpacker per applicare un plug-in quando si avvia un confronto di file dalla finestra di " -"dialogo Seleziona file o cartelle.Vedi <xref linkend=\"Open_paths_unpacker\" /> per i dettagli." +"È possibile utilizzare la finestra di dialogo Seleziona Unpacker per " +"applicare un plug-in quando si avvia un confronto di file dalla finestra di " +"dialogo Seleziona file o cartelle.Vedi <xref " +"linkend=\"Open_paths_unpacker\" /> per i dettagli." #. type: Content of: <article><section><section><title> #: English/Plugins.xml:321 msgid "Applying prediffer plugins in the Folder Compare window" -msgstr "Applicazione dei plug-in di preferenza nella finestra Confronto cartelle" +msgstr "" +"Applicazione dei plug-in di preferenza nella finestra Confronto cartelle" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:323 msgid "" -"With prediffer plugins, you set the mode (<firstterm><Automatic> </firstterm> or <firstterm><None></firstterm>) or the plugin name for " -"individual files. (Contrast this with unpacker plugins, where you set the mode for all files.) That is, some files in the same folder have different " +"With prediffer plugins, you set the mode (<firstterm><Automatic> </" +"firstterm> or <firstterm><None></firstterm>) or the plugin name for " +"individual files. (Contrast this with unpacker plugins, where you set the " +"mode for all files.) That is, some files in the same folder have different " "prediffer modes." msgstr "" -"Con i plugin prediffer, imposti la modalità (<firstterm><Automatica> </firstterm> o <firstterm><None></firstterm>) o il nome del plugin " -"per i singoli file.(Confronta questo con i plugin di decompressione, dove imposti la modalità per tutti i file.) Cioè, alcuni file nella stessa " -"cartella hanno modalità predifferenti diverse." +"Con i plugin prediffer, imposti la modalità (<firstterm><Automatica> </" +"firstterm> o <firstterm><None></firstterm>) o il nome del plugin per i " +"singoli file.(Confronta questo con i plugin di decompressione, dove imposti " +"la modalità per tutti i file.) Cioè, alcuni file nella stessa cartella hanno " +"modalità predifferenti diverse." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:329 msgid "" -"To set the mode for one or more files in the Folder Compare window, right-click the files and choose <menuchoice> <guimenu>Plugin Settings</guimenu> " -"<guisubmenu>Prediffer Settings</guisubmenu> </menuchoice>, then choose one of the submenu options:" +"To set the mode for one or more files in the Folder Compare window, right-" +"click the files and choose <menuchoice> <guimenu>Plugin Settings</guimenu> " +"<guisubmenu>Prediffer Settings</guisubmenu> </menuchoice>, then choose one " +"of the submenu options:" msgstr "" -"Per impostare la modalità per uno o più file nella finestra Confronto cartelle, fai clic con il pulsante destro del mouse sui file e scegli " -"<menuchoice> <guimenu >Impostazioni plugin</guimenu > <guisubmenu >Impostazioni preferenze</guisubmenu > </menuchoice >, quindi scegli una delle " -"opzioni del sottomenu:" +"Per impostare la modalità per uno o più file nella finestra Confronto " +"cartelle, fai clic con il pulsante destro del mouse sui file e scegli " +"<menuchoice> <guimenu >Impostazioni plugin</guimenu > <guisubmenu " +">Impostazioni preferenze</guisubmenu > </menuchoice >, quindi scegli una " +"delle opzioni del sottomenu:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:338 -msgid "<guisubmenu><Automatic></guisubmenu> selects the first prediffer plugin available for the file type." -msgstr "<guisubmenu ><Automatico></guisubmenu > seleziona il primo plugin di predifferenza disponibile per il tipo di file." +msgid "" +"<guisubmenu><Automatic></guisubmenu> selects the first prediffer " +"plugin available for the file type." +msgstr "" +"<guisubmenu ><Automatico></guisubmenu > seleziona il primo plugin di " +"predifferenza disponibile per il tipo di file." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Plugins.xml:343 -msgid "<guisubmenu><None></guisubmenu> means that no prediffer plugin is used." -msgstr "<guisubmenu ><None></guisubmenu > significa che non viene utilizzato alcun plugin di prediffer." +msgid "" +"<guisubmenu><None></guisubmenu> means that no prediffer plugin is used." +msgstr "" +"<guisubmenu ><None></guisubmenu > significa che non viene utilizzato " +"alcun plugin di prediffer." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:348 @@ -17547,16 +22886,22 @@ msgstr "Fai clic su <keycap>F5</keycap> per aggiornare la finestra." #. type: Content of: <article><section><section><note><para> #: English/Plugins.xml:351 -msgid "When you open a subfolder during a non-recursive compare, the mode is always reset to <guimenuitem><None></guimenuitem>." +msgid "" +"When you open a subfolder during a non-recursive compare, the mode is always " +"reset to <guimenuitem><None></guimenuitem>." msgstr "" -"Quando apri una sottocartella durante un confronto non ricorsivo, la modalità viene sempre reimpostata su <guimenuitem ><Nessuno></guimenuitem " -">." +"Quando apri una sottocartella durante un confronto non ricorsivo, la " +"modalità viene sempre reimpostata su <guimenuitem ><Nessuno></" +"guimenuitem >." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:355 -msgid "When you open a file from the Folder Compare window, your prediffer setting for that file is applied before the File Compare window is opened." +msgid "" +"When you open a file from the Folder Compare window, your prediffer setting " +"for that file is applied before the File Compare window is opened." msgstr "" -"Quando apri un file dalla finestra Confronto cartelle, l'impostazione predefinita per quel file viene applicata prima dell'apertura della finestra " +"Quando apri un file dalla finestra Confronto cartelle, l'impostazione " +"predefinita per quel file viene applicata prima dell'apertura della finestra " "Confronto file." #. type: Content of: <article><section><section><title> @@ -17567,13 +22912,18 @@ msgstr "Applicazione dei plug-in di preferenza nella finestra Confronto file" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:363 msgid "" -"In the File Compare window, you can apply a prediffer plugin by clicking <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Prediffer</guisubmenu> </" -"menuchoice> and choosing one of the plugins in the list. Suggested plugins are indicated at the top of the list. The files are compared again after " -"the plugin is applied, so you don't need to rescan the files." +"In the File Compare window, you can apply a prediffer plugin by clicking " +"<menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Prediffer</guisubmenu> </" +"menuchoice> and choosing one of the plugins in the list. Suggested plugins " +"are indicated at the top of the list. The files are compared again after the " +"plugin is applied, so you don't need to rescan the files." msgstr "" -"Nella finestra Confronta file, puoi applicare un plugin di prediffer facendo clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Prediffer</" -"guisubmenu > </menuchoice > e scegliendo uno dei plugin nell'elenco.I plugin suggeriti sono indicati in cima all'elenco.I file vengono confrontati " -"nuovamente dopo l'applicazione del plug-in, quindi non è necessario ripetere la scansione dei file." +"Nella finestra Confronta file, puoi applicare un plugin di prediffer facendo " +"clic su <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Prediffer</" +"guisubmenu > </menuchoice > e scegliendo uno dei plugin nell'elenco.I plugin " +"suggeriti sono indicati in cima all'elenco.I file vengono confrontati " +"nuovamente dopo l'applicazione del plug-in, quindi non è necessario ripetere " +"la scansione dei file." #. type: Content of: <article><section><title><indexterm><primary> #: English/Plugins.xml:376 @@ -17587,8 +22937,12 @@ msgstr "Dll di Visual Basic" #. type: Content of: <article><section><title> #: English/Plugins.xml:375 -msgid "Available plugins<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Plug-in disponibili<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Available plugins<placeholder type=\"indexterm\" id=\"0\"/><placeholder " +"type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Plug-in disponibili<placeholder type=\"indexterm\" id=\"0\"/>><placeholder " +"type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:385 @@ -17597,82 +22951,128 @@ msgstr "File del plugin CompareEscapedJavaPropertiesFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:384 -msgid "<filename>CompareEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ConfrontaEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CompareEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" " +"id=\"0\"/></filename>" +msgstr "" +"<filename>ConfrontaEscapedJavaPropertiesFiles<placeholder type=\"indexterm\" " +"id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:388 -msgid "This plugin unescapes Java .properties files for easy viewing, then re-escapes them when saving." +msgid "" +"This plugin unescapes Java .properties files for easy viewing, then re-" +"escapes them when saving." msgstr "" -"Questo plugin esegue l'escape dei file Java .properties per facilitarne la visualizzazione, quindi li esegue nuovamente l'escape durante il " -"salvataggio." +"Questo plugin esegue l'escape dei file Java .properties per facilitarne la " +"visualizzazione, quindi li esegue nuovamente l'escape durante il salvataggio." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:392 English/Plugins.xml:426 English/Plugins.xml:472 English/Plugins.xml:518 English/Plugins.xml:565 English/Plugins.xml:623 -#: English/Plugins.xml:677 English/Plugins.xml:730 English/Plugins.xml:783 English/Plugins.xml:845 English/Plugins.xml:903 English/Plugins.xml:956 -#: English/Plugins.xml:1009 English/Plugins.xml:1062 English/Plugins.xml:1116 English/Plugins.xml:1178 English/Plugins.xml:1236 English/Plugins.xml:1290 -#: English/Plugins.xml:1344 English/Plugins.xml:1398 English/Plugins.xml:1451 English/Plugins.xml:1504 English/Plugins.xml:1557 English/Plugins.xml:1613 -#: English/Plugins.xml:1669 English/Plugins.xml:1706 English/Plugins.xml:1743 English/Plugins.xml:1780 English/Plugins.xml:1817 English/Plugins.xml:1854 -#: English/Plugins.xml:1891 English/Plugins.xml:1928 English/Plugins.xml:1965 English/Plugins.xml:2067 English/Plugins.xml:2160 English/Plugins.xml:2242 -#: English/Plugins.xml:2296 English/Plugins.xml:2333 English/Plugins.xml:2421 English/Plugins.xml:2449 English/Plugins.xml:2491 English/Plugins.xml:2526 +#: English/Plugins.xml:392 English/Plugins.xml:426 English/Plugins.xml:472 +#: English/Plugins.xml:518 English/Plugins.xml:565 English/Plugins.xml:623 +#: English/Plugins.xml:677 English/Plugins.xml:730 English/Plugins.xml:783 +#: English/Plugins.xml:845 English/Plugins.xml:903 English/Plugins.xml:956 +#: English/Plugins.xml:1009 English/Plugins.xml:1062 English/Plugins.xml:1116 +#: English/Plugins.xml:1178 English/Plugins.xml:1236 English/Plugins.xml:1290 +#: English/Plugins.xml:1344 English/Plugins.xml:1398 English/Plugins.xml:1451 +#: English/Plugins.xml:1504 English/Plugins.xml:1557 English/Plugins.xml:1613 +#: English/Plugins.xml:1669 English/Plugins.xml:1706 English/Plugins.xml:1743 +#: English/Plugins.xml:1780 English/Plugins.xml:1817 English/Plugins.xml:1854 +#: English/Plugins.xml:1891 English/Plugins.xml:1928 English/Plugins.xml:1965 +#: English/Plugins.xml:2067 English/Plugins.xml:2160 English/Plugins.xml:2242 +#: English/Plugins.xml:2296 English/Plugins.xml:2333 English/Plugins.xml:2421 +#: English/Plugins.xml:2449 English/Plugins.xml:2491 English/Plugins.xml:2526 #: English/Plugins.xml:2555 English/Plugins.xml:2662 English/Plugins.xml:2698 msgid "Category" msgstr "Categoria" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:394 English/Plugins.xml:428 English/Plugins.xml:474 English/Plugins.xml:520 English/Plugins.xml:567 English/Plugins.xml:625 -#: English/Plugins.xml:679 English/Plugins.xml:732 English/Plugins.xml:785 English/Plugins.xml:847 English/Plugins.xml:905 English/Plugins.xml:958 -#: English/Plugins.xml:1011 English/Plugins.xml:1064 English/Plugins.xml:1118 English/Plugins.xml:1180 English/Plugins.xml:1238 English/Plugins.xml:1292 -#: English/Plugins.xml:1346 English/Plugins.xml:1400 English/Plugins.xml:1453 English/Plugins.xml:1506 English/Plugins.xml:1559 English/Plugins.xml:1615 -#: English/Plugins.xml:1671 English/Plugins.xml:1708 English/Plugins.xml:1745 English/Plugins.xml:1782 English/Plugins.xml:1819 English/Plugins.xml:1856 -#: English/Plugins.xml:1893 English/Plugins.xml:1930 English/Plugins.xml:1967 English/Plugins.xml:2069 English/Plugins.xml:2162 English/Plugins.xml:2244 -#: English/Plugins.xml:2298 English/Plugins.xml:2335 English/Plugins.xml:2423 English/Plugins.xml:2451 English/Plugins.xml:2493 English/Plugins.xml:2528 +#: English/Plugins.xml:394 English/Plugins.xml:428 English/Plugins.xml:474 +#: English/Plugins.xml:520 English/Plugins.xml:567 English/Plugins.xml:625 +#: English/Plugins.xml:679 English/Plugins.xml:732 English/Plugins.xml:785 +#: English/Plugins.xml:847 English/Plugins.xml:905 English/Plugins.xml:958 +#: English/Plugins.xml:1011 English/Plugins.xml:1064 English/Plugins.xml:1118 +#: English/Plugins.xml:1180 English/Plugins.xml:1238 English/Plugins.xml:1292 +#: English/Plugins.xml:1346 English/Plugins.xml:1400 English/Plugins.xml:1453 +#: English/Plugins.xml:1506 English/Plugins.xml:1559 English/Plugins.xml:1615 +#: English/Plugins.xml:1671 English/Plugins.xml:1708 English/Plugins.xml:1745 +#: English/Plugins.xml:1782 English/Plugins.xml:1819 English/Plugins.xml:1856 +#: English/Plugins.xml:1893 English/Plugins.xml:1930 English/Plugins.xml:1967 +#: English/Plugins.xml:2069 English/Plugins.xml:2162 English/Plugins.xml:2244 +#: English/Plugins.xml:2298 English/Plugins.xml:2335 English/Plugins.xml:2423 +#: English/Plugins.xml:2451 English/Plugins.xml:2493 English/Plugins.xml:2528 #: English/Plugins.xml:2557 English/Plugins.xml:2663 English/Plugins.xml:2700 msgid "File filter" msgstr "Filtro file" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:396 English/Plugins.xml:430 English/Plugins.xml:476 English/Plugins.xml:522 English/Plugins.xml:569 English/Plugins.xml:627 -#: English/Plugins.xml:681 English/Plugins.xml:734 English/Plugins.xml:787 English/Plugins.xml:849 English/Plugins.xml:907 English/Plugins.xml:960 -#: English/Plugins.xml:1013 English/Plugins.xml:1066 English/Plugins.xml:1120 English/Plugins.xml:1182 English/Plugins.xml:1240 English/Plugins.xml:1294 -#: English/Plugins.xml:1348 English/Plugins.xml:1402 English/Plugins.xml:1455 English/Plugins.xml:1508 English/Plugins.xml:1561 English/Plugins.xml:1617 -#: English/Plugins.xml:1673 English/Plugins.xml:1710 English/Plugins.xml:1747 English/Plugins.xml:1784 English/Plugins.xml:1821 English/Plugins.xml:1858 -#: English/Plugins.xml:1895 English/Plugins.xml:1932 English/Plugins.xml:1969 English/Plugins.xml:2071 English/Plugins.xml:2164 English/Plugins.xml:2246 -#: English/Plugins.xml:2300 English/Plugins.xml:2337 English/Plugins.xml:2425 English/Plugins.xml:2453 English/Plugins.xml:2495 English/Plugins.xml:2530 +#: English/Plugins.xml:396 English/Plugins.xml:430 English/Plugins.xml:476 +#: English/Plugins.xml:522 English/Plugins.xml:569 English/Plugins.xml:627 +#: English/Plugins.xml:681 English/Plugins.xml:734 English/Plugins.xml:787 +#: English/Plugins.xml:849 English/Plugins.xml:907 English/Plugins.xml:960 +#: English/Plugins.xml:1013 English/Plugins.xml:1066 English/Plugins.xml:1120 +#: English/Plugins.xml:1182 English/Plugins.xml:1240 English/Plugins.xml:1294 +#: English/Plugins.xml:1348 English/Plugins.xml:1402 English/Plugins.xml:1455 +#: English/Plugins.xml:1508 English/Plugins.xml:1561 English/Plugins.xml:1617 +#: English/Plugins.xml:1673 English/Plugins.xml:1710 English/Plugins.xml:1747 +#: English/Plugins.xml:1784 English/Plugins.xml:1821 English/Plugins.xml:1858 +#: English/Plugins.xml:1895 English/Plugins.xml:1932 English/Plugins.xml:1969 +#: English/Plugins.xml:2071 English/Plugins.xml:2164 English/Plugins.xml:2246 +#: English/Plugins.xml:2300 English/Plugins.xml:2337 English/Plugins.xml:2425 +#: English/Plugins.xml:2453 English/Plugins.xml:2495 English/Plugins.xml:2530 #: English/Plugins.xml:2559 msgid "Plugin arguments" msgstr "Argomenti del plugin" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:398 English/Plugins.xml:432 English/Plugins.xml:478 English/Plugins.xml:524 English/Plugins.xml:571 English/Plugins.xml:629 -#: English/Plugins.xml:683 English/Plugins.xml:736 English/Plugins.xml:789 English/Plugins.xml:851 English/Plugins.xml:909 English/Plugins.xml:962 -#: English/Plugins.xml:1015 English/Plugins.xml:1068 English/Plugins.xml:1122 English/Plugins.xml:1184 English/Plugins.xml:1242 English/Plugins.xml:1296 -#: English/Plugins.xml:1350 English/Plugins.xml:1404 English/Plugins.xml:1457 English/Plugins.xml:1510 English/Plugins.xml:1563 English/Plugins.xml:1619 -#: English/Plugins.xml:1675 English/Plugins.xml:1712 English/Plugins.xml:1749 English/Plugins.xml:1786 English/Plugins.xml:1823 English/Plugins.xml:1860 -#: English/Plugins.xml:1897 English/Plugins.xml:1934 English/Plugins.xml:1971 English/Plugins.xml:2073 English/Plugins.xml:2166 English/Plugins.xml:2248 +#: English/Plugins.xml:398 English/Plugins.xml:432 English/Plugins.xml:478 +#: English/Plugins.xml:524 English/Plugins.xml:571 English/Plugins.xml:629 +#: English/Plugins.xml:683 English/Plugins.xml:736 English/Plugins.xml:789 +#: English/Plugins.xml:851 English/Plugins.xml:909 English/Plugins.xml:962 +#: English/Plugins.xml:1015 English/Plugins.xml:1068 English/Plugins.xml:1122 +#: English/Plugins.xml:1184 English/Plugins.xml:1242 English/Plugins.xml:1296 +#: English/Plugins.xml:1350 English/Plugins.xml:1404 English/Plugins.xml:1457 +#: English/Plugins.xml:1510 English/Plugins.xml:1563 English/Plugins.xml:1619 +#: English/Plugins.xml:1675 English/Plugins.xml:1712 English/Plugins.xml:1749 +#: English/Plugins.xml:1786 English/Plugins.xml:1823 English/Plugins.xml:1860 +#: English/Plugins.xml:1897 English/Plugins.xml:1934 English/Plugins.xml:1971 +#: English/Plugins.xml:2073 English/Plugins.xml:2166 English/Plugins.xml:2248 #: English/Plugins.xml:2302 English/Plugins.xml:2339 msgid "Packing" msgstr "Imballaggio" #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:400 English/Plugins.xml:434 English/Plugins.xml:480 English/Plugins.xml:526 English/Plugins.xml:573 English/Plugins.xml:631 -#: English/Plugins.xml:685 English/Plugins.xml:738 English/Plugins.xml:791 English/Plugins.xml:853 English/Plugins.xml:911 English/Plugins.xml:964 -#: English/Plugins.xml:1017 English/Plugins.xml:1070 English/Plugins.xml:1124 English/Plugins.xml:1186 English/Plugins.xml:1244 English/Plugins.xml:1298 -#: English/Plugins.xml:1352 English/Plugins.xml:1406 English/Plugins.xml:1459 English/Plugins.xml:1512 English/Plugins.xml:1565 English/Plugins.xml:1621 -#: English/Plugins.xml:1677 English/Plugins.xml:1714 English/Plugins.xml:1751 English/Plugins.xml:1788 English/Plugins.xml:1825 English/Plugins.xml:1862 -#: English/Plugins.xml:1899 English/Plugins.xml:1936 English/Plugins.xml:1973 English/Plugins.xml:2075 English/Plugins.xml:2168 English/Plugins.xml:2250 -#: English/Plugins.xml:2304 English/Plugins.xml:2341 English/Plugins.xml:2427 English/Plugins.xml:2455 English/Plugins.xml:2497 English/Plugins.xml:2532 +#: English/Plugins.xml:400 English/Plugins.xml:434 English/Plugins.xml:480 +#: English/Plugins.xml:526 English/Plugins.xml:573 English/Plugins.xml:631 +#: English/Plugins.xml:685 English/Plugins.xml:738 English/Plugins.xml:791 +#: English/Plugins.xml:853 English/Plugins.xml:911 English/Plugins.xml:964 +#: English/Plugins.xml:1017 English/Plugins.xml:1070 English/Plugins.xml:1124 +#: English/Plugins.xml:1186 English/Plugins.xml:1244 English/Plugins.xml:1298 +#: English/Plugins.xml:1352 English/Plugins.xml:1406 English/Plugins.xml:1459 +#: English/Plugins.xml:1512 English/Plugins.xml:1565 English/Plugins.xml:1621 +#: English/Plugins.xml:1677 English/Plugins.xml:1714 English/Plugins.xml:1751 +#: English/Plugins.xml:1788 English/Plugins.xml:1825 English/Plugins.xml:1862 +#: English/Plugins.xml:1899 English/Plugins.xml:1936 English/Plugins.xml:1973 +#: English/Plugins.xml:2075 English/Plugins.xml:2168 English/Plugins.xml:2250 +#: English/Plugins.xml:2304 English/Plugins.xml:2341 English/Plugins.xml:2427 +#: English/Plugins.xml:2455 English/Plugins.xml:2497 English/Plugins.xml:2532 #: English/Plugins.xml:2561 English/Plugins.xml:2664 English/Plugins.xml:2702 msgid "Settings dialog support" msgstr "Supporto della finestra di dialogo Impostazioni" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:403 English/Plugins.xml:439 English/Plugins.xml:485 English/Plugins.xml:531 English/Plugins.xml:578 English/Plugins.xml:636 -#: English/Plugins.xml:690 English/Plugins.xml:743 English/Plugins.xml:796 English/Plugins.xml:858 English/Plugins.xml:916 English/Plugins.xml:969 -#: English/Plugins.xml:1022 English/Plugins.xml:1075 English/Plugins.xml:1129 English/Plugins.xml:1191 English/Plugins.xml:1249 English/Plugins.xml:1303 -#: English/Plugins.xml:1357 English/Plugins.xml:1411 English/Plugins.xml:1464 English/Plugins.xml:1517 English/Plugins.xml:1570 English/Plugins.xml:1626 -#: English/Plugins.xml:1682 English/Plugins.xml:1719 English/Plugins.xml:1756 English/Plugins.xml:1793 English/Plugins.xml:1830 English/Plugins.xml:1867 -#: English/Plugins.xml:1904 English/Plugins.xml:1941 English/Plugins.xml:1978 English/Plugins.xml:2080 English/Plugins.xml:2173 English/Plugins.xml:2255 +#: English/Plugins.xml:403 English/Plugins.xml:439 English/Plugins.xml:485 +#: English/Plugins.xml:531 English/Plugins.xml:578 English/Plugins.xml:636 +#: English/Plugins.xml:690 English/Plugins.xml:743 English/Plugins.xml:796 +#: English/Plugins.xml:858 English/Plugins.xml:916 English/Plugins.xml:969 +#: English/Plugins.xml:1022 English/Plugins.xml:1075 English/Plugins.xml:1129 +#: English/Plugins.xml:1191 English/Plugins.xml:1249 English/Plugins.xml:1303 +#: English/Plugins.xml:1357 English/Plugins.xml:1411 English/Plugins.xml:1464 +#: English/Plugins.xml:1517 English/Plugins.xml:1570 English/Plugins.xml:1626 +#: English/Plugins.xml:1682 English/Plugins.xml:1719 English/Plugins.xml:1756 +#: English/Plugins.xml:1793 English/Plugins.xml:1830 English/Plugins.xml:1867 +#: English/Plugins.xml:1904 English/Plugins.xml:1941 English/Plugins.xml:1978 +#: English/Plugins.xml:2080 English/Plugins.xml:2173 English/Plugins.xml:2255 #: English/Plugins.xml:2309 English/Plugins.xml:2346 msgid "Unpacker" msgstr "Disimballatore" @@ -17683,32 +23083,53 @@ msgid "<filename class=\"extension\">*.properties</filename>" msgstr "<filename class=\"extension\">*.properties</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:407 English/Plugins.xml:411 English/Plugins.xml:450 English/Plugins.xml:452 English/Plugins.xml:496 English/Plugins.xml:498 -#: English/Plugins.xml:543 English/Plugins.xml:545 English/Plugins.xml:587 English/Plugins.xml:589 English/Plugins.xml:644 English/Plugins.xml:646 -#: English/Plugins.xml:697 English/Plugins.xml:699 English/Plugins.xml:750 English/Plugins.xml:752 English/Plugins.xml:804 English/Plugins.xml:806 -#: English/Plugins.xml:867 English/Plugins.xml:869 English/Plugins.xml:923 English/Plugins.xml:925 English/Plugins.xml:976 English/Plugins.xml:978 -#: English/Plugins.xml:1029 English/Plugins.xml:1031 English/Plugins.xml:1083 English/Plugins.xml:1085 English/Plugins.xml:1137 English/Plugins.xml:1139 -#: English/Plugins.xml:1200 English/Plugins.xml:1202 English/Plugins.xml:1257 English/Plugins.xml:1259 English/Plugins.xml:1311 English/Plugins.xml:1313 -#: English/Plugins.xml:1365 English/Plugins.xml:1367 English/Plugins.xml:1418 English/Plugins.xml:1420 English/Plugins.xml:1471 English/Plugins.xml:1473 -#: English/Plugins.xml:1524 English/Plugins.xml:1526 English/Plugins.xml:1580 English/Plugins.xml:1582 English/Plugins.xml:1636 English/Plugins.xml:1638 -#: English/Plugins.xml:1689 English/Plugins.xml:1691 English/Plugins.xml:1724 English/Plugins.xml:1726 English/Plugins.xml:1728 English/Plugins.xml:1761 -#: English/Plugins.xml:1763 English/Plugins.xml:1765 English/Plugins.xml:1798 English/Plugins.xml:1800 English/Plugins.xml:1802 English/Plugins.xml:1835 -#: English/Plugins.xml:1837 English/Plugins.xml:1839 English/Plugins.xml:1872 English/Plugins.xml:1874 English/Plugins.xml:1876 English/Plugins.xml:1909 -#: English/Plugins.xml:1911 English/Plugins.xml:1913 English/Plugins.xml:1946 English/Plugins.xml:1948 English/Plugins.xml:1950 English/Plugins.xml:1983 -#: English/Plugins.xml:1985 English/Plugins.xml:1987 English/Plugins.xml:2087 English/Plugins.xml:2089 English/Plugins.xml:2180 English/Plugins.xml:2182 -#: English/Plugins.xml:2262 English/Plugins.xml:2264 English/Plugins.xml:2316 English/Plugins.xml:2318 English/Plugins.xml:2351 English/Plugins.xml:2353 -#: English/Plugins.xml:2355 English/Plugins.xml:2470 English/Plugins.xml:2472 English/Plugins.xml:2570 English/Plugins.xml:2572 English/Plugins.xml:2669 +#: English/Plugins.xml:407 English/Plugins.xml:411 English/Plugins.xml:450 +#: English/Plugins.xml:452 English/Plugins.xml:496 English/Plugins.xml:498 +#: English/Plugins.xml:543 English/Plugins.xml:545 English/Plugins.xml:587 +#: English/Plugins.xml:589 English/Plugins.xml:644 English/Plugins.xml:646 +#: English/Plugins.xml:697 English/Plugins.xml:699 English/Plugins.xml:750 +#: English/Plugins.xml:752 English/Plugins.xml:804 English/Plugins.xml:806 +#: English/Plugins.xml:867 English/Plugins.xml:869 English/Plugins.xml:923 +#: English/Plugins.xml:925 English/Plugins.xml:976 English/Plugins.xml:978 +#: English/Plugins.xml:1029 English/Plugins.xml:1031 English/Plugins.xml:1083 +#: English/Plugins.xml:1085 English/Plugins.xml:1137 English/Plugins.xml:1139 +#: English/Plugins.xml:1200 English/Plugins.xml:1202 English/Plugins.xml:1257 +#: English/Plugins.xml:1259 English/Plugins.xml:1311 English/Plugins.xml:1313 +#: English/Plugins.xml:1365 English/Plugins.xml:1367 English/Plugins.xml:1418 +#: English/Plugins.xml:1420 English/Plugins.xml:1471 English/Plugins.xml:1473 +#: English/Plugins.xml:1524 English/Plugins.xml:1526 English/Plugins.xml:1580 +#: English/Plugins.xml:1582 English/Plugins.xml:1636 English/Plugins.xml:1638 +#: English/Plugins.xml:1689 English/Plugins.xml:1691 English/Plugins.xml:1724 +#: English/Plugins.xml:1726 English/Plugins.xml:1728 English/Plugins.xml:1761 +#: English/Plugins.xml:1763 English/Plugins.xml:1765 English/Plugins.xml:1798 +#: English/Plugins.xml:1800 English/Plugins.xml:1802 English/Plugins.xml:1835 +#: English/Plugins.xml:1837 English/Plugins.xml:1839 English/Plugins.xml:1872 +#: English/Plugins.xml:1874 English/Plugins.xml:1876 English/Plugins.xml:1909 +#: English/Plugins.xml:1911 English/Plugins.xml:1913 English/Plugins.xml:1946 +#: English/Plugins.xml:1948 English/Plugins.xml:1950 English/Plugins.xml:1983 +#: English/Plugins.xml:1985 English/Plugins.xml:1987 English/Plugins.xml:2087 +#: English/Plugins.xml:2089 English/Plugins.xml:2180 English/Plugins.xml:2182 +#: English/Plugins.xml:2262 English/Plugins.xml:2264 English/Plugins.xml:2316 +#: English/Plugins.xml:2318 English/Plugins.xml:2351 English/Plugins.xml:2353 +#: English/Plugins.xml:2355 English/Plugins.xml:2470 English/Plugins.xml:2472 +#: English/Plugins.xml:2570 English/Plugins.xml:2572 English/Plugins.xml:2669 #: English/Plugins.xml:2709 msgid "No" msgstr "NO" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:409 English/Plugins.xml:454 English/Plugins.xml:500 English/Plugins.xml:547 English/Plugins.xml:591 English/Plugins.xml:642 -#: English/Plugins.xml:695 English/Plugins.xml:748 English/Plugins.xml:802 English/Plugins.xml:865 English/Plugins.xml:921 English/Plugins.xml:974 -#: English/Plugins.xml:1027 English/Plugins.xml:1081 English/Plugins.xml:1135 English/Plugins.xml:1198 English/Plugins.xml:1255 English/Plugins.xml:1309 -#: English/Plugins.xml:1363 English/Plugins.xml:1416 English/Plugins.xml:1469 English/Plugins.xml:1522 English/Plugins.xml:1578 English/Plugins.xml:1634 -#: English/Plugins.xml:1687 English/Plugins.xml:2085 English/Plugins.xml:2178 English/Plugins.xml:2260 English/Plugins.xml:2314 English/Plugins.xml:2434 -#: English/Plugins.xml:2504 English/Plugins.xml:2506 English/Plugins.xml:2539 English/Plugins.xml:2541 +#: English/Plugins.xml:409 English/Plugins.xml:454 English/Plugins.xml:500 +#: English/Plugins.xml:547 English/Plugins.xml:591 English/Plugins.xml:642 +#: English/Plugins.xml:695 English/Plugins.xml:748 English/Plugins.xml:802 +#: English/Plugins.xml:865 English/Plugins.xml:921 English/Plugins.xml:974 +#: English/Plugins.xml:1027 English/Plugins.xml:1081 English/Plugins.xml:1135 +#: English/Plugins.xml:1198 English/Plugins.xml:1255 English/Plugins.xml:1309 +#: English/Plugins.xml:1363 English/Plugins.xml:1416 English/Plugins.xml:1469 +#: English/Plugins.xml:1522 English/Plugins.xml:1578 English/Plugins.xml:1634 +#: English/Plugins.xml:1687 English/Plugins.xml:2085 English/Plugins.xml:2178 +#: English/Plugins.xml:2260 English/Plugins.xml:2314 English/Plugins.xml:2434 +#: English/Plugins.xml:2504 English/Plugins.xml:2506 English/Plugins.xml:2539 +#: English/Plugins.xml:2541 msgid "Yes" msgstr "SÌ" @@ -17719,25 +23140,37 @@ msgstr "Confronta il file del plug-in MSExcelFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:417 -msgid "<filename>CompareMSExcelFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Confronta file MSExcel<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CompareMSExcelFiles<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>Confronta file MSExcel<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:421 msgid "" -"Displays the text contents of a <trademark class=\"registered\">Microsoft</trademark> <application>Excel</application> file, stripping away all " +"Displays the text contents of a <trademark class=\"registered\">Microsoft</" +"trademark> <application>Excel</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>, eliminando tutta " -"la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark " +"class=\"registered\">Microsoft</trademark> <application>Excel</application>, " +"eliminando tutta la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> -#: English/Plugins.xml:436 English/Plugins.xml:482 English/Plugins.xml:528 English/Plugins.xml:575 English/Plugins.xml:633 English/Plugins.xml:687 -#: English/Plugins.xml:740 English/Plugins.xml:793 English/Plugins.xml:855 English/Plugins.xml:913 English/Plugins.xml:966 English/Plugins.xml:1019 -#: English/Plugins.xml:1072 English/Plugins.xml:1126 English/Plugins.xml:1188 English/Plugins.xml:1246 English/Plugins.xml:1300 English/Plugins.xml:1354 -#: English/Plugins.xml:1408 English/Plugins.xml:1461 English/Plugins.xml:1514 English/Plugins.xml:1567 English/Plugins.xml:1623 English/Plugins.xml:1679 -#: English/Plugins.xml:1716 English/Plugins.xml:1753 English/Plugins.xml:1790 English/Plugins.xml:1827 English/Plugins.xml:1864 English/Plugins.xml:1901 -#: English/Plugins.xml:1938 English/Plugins.xml:1975 English/Plugins.xml:2077 English/Plugins.xml:2170 English/Plugins.xml:2252 English/Plugins.xml:2306 +#: English/Plugins.xml:436 English/Plugins.xml:482 English/Plugins.xml:528 +#: English/Plugins.xml:575 English/Plugins.xml:633 English/Plugins.xml:687 +#: English/Plugins.xml:740 English/Plugins.xml:793 English/Plugins.xml:855 +#: English/Plugins.xml:913 English/Plugins.xml:966 English/Plugins.xml:1019 +#: English/Plugins.xml:1072 English/Plugins.xml:1126 English/Plugins.xml:1188 +#: English/Plugins.xml:1246 English/Plugins.xml:1300 English/Plugins.xml:1354 +#: English/Plugins.xml:1408 English/Plugins.xml:1461 English/Plugins.xml:1514 +#: English/Plugins.xml:1567 English/Plugins.xml:1623 English/Plugins.xml:1679 +#: English/Plugins.xml:1716 English/Plugins.xml:1753 English/Plugins.xml:1790 +#: English/Plugins.xml:1827 English/Plugins.xml:1864 English/Plugins.xml:1901 +#: English/Plugins.xml:1938 English/Plugins.xml:1975 English/Plugins.xml:2077 +#: English/Plugins.xml:2170 English/Plugins.xml:2252 English/Plugins.xml:2306 #: English/Plugins.xml:2343 msgid "Dependency" msgstr "Dipendenza" @@ -17745,18 +23178,28 @@ msgstr "Dipendenza" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:441 msgid "" -"<filename class=\"extension\">*.xls</filename>, <filename class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</filename>, " -"<filename class=\"extension\">*.xlsb</filename>, <filename class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</filename>, " -"<filename class=\"extension\">*.xltx</filename>, <filename class=\"extension\">*.xltm</filename>" +"<filename class=\"extension\">*.xls</filename>, <filename " +"class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</" +"filename>, <filename class=\"extension\">*.xlsb</filename>, <filename " +"class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</" +"filename>, <filename class=\"extension\">*.xltx</filename>, <filename " +"class=\"extension\">*.xltm</filename>" msgstr "" -"<filename class=\"extension\">*.xls</filename>, <filename class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</filename>, " -"<filename class=\"extension\">*.xlsb</filename>, <filename class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</filename>, " -"<filename class=\"estensione\">*.xltx</filename>, <filename class=\"estensione\">*.xltm</filename>" +"<filename class=\"extension\">*.xls</filename>, <filename " +"class=\"extension\">*.xlsx</filename>, <filename class=\"extension\">*.xlsm</" +"filename>, <filename class=\"extension\">*.xlsb</filename>, <filename " +"class=\"extension\">*.xla</filename>, <filename class=\"extension\">*.xlax</" +"filename>, <filename class=\"estensione\">*.xltx</filename>, <filename " +"class=\"estensione\">*.xltm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:456 -msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>" -msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Excel</application>" +msgid "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Excel</" +"application>" +msgstr "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Excel</" +"application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:464 @@ -17765,33 +23208,49 @@ msgstr "Confronta il file del plug-in MSPowerPointFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:463 -msgid "<filename>CompareMSPowerPointFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Confronta file MSPowerPoint<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CompareMSPowerPointFiles<placeholder type=\"indexterm\" id=\"0\"/" +"></filename>" +msgstr "" +"<filename>Confronta file MSPowerPoint<placeholder type=\"indexterm\" " +"id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:467 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</" +"trademark> <application>PowerPoint</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>, eliminando " -"tutta la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark " +"class=\"registered\">Microsoft</trademark> <application>PowerPoint</" +"application>, eliminando tutta la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:487 msgid "" -"<filename class=\"extension\">*.ppt</filename>, <filename class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</filename>, " -"<filename class=\"extension\">*.ppa</filename>, <filename class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</filename>, " -"<filename class=\"extension\">*.potx</filename>, <filename class=\"extension\">*.potm</filename>" +"<filename class=\"extension\">*.ppt</filename>, <filename " +"class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</" +"filename>, <filename class=\"extension\">*.ppa</filename>, <filename " +"class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</" +"filename>, <filename class=\"extension\">*.potx</filename>, <filename " +"class=\"extension\">*.potm</filename>" msgstr "" -"<filename class=\"extension\">*.ppt</filename>, <filename class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</filename>, " -"<filename class=\"extension\">*.ppa</filename>, <filename class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</filename>, " -"<filename class=\"estensione\">*.potx</filename>, <filename class=\"estensione\">*.potm</filename>" +"<filename class=\"extension\">*.ppt</filename>, <filename " +"class=\"extension\">*.pptx</filename>, <filename class=\"extension\">*.pptm</" +"filename>, <filename class=\"extension\">*.ppa</filename>, <filename " +"class=\"extension\">*.ppam</filename>, <filename class=\"extension\">*.pot</" +"filename>, <filename class=\"estensione\">*.potx</filename>, <filename " +"class=\"estensione\">*.potm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:502 -msgid "<trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>" -msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>PowerPoint</application>" +msgid "" +"<trademark class=\"registered\">Microsoft</trademark> " +"<application>PowerPoint</application>" +msgstr "" +"<trademark class=\"registered\">Microsoft</trademark> " +"<application>PowerPoint</application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:510 @@ -17800,33 +23259,51 @@ msgstr "Confronta il file del plug-in MSVisioFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:509 -msgid "<filename>CompareMSVisioFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Confronta file MSVisio<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CompareMSVisioFiles<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>Confronta file MSVisio<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:513 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>Visio</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</" +"trademark> <application>Visio</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>, eliminando tutta " -"la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark " +"class=\"registered\">Microsoft</trademark> <application>Visio</application>, " +"eliminando tutta la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:533 msgid "" -"<filename class=\"extension\">*.vsd</filename>, <filename class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</filename>, " -"<filename class=\"extension\">*.vss</filename>, <filename class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</filename>, " -"<filename class=\"extension\">*.vst</filename>, <filename class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</filename>" -msgstr "" -"<filename class=\"extension\">*.vsd</filename>, <filename class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</filename>, " -"<filename class=\"extension\">*.vss</filename>, <filename class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</filename>, " -"<filename class=\"extension\">*.vst</filename>, <filename class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</filename>" +"<filename class=\"extension\">*.vsd</filename>, <filename " +"class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</" +"filename>, <filename class=\"extension\">*.vss</filename>, <filename " +"class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</" +"filename>, <filename class=\"extension\">*.vst</filename>, <filename " +"class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</" +"filename>" +msgstr "" +"<filename class=\"extension\">*.vsd</filename>, <filename " +"class=\"extension\">*.vsdx</filename>, <filename class=\"extension\">*.vsdm</" +"filename>, <filename class=\"extension\">*.vss</filename>, <filename " +"class=\"extension\">*.vssx</filename>, <filename class=\"extension\">*.vssm</" +"filename>, <filename class=\"extension\">*.vst</filename>, <filename " +"class=\"extension\">*.vstx</filename>, <filename class=\"extension\">*.vstm</" +"filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:549 -msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>" -msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Visio</application>" +msgid "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Visio</" +"application>" +msgstr "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Visio</" +"application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:557 @@ -17835,31 +23312,47 @@ msgstr "Confronta il file del plugin MSWordFiles" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:556 -msgid "<filename>CompareMSWordFiles<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Confronta file MSWord<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CompareMSWordFiles<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>Confronta file MSWord<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:560 msgid "" -"Displays the text content of a <trademark class=\"registered\">Microsoft</trademark> <application>Word</application> file, stripping away all " +"Displays the text content of a <trademark class=\"registered\">Microsoft</" +"trademark> <application>Word</application> file, stripping away all " "formatting and embedded objects." msgstr "" -"Visualizza il contenuto testuale di un file <trademark class=\"registered\">Microsoft</trademark> <application>Word</application>, eliminando tutta " -"la formattazione e gli oggetti incorporati." +"Visualizza il contenuto testuale di un file <trademark " +"class=\"registered\">Microsoft</trademark> <application>Word</application>, " +"eliminando tutta la formattazione e gli oggetti incorporati." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:580 msgid "" -"<filename class=\"extension\">*.doc</filename>, <filename class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</filename>, " -"<filename class=\"extension\">*.dot</filename>, <filename class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</filename>" +"<filename class=\"extension\">*.doc</filename>, <filename " +"class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</" +"filename>, <filename class=\"extension\">*.dot</filename>, <filename " +"class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</" +"filename>" msgstr "" -"<filename class=\"extension\">*.doc</filename>, <filename class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</filename>, " -"<filename class=\"extension\">*.dot</filename>, <filename class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</filename>" +"<filename class=\"extension\">*.doc</filename>, <filename " +"class=\"extension\">*.docx</filename>, <filename class=\"extension\">*.docm</" +"filename>, <filename class=\"extension\">*.dot</filename>, <filename " +"class=\"extension\">*.dotx</filename>, <filename class=\"extension\">*.dotm</" +"filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:593 -msgid "<trademark class=\"registered\">Microsoft</trademark> <application>Word</application>" -msgstr "<trademark class=\"registered\">Microsoft</trademark> <application>Word</application>" +msgid "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Word</" +"application>" +msgstr "" +"<trademark class=\"registered\">Microsoft</trademark> <application>Word</" +"application>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:601 @@ -17868,8 +23361,10 @@ msgstr "File del plugin PrettifyHTML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:600 -msgid "<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>PrettifyHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:604 @@ -17878,13 +23373,20 @@ msgstr "HTML più carino con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:607 -msgid "<command>PrettifyHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PrettifyHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PrettifyHTML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PrettifyHTML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Plugins.xml:615 English/Plugins.xml:669 English/Plugins.xml:722 English/Plugins.xml:775 English/Plugins.xml:895 English/Plugins.xml:948 -#: English/Plugins.xml:1001 English/Plugins.xml:1054 English/Plugins.xml:1108 English/Plugins.xml:1228 English/Plugins.xml:1282 English/Plugins.xml:1336 -#: English/Plugins.xml:1390 English/Plugins.xml:1443 English/Plugins.xml:1496 English/Plugins.xml:1549 English/Plugins.xml:1605 +#: English/Plugins.xml:615 English/Plugins.xml:669 English/Plugins.xml:722 +#: English/Plugins.xml:775 English/Plugins.xml:895 English/Plugins.xml:948 +#: English/Plugins.xml:1001 English/Plugins.xml:1054 English/Plugins.xml:1108 +#: English/Plugins.xml:1228 English/Plugins.xml:1282 English/Plugins.xml:1336 +#: English/Plugins.xml:1390 English/Plugins.xml:1443 English/Plugins.xml:1496 +#: English/Plugins.xml:1549 English/Plugins.xml:1605 msgid "<option><replaceable>arguments</replaceable></option>" msgstr "<option><replaceable>argomenti</replaceable></option>" @@ -17895,8 +23397,12 @@ msgstr "Opzioni della riga di comando passate al comando tidy" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:638 English/Plugins.xml:1131 -msgid "<filename class=\"extension\">*.html</filename>, <filename class=\"extension\">*.htm</filename>" -msgstr "<filename class=\"extension\">*.html</filename>, <filename class=\"extension\">*.htm</filename>" +msgid "" +"<filename class=\"extension\">*.html</filename>, <filename " +"class=\"extension\">*.htm</filename>" +msgstr "" +"<filename class=\"extension\">*.html</filename>, <filename " +"class=\"extension\">*.htm</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:648 English/Plugins.xml:701 English/Plugins.xml:1141 @@ -17910,8 +23416,10 @@ msgstr "File del plug-in PrettifyXML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:654 -msgid "<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>PrettifyXML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:658 @@ -17920,8 +23428,12 @@ msgstr "XML più bello con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:661 -msgid "<command>PrettifyXML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PrettifyXML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PrettifyXML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PrettifyXML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:692 @@ -17935,8 +23447,10 @@ msgstr "File del plugin PrettifyJSON" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:707 -msgid "<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>PrettifyJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:711 @@ -17945,8 +23459,12 @@ msgstr "JSON Più carino con il comando jq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:714 -msgid "<command>PrettifyJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PrettifyJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PrettifyJSON</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PrettifyJSON</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:724 English/Plugins.xml:1003 @@ -17970,8 +23488,10 @@ msgstr "File del plug-in PrettifyYAML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:760 -msgid "<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>PrettifyYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:764 @@ -17980,8 +23500,12 @@ msgstr "YAML Più carino con il comando yq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:767 -msgid "<command>PrettifyYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PrettifyYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PrettifyYAML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PrettifyYAML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:777 English/Plugins.xml:1056 @@ -17990,8 +23514,12 @@ msgstr "Opzioni del filtro o della riga di comando passate al comando yq" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:798 English/Plugins.xml:1077 -msgid "<filename class=\"extension\">*.yaml</filename>, <filename class=\"extension\">*.yml</filename>" -msgstr "<filename class=\"extension\">*.yaml</filename>, <filename class=\"extension\">*.yml</filename>" +msgid "" +"<filename class=\"extension\">*.yaml</filename>, <filename " +"class=\"extension\">*.yml</filename>" +msgstr "" +"<filename class=\"extension\">*.yaml</filename>, <filename " +"class=\"extension\">*.yml</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:808 @@ -18005,8 +23533,10 @@ msgstr "File del plug-in PrettifyPO" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:815 -msgid "<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>PrettifyPO<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:819 @@ -18015,8 +23545,12 @@ msgstr "PO Più carino con gettext msgcat" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:822 -msgid "<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>arguments</replaceable> </arg>" -msgstr "<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>argomenti</replaceable> </arg>" +msgid "" +"<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> " +"<replaceable>arguments</replaceable> </arg>" +msgstr "" +"<command>PrettifyPO</command> <arg choice=\"opt\" rep=\"repeat\"> " +"<replaceable>argomenti</replaceable> </arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:833 English/Plugins.xml:1166 @@ -18030,8 +23564,12 @@ msgstr "Opzioni della riga di comando passate al comando msgcat" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:861 English/Plugins.xml:1194 -msgid "<filename class=\"extension\">*.po</filename> <filename class=\"extension\">*.pot</filename>" -msgstr "<filename class=\"extension\">*.po</filename> <filename class=\"extension\">*.pot</filename>" +msgid "" +"<filename class=\"extension\">*.po</filename> <filename " +"class=\"extension\">*.pot</filename>" +msgstr "" +"<filename class=\"extension\">*.po</filename> <filename " +"class=\"extension\">*.pot</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:872 English/Plugins.xml:1205 @@ -18046,7 +23584,8 @@ msgstr "File del plug-in QueryCSV" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:880 msgid "<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>QueryCSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:884 @@ -18055,8 +23594,12 @@ msgstr "CSV Querier con il comando q" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:887 -msgid "<command>QueryCSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>QueryCSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>QueryCSV</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>QueryCSV</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:897 English/Plugins.xml:950 @@ -18081,7 +23624,8 @@ msgstr "File del plug-in QueryTSV" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:933 msgid "<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>QueryTSV<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:937 @@ -18090,8 +23634,12 @@ msgstr "TSV Querier con il comando q" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:940 -msgid "<command>QueryTSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>QueryTSV</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>QueryTSV</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>QueryTSV</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:971 @@ -18105,8 +23653,10 @@ msgstr "File del plug-in QueryJSON" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:986 -msgid "<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>QueryJSON<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:990 @@ -18115,8 +23665,12 @@ msgstr "Interrogante JSON con comando jq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:993 -msgid "<command>QueryJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>QueryJSON</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>QueryJSON</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>QueryJSON</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1040 @@ -18125,8 +23679,10 @@ msgstr "File del plug-in QueryYAML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1039 -msgid "<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>QueryYAML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1043 @@ -18135,8 +23691,12 @@ msgstr "Interrogante YAML con il comando yq" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1046 -msgid "<command>QueryYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>QueryYAML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>QueryYAML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>QueryYAML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1087 @@ -18150,8 +23710,10 @@ msgstr "File del plugin ValidateHTML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1093 -msgid "<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>ValidateHTML<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1097 @@ -18160,8 +23722,12 @@ msgstr "Validatore HTML con tidy-html5" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1100 -msgid "<command>ValidateHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>ValidateHTML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>ValidateHTML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>ValidateHTML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1149 @@ -18170,8 +23736,10 @@ msgstr "File del plug-in ValidatePO" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1148 -msgid "<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>ValidatePO<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1152 @@ -18180,8 +23748,12 @@ msgstr "Convalidatore PO con gettext msgfmt" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1155 -msgid "<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>arguments</replaceable> </arg>" -msgstr "<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> <replaceable>argomenti</replaceable> </arg>" +msgid "" +"<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> " +"<replaceable>arguments</replaceable> </arg>" +msgstr "" +"<command>ValidatePO</command> <arg choice=\"opt\" rep=\"repeat\"> " +"<replaceable>argomenti</replaceable> </arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1171 @@ -18195,8 +23767,12 @@ msgstr "Anteprima del file del plug-in Graphviz" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1213 -msgid "<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>PreviewGraphviz<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1217 @@ -18205,8 +23781,12 @@ msgstr "Visualizzatore anteprima Graphviz" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1220 -msgid "<command>PreviewGraphviz</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PreviewGraphviz</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PreviewGraphviz</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PreviewGraphviz</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1230 @@ -18215,8 +23795,12 @@ msgstr "Opzioni della riga di comando passate al comando punto" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1251 -msgid "<filename class=\"extension\">*.gv</filename>, <filename class=\"extension\">,*.dot</filename>" -msgstr "<filename class=\"extension\">*.gv</filename>, <filename class=\"extension\">,*.dot</filename>" +msgid "" +"<filename class=\"extension\">*.gv</filename>, <filename " +"class=\"extension\">,*.dot</filename>" +msgstr "" +"<filename class=\"extension\">*.gv</filename>, <filename " +"class=\"extension\">,*.dot</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1261 @@ -18230,8 +23814,12 @@ msgstr "File del plugin PreviewMarkdown" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1267 -msgid "<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>PreviewMarkdown<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1271 @@ -18240,8 +23828,12 @@ msgstr "Visualizzatore anteprima Markdown" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1274 -msgid "<command>PreviewMarkdown</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PreviewMarkdown</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PreviewMarkdown</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PreviewMarkdown</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1284 @@ -18250,8 +23842,12 @@ msgstr "Opzioni della riga di comando passate al comando md2html" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1305 -msgid "<filename class=\"extension\">*.md</filename>, <filename class=\"extension\">,*.markdown</filename>" -msgstr "<filename class=\"extension\">*.md</filename>, <filename class=\"extension\">,*.markdown</filename>" +msgid "" +"<filename class=\"extension\">*.md</filename>, <filename " +"class=\"extension\">,*.markdown</filename>" +msgstr "" +"<filename class=\"extension\">*.md</filename>, <filename " +"class=\"extension\">,*.markdown</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1315 @@ -18265,8 +23861,12 @@ msgstr "File del plugin PreviewPlantUML" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1321 -msgid "<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>PreviewPlantUML<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1325 @@ -18275,8 +23875,12 @@ msgstr "Visualizzatore anteprima PlantUML" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1328 -msgid "<command>PreviewPlantUML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>PreviewPlantUML</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>PreviewPlantUML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>PreviewPlantUML</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1338 @@ -18285,17 +23889,23 @@ msgstr "Opzioni della riga di comando passate al comando plantuml.jar" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1359 -msgid "<filename class=\"extension\">*.pu</filename>, <filename class=\"extension\">,*.puml</filename>" -msgstr "<filename class=\"extension\">*.pu</filename>, <filename class=\"extension\">,*.puml</filename>" +msgid "" +"<filename class=\"extension\">*.pu</filename>, <filename " +"class=\"extension\">,*.puml</filename>" +msgstr "" +"<filename class=\"extension\">*.pu</filename>, <filename " +"class=\"extension\">,*.puml</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1369 msgid "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink " -"url=\"https://graphviz.org/\">Graphviz</ulink>" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink url=\"https://" +"graphviz.org/\">Graphviz</ulink>" msgstr "" -"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink " -"url=\"https://graphviz.org/\">Graphviz</ulink>" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://plantuml.com/\">PlantUML</ulink>, <ulink url=\"https://" +"graphviz.org/\">Graphviz</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1376 @@ -18304,8 +23914,10 @@ msgstr "File del plug-in ApacheTika" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1375 -msgid "<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>ApacheTika<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1379 @@ -18314,8 +23926,12 @@ msgstr "Estrattore di contenuti generali con Apache Tika" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1382 -msgid "<command>ApacheTika</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>ApacheTika</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>ApacheTika</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>ApacheTika</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1392 @@ -18329,8 +23945,12 @@ msgstr "<filename class=\"estensione\">*.*</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1422 -msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" -msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" +msgid "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" +msgstr "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://tika.apache.org/\">Apache Tika</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1429 @@ -18339,8 +23959,10 @@ msgstr "Disassemblare il file del plugin JVM" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1428 -msgid "<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>DisassembleJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1432 @@ -18349,8 +23971,12 @@ msgstr "Disassemblatore di bytecode JVM con javap" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1435 -msgid "<command>DisassembleJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>DisassembleJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>DisassembleJVM</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>DisassembleJVM</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1445 @@ -18364,8 +23990,10 @@ msgstr "<filename class=\"estensione\">*.class</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1475 -msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" -msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" +msgid "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" +msgstr "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1482 @@ -18374,18 +24002,28 @@ msgstr "Decompilare il file del plugin JVM" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1481 -msgid "<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>DecompileJVM<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1485 -msgid "Java decompiler with CFR - decompiles .class files into readable Java source code" -msgstr "Decompilatore Java con CFR: decompila i file .class in codice sorgente Java leggibile" +msgid "" +"Java decompiler with CFR - decompiles .class files into readable Java source " +"code" +msgstr "" +"Decompilatore Java con CFR: decompila i file .class in codice sorgente Java " +"leggibile" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1488 -msgid "<command>DecompileJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>DecompileJVM</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>DecompileJVM</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>DecompileJVM</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1498 @@ -18394,8 +24032,12 @@ msgstr "Opzioni della riga di comando passate al decompilatore CFR" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1528 -msgid "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" -msgstr "<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, <ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" +msgid "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" +msgstr "" +"<ulink url=\"https://www.java.com/ja/download/ie_manual.jsp\">Java</ulink>, " +"<ulink url=\"https://github.com/leibnitz27/cfr\">CFR</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1535 @@ -18404,8 +24046,10 @@ msgstr "Disassemblare il file del plugin IL" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1534 -msgid "<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>DisassembleIL<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1538 @@ -18414,8 +24058,12 @@ msgstr "Disassemblatore di codice IL con ildasm" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1541 -msgid "<command>DisassembleIL</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>DisassembleIL</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>DisassembleIL</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>DisassembleIL</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1551 @@ -18425,16 +24073,20 @@ msgstr "Opzioni della riga di comando passate al comando ildasm" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1572 English/Plugins.xml:1628 msgid "" -"<filename class=\"extension\">*.obj</filename>, <filename class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</filename>, " -"<filename class=\"extension\">*.dll</filename>" +"<filename class=\"extension\">*.obj</filename>, <filename " +"class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</" +"filename>, <filename class=\"extension\">*.dll</filename>" msgstr "" -"<filename class=\"extension\">*.obj</filename>, <filename class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</filename>, " -"<filename class=\"extension\">*.dll</filename>" +"<filename class=\"extension\">*.obj</filename>, <filename " +"class=\"extension\">*.lib</filename>, <filename class=\"extension\">*.exe</" +"filename>, <filename class=\"extension\">*.dll</filename>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:1584 English/Plugins.xml:1640 -msgid "<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" -msgstr "<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" +msgid "" +"<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" +msgstr "" +"<ulink url=\"https://visualstudio.microsoft.com/\">Visual Studio</ulink>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:1591 @@ -18443,8 +24095,12 @@ msgstr "File del plugin DisassembleNative" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1590 -msgid "<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>DisassembleNative<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1594 @@ -18453,8 +24109,12 @@ msgstr "Disassemblatore di codice nativo con dumpbin" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1597 -msgid "<command>DisassembleNative</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>arguments</replaceable></arg>" -msgstr "<command>DisassembleNative</command> <arg choice=\"opt\" rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" +msgid "" +"<command>DisassembleNative</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>arguments</replaceable></arg>" +msgstr "" +"<command>DisassembleNative</command> <arg choice=\"opt\" " +"rep=\"repeat\"><replaceable>argomenti</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1607 @@ -18468,8 +24128,12 @@ msgstr "File del plug-in ExecFilterCommand" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1646 -msgid "<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>ExecFilterCommand<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1650 @@ -18478,8 +24142,12 @@ msgstr "Applica il comando di filtro" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:1653 -msgid "<command>ExecFilterCommand</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>command</replaceable></arg>" -msgstr "<command>ExecFilterCommand</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>comando</replaceable></arg>" +msgid "" +"<command>ExecFilterCommand</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>command</replaceable></arg>" +msgstr "" +"<command>ExecFilterCommand</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>comando</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:1661 @@ -18489,18 +24157,23 @@ msgstr "<option><replaceable>comando</replaceable></option>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:1663 msgid "command to execute. %1 in the command is replaced with the filename" -msgstr "comando da eseguire.%1 nel comando viene sostituito con il nome del file" +msgstr "" +"comando da eseguire.%1 nel comando viene sostituito con il nome del file" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:1684 English/Plugins.xml:1721 English/Plugins.xml:1758 English/Plugins.xml:1795 English/Plugins.xml:1832 English/Plugins.xml:1869 -#: English/Plugins.xml:1906 English/Plugins.xml:1943 English/Plugins.xml:1980 English/Plugins.xml:2082 English/Plugins.xml:2175 English/Plugins.xml:2257 +#: English/Plugins.xml:1684 English/Plugins.xml:1721 English/Plugins.xml:1758 +#: English/Plugins.xml:1795 English/Plugins.xml:1832 English/Plugins.xml:1869 +#: English/Plugins.xml:1906 English/Plugins.xml:1943 English/Plugins.xml:1980 +#: English/Plugins.xml:2082 English/Plugins.xml:2175 English/Plugins.xml:2257 #: English/Plugins.xml:2311 English/Plugins.xml:2348 msgid "<filename class=\"extension\">*.nomatch</filename>" msgstr "<filename class=\"extension\">*.nomatch</filename>" #. type: Content of: <article><section><section><title> -#: English/Plugins.xml:1693 English/Plugins.xml:1730 English/Plugins.xml:1767 English/Plugins.xml:1804 English/Plugins.xml:1841 English/Plugins.xml:1878 -#: English/Plugins.xml:1915 English/Plugins.xml:1952 English/Plugins.xml:1989 English/Plugins.xml:2091 English/Plugins.xml:2184 English/Plugins.xml:2266 +#: English/Plugins.xml:1693 English/Plugins.xml:1730 English/Plugins.xml:1767 +#: English/Plugins.xml:1804 English/Plugins.xml:1841 English/Plugins.xml:1878 +#: English/Plugins.xml:1915 English/Plugins.xml:1952 English/Plugins.xml:1989 +#: English/Plugins.xml:2091 English/Plugins.xml:2184 English/Plugins.xml:2266 #: English/Plugins.xml:2320 English/Plugins.xml:2357 English/Plugins.xml:2723 msgid "Windows Script Host" msgstr "Host di script di Windows" @@ -18512,8 +24185,10 @@ msgstr "File del plugin MakeUpper" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1699 -msgid "<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>MakeUpper<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1703 @@ -18527,8 +24202,10 @@ msgstr "File del plugin MakeLower" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1736 -msgid "<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>MakeLower<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1740 @@ -18542,8 +24219,12 @@ msgstr "File del plugin RemoveDuplicates" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1773 -msgid "<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>RemoveDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1777 @@ -18557,8 +24238,12 @@ msgstr "File del plugin CountDuplicates" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1810 -msgid "<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>CountDuplicates<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1814 @@ -18572,8 +24257,11 @@ msgstr "File del plug-in con ordinamento ascendente" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1847 -msgid "<filename>SortAscending<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Ordinamento crescente<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>SortAscending<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>Ordinamento crescente<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1851 @@ -18587,8 +24275,11 @@ msgstr "File del plug-in Ordinamento discendente" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1884 -msgid "<filename>SortDescending<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Ordinamento decrescente<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>SortDescending<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>Ordinamento decrescente<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1888 @@ -18602,8 +24293,10 @@ msgstr "File del plugin ReverseColumns" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1921 -msgid "<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>ReverseColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1925 @@ -18617,8 +24310,10 @@ msgstr "File del plug-in ReverseLines" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1958 -msgid "<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>ReverseLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1962 @@ -18632,8 +24327,11 @@ msgstr "Seleziona il file del plugin Colonne" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:1995 -msgid "<filename>SelectColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>SelezionaColonne<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>SelectColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>SelezionaColonne<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:1999 @@ -18642,17 +24340,23 @@ msgstr "Seleziona alcune colonne" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2002 -msgid "<command>SelectColumns</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" -msgstr "<command>SelectColumns</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" +msgid "" +"<command>SelectColumns</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" +msgstr "" +"<command>SelectColumns</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2009 msgid "" -"<command>SelectColumns</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-e</" -"option> <replaceable>patterns</replaceable></arg>" +"<command>SelectColumns</command> <arg><option>-v</option></arg> " +"<arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-" +"e</option> <replaceable>patterns</replaceable></arg>" msgstr "" -"<command>Selezionacolonne</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-e</" -"option> <replaceable>modelli</replaceable></arg>" +"<command>Selezionacolonne</command> <arg><option>-v</option></arg> " +"<arg><option>-i</option></arg> <arg><option>-g</option></arg> <arg><option>-" +"e</option> <replaceable>modelli</replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:2023 English/Plugins.xml:2123 @@ -18721,8 +24425,10 @@ msgstr "File del plug-in SelectLines" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2097 -msgid "<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>SelectLines<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2101 @@ -18731,16 +24437,22 @@ msgstr "Seleziona alcune righe" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2104 -msgid "<command>SelectLines</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" -msgstr "<command>SelectLines</command> <arg choice=\"opt\" rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" +msgid "" +"<command>SelectLines</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>ranges</replaceable></arg>" +msgstr "" +"<command>SelectLines</command> <arg choice=\"opt\" " +"rep=\"norepeat\"><replaceable>intervalli</replaceable></arg>" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2111 msgid "" -"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-e</option> <replaceable>patterns</" +"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-" +"i</option></arg> <arg><option>-e</option> <replaceable>patterns</" "replaceable></arg>" msgstr "" -"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-i</option></arg> <arg><option>-e</option> <replaceable>modelli</" +"<command>SelectLines</command> <arg><option>-v</option></arg> <arg><option>-" +"i</option></arg> <arg><option>-e</option> <replaceable>modelli</" "replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> @@ -18761,7 +24473,8 @@ msgstr "Sostituisci il file del plugin" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2190 msgid "<filename>Replace<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Sostituisci<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>Sostituisci<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2194 @@ -18771,11 +24484,14 @@ msgstr "Sostituisce il testo con un altro testo" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2197 msgid "" -"<command>Replace</command> <arg><option>-i</option></arg> <arg><option>-e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" -"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" +"<command>Replace</command> <arg><option>-i</option></arg> <arg><option>-e</" +"option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</replaceable></" +"arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" msgstr "" -"<command>Sostituisci</command> <arg><option>-i</option></arg> <arg><option>-e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" -"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</replaceable></arg>" +"<command>Sostituisci</command> <arg><option>-i</option></arg> <arg><option>-" +"e</option></arg> <arg rep=\"norepeat\"><replaceable>text_to_find</" +"replaceable></arg> <arg rep=\"norepeat\"><replaceable>text_to_replace</" +"replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> #: English/Plugins.xml:2212 @@ -18815,7 +24531,8 @@ msgstr "Tokenizza il file del plugin" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2272 msgid "<filename>Tokenize<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>Tokenizza<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>Tokenizza<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2276 @@ -18824,8 +24541,12 @@ msgstr "Tokenizza la selezione" #. type: Content of: <article><section><section><cmdsynopsis> #: English/Plugins.xml:2279 -msgid "<command>Tokenize</command> <arg rep=\"norepeat\"><replaceable>patterns</replaceable></arg>" -msgstr "<command>Tokenizza</command> <arg rep=\"norepeat\"><replaceable>modelli</replaceable></arg>" +msgid "" +"<command>Tokenize</command> <arg rep=\"norepeat\"><replaceable>patterns</" +"replaceable></arg>" +msgstr "" +"<command>Tokenizza</command> <arg rep=\"norepeat\"><replaceable>modelli</" +"replaceable></arg>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> #: English/Plugins.xml:2289 @@ -18854,26 +24575,38 @@ msgstr "File del plugin IgnoreColumns" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2363 -msgid "<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>IgnoreColumns<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2367 -msgid "This plugin ignores characters at specified columns. The first column is number 1." -msgstr "Questo plugin ignora i caratteri nelle colonne specificate.La prima colonna è la numero 1." +msgid "" +"This plugin ignores characters at specified columns. The first column is " +"number 1." +msgstr "" +"Questo plugin ignora i caratteri nelle colonne specificate.La prima colonna " +"è la numero 1." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2370 -msgid "Note that this plugin does not support files with tabs: the plugin does not fail, but all tabs are be treated as normal characters." +msgid "" +"Note that this plugin does not support files with tabs: the plugin does not " +"fail, but all tabs are be treated as normal characters." msgstr "" -"Tieni presente che questo plugin non supporta file con tabulazioni: il plugin non fallisce, ma tutte le tabulazioni vengono trattate come caratteri " +"Tieni presente che questo plugin non supporta file con tabulazioni: il " +"plugin non fallisce, ma tutte le tabulazioni vengono trattate come caratteri " "normali." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2373 -msgid "To specify columns, use plugin settings dialog or rename the <filename>dll</filename> using following fields as parameters:" +msgid "" +"To specify columns, use plugin settings dialog or rename the <filename>dll</" +"filename> using following fields as parameters:" msgstr "" -"Per specificare le colonne, utilizza la finestra di dialogo delle impostazioni del plugin o rinomina la <filename>dll</filename> utilizzando i " +"Per specificare le colonne, utilizza la finestra di dialogo delle " +"impostazioni del plugin o rinomina la <filename>dll</filename> utilizzando i " "seguenti campi come parametri:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> @@ -18884,7 +24617,8 @@ msgstr "Delimitatori tra intervalli: _ o ," #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2382 msgid "Delimiters between min and max: <emphasis>anything else</emphasis>" -msgstr "Delimitatori tra minimo e massimo: <emphasis>qualsiasi altra cosa</emphasis>" +msgstr "" +"Delimitatori tra minimo e massimo: <emphasis>qualsiasi altra cosa</emphasis>" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2387 @@ -18908,8 +24642,11 @@ msgstr "<filename>IgnoraColumns _ 3 _ 10 - 20 _ 32 - 33.dll</filename>" #. type: Content of: <article><section><section><example><variablelist><varlistentry><listitem><simpara> #: English/Plugins.xml:2404 -msgid "Ignore all characters at column 3, and in columns 10 to 20, and 32 to 33." -msgstr "Ignora tutti i caratteri nella colonna 3 e nelle colonne da 10 a 20 e da 32 a 33." +msgid "" +"Ignore all characters at column 3, and in columns 10 to 20, and 32 to 33." +msgstr "" +"Ignora tutti i caratteri nella colonna 3 e nelle colonne da 10 a 20 e da 32 " +"a 33." #. type: Content of: <article><section><section><example><variablelist><varlistentry><term> #: English/Plugins.xml:2410 @@ -18927,7 +24664,8 @@ msgid "<placeholder type=\"variablelist\" id=\"0\"/>" msgstr "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> -#: English/Plugins.xml:2430 English/Plugins.xml:2458 English/Plugins.xml:2500 English/Plugins.xml:2535 English/Plugins.xml:2566 +#: English/Plugins.xml:2430 English/Plugins.xml:2458 English/Plugins.xml:2500 +#: English/Plugins.xml:2535 English/Plugins.xml:2566 msgid "Prediffer" msgstr "Predifferire" @@ -18943,28 +24681,42 @@ msgstr "File del plugin IgnoreCommentsC" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2440 -msgid "<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>IgnoreCommentsC<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2444 msgid "" -"The plugin ignores comments within<constant> //</constant>... and <constant>/*</constant> ... <constant>*/</constant> delimiters in C, C++, PHP and " +"The plugin ignores comments within<constant> //</constant>... and <constant>/" +"*</constant> ... <constant>*/</constant> delimiters in C, C++, PHP and " "JavaScript files." msgstr "" -"Il plugin ignora i commenti all'interno dei delimitatori <constant> //</constant>... e <constant>/*</constant> ... <constant>*/</constant> nei file " +"Il plugin ignora i commenti all'interno dei delimitatori <constant> //</" +"constant>... e <constant>/*</constant> ... <constant>*/</constant> nei file " "C, C++, PHP e JavaScript." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:2460 msgid "" -"<filename class=\"extension\">*.cpp</filename>, <filename class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</filename>, " -"<filename class=\"extension\">*.hxx</filename>, <filename class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</filename>, " -"<filename class=\"extension\">*.js</filename>, <filename class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</filename>" -msgstr "" -"<filename class=\"extension\">*.cpp</filename>, <filename class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</filename>, " -"<filename class=\"extension\">*.hxx</filename>, <filename class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</filename>, " -"<filename class=\"extension\">*.js</filename>, <filename class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</filename>" +"<filename class=\"extension\">*.cpp</filename>, <filename " +"class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</" +"filename>, <filename class=\"extension\">*.hxx</filename>, <filename " +"class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</" +"filename>, <filename class=\"extension\">*.js</filename>, <filename " +"class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</" +"filename>" +msgstr "" +"<filename class=\"extension\">*.cpp</filename>, <filename " +"class=\"extension\">*.cxx</filename>, <filename class=\"extension\">*.h</" +"filename>, <filename class=\"extension\">*.hxx</filename>, <filename " +"class=\"extension\">*.c</filename>, <filename class=\"extension\">*.php</" +"filename>, <filename class=\"extension\">*.js</filename>, <filename " +"class=\"extension\">*.cs</filename>, <filename class=\"extension\">*.ts</" +"filename>" #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2479 @@ -18973,25 +24725,34 @@ msgstr "File del plugin IgnoreFieldsComma" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2478 -msgid "<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>IgnoreFieldsComma<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2482 msgid "" -"This plugin is for files with fields and commas as delimiters (CSV files, for example). It ignores the delimiter characters. The first field is " -"number 1." +"This plugin is for files with fields and commas as delimiters (CSV files, " +"for example). It ignores the delimiter characters. The first field is number " +"1." msgstr "" -"Questo plugin è per file con campi e virgole come delimitatori (file CSV, ad esempio).Ignora i caratteri delimitatori.Il primo campo è il numero 1." +"Questo plugin è per file con campi e virgole come delimitatori (file CSV, ad " +"esempio).Ignora i caratteri delimitatori.Il primo campo è il numero 1." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2486 English/Plugins.xml:2521 msgid "" -"To specify the delimiters, use plugin settings dialog or rename the <filename>dll</filename> using the same parameter fields used for <xref " +"To specify the delimiters, use plugin settings dialog or rename the " +"<filename>dll</filename> using the same parameter fields used for <xref " "linkend=\"IgnoreColumns\" />." msgstr "" -"Per specificare i delimitatori, utilizzare la finestra di dialogo delle impostazioni del plugin o rinominare la <filename>dll</filename> utilizzando " -"gli stessi campi dei parametri utilizzati per <xref linkend=\"IgnoreColumns\" />." +"Per specificare i delimitatori, utilizzare la finestra di dialogo delle " +"impostazioni del plugin o rinominare la <filename>dll</filename> utilizzando " +"gli stessi campi dei parametri utilizzati per <xref " +"linkend=\"IgnoreColumns\" />." #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2513 @@ -19000,17 +24761,25 @@ msgstr "Ignora il file del pluginFieldsTab" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2512 -msgid "<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>IgnoreFieldsTab<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2516 msgid "" -"This plugin is for files that use fields and tabs as delimiters (<application>for example, Excel</application> files saved in the <filename " -"class=\"extension\">*.txt</filename> format). It ignores the delimiter characters. The first field is number 1." +"This plugin is for files that use fields and tabs as delimiters " +"(<application>for example, Excel</application> files saved in the <filename " +"class=\"extension\">*.txt</filename> format). It ignores the delimiter " +"characters. The first field is number 1." msgstr "" -"Questo plugin è per i file che utilizzano campi e tabulazioni come delimitatori (<application>ad esempio, file Excel</application> salvati nel " -"formato <filename class=\"extension\">*.txt</filename>).Ignora i caratteri delimitatori.Il primo campo è il numero 1." +"Questo plugin è per i file che utilizzano campi e tabulazioni come " +"delimitatori (<application>ad esempio, file Excel</application> salvati nel " +"formato <filename class=\"extension\">*.txt</filename>).Ignora i caratteri " +"delimitatori.Il primo campo è il numero 1." #. type: Content of: <article><section><section><title><filename><indexterm><primary> #: English/Plugins.xml:2548 @@ -19019,13 +24788,21 @@ msgstr "Ignora il file plug-in LeadingLineNumbers" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2547 -msgid "<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/" +"></filename>" +msgstr "" +"<filename>IgnoreLeadingLineNumbers<placeholder type=\"indexterm\" id=\"0\"/" +"></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2551 -msgid "This plugin ignores the leading line numbers in text files (for example, NC and BASIC files)." -msgstr "Questo plugin ignora i numeri di riga iniziali nei file di testo (ad esempio, file NC e BASIC)." +msgid "" +"This plugin ignores the leading line numbers in text files (for example, NC " +"and BASIC files)." +msgstr "" +"Questo plugin ignora i numeri di riga iniziali nei file di testo (ad " +"esempio, file NC e BASIC)." #. type: Content of: <article><section><section><para><segmentedlist><segtitle> #: English/Plugins.xml:2563 @@ -19044,88 +24821,147 @@ msgstr "file del plugin aggiuntivo dell'editor" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2578 -msgid "<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgstr "" +"<filename>editor addin<placeholder type=\"indexterm\" id=\"0\"/></filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2582 -msgid "Adds some functions to the <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" -msgstr "Aggiunge alcune funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </menuchoice >:" +msgid "" +"Adds some functions to the <menuchoice> <guimenu>Plugins</guimenu> " +"<guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" +msgstr "" +"Aggiunge alcune funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > " +"<guisubmenu >Script</guisubmenu > </menuchoice >:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2590 -msgid "<guimenuitem>Make Uppercase</guimenuitem> convert the selection to UPPER CASE." -msgstr "<guimenuitem >Rendi maiuscolo</guimenuitem > converte la selezione in MAIUSCOLO." +msgid "" +"<guimenuitem>Make Uppercase</guimenuitem> convert the selection to UPPER " +"CASE." +msgstr "" +"<guimenuitem >Rendi maiuscolo</guimenuitem > converte la selezione in " +"MAIUSCOLO." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2595 -msgid "<guimenuitem>Make Lowercase</guimenuitem> convert the selection to lower case." -msgstr "<guimenuitem >Rendi minuscolo</guimenuitem > converte la selezione in minuscolo." +msgid "" +"<guimenuitem>Make Lowercase</guimenuitem> convert the selection to lower " +"case." +msgstr "" +"<guimenuitem >Rendi minuscolo</guimenuitem > converte la selezione in " +"minuscolo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2600 -msgid "<guimenuitem>Remove Duplicate Lines</guimenuitem> remove duplicate lines in the selection." -msgstr "<guimenuitem >Rimuovi linee duplicate</guimenuitem > rimuove le linee duplicate nella selezione." +msgid "" +"<guimenuitem>Remove Duplicate Lines</guimenuitem> remove duplicate lines in " +"the selection." +msgstr "" +"<guimenuitem >Rimuovi linee duplicate</guimenuitem > rimuove le linee " +"duplicate nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2605 -msgid "<guimenuitem>Count Duplicate Lines</guimenuitem> remove duplicate lines in the selection and insert the number of duplicate lines on the right." +msgid "" +"<guimenuitem>Count Duplicate Lines</guimenuitem> remove duplicate lines in " +"the selection and insert the number of duplicate lines on the right." msgstr "" -"<guimenuitem >Conta righe duplicate</guimenuitem > rimuove le righe duplicate nella selezione e inserisce il numero di righe duplicate sulla destra." +"<guimenuitem >Conta righe duplicate</guimenuitem > rimuove le righe " +"duplicate nella selezione e inserisce il numero di righe duplicate sulla " +"destra." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2610 -msgid "<guimenuitem>Sort Lines Ascending</guimenuitem> sort the selection in ascending order." -msgstr "<guimenuitem >Ordina le righe in ordine crescente</guimenuitem > ordina la selezione in ordine crescente." +msgid "" +"<guimenuitem>Sort Lines Ascending</guimenuitem> sort the selection in " +"ascending order." +msgstr "" +"<guimenuitem >Ordina le righe in ordine crescente</guimenuitem > ordina la " +"selezione in ordine crescente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2615 -msgid "<guimenuitem>Sort Lines Descending</guimenuitem> sort the selection in descending order." -msgstr "<guimenuitem >Ordina le righe discendente</guimenuitem > ordina la selezione in ordine discendente." +msgid "" +"<guimenuitem>Sort Lines Descending</guimenuitem> sort the selection in " +"descending order." +msgstr "" +"<guimenuitem >Ordina le righe discendente</guimenuitem > ordina la selezione " +"in ordine discendente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2620 -msgid "<guimenuitem>Reverse Columns</guimenuitem> reverse columns in the selection." -msgstr "<guimenuitem >Inverti colonne</guimenuitem > inverte le colonne nella selezione." +msgid "" +"<guimenuitem>Reverse Columns</guimenuitem> reverse columns in the selection." +msgstr "" +"<guimenuitem >Inverti colonne</guimenuitem > inverte le colonne nella " +"selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2625 -msgid "<guimenuitem>Reverse Lines</guimenuitem> reverse lines in the selection." -msgstr "<guimenuitem >Inverti linee</guimenuitem > inverte le linee nella selezione." +msgid "" +"<guimenuitem>Reverse Lines</guimenuitem> reverse lines in the selection." +msgstr "" +"<guimenuitem >Inverti linee</guimenuitem > inverte le linee nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2630 -msgid "<guimenuitem>Select Columns...</guimenuitem> select some columns in the selection." -msgstr "<guimenuitem >Seleziona colonne...</guimenuitem > seleziona alcune colonne nella selezione." +msgid "" +"<guimenuitem>Select Columns...</guimenuitem> select some columns in the " +"selection." +msgstr "" +"<guimenuitem >Seleziona colonne...</guimenuitem > seleziona alcune colonne " +"nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2635 -msgid "<guimenuitem>Select Lines...</guimenuitem> select some lines in the selection." -msgstr "<guimenuitem >Seleziona righe...</guimenuitem > seleziona alcune righe nella selezione." +msgid "" +"<guimenuitem>Select Lines...</guimenuitem> select some lines in the " +"selection." +msgstr "" +"<guimenuitem >Seleziona righe...</guimenuitem > seleziona alcune righe nella " +"selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2640 -msgid "<guimenuitem>Replace...</guimenuitem> replace text in the selection with another text." -msgstr "<guimenuitem >Sostituisci...</guimenuitem > sostituisce il testo nella selezione con un altro testo." +msgid "" +"<guimenuitem>Replace...</guimenuitem> replace text in the selection with " +"another text." +msgstr "" +"<guimenuitem >Sostituisci...</guimenuitem > sostituisce il testo nella " +"selezione con un altro testo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2645 msgid "" -"<guimenuitem>Apply Filter Command...</guimenuitem> replace the selection with the output of the specified filter command. Specifying %1 in the " -"argument of the filter command replaces it with the filename of the active pane." +"<guimenuitem>Apply Filter Command...</guimenuitem> replace the selection " +"with the output of the specified filter command. Specifying %1 in the " +"argument of the filter command replaces it with the filename of the active " +"pane." msgstr "" -"<guimenuitem >Applica comando filtro...</guimenuitem > sostituisce la selezione con l'output del comando filtro specificato.Specificando %1 " -"nell'argomento del comando filter lo sostituisce con il nome file del riquadro attivo." +"<guimenuitem >Applica comando filtro...</guimenuitem > sostituisce la " +"selezione con l'output del comando filtro specificato.Specificando %1 " +"nell'argomento del comando filter lo sostituisce con il nome file del " +"riquadro attivo." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2651 -msgid "<guimenuitem>Tokenize...</guimenuitem> replaces the token delimiter with a newline in the selection." -msgstr "<guimenuitem >Tokenizza...</guimenuitem > sostituisce il delimitatore del token con un fine riga nella selezione." +msgid "" +"<guimenuitem>Tokenize...</guimenuitem> replaces the token delimiter with a " +"newline in the selection." +msgstr "" +"<guimenuitem >Tokenizza...</guimenuitem > sostituisce il delimitatore del " +"token con un fine riga nella selezione." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2656 -msgid "<guimenuitem>Trim Spaces</guimenuitem> remove spaces at the beginning and end of lines in the selection." -msgstr "<guimenuitem >Taglia spazi</guimenuitem > rimuove gli spazi all'inizio e alla fine delle righe nella selezione." +msgid "" +"<guimenuitem>Trim Spaces</guimenuitem> remove spaces at the beginning and " +"end of lines in the selection." +msgstr "" +"<guimenuitem >Taglia spazi</guimenuitem > rimuove gli spazi all'inizio e " +"alla fine delle righe nella selezione." #. type: Content of: <article><section><section><para><segmentedlist><seglistitem><seg> #: English/Plugins.xml:2667 English/Plugins.xml:2705 @@ -19144,23 +24980,39 @@ msgstr "inserire il file del plugin datetime" #. type: Content of: <article><section><section><title> #: English/Plugins.xml:2675 -msgid "<filename>insert datetime<placeholder type=\"indexterm\" id=\"0\"/></filename>" -msgstr "<filename>inserisci data/ora<placeholder type=\"indexterm\" id=\"0\"/></filename>" +msgid "" +"<filename>insert datetime<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" +msgstr "" +"<filename>inserisci data/ora<placeholder type=\"indexterm\" id=\"0\"/></" +"filename>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2679 -msgid "Adds two functions to the <menuchoice> <guimenu>Plugins</guimenu> <guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" -msgstr "Aggiunge due funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > <guisubmenu >Script</guisubmenu > </menuchoice >:" +msgid "" +"Adds two functions to the <menuchoice> <guimenu>Plugins</guimenu> " +"<guisubmenu>Scripts</guisubmenu> </menuchoice> menu:" +msgstr "" +"Aggiunge due funzioni al menu <menuchoice> <guimenu >Plugin</guimenu > " +"<guisubmenu >Script</guisubmenu > </menuchoice >:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2687 -msgid "<guimenuitem>Insert Date</guimenuitem> insert date in the current locale format." -msgstr "<guimenuitem >Inserisci data</guimenuitem > inserisce la data nel formato locale corrente." +msgid "" +"<guimenuitem>Insert Date</guimenuitem> insert date in the current locale " +"format." +msgstr "" +"<guimenuitem >Inserisci data</guimenuitem > inserisce la data nel formato " +"locale corrente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Plugins.xml:2692 -msgid "<guimenuitem>Insert Time</guimenuitem> insert time in the current locale format." -msgstr "<guimenuitem >Inserisci ora</guimenuitem > inserisce l'ora nel formato locale corrente." +msgid "" +"<guimenuitem>Insert Time</guimenuitem> insert time in the current locale " +"format." +msgstr "" +"<guimenuitem >Inserisci ora</guimenuitem > inserisce l'ora nel formato " +"locale corrente." #. type: Content of: <article><section><title><indexterm><secondary> #: English/Plugins.xml:2719 @@ -19174,13 +25026,21 @@ msgstr "Requisiti<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2725 -msgid "Some editor complement plugins require this optional component from <trademark class=\"registered\">Microsoft</trademark>." -msgstr "Alcuni plugin di complemento dell'editor richiedono questo componente opzionale da <trademark class=\"registered\">Microsoft</trademark>." +msgid "" +"Some editor complement plugins require this optional component from " +"<trademark class=\"registered\">Microsoft</trademark>." +msgstr "" +"Alcuni plugin di complemento dell'editor richiedono questo componente " +"opzionale da <trademark class=\"registered\">Microsoft</trademark>." #. type: Content of: <article><section><section><para> #: English/Plugins.xml:2728 -msgid "It should already be included in your version of Windows, unless you use some really old pre Windows XP version." -msgstr "Dovrebbe essere già incluso nella tua versione di Windows, a meno che tu non utilizzi una versione precedente a Windows XP molto vecchia." +msgid "" +"It should already be included in your version of Windows, unless you use " +"some really old pre Windows XP version." +msgstr "" +"Dovrebbe essere già incluso nella tua versione di Windows, a meno che tu non " +"utilizzi una versione precedente a Windows XP molto vecchia." #. type: Content of: <article><title> #: English/Quick_start.xml:3 @@ -19198,25 +25058,37 @@ msgid "choosing files and folders" msgstr "scelta di file e cartelle" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Quick_start.xml:11 English/Quick_start.xml:241 English/Quick_start.xml:245 English/Quick_start.xml:327 English/Quick_start.xml:331 +#: English/Quick_start.xml:11 English/Quick_start.xml:241 +#: English/Quick_start.xml:245 English/Quick_start.xml:327 +#: English/Quick_start.xml:331 msgid "getting started" msgstr "iniziare" #. type: Content of: <article><section><title> #: English/Quick_start.xml:6 -msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Selecting files and folders to compare" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Selezione di file e cartelle da confrontare" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>Selecting files and folders to compare" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"id=\"1\"/>Selezione di file e cartelle da confrontare" #. type: Content of: <article><section><para> #: English/Quick_start.xml:14 msgid "" -"After you have installed WinMerge, step through the procedure and discussions in this topic to learn basic WinMerge operations and concepts. The " -"methods shown are not the only ways to do things: there are usually several ways to do each task. When you are done, you can go on to learn other " -"methods and more advanced skills, which are covered in other help topics." +"After you have installed WinMerge, step through the procedure and " +"discussions in this topic to learn basic WinMerge operations and concepts. " +"The methods shown are not the only ways to do things: there are usually " +"several ways to do each task. When you are done, you can go on to learn " +"other methods and more advanced skills, which are covered in other help " +"topics." msgstr "" -"Dopo aver installato WinMerge, seguire la procedura e le discussioni contenute in questo argomento per apprendere le operazioni e i concetti di base " -"di WinMerge.I metodi mostrati non sono gli unici modi per eseguire le operazioni: in genere esistono diversi modi per eseguire ciascuna attività.Una " -"volta terminato, puoi continuare ad apprendere altri metodi e competenze più avanzate, trattate in altri argomenti della guida." +"Dopo aver installato WinMerge, seguire la procedura e le discussioni " +"contenute in questo argomento per apprendere le operazioni e i concetti di " +"base di WinMerge.I metodi mostrati non sono gli unici modi per eseguire le " +"operazioni: in genere esistono diversi modi per eseguire ciascuna attività." +"Una volta terminato, puoi continuare ad apprendere altri metodi e competenze " +"più avanzate, trattate in altri argomenti della guida." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:22 @@ -19240,33 +25112,54 @@ msgstr "Passare al launcher WinMerge nel menu Start." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:36 -msgid "In a Command Prompt window, cd to the WinMerge installation folder and enter <command>WinMergeU</command>." -msgstr "In una finestra del prompt dei comandi, vai alla cartella di installazione di WinMerge e inserisci <command>WinMergeU</command>." +msgid "" +"In a Command Prompt window, cd to the WinMerge installation folder and enter " +"<command>WinMergeU</command>." +msgstr "" +"In una finestra del prompt dei comandi, vai alla cartella di installazione " +"di WinMerge e inserisci <command>WinMergeU</command>." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:41 -msgid "Press <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> and enter <command>winmerge</command>." -msgstr "Premi <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> e inserisci <command>winmerge</command>." +msgid "" +"Press <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> and " +"enter <command>winmerge</command>." +msgstr "" +"Premi <keycombo><keycap>Windows</keycap><keycap>R</keycap></keycombo> e " +"inserisci <command>winmerge</command>." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:47 msgid "Open the <guilabel>Select Files or Folders</guilabel> dialog" -msgstr "Apri la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" +msgstr "" +"Apri la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" #. type: Content of: <article><section><section><para> #: English/Quick_start.xml:49 -msgid "In the WinMerge window use the following methods to open the <guilabel>Select Files or Folders</guilabel> dialog:" -msgstr "Nella finestra WinMerge utilizza i seguenti metodi per aprire la finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >:" +msgid "" +"In the WinMerge window use the following methods to open the " +"<guilabel>Select Files or Folders</guilabel> dialog:" +msgstr "" +"Nella finestra WinMerge utilizza i seguenti metodi per aprire la finestra di " +"dialogo <guilabel >Seleziona file o cartelle</guilabel >:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:53 -msgid "Click <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>." -msgstr "Fai clic su <menuchoice ><guimenu >File</guimenu ><guimenuitem >Apri</guimenuitem ></menuchoice >." +msgid "" +"Click <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></" +"menuchoice>." +msgstr "" +"Fai clic su <menuchoice ><guimenu >File</guimenu ><guimenuitem >Apri</" +"guimenuitem ></menuchoice >." #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject> #: English/Quick_start.xml:59 -msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon." +"png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/open_icon." +"png\" /> </imageobject>" #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase> #: English/Quick_start.xml:62 @@ -19275,8 +25168,12 @@ msgstr "Pulsante di apertura di WinMerge" #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:57 -msgid "Click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Open tool bar button." -msgstr "Fai clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> Apri della barra degli strumenti." +msgid "" +"Click the <placeholder type=\"inlinemediaobject\" id=\"0\"/> Open tool bar " +"button." +msgstr "" +"Fai clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " +"Apri della barra degli strumenti." #. type: Content of: <article><section><section><itemizedlist><listitem><para> #: English/Quick_start.xml:69 @@ -19285,13 +25182,21 @@ msgstr "Premi <keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo>." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:75 -msgid "<placeholder type=\"indexterm\" id=\"0\"/> The <guilabel>Select Files or Folders</guilabel> dialog" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/> La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel >" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/> The <guilabel>Select Files or " +"Folders</guilabel> dialog" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/> La finestra di dialogo <guilabel " +">Seleziona file o cartelle</guilabel >" #. type: Content of: <article><section><section><para><mediaobject> #: English/Quick_start.xml:80 -msgid "<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/OpenDlg1.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><section><title> #: English/Quick_start.xml:90 @@ -19300,8 +25205,12 @@ msgstr "Specificare i file e le cartelle" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:92 -msgid "In the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> fields, specify the files and folders to compare. Use any of these methods:" -msgstr "Nei campi <guilabel >1°</guilabel > e <guilabel >2°</guilabel >, specifica i file e le cartelle da confrontare.Utilizza uno di questi metodi:" +msgid "" +"In the <guilabel>1st</guilabel> and <guilabel>2nd</guilabel> fields, specify " +"the files and folders to compare. Use any of these methods:" +msgstr "" +"Nei campi <guilabel >1°</guilabel > e <guilabel >2°</guilabel >, specifica i " +"file e le cartelle da confrontare.Utilizza uno di questi metodi:" #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:98 @@ -19310,59 +25219,86 @@ msgstr "Immettere i nomi dei percorsi direttamente nei campi." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:102 -msgid "Click the <guibutton>Browse</guibutton> button to navigate to the desired path." -msgstr "Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il percorso desiderato." +msgid "" +"Click the <guibutton>Browse</guibutton> button to navigate to the desired " +"path." +msgstr "" +"Fai clic sul pulsante <guibutton >Sfoglia</guibutton > per raggiungere il " +"percorso desiderato." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:105 msgid "" -"In the Open dialog, the text, <literal>Folder Selection</literal>, is initially displayed in the <guilabel>File name</guilabel> field. Your selection " -"depends on the type of comparison you want to do:" +"In the Open dialog, the text, <literal>Folder Selection</literal>, is " +"initially displayed in the <guilabel>File name</guilabel> field. Your " +"selection depends on the type of comparison you want to do:" msgstr "" -"Nella finestra di dialogo Apri, il testo <literal >Selezione cartella</literal >, viene inizialmente visualizzato nel campo <guilabel >Nome file</" +"Nella finestra di dialogo Apri, il testo <literal >Selezione cartella</" +"literal >, viene inizialmente visualizzato nel campo <guilabel >Nome file</" "guilabel >.La selezione dipende dal tipo di confronto che desideri eseguire:" #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Quick_start.xml:112 -msgid "If you are comparing files, select the target file. The <literal>Folder Selection</literal> text is overwritten with your selection." +msgid "" +"If you are comparing files, select the target file. The <literal>Folder " +"Selection</literal> text is overwritten with your selection." msgstr "" -"Se stai confrontando file, seleziona il file di destinazione.Il testo <literal>Selezione cartella</literal> viene sovrascritto con la tua selezione." +"Se stai confrontando file, seleziona il file di destinazione.Il testo " +"<literal>Selezione cartella</literal> viene sovrascritto con la tua " +"selezione." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> #: English/Quick_start.xml:118 -msgid "If you are comparing folders, open the target folder; do not select a file. The <literal>Folder Selection</literal> text remains in place." +msgid "" +"If you are comparing folders, open the target folder; do not select a file. " +"The <literal>Folder Selection</literal> text remains in place." msgstr "" -"Se stai confrontando cartelle, apri la cartella di destinazione;non selezionare un file.Il testo <literal>Selezione cartella</literal> rimane al suo " -"posto." +"Se stai confrontando cartelle, apri la cartella di destinazione;non " +"selezionare un file.Il testo <literal>Selezione cartella</literal> rimane al " +"suo posto." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:124 msgid "" -"Click <guibutton>Open</guibutton> to dismiss the Open dialog and load your selection in the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> " -"field. If you specified folders, the field includes a backslash ( \\ ) at end of the path." +"Click <guibutton>Open</guibutton> to dismiss the Open dialog and load your " +"selection in the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> field. " +"If you specified folders, the field includes a backslash ( \\ ) at end of " +"the path." msgstr "" -"Fai clic su <guibutton >Apri</guibutton > per chiudere la finestra di dialogo Apri e caricare la selezione nel campo <guilabel >1°</guilabel > o " -"<guilabel >2°</guilabel >.Se hai specificato le cartelle, il campo include una barra rovesciata ( \\ ) alla fine del percorso." +"Fai clic su <guibutton >Apri</guibutton > per chiudere la finestra di " +"dialogo Apri e caricare la selezione nel campo <guilabel >1°</guilabel > o " +"<guilabel >2°</guilabel >.Se hai specificato le cartelle, il campo include " +"una barra rovesciata ( \\ ) alla fine del percorso." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:131 msgid "Click the combo box and choose a previously-used path." -msgstr "Fare clic sulla casella combinata e scegliere un percorso utilizzato in precedenza." +msgstr "" +"Fare clic sulla casella combinata e scegliere un percorso utilizzato in " +"precedenza." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><tip><para> #: English/Quick_start.xml:135 msgid "" -"To make it easier to select frequently-used paths, consider enabling the <guilabel>Open-dialog Auto-completion</guilabel> option. With this option, " -"WinMerge shows a list of paths available as you type in the fields. See <xref linkend=\"Configuration\" /> for details." +"To make it easier to select frequently-used paths, consider enabling the " +"<guilabel>Open-dialog Auto-completion</guilabel> option. With this option, " +"WinMerge shows a list of paths available as you type in the fields. See " +"<xref linkend=\"Configuration\" /> for details." msgstr "" -"Per rendere più semplice la selezione dei percorsi utilizzati di frequente, valuta la possibilità di abilitare l'opzione <guilabel >Completamento " -"automatico finestra di apertura</guilabel >.Con questa opzione, WinMerge mostra un elenco di percorsi disponibili durante la digitazione nei " -"campi.Vedi <xref linkend=\"Configuration\" /> per i dettagli." +"Per rendere più semplice la selezione dei percorsi utilizzati di frequente, " +"valuta la possibilità di abilitare l'opzione <guilabel >Completamento " +"automatico finestra di apertura</guilabel >.Con questa opzione, WinMerge " +"mostra un elenco di percorsi disponibili durante la digitazione nei campi." +"Vedi <xref linkend=\"Configuration\" /> per i dettagli." #. type: Content of: <article><section><section><section><para><itemizedlist><listitem><para> #: English/Quick_start.xml:145 -msgid "Drag and drop a file or folder into the dialog or the <guilabel>1st</guilabel> or <guilabel>2nd</guilabel> field." -msgstr "Trascina e rilascia un file o una cartella nella finestra di dialogo o nel campo <guilabel >1°</guilabel > o <guilabel >2°</guilabel >." +msgid "" +"Drag and drop a file or folder into the dialog or the <guilabel>1st</" +"guilabel> or <guilabel>2nd</guilabel> field." +msgstr "" +"Trascina e rilascia un file o una cartella nella finestra di dialogo o nel " +"campo <guilabel >1°</guilabel > o <guilabel >2°</guilabel >." #. type: Content of: <article><section><section><section><para><note> #: English/Quick_start.xml:151 @@ -19372,16 +25308,24 @@ msgstr "<note>" #. type: Content of: <article><section><section><section><para><note><para> #: English/Quick_start.xml:152 msgid "" -"You can select only one pair of files or one pair of folders to compare. If you select a file and a folder or if one of the files or folders is not " -"found, WinMerge disables the <guibutton>Compare</guibutton> button in the dialog." +"You can select only one pair of files or one pair of folders to compare. If " +"you select a file and a folder or if one of the files or folders is not " +"found, WinMerge disables the <guibutton>Compare</guibutton> button in the " +"dialog." msgstr "" -"È possibile selezionare solo una coppia di file o una coppia di cartelle da confrontare.Se selezioni un file e una cartella o se uno dei file o delle " -"cartelle non viene trovato, WinMerge disabilita il pulsante <guibutton >Confronta</guibutton > nella finestra di dialogo." +"È possibile selezionare solo una coppia di file o una coppia di cartelle da " +"confrontare.Se selezioni un file e una cartella o se uno dei file o delle " +"cartelle non viene trovato, WinMerge disabilita il pulsante <guibutton " +">Confronta</guibutton > nella finestra di dialogo." #. type: Content of: <article><section><section><section><para><note><para> #: English/Quick_start.xml:157 -msgid "The status message at the bottom of the dialog also informs you if one of the paths is invalid." -msgstr "Il messaggio di stato nella parte inferiore della finestra di dialogo informa inoltre se uno dei percorsi non è valido." +msgid "" +"The status message at the bottom of the dialog also informs you if one of " +"the paths is invalid." +msgstr "" +"Il messaggio di stato nella parte inferiore della finestra di dialogo " +"informa inoltre se uno dei percorsi non è valido." #. type: Content of: <article><section><section><section><title> #: English/Quick_start.xml:163 @@ -19391,20 +25335,26 @@ msgstr "Controlla l'ambito dei confronti delle cartelle" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:165 msgid "" -"If you are comparing folders, you can use the <guilabel>Filter</guilabel> field to eliminate some files from the operation. The field specifies a " -"subset of files in the selected paths that are to be included; all unspecified files are excluded." +"If you are comparing folders, you can use the <guilabel>Filter</guilabel> " +"field to eliminate some files from the operation. The field specifies a " +"subset of files in the selected paths that are to be included; all " +"unspecified files are excluded." msgstr "" -"Se stai confrontando cartelle, puoi usare il campo <guilabel >Filtro</guilabel > per eliminare alcuni file dall'operazione.Il campo specifica un " -"sottoinsieme di file nei percorsi selezionati che devono essere inclusi;tutti i file non specificati sono esclusi." +"Se stai confrontando cartelle, puoi usare il campo <guilabel >Filtro</" +"guilabel > per eliminare alcuni file dall'operazione.Il campo specifica un " +"sottoinsieme di file nei percorsi selezionati che devono essere inclusi;" +"tutti i file non specificati sono esclusi." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:170 msgid "" -"You can enter file masks to filter files with certain extensions. For example, this expression includes only C and C++ source files; all other file " -"types are eliminated from your selection." +"You can enter file masks to filter files with certain extensions. For " +"example, this expression includes only C and C++ source files; all other " +"file types are eliminated from your selection." msgstr "" -"È possibile inserire maschere di file per filtrare i file con determinate estensioni.Ad esempio, questa espressione include solo file di origine C e " -"C++;tutti gli altri tipi di file vengono eliminati dalla selezione." +"È possibile inserire maschere di file per filtrare i file con determinate " +"estensioni.Ad esempio, questa espressione include solo file di origine C e C+" +"+;tutti gli altri tipi di file vengono eliminati dalla selezione." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:174 @@ -19414,29 +25364,45 @@ msgstr "<filename><userinput>*.cpp;*.hpp;*.c;*.h</userinput></filename>" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:176 msgid "" -"For more robust filtering, enter a filter file instead of file masks: click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</" -"guilabel> field to choose from a list of available filters. File filters contain any number of rules to either include or exclude files. WinMerge " -"installs a set of filter files, which you can edit or augment with your own files." +"For more robust filtering, enter a filter file instead of file masks: click " +"the <guibutton>Select</guibutton> button next to the <guilabel>Filters</" +"guilabel> field to choose from a list of available filters. File filters " +"contain any number of rules to either include or exclude files. WinMerge " +"installs a set of filter files, which you can edit or augment with your own " +"files." msgstr "" -"Per un filtraggio più efficace, inserisci un file filtro invece delle maschere file: fai clic sul pulsante <guibutton >Seleziona</guibutton > accanto " -"al campo <guilabel >Filtri</guilabel > per scegliere da un elenco di filtri disponibili.I filtri di file contengono un numero qualsiasi di regole per " -"includere o escludere file.WinMerge installa una serie di file filtro, che puoi modificare o aumentare con i tuoi file." +"Per un filtraggio più efficace, inserisci un file filtro invece delle " +"maschere file: fai clic sul pulsante <guibutton >Seleziona</guibutton > " +"accanto al campo <guilabel >Filtri</guilabel > per scegliere da un elenco di " +"filtri disponibili.I filtri di file contengono un numero qualsiasi di regole " +"per includere o escludere file.WinMerge installa una serie di file filtro, " +"che puoi modificare o aumentare con i tuoi file." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:183 -msgid "See <xref linkend=\"Filters\" /> for full details about file masks and filter files." -msgstr "Vedi <xref linkend=\"Filters\" /> per i dettagli completi sulle maschere di file e sui file di filtro." +msgid "" +"See <xref linkend=\"Filters\" /> for full details about file masks and " +"filter files." +msgstr "" +"Vedi <xref linkend=\"Filters\" /> per i dettagli completi sulle maschere di " +"file e sui file di filtro." #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:186 msgid "" -"The <guilabel>Include subfolders</guilabel> check box provides another way to control the scope of folder comparisons. If you check this option, " -"WinMerge recursively compares subfolders, and shows all the files and folders it finds in one view. If you disable the option, only the current " -"folder is compared, and subfolders are listed by name (without their contents), so you can browse into them." -msgstr "" -"La casella di controllo <guilabel >Includi sottocartelle</guilabel > fornisce un altro modo per controllare l'ambito dei confronti delle cartelle.Se " -"selezioni questa opzione, WinMerge confronta ricorsivamente le sottocartelle e mostra tutti i file e le cartelle che trova in un'unica " -"visualizzazione.Se disabiliti l'opzione, viene confrontata solo la cartella corrente e le sottocartelle vengono elencate per nome (senza il loro " +"The <guilabel>Include subfolders</guilabel> check box provides another way " +"to control the scope of folder comparisons. If you check this option, " +"WinMerge recursively compares subfolders, and shows all the files and " +"folders it finds in one view. If you disable the option, only the current " +"folder is compared, and subfolders are listed by name (without their " +"contents), so you can browse into them." +msgstr "" +"La casella di controllo <guilabel >Includi sottocartelle</guilabel > " +"fornisce un altro modo per controllare l'ambito dei confronti delle cartelle." +"Se selezioni questa opzione, WinMerge confronta ricorsivamente le " +"sottocartelle e mostra tutti i file e le cartelle che trova in un'unica " +"visualizzazione.Se disabiliti l'opzione, viene confrontata solo la cartella " +"corrente e le sottocartelle vengono elencate per nome (senza il loro " "contenuto), in modo da poterle sfogliare." #. type: Content of: <article><section><section><section><title> @@ -19446,26 +25412,39 @@ msgstr "Utilizza i plugin Unpacker" #. type: Content of: <article><section><section><section><para> #: English/Quick_start.xml:196 -msgid "The Unpacker field enables you to perform compare operations on plug-ins." -msgstr "Il campo Unpacker consente di eseguire operazioni di confronto sui plug-in." +msgid "" +"The Unpacker field enables you to perform compare operations on plug-ins." +msgstr "" +"Il campo Unpacker consente di eseguire operazioni di confronto sui plug-in." #. type: Content of: <article><section><section><title> #: English/Quick_start.xml:202 -msgid "Other ways to open files and folders<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" -msgstr "Altri modi per aprire file e cartelle<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" +msgid "" +"Other ways to open files and folders<placeholder type=\"indexterm\" id=\"0\"/" +"><placeholder type=\"indexterm\" id=\"1\"/>" +msgstr "" +"Altri modi per aprire file e cartelle<placeholder type=\"indexterm\" " +"id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> #: English/Quick_start.xml:210 msgid "" -"The <guilabel>Select Files or Folders</guilabel> dialog is the main interface for opening files and folders. But you can use many other ways, too:" +"The <guilabel>Select Files or Folders</guilabel> dialog is the main " +"interface for opening files and folders. But you can use many other ways, " +"too:" msgstr "" -"La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel > è l'interfaccia principale per l'apertura di file e cartelle.Ma puoi usare " +"La finestra di dialogo <guilabel >Seleziona file o cartelle</guilabel > è " +"l'interfaccia principale per l'apertura di file e cartelle.Ma puoi usare " "anche molti altri modi:" #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:215 -msgid "<xref linkend=\"OpenPaths_project\" /> are the easiest and fastest way to open frequently used paths." -msgstr "<xref linkend=\"OpenPaths_project\" /> rappresenta il modo più semplice e veloce per aprire i percorsi utilizzati di frequente." +msgid "" +"<xref linkend=\"OpenPaths_project\" /> are the easiest and fastest way to " +"open frequently used paths." +msgstr "" +"<xref linkend=\"OpenPaths_project\" /> rappresenta il modo più semplice e " +"veloce per aprire i percorsi utilizzati di frequente." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:220 @@ -19474,67 +25453,100 @@ msgstr "<xref linkend=\"OpenPaths_shell-integ\" />." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:224 -msgid "Use the <xref linkend=\"Command_line\" /> interface to start WinMerge from other applications, from a command prompt, or a batch or script file." +msgid "" +"Use the <xref linkend=\"Command_line\" /> interface to start WinMerge from " +"other applications, from a command prompt, or a batch or script file." msgstr "" -"Utilizzare l'interfaccia <xref linkend=\"Command_line\" /> per avviare WinMerge da altre applicazioni, da un prompt dei comandi o da un file batch o " -"script." +"Utilizzare l'interfaccia <xref linkend=\"Command_line\" /> per avviare " +"WinMerge da altre applicazioni, da un prompt dei comandi o da un file batch " +"o script." #. type: Content of: <article><section><section><itemizedlist><listitem><simpara> #: English/Quick_start.xml:230 -msgid "Drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut." -msgstr "Trascina e rilascia file e cartelle direttamente nella finestra WinMerge o sul collegamento sul desktop di WinMerge." +msgid "" +"Drag and drop files and folders directly into the WinMerge window or on the " +"WinMerge desktop shortcut." +msgstr "" +"Trascina e rilascia file e cartelle direttamente nella finestra WinMerge o " +"sul collegamento sul desktop di WinMerge." #. type: Content of: <article><section><title> #: English/Quick_start.xml:238 -msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Comparing folders" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Confronto di cartelle" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>Comparing folders" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"id=\"1\"/>Confronto di cartelle" #. type: Content of: <article><section><para> #: English/Quick_start.xml:248 msgid "" -"If you selected two folders in the Open dialog, the Folder Compare window is opened. The Folder Compare window is a tabular list of items found in " -"the compared folders. Each row displays information about a found file, with the file name in the left column and additional information in the other " -"columns:" +"If you selected two folders in the Open dialog, the Folder Compare window is " +"opened. The Folder Compare window is a tabular list of items found in the " +"compared folders. Each row displays information about a found file, with the " +"file name in the left column and additional information in the other columns:" msgstr "" -"Se hai selezionato due cartelle nella finestra di dialogo Apri, viene aperta la finestra Confronto cartelle.La finestra Confronto cartelle è un " -"elenco tabellare degli elementi trovati nelle cartelle confrontate.Ogni riga visualizza le informazioni su un file trovato, con il nome del file " -"nella colonna di sinistra e informazioni aggiuntive nelle altre colonne:" +"Se hai selezionato due cartelle nella finestra di dialogo Apri, viene aperta " +"la finestra Confronto cartelle.La finestra Confronto cartelle è un elenco " +"tabellare degli elementi trovati nelle cartelle confrontate.Ogni riga " +"visualizza le informazioni su un file trovato, con il nome del file nella " +"colonna di sinistra e informazioni aggiuntive nelle altre colonne:" #. type: Content of: <article><section><para> #: English/Quick_start.xml:265 msgid "" -"WinMerge does not have a concept of <wordasword>original</wordasword> and <wordasword>changed</wordasword> sides. Instead, it simply shows what is " -"different between two selected folders. A file or folder that is found only on one side is simply shown as a unique item on that side, not as added " -"or removed. For example, in the <guilabel>Comparison Result </guilabel>column of the preceding figure, <filename>Merge.aps</filename> and " -"<filename>Merge.rc.bak</filename> are each found in only one of the compared folders." -msgstr "" -"WinMerge non ha il concetto di lato <wordasword>originale</wordasword> e <wordasword>modificato</wordasword>.Invece, mostra semplicemente cosa c'è di " -"diverso tra due cartelle selezionate.Un file o una cartella che si trova solo su un lato viene semplicemente mostrato come un elemento univoco su " -"quel lato, non come aggiunto o rimosso.Ad esempio, nella colonna <guilabel >Risultato del confronto </guilabel >della figura precedente, " -"<filename>Merge.aps</filename> e <filename>Merge.rc.bak</filename> si trovano ciascuno solo in una delle cartelle confrontate." +"WinMerge does not have a concept of <wordasword>original</wordasword> and " +"<wordasword>changed</wordasword> sides. Instead, it simply shows what is " +"different between two selected folders. A file or folder that is found only " +"on one side is simply shown as a unique item on that side, not as added or " +"removed. For example, in the <guilabel>Comparison Result </guilabel>column " +"of the preceding figure, <filename>Merge.aps</filename> and <filename>Merge." +"rc.bak</filename> are each found in only one of the compared folders." +msgstr "" +"WinMerge non ha il concetto di lato <wordasword>originale</wordasword> e " +"<wordasword>modificato</wordasword>.Invece, mostra semplicemente cosa c'è di " +"diverso tra due cartelle selezionate.Un file o una cartella che si trova " +"solo su un lato viene semplicemente mostrato come un elemento univoco su " +"quel lato, non come aggiunto o rimosso.Ad esempio, nella colonna <guilabel " +">Risultato del confronto </guilabel >della figura precedente, " +"<filename>Merge.aps</filename> e <filename>Merge.rc.bak</filename> si " +"trovano ciascuno solo in una delle cartelle confrontate." #. type: Content of: <article><section><para> #: English/Quick_start.xml:274 msgid "" -"You can manage files and folders in many ways using the <guimenu>Merge</guimenu> menu, toolbar buttons, or context (right-click) menu. The most " -"important action is making files or folders identical in both sides by selecting one of several Copy items. When you copy a file or folder to other " +"You can manage files and folders in many ways using the <guimenu>Merge</" +"guimenu> menu, toolbar buttons, or context (right-click) menu. The most " +"important action is making files or folders identical in both sides by " +"selecting one of several Copy items. When you copy a file or folder to other " "side, the Comparison Result value changes to <literal>Identical</literal>." msgstr "" -"Puoi gestire file e cartelle in molti modi usando il menu <guimenu >Unisci</guimenu >, i pulsanti della barra degli strumenti o il menu contestuale " -"(clicca con il tasto destro).L'azione più importante è rendere i file o le cartelle identici su entrambi i lati selezionando uno dei numerosi " -"elementi Copia.Quando copi un file o una cartella sull'altro lato, il valore del risultato del confronto cambia in <literal>Identical</literal>." +"Puoi gestire file e cartelle in molti modi usando il menu <guimenu >Unisci</" +"guimenu >, i pulsanti della barra degli strumenti o il menu contestuale " +"(clicca con il tasto destro).L'azione più importante è rendere i file o le " +"cartelle identici su entrambi i lati selezionando uno dei numerosi elementi " +"Copia.Quando copi un file o una cartella sull'altro lato, il valore del " +"risultato del confronto cambia in <literal>Identical</literal>." #. type: Content of: <article><section><para> #: English/Quick_start.xml:281 -msgid "If a file or folder exists in both sides (and it is not a binary file) it can be opened for file comparison using one of these methods:" +msgid "" +"If a file or folder exists in both sides (and it is not a binary file) it " +"can be opened for file comparison using one of these methods:" msgstr "" -"Se un file o una cartella esiste su entrambi i lati (e non è un file binario), può essere aperto per il confronto dei file utilizzando uno di questi " -"metodi:" +"Se un file o una cartella esiste su entrambi i lati (e non è un file " +"binario), può essere aperto per il confronto dei file utilizzando uno di " +"questi metodi:" #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/Quick_start.xml:285 -msgid "Click <menuchoice> <guimenuitem>Compare</guimenuitem> <guimenuitem>Merge</guimenuitem> </menuchoice> in the WinMerge menu." -msgstr "Fai clic su <menuchoice> <guimenuitem >Confronta</guimenuitem > <guimenuitem >Unisci</guimenuitem > </menuchoice > nel menu WinMerge." +msgid "" +"Click <menuchoice> <guimenuitem>Compare</guimenuitem> <guimenuitem>Merge</" +"guimenuitem> </menuchoice> in the WinMerge menu." +msgstr "" +"Fai clic su <menuchoice> <guimenuitem >Confronta</guimenuitem > <guimenuitem " +">Unisci</guimenuitem > </menuchoice > nel menu WinMerge." #. type: Content of: <article><section><para><itemizedlist><listitem><simpara> #: English/Quick_start.xml:298 @@ -19548,8 +25560,12 @@ msgstr "Seleziona la riga e premi <keycap>Invio</keycap>." #. type: Content of: <article><section><para><inlinemediaobject> #: English/Quick_start.xml:308 -msgid "<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/nav_uparrow_btn.png\" /> </imageobject>" -msgstr "<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/nav_uparrow_btn.png\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/" +"nav_uparrow_btn.png\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata contentwidth=\"23\" fileref=\"screenshots/" +"nav_uparrow_btn.png\" /> </imageobject>" #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase> #: English/Quick_start.xml:313 @@ -19559,63 +25575,92 @@ msgstr "Pulsante freccia su del navigatore" #. type: Content of: <article><section><para> #: English/Quick_start.xml:304 msgid "" -"If you compare a subfolder, the new folder's comparison table is loaded in the current Folder Compare window . When you are done with that folder's " -"comparison, you can navigate back to its parent folder by double-clicking the <placeholder type=\"inlinemediaobject\" id=\"0\"/> up arrow at the top " +"If you compare a subfolder, the new folder's comparison table is loaded in " +"the current Folder Compare window . When you are done with that folder's " +"comparison, you can navigate back to its parent folder by double-clicking " +"the <placeholder type=\"inlinemediaobject\" id=\"0\"/> up arrow at the top " "of the Filename column." msgstr "" -"Se confronti una sottocartella, la tabella di confronto della nuova cartella viene caricata nella finestra Confronto cartelle corrente.Una volta " -"terminato il confronto della cartella, puoi tornare alla cartella principale facendo doppio clic sulla freccia su <placeholder " -"type=\"inlinemediaobject\" id=\"0\"/> nella parte superiore della colonna Nome file." +"Se confronti una sottocartella, la tabella di confronto della nuova cartella " +"viene caricata nella finestra Confronto cartelle corrente.Una volta " +"terminato il confronto della cartella, puoi tornare alla cartella principale " +"facendo doppio clic sulla freccia su <placeholder type=\"inlinemediaobject\" " +"id=\"0\"/> nella parte superiore della colonna Nome file." #. type: Content of: <article><section><para> #: English/Quick_start.xml:317 msgid "" -"If you compare a file, WinMerge opens the File Compare window, described in the next section. If you change a file in the File Compare window, and " -"then return to the Folder Compare window, you will see the file's data is updated there." +"If you compare a file, WinMerge opens the File Compare window, described in " +"the next section. If you change a file in the File Compare window, and then " +"return to the Folder Compare window, you will see the file's data is updated " +"there." msgstr "" -"Se confronti un file, WinMerge apre la finestra Confronta file, descritta nella sezione successiva.Se modifichi un file nella finestra Confronta file " -"e poi ritorni alla finestra Confronta cartelle, vedrai che i dati del file vengono aggiornati lì." +"Se confronti un file, WinMerge apre la finestra Confronta file, descritta " +"nella sezione successiva.Se modifichi un file nella finestra Confronta file " +"e poi ritorni alla finestra Confronta cartelle, vedrai che i dati del file " +"vengono aggiornati lì." #. type: Content of: <article><section><title> #: English/Quick_start.xml:324 -msgid "<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>Comparing files" -msgstr "<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" id=\"1\"/>Confronto di file" +msgid "" +"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" " +"id=\"1\"/>Comparing files" +msgstr "" +"<placeholder type=\"indexterm\" id=\"0\"/>><placeholder type=\"indexterm\" " +"id=\"1\"/>Confronto di file" #. type: Content of: <article><section><para> #: English/Quick_start.xml:345 msgid "" -"The File Compare window shows the two selected files side by side, in separate File panes. Different lines are highlighted with a background color. " -"One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>). In the preceding example, a single difference is " -"selected in the File panes and displayed by itself in the Diff Pane. WinMerge mainly works with these differences, not separate lines. When you " +"The File Compare window shows the two selected files side by side, in " +"separate File panes. Different lines are highlighted with a background " +"color. One or more consecutive different lines form one difference (or " +"<glossterm>diff</glossterm>). In the preceding example, a single difference " +"is selected in the File panes and displayed by itself in the Diff Pane. " +"WinMerge mainly works with these differences, not separate lines. When you " "merge a difference, you copy all of its lines from one side to the other." msgstr "" -"La finestra Confronto file mostra i due file selezionati fianco a fianco, in riquadri File separati.Le diverse linee sono evidenziate con un colore " -"di sfondo.Una o più linee diverse consecutive formano una differenza (o <glossterm>diff</glossterm>).Nell'esempio precedente, una singola differenza " -"viene selezionata nei riquadri File e visualizzata da sola nel riquadro Diff.WinMerge funziona principalmente con queste differenze, non con linee " -"separate.Quando unisci una differenza, copi tutte le sue linee da un lato all'altro." +"La finestra Confronto file mostra i due file selezionati fianco a fianco, in " +"riquadri File separati.Le diverse linee sono evidenziate con un colore di " +"sfondo.Una o più linee diverse consecutive formano una differenza (o " +"<glossterm>diff</glossterm>).Nell'esempio precedente, una singola differenza " +"viene selezionata nei riquadri File e visualizzata da sola nel riquadro Diff." +"WinMerge funziona principalmente con queste differenze, non con linee " +"separate.Quando unisci una differenza, copi tutte le sue linee da un lato " +"all'altro." #. type: Content of: <article><section><para><important><para> #: English/Quick_start.xml:355 msgid "" -"Notice how WinMerge fills missing lines, so that similar lines are always aligned vertically, side by side. This is different from most other compare/" +"Notice how WinMerge fills missing lines, so that similar lines are always " +"aligned vertically, side by side. This is different from most other compare/" "merge programs, and can take a while to learn." msgstr "" -"Nota come WinMerge riempie le righe mancanti, in modo che le righe simili siano sempre allineate verticalmente, una accanto all'altra.Questo è " -"diverso dalla maggior parte degli altri programmi di confronto/unione e può richiedere del tempo per essere appreso." +"Nota come WinMerge riempie le righe mancanti, in modo che le righe simili " +"siano sempre allineate verticalmente, una accanto all'altra.Questo è diverso " +"dalla maggior parte degli altri programmi di confronto/unione e può " +"richiedere del tempo per essere appreso." #. type: Content of: <article><section><para> #: English/Quick_start.xml:360 msgid "" -"WinMerge has a simple integrated editor that features basic typing, copying, cutting and pasting of text. If <guilabel>Automatic rescan</guilabel> is " -"enabled, WinMerge updates file differences while you edit a file. If <guilabel>Automatic rescan</guilabel> is disabled, you can update files by " -"selecting <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Refresh</guimenuitem> </menuchoice>, clicking the <placeholder type=\"inlinemediaobject\" " -"id=\"0\"/> toolbar button, or pressing <keycap>F5</keycap>." -msgstr "" -"WinMerge ha un semplice editor integrato che consente di digitare, copiare, tagliare e incollare testo di base.Se la <guilabel >Riscansione " -"automatica</guilabel > è abilitata, WinMerge aggiorna le differenze tra i file mentre modifichi un file.Se la <guilabel >Riscansione automatica</" -"guilabel > è disabilitata, puoi aggiornare i file selezionando <menuchoice> <guimenu >Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </" -"menuchoice >, facendo clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> nella barra degli strumenti, o premendo <keycap >F5</" -"keycap >." +"WinMerge has a simple integrated editor that features basic typing, copying, " +"cutting and pasting of text. If <guilabel>Automatic rescan</guilabel> is " +"enabled, WinMerge updates file differences while you edit a file. If " +"<guilabel>Automatic rescan</guilabel> is disabled, you can update files by " +"selecting <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Refresh</" +"guimenuitem> </menuchoice>, clicking the <placeholder " +"type=\"inlinemediaobject\" id=\"0\"/> toolbar button, or pressing " +"<keycap>F5</keycap>." +msgstr "" +"WinMerge ha un semplice editor integrato che consente di digitare, copiare, " +"tagliare e incollare testo di base.Se la <guilabel >Riscansione automatica</" +"guilabel > è abilitata, WinMerge aggiorna le differenze tra i file mentre " +"modifichi un file.Se la <guilabel >Riscansione automatica</guilabel > è " +"disabilitata, puoi aggiornare i file selezionando <menuchoice> <guimenu " +">Modifica</guimenu > <guimenuitem >Aggiorna</guimenuitem > </menuchoice >, " +"facendo clic sul pulsante <placeholder type=\"inlinemediaobject\" id=\"0\"/> " +"nella barra degli strumenti, o premendo <keycap >F5</keycap >." #. type: Content of: <appendix><title><indexterm><primary> #: English/Shortcut_keys.xml:4 @@ -19629,8 +25674,12 @@ msgstr "Tasti di scelta rapida<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <appendix><para> #: English/Shortcut_keys.xml:7 -msgid "WinMerge includes most of the familiar shortcut keys commonly used in other Windows applications." -msgstr "WinMerge include la maggior parte dei tasti di scelta rapida familiari comunemente utilizzati in altre applicazioni Windows." +msgid "" +"WinMerge includes most of the familiar shortcut keys commonly used in other " +"Windows applications." +msgstr "" +"WinMerge include la maggior parte dei tasti di scelta rapida familiari " +"comunemente utilizzati in altre applicazioni Windows." #. type: Content of: <appendix><table><title> #: English/Shortcut_keys.xml:11 @@ -19638,14 +25687,18 @@ msgid "General" msgstr "Generale" #. type: Content of: <appendix><table><tgroup><thead><row><entry> -#: English/Shortcut_keys.xml:16 English/Shortcut_keys.xml:57 English/Shortcut_keys.xml:162 English/Shortcut_keys.xml:409 English/Shortcut_keys.xml:543 -#: English/Shortcut_keys.xml:609 English/Shortcut_keys.xml:683 English/Shortcut_keys.xml:740 +#: English/Shortcut_keys.xml:16 English/Shortcut_keys.xml:57 +#: English/Shortcut_keys.xml:162 English/Shortcut_keys.xml:409 +#: English/Shortcut_keys.xml:543 English/Shortcut_keys.xml:609 +#: English/Shortcut_keys.xml:683 English/Shortcut_keys.xml:740 msgid "Keys" msgstr "Chiavi" #. type: Content of: <appendix><table><tgroup><thead><row><entry> -#: English/Shortcut_keys.xml:18 English/Shortcut_keys.xml:59 English/Shortcut_keys.xml:164 English/Shortcut_keys.xml:411 English/Shortcut_keys.xml:545 -#: English/Shortcut_keys.xml:611 English/Shortcut_keys.xml:685 English/Shortcut_keys.xml:742 +#: English/Shortcut_keys.xml:18 English/Shortcut_keys.xml:59 +#: English/Shortcut_keys.xml:164 English/Shortcut_keys.xml:411 +#: English/Shortcut_keys.xml:545 English/Shortcut_keys.xml:611 +#: English/Shortcut_keys.xml:685 English/Shortcut_keys.xml:742 msgid "Function" msgstr "Funzione" @@ -19661,8 +25714,12 @@ msgstr "Passa alla scheda successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:35 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>Tab</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>Tab</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>Tab</keycap> " +"</keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>Tab</" +"keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:43 @@ -19691,8 +25748,12 @@ msgstr "<keycap>Backspace</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:73 -msgid "Open parent folder if possible (available only when subfolders are not included in compare)" -msgstr "Apri la cartella principale se possibile (disponibile solo quando le sottocartelle non sono incluse nel confronto)" +msgid "" +"Open parent folder if possible (available only when subfolders are not " +"included in compare)" +msgstr "" +"Apri la cartella principale se possibile (disponibile solo quando le " +"sottocartelle non sono incluse nel confronto)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:78 English/Shortcut_keys.xml:188 @@ -19732,12 +25793,15 @@ msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Invio</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:110 msgid "Go to currently selected item (if scrolled off-screen)" -msgstr "Vai all'elemento attualmente selezionato (se fatto scorrere fuori dallo schermo)" +msgstr "" +"Vai all'elemento attualmente selezionato (se fatto scorrere fuori dallo " +"schermo)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:114 English/Shortcut_keys.xml:447 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Up Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia su</keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Freccia su</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:120 @@ -19747,7 +25811,8 @@ msgstr "Vai al file o alla cartella precedente diversa" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:124 English/Shortcut_keys.xml:457 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Down Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia giù</keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Freccia giù</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:130 @@ -19757,7 +25822,8 @@ msgstr "Vai al file o alla cartella successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:134 English/Shortcut_keys.xml:489 msgid "<keycombo> <keycap>Alt</keycap> <keycap>Left Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:140 @@ -19766,8 +25832,10 @@ msgstr "Copia gli elementi selezionati da destra a sinistra" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:144 English/Shortcut_keys.xml:499 -msgid "<keycombo> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:150 @@ -19845,7 +25913,8 @@ msgid "<keycap>F7</keycap>" msgstr "<keycap>F7</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> -#: English/Shortcut_keys.xml:214 English/Shortcut_keys.xml:453 English/Shortcut_keys.xml:553 +#: English/Shortcut_keys.xml:214 English/Shortcut_keys.xml:453 +#: English/Shortcut_keys.xml:553 msgid "Go to previous difference" msgstr "Vai alla differenza precedente" @@ -19875,7 +25944,8 @@ msgid "<keycap>F8</keycap>" msgstr "<keycap>F8</keycap>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> -#: English/Shortcut_keys.xml:232 English/Shortcut_keys.xml:463 English/Shortcut_keys.xml:559 +#: English/Shortcut_keys.xml:232 English/Shortcut_keys.xml:463 +#: English/Shortcut_keys.xml:559 msgid "Go to next difference" msgstr "Vai alla differenza successiva" @@ -19931,8 +26001,12 @@ msgstr "Attiva/disattiva la modalità contesto differenze" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:274 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>E</keycap> </" +"keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:281 @@ -19951,8 +26025,12 @@ msgstr "Vai alla differenza o alla linea" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:295 English/Shortcut_keys.xml:306 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>G</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>G</keycap> " +"</keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:302 @@ -19966,18 +26044,27 @@ msgstr "Vai alla linea spostata tra il lato sinistro e il centro (3 riquadri)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:317 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>G</keycap> </" +"keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:324 msgid "Go to moved line between middle and right side (3 panes)" -msgstr "Vai alla linea spostata tra il lato centrale e quello destro (3 riquadri)" +msgstr "" +"Vai alla linea spostata tra il lato centrale e quello destro (3 riquadri)" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:328 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>M</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>M</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>M</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>M</keycap> " +"</keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:335 @@ -19986,8 +26073,12 @@ msgstr "Aggiungi marcatore" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:339 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>M</keycap> </" +"keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:346 @@ -20016,8 +26107,12 @@ msgstr "Converti il ​​testo selezionato in minuscolo" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:370 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>U</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>U</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>U</keycap> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>U</keycap> " +"</keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:377 @@ -20066,13 +26161,21 @@ msgstr "Vai alla differenza attuale o seleziona la differenza" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:467 -msgid "<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Up Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia su</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Up Arrow</" +"keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia su</" +"keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:478 -msgid "<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Down Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia giù</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Alt</keycap> <keycap>Shift</keycap> <keycap>Down Arrow</" +"keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Alt</keycap> <keycap>Maiusc</keycap> <keycap>Freccia giù</" +"keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:495 English/Shortcut_keys.xml:565 @@ -20086,23 +26189,35 @@ msgstr "Copia la differenza dal lato sinistro al lato destro" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:509 English/Shortcut_keys.xml:575 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia sinistra</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Left Arrow</" +"keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia " +"sinistra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:517 English/Shortcut_keys.xml:583 msgid "Copy difference from right side to left side and select next difference" -msgstr "Copia la differenza dal lato destro a quello sinistro e seleziona la differenza successiva" +msgstr "" +"Copia la differenza dal lato destro a quello sinistro e seleziona la " +"differenza successiva" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:522 English/Shortcut_keys.xml:588 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right Arrow</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia destra</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Right Arrow</" +"keycap> </keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Freccia " +"destra</keycap> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:530 English/Shortcut_keys.xml:596 msgid "Copy difference from left side to right side and select next difference" -msgstr "Copia la differenza dal lato sinistro al lato destro e seleziona la differenza successiva" +msgstr "" +"Copia la differenza dal lato sinistro al lato destro e seleziona la " +"differenza successiva" #. type: Content of: <appendix><table><title> #: English/Shortcut_keys.xml:538 @@ -20186,8 +26301,12 @@ msgstr "Trova il testo selezionato nel file" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:663 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F3</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F3</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F3</keycap> " +"</keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F3</keycap> " +"</keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:671 @@ -20231,8 +26350,12 @@ msgstr "Attiva/disattiva segnalibro" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:719 -msgid "<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F2</keycap> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F2</keycap> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Shift</keycap> <keycap>F2</keycap> " +"</keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <keycap>Maiusc</keycap> <keycap>F2</keycap> " +"</keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:727 @@ -20271,29 +26394,46 @@ msgstr "Ripristina lo zoom del testo alle dimensioni predefinite" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:778 -msgid "<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Up</mousebutton> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotellina del mouse su</mousebutton> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Up</mousebutton> </" +"keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotellina del mouse su</" +"mousebutton> </keycombo>" #. type: Content of: <appendix><table><tgroup><tbody><row><entry> #: English/Shortcut_keys.xml:788 -msgid "<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Down</mousebutton> </keycombo>" -msgstr "<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotella del mouse giù</mousebutton> </keycombo>" +msgid "" +"<keycombo> <keycap>Ctrl</keycap> <mousebutton>MouseWheel Down</mousebutton> " +"</keycombo>" +msgstr "" +"<keycombo> <keycap>Ctrl</keycap> <mousebutton>Rotella del mouse giù</" +"mousebutton> </keycombo>" #. type: Content of: <article><title> #: English/Version_control.xml:3 -msgid "Using WinMerge with other tools<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzo di WinMerge con altri strumenti<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Using WinMerge with other tools<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" +"Utilizzo di WinMerge con altri strumenti<placeholder type=\"indexterm\" " +"id=\"0\"/>" #. type: Content of: <article><para> #: English/Version_control.xml:7 msgid "" -"Comparing and merging files are often subtasks in a larger change management process. For that reason, WinMerge is often used not just by itself, but " -"also in conjunction with other tools. In addition, diff and merge utilities provide different features, so it's sometimes handy to combine different " -"tools. This topic describes the primary methods for using WinMerge with other tools." +"Comparing and merging files are often subtasks in a larger change management " +"process. For that reason, WinMerge is often used not just by itself, but " +"also in conjunction with other tools. In addition, diff and merge utilities " +"provide different features, so it's sometimes handy to combine different " +"tools. This topic describes the primary methods for using WinMerge with " +"other tools." msgstr "" -"Il confronto e l'unione dei file sono spesso attività secondarie in un processo di gestione delle modifiche più ampio.Per questo motivo WinMerge " -"viene spesso utilizzato non solo da solo, ma anche insieme ad altri strumenti.Inoltre, le utilità diff e merge forniscono funzionalità diverse, " -"quindi a volte è utile combinare diversi strumenti.Questo argomento descrive i metodi principali per utilizzare WinMerge con altri strumenti." +"Il confronto e l'unione dei file sono spesso attività secondarie in un " +"processo di gestione delle modifiche più ampio.Per questo motivo WinMerge " +"viene spesso utilizzato non solo da solo, ma anche insieme ad altri " +"strumenti.Inoltre, le utilità diff e merge forniscono funzionalità diverse, " +"quindi a volte è utile combinare diversi strumenti.Questo argomento descrive " +"i metodi principali per utilizzare WinMerge con altri strumenti." #. type: Content of: <article><section><title> #: English/Version_control.xml:15 @@ -20303,13 +26443,18 @@ msgstr "Utilizzo dell'interfaccia della riga di comando (CLI)" #. type: Content of: <article><section><para> #: English/Version_control.xml:17 msgid "" -"The WinMerge command-line interface (CLI), described in <xref linkend=\"Command_line\" />, enables you to run WinMerge from a Command Prompt window, " -"from scripts, or from another tool or program. Basically, any program that allows you to call an external executable with at least one path, can be " -"used to launch a WinMerge operation." +"The WinMerge command-line interface (CLI), described in <xref " +"linkend=\"Command_line\" />, enables you to run WinMerge from a Command " +"Prompt window, from scripts, or from another tool or program. Basically, any " +"program that allows you to call an external executable with at least one " +"path, can be used to launch a WinMerge operation." msgstr "" -"L'interfaccia della riga di comando (CLI) di WinMerge, descritta in <xref linkend=\"Command_line\" />, consente di eseguire WinMerge da una finestra " -"del prompt dei comandi, da script o da un altro strumento o programma.In sostanza, qualsiasi programma che consenta di richiamare un eseguibile " -"esterno con almeno un percorso, può essere utilizzato per avviare un'operazione WinMerge." +"L'interfaccia della riga di comando (CLI) di WinMerge, descritta in <xref " +"linkend=\"Command_line\" />, consente di eseguire WinMerge da una finestra " +"del prompt dei comandi, da script o da un altro strumento o programma.In " +"sostanza, qualsiasi programma che consenta di richiamare un eseguibile " +"esterno con almeno un percorso, può essere utilizzato per avviare " +"un'operazione WinMerge." #. type: Content of: <article><section><para> #: English/Version_control.xml:23 @@ -20318,8 +26463,12 @@ msgstr "Ecco solo alcuni esempi:" #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Version_control.xml:27 -msgid "A batch file can launch WinMerge and enable users to specify parameters interactively:" -msgstr "Un file batch può avviare WinMerge e consentire agli utenti di specificare i parametri in modo interattivo:" +msgid "" +"A batch file can launch WinMerge and enable users to specify parameters " +"interactively:" +msgstr "" +"Un file batch può avviare WinMerge e consentire agli utenti di specificare i " +"parametri in modo interattivo:" #. type: Content of: <article><section><itemizedlist><listitem><literallayout> #: English/Version_control.xml:30 @@ -20329,8 +26478,12 @@ msgstr "avviare \"WinMerge\" /B \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" /e /s #. type: Content of: <article><section><itemizedlist><listitem><para> #: English/Version_control.xml:34 -msgid "The Subversion client allows you to call an external diff program and pass parameters, like this:" -msgstr "Il client Subversion ti consente di chiamare un programma diff esterno e passare parametri, come questo:" +msgid "" +"The Subversion client allows you to call an external diff program and pass " +"parameters, like this:" +msgstr "" +"Il client Subversion ti consente di chiamare un programma diff esterno e " +"passare parametri, come questo:" #. type: Content of: <article><section><itemizedlist><listitem><literallayout> #: English/Version_control.xml:37 @@ -20341,119 +26494,175 @@ msgstr "$ svn diff --diff-cmd \"C:\\Programmi\\WinMerge\\WinMergeU.exe\" -x \"-d #. type: Content of: <article><section><tip><para> #: English/Version_control.xml:42 msgid "" -"Similarly, many GUI tools (like version control clients and IDEs) that include built-in diff tools enable you to configure WinMerge as their default " -"diff tool, instead. The next section describes how to use WinMerge this way with TortoiseSVN and Visual Studio Team Foundation Server. For other " -"tools, like Eclipse and Perforce, check their documentation or search the Internet for details and examples." +"Similarly, many GUI tools (like version control clients and IDEs) that " +"include built-in diff tools enable you to configure WinMerge as their " +"default diff tool, instead. The next section describes how to use WinMerge " +"this way with TortoiseSVN and Visual Studio Team Foundation Server. For " +"other tools, like Eclipse and Perforce, check their documentation or search " +"the Internet for details and examples." msgstr "" -"Allo stesso modo, molti strumenti GUI (come client di controllo versione e IDE) che includono strumenti diff integrati consentono invece di " -"configurare WinMerge come strumento diff predefinito.La sezione successiva descrive come utilizzare WinMerge in questo modo con TortoiseSVN e Visual " -"Studio Team Foundation Server.Per altri strumenti, come Eclipse e Perforce, controlla la loro documentazione o cerca in Internet dettagli ed esempi." +"Allo stesso modo, molti strumenti GUI (come client di controllo versione e " +"IDE) che includono strumenti diff integrati consentono invece di configurare " +"WinMerge come strumento diff predefinito.La sezione successiva descrive come " +"utilizzare WinMerge in questo modo con TortoiseSVN e Visual Studio Team " +"Foundation Server.Per altri strumenti, come Eclipse e Perforce, controlla la " +"loro documentazione o cerca in Internet dettagli ed esempi." #. type: Content of: <article><section><title> #: English/Version_control.xml:52 -msgid "Using WinMerge with version control systems<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "Utilizzo di WinMerge con sistemi di controllo della versione<placeholder type=\"indexterm\" id=\"0\"/>" +msgid "" +"Using WinMerge with version control systems<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" +"Utilizzo di WinMerge con sistemi di controllo della versione<placeholder " +"type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> #: English/Version_control.xml:58 msgid "" -"You can configure WinMerge to interact with a few supported version control systems (VCS). This section describes the VCS integration and provides " -"some examples." +"You can configure WinMerge to interact with a few supported version control " +"systems (VCS). This section describes the VCS integration and provides some " +"examples." msgstr "" -"È possibile configurare WinMerge per interagire con alcuni sistemi di controllo della versione supportati (VCS).Questa sezione descrive " +"È possibile configurare WinMerge per interagire con alcuni sistemi di " +"controllo della versione supportati (VCS).Questa sezione descrive " "l'integrazione VCS e fornisce alcuni esempi." #. type: Content of: <article><section><section><title> #: English/Version_control.xml:62 msgid "Using WinMerge as a version control system's diff tool" -msgstr "Utilizzo di WinMerge come strumento diff del sistema di controllo della versione" +msgstr "" +"Utilizzo di WinMerge come strumento diff del sistema di controllo della " +"versione" #. type: Content of: <article><section><section><para> #: English/Version_control.xml:68 msgid "" -"When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGit, you can have the VCS launch WinMerge instead of its native diff utility. You can " -"configure some of these integrations during <link linkend=\"Installing_usinginstaller\">WinMerge installation</link>." +"When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGit, you can " +"have the VCS launch WinMerge instead of its native diff utility. You can " +"configure some of these integrations during <link " +"linkend=\"Installing_usinginstaller\">WinMerge installation</link>." msgstr "" -"Quando confronti i file in TortoiseCVS, TortoiseSVN o TortoiseGit, puoi fare in modo che VCS avvii WinMerge invece della sua utilità diff nativa.Puoi " -"configurare alcune di queste integrazioni durante l'<link linkend=\"Installing_usinginstaller\">installazione di WinMerge</link>." +"Quando confronti i file in TortoiseCVS, TortoiseSVN o TortoiseGit, puoi fare " +"in modo che VCS avvii WinMerge invece della sua utilità diff nativa.Puoi " +"configurare alcune di queste integrazioni durante l'<link " +"linkend=\"Installing_usinginstaller\">installazione di WinMerge</link>." #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:76 -msgid "Here is a sample diff operation in TortoiseSVN that uses the WinMerge integration. The integration with TortoiseCVS and TortoiseGit is similar." +msgid "" +"Here is a sample diff operation in TortoiseSVN that uses the WinMerge " +"integration. The integration with TortoiseCVS and TortoiseGit is similar." msgstr "" -"Ecco un'operazione di confronto di esempio in TortoiseSVN che utilizza l'integrazione WinMerge.L'integrazione con TortoiseCVS e TortoiseGit è simile." +"Ecco un'operazione di confronto di esempio in TortoiseSVN che utilizza " +"l'integrazione WinMerge.L'integrazione con TortoiseCVS e TortoiseGit è " +"simile." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:82 -msgid "In Windows Explorer, navigate to a Subversion working copy that you have checked out." -msgstr "In Esplora risorse, vai a una copia di lavoro di Subversion che hai estratto." +msgid "" +"In Windows Explorer, navigate to a Subversion working copy that you have " +"checked out." +msgstr "" +"In Esplora risorse, vai a una copia di lavoro di Subversion che hai estratto." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:87 msgid "" -"Right-click a file that is under Subversion management (usually indicated by a distinct TortoiseSVN icon), and click <guimenu>TortoiseSVN</guimenu> " -"in the context menu." +"Right-click a file that is under Subversion management (usually indicated by " +"a distinct TortoiseSVN icon), and click <guimenu>TortoiseSVN</guimenu> in " +"the context menu." msgstr "" -"Fai clic con il pulsante destro del mouse su un file che si trova sotto la gestione di Subversion (solitamente indicato da un'icona TortoiseSVN " -"distinta) e fai clic su <guimenu >TortoiseSVN</guimenu > nel menu contestuale." +"Fai clic con il pulsante destro del mouse su un file che si trova sotto la " +"gestione di Subversion (solitamente indicato da un'icona TortoiseSVN " +"distinta) e fai clic su <guimenu >TortoiseSVN</guimenu > nel menu " +"contestuale." #. type: Content of: <article><section><section><example><orderedlist><listitem><itemizedlist><listitem><para> #: English/Version_control.xml:93 msgid "" -"If the file has not been modified, the context menu contains the shortcut, <guimenuitem>Diff with previous version</guimenuitem>. This command " -"compares the checked-out version of the file with the previous version that was checked in to the repository." +"If the file has not been modified, the context menu contains the shortcut, " +"<guimenuitem>Diff with previous version</guimenuitem>. This command compares " +"the checked-out version of the file with the previous version that was " +"checked in to the repository." msgstr "" -"Se il file non è stato modificato, il menu contestuale contiene la scorciatoia <guimenuitem >Differenze con la versione precedente</guimenuitem " -">.Questo comando confronta la versione estratta del file con la versione precedente archiviata nel repository." +"Se il file non è stato modificato, il menu contestuale contiene la " +"scorciatoia <guimenuitem >Differenze con la versione precedente</guimenuitem " +">.Questo comando confronta la versione estratta del file con la versione " +"precedente archiviata nel repository." #. type: Content of: <article><section><section><example><orderedlist><listitem><itemizedlist><listitem><para> #: English/Version_control.xml:101 msgid "" -"If you have modified the file, the context menu contains the same <guimenuitem>Diff with previous version</guimenuitem> shortcut, plus the " -"<guimenuitem>Diff</guimenuitem> shortcut. This command compares your revision to the current version (the one you checked out). It is useful for " +"If you have modified the file, the context menu contains the same " +"<guimenuitem>Diff with previous version</guimenuitem> shortcut, plus the " +"<guimenuitem>Diff</guimenuitem> shortcut. This command compares your " +"revision to the current version (the one you checked out). It is useful for " "reviewing the changes you have made." msgstr "" -"Se hai modificato il file, il menu contestuale contiene la stessa scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem >, più la " -"scorciatoia <guimenuitem >Diff</guimenuitem >.Questo comando confronta la tua revisione con la versione corrente (quella che hai estratto).È utile " -"per rivedere le modifiche apportate." +"Se hai modificato il file, il menu contestuale contiene la stessa " +"scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem >, " +"più la scorciatoia <guimenuitem >Diff</guimenuitem >.Questo comando " +"confronta la tua revisione con la versione corrente (quella che hai " +"estratto).È utile per rivedere le modifiche apportate." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:112 msgid "" -"Choose either the <guimenuitem>Diff with previous version</guimenuitem> or <guimenuitem>Diff</guimenuitem> shortcut. The WinMerge window opens, with " +"Choose either the <guimenuitem>Diff with previous version</guimenuitem> or " +"<guimenuitem>Diff</guimenuitem> shortcut. The WinMerge window opens, with " "the target file versions loaded in the File Compare window." msgstr "" -"Scegli la scorciatoia <guimenuitem >Diff con la versione precedente</guimenuitem > o <guimenuitem >Diff</guimenuitem >.Si apre la finestra WinMerge, " -"con le versioni dei file di destinazione caricate nella finestra Confronto file." +"Scegli la scorciatoia <guimenuitem >Diff con la versione precedente</" +"guimenuitem > o <guimenuitem >Diff</guimenuitem >.Si apre la finestra " +"WinMerge, con le versioni dei file di destinazione caricate nella finestra " +"Confronto file." #. type: Content of: <article><section><section><example> -#: English/Version_control.xml:80 English/Version_control.xml:127 English/Version_control.xml:153 +#: English/Version_control.xml:80 English/Version_control.xml:127 +#: English/Version_control.xml:153 msgid "<placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "<placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:119 msgid "" -"The <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</guimenuitem> </menuchoice> shortcut is available for comparing any two files in " -"your file system, not just files that are managed by Subversion. To illustrate how the WinMerge integration works in this case:" +"The <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</" +"guimenuitem> </menuchoice> shortcut is available for comparing any two files " +"in your file system, not just files that are managed by Subversion. To " +"illustrate how the WinMerge integration works in this case:" msgstr "" -"La scorciatoia <menuchoice> <guimenu >TortoiseSVN</guimenu> <guimenuitem >Diff</guimenuitem > </menuchoice > è disponibile per confrontare due file " -"qualsiasi nel tuo file system, non solo i file gestiti da Subversion.Per illustrare come funziona l'integrazione WinMerge in questo caso:" +"La scorciatoia <menuchoice> <guimenu >TortoiseSVN</guimenu> <guimenuitem " +">Diff</guimenuitem > </menuchoice > è disponibile per confrontare due file " +"qualsiasi nel tuo file system, non solo i file gestiti da Subversion.Per " +"illustrare come funziona l'integrazione WinMerge in questo caso:" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:129 -msgid "In Windows Explorer, hold <keycap>Ctrl</keycap>, select any two files, and right-click." -msgstr "In Esplora risorse, tieni premuto <keycap>Ctrl</keycap>, seleziona due file qualsiasi e fai clic con il pulsante destro del mouse." +msgid "" +"In Windows Explorer, hold <keycap>Ctrl</keycap>, select any two files, and " +"right-click." +msgstr "" +"In Esplora risorse, tieni premuto <keycap>Ctrl</keycap>, seleziona due file " +"qualsiasi e fai clic con il pulsante destro del mouse." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:134 -msgid "Choose <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</guimenuitem> </menuchoice> in the context menu." -msgstr "Scegli <menuchoice> <guimenu >TortoiseSVN</guimenu > <guimenuitem >Diff</guimenuitem > </menuchoice > nel menu contestuale." +msgid "" +"Choose <menuchoice> <guimenu>TortoiseSVN</guimenu> <guimenuitem>Diff</" +"guimenuitem> </menuchoice> in the context menu." +msgstr "" +"Scegli <menuchoice> <guimenu >TortoiseSVN</guimenu > <guimenuitem >Diff</" +"guimenuitem > </menuchoice > nel menu contestuale." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:140 -msgid "The WinMerge window opens, with the selected files loaded in the File Compare window." -msgstr "Si apre la finestra WinMerge, con i file selezionati caricati nella finestra Confronta file." +msgid "" +"The WinMerge window opens, with the selected files loaded in the File " +"Compare window." +msgstr "" +"Si apre la finestra WinMerge, con i file selezionati caricati nella finestra " +"Confronta file." #. type: Content of: <article><section><section><example><title> #: English/Version_control.xml:147 @@ -20463,30 +26672,41 @@ msgstr "Integrazione di Visual Studio Team Foundation Server" #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:149 msgid "" -"You can manually set up WinMerge as the default tool to use for in Visual Studio to show differences in Team Foundation Server (TFS). Other version " +"You can manually set up WinMerge as the default tool to use for in Visual " +"Studio to show differences in Team Foundation Server (TFS). Other version " "control systems can be set up in very similar ways." msgstr "" -"È possibile impostare manualmente WinMerge come strumento predefinito da utilizzare in Visual Studio per mostrare le differenze in Team Foundation " -"Server (TFS).Altri sistemi di controllo della versione possono essere impostati in modi molto simili." +"È possibile impostare manualmente WinMerge come strumento predefinito da " +"utilizzare in Visual Studio per mostrare le differenze in Team Foundation " +"Server (TFS).Altri sistemi di controllo della versione possono essere " +"impostati in modi molto simili." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:155 -msgid "In Visual Studio, navigate to the <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Options...</guimenuitem> </menuchoice> menu." -msgstr "In Visual Studio, vai al menu <menuchoice> <guimenu >Strumenti</guimenu > <guimenuitem >Opzioni...</guimenuitem > </menuchoice >." +msgid "" +"In Visual Studio, navigate to the <menuchoice> <guimenu>Tools</guimenu> " +"<guimenuitem>Options...</guimenuitem> </menuchoice> menu." +msgstr "" +"In Visual Studio, vai al menu <menuchoice> <guimenu >Strumenti</guimenu > " +"<guimenuitem >Opzioni...</guimenuitem > </menuchoice >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:164 msgid "" -"Under <menuchoice> <guimenu>Source Control</guimenu> </menuchoice>, find the<menuchoice> <guimenu> Visual Studio Team Foundation Server</guimenu> </" +"Under <menuchoice> <guimenu>Source Control</guimenu> </menuchoice>, find " +"the<menuchoice> <guimenu> Visual Studio Team Foundation Server</guimenu> </" "menuchoice> options." msgstr "" -"In <menuchoice> <guimenu >Controllo del codice sorgente</guimenu > </menuchoice >, trova le opzioni <menuchoice> <guimenu >Visual Studio Team " +"In <menuchoice> <guimenu >Controllo del codice sorgente</guimenu > </" +"menuchoice >, trova le opzioni <menuchoice> <guimenu >Visual Studio Team " "Foundation Server</guimenu > </menuchoice >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:172 msgid "Click the <guimenuitem>Configure User Tools...</guimenuitem> button." -msgstr "Fai clic sul pulsante <guimenuitem >Configura strumenti utente...</guimenuitem >." +msgstr "" +"Fai clic sul pulsante <guimenuitem >Configura strumenti utente...</" +"guimenuitem >." #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:176 @@ -20495,8 +26715,12 @@ msgstr "Fai clic sul pulsante <guimenuitem >Aggiungi...</guimenuitem >." #. type: Content of: <article><section><section><example><orderedlist><listitem><mediaobject> #: English/Version_control.xml:181 -msgid "<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" format=\"PNG\" /> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" format=\"PNG\" /> </imageobject>" +msgid "" +"<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" " +"format=\"PNG\" /> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"screenshots/tfs_configure.png\" " +"format=\"PNG\" /> </imageobject>" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:185 @@ -20526,10 +26750,12 @@ msgstr "Argomenti: /e /u /dl %6 /dr %7 %1 %2" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> #: English/Version_control.xml:203 msgid "" -"Where {Path to WinMerge} is the path were WinMerge is installed. In the above screenshot it is installed to the default installation path C:" +"Where {Path to WinMerge} is the path were WinMerge is installed. In the " +"above screenshot it is installed to the default installation path C:" "\\Program Files (x86)\\WinMerge\\WinMergeU.exe" msgstr "" -"Dove {Percorso WinMerge} è il percorso in cui è installato WinMerge.Nello screenshot sopra è installato nel percorso di installazione predefinito C:" +"Dove {Percorso WinMerge} è il percorso in cui è installato WinMerge.Nello " +"screenshot sopra è installato nel percorso di installazione predefinito C:" "\\Program Files (x86)\\WinMerge\\WinMerge.exe" #. type: Content of: <article><section><section><example><orderedlist><listitem><para> @@ -20540,7 +26766,8 @@ msgstr "Gli argomenti sono descritti in <xref linkend=\"Command_line\" />." #. type: Content of: <article><section><section><example><para> #: English/Version_control.xml:210 msgid "Every time you tell TFS to compare two files, it will now use WinMerge." -msgstr "Ogni volta che dici a TFS di confrontare due file, ora utilizzerà WinMerge." +msgstr "" +"Ogni volta che dici a TFS di confrontare due file, ora utilizzerà WinMerge." #. type: Content of: <section><title> #: English/select_unpacker.xml:4 @@ -20550,40 +26777,54 @@ msgstr "Utilizzando la finestra di dialogo Seleziona Unpacker" #. type: Content of: <section><orderedlist><listitem><para> #: English/select_unpacker.xml:8 msgid "Configure automatic plugin selection or choose a plugin manually:" -msgstr "Configura la selezione automatica del plugin o scegli un plugin manualmente:" +msgstr "" +"Configura la selezione automatica del plugin o scegli un plugin manualmente:" #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:13 msgid "" -"To use automatic mode (which applies the first available plugin), verify that <guilabel><Automatic></guilabel> is displayed in the " +"To use automatic mode (which applies the first available plugin), verify " +"that <guilabel><Automatic></guilabel> is displayed in the " "<guilabel>File unpacker</guilabel> control." msgstr "" -"Per utilizzare la modalità automatica (che applica il primo plugin disponibile), verifica che <guilabel ><Automatico></guilabel > sia " +"Per utilizzare la modalità automatica (che applica il primo plugin " +"disponibile), verifica che <guilabel ><Automatico></guilabel > sia " "visualizzato nel controllo <guilabel >Unpacker file</guilabel >." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:19 -msgid "To choose a different plugin (if available), use the <guilabel>File unpacker</guilabel> control to choose the plugin." -msgstr "Per scegliere un plugin diverso (se disponibile), usa il controllo <guilabel >Unpacker file</guilabel > per scegliere il plugin." +msgid "" +"To choose a different plugin (if available), use the <guilabel>File " +"unpacker</guilabel> control to choose the plugin." +msgstr "" +"Per scegliere un plugin diverso (se disponibile), usa il controllo <guilabel " +">Unpacker file</guilabel > per scegliere il plugin." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:23 msgid "" -"By default, this control lists only suggested plugins for the file type you selected to compare. To see all available plugins, enable the option, " +"By default, this control lists only suggested plugins for the file type you " +"selected to compare. To see all available plugins, enable the option, " "<guilabel>Display all packers, don't check the extension</guilabel>." msgstr "" -"Per impostazione predefinita, questo controllo elenca solo i plug-in suggeriti per il tipo di file selezionato per il confronto.Per vedere tutti i " -"plugin disponibili, abilita l'opzione <guilabel >Visualizza tutti i packer, non selezionare l'estensione</guilabel >." +"Per impostazione predefinita, questo controllo elenca solo i plug-in " +"suggeriti per il tipo di file selezionato per il confronto.Per vedere tutti " +"i plugin disponibili, abilita l'opzione <guilabel >Visualizza tutti i " +"packer, non selezionare l'estensione</guilabel >." #. type: Content of: <section><orderedlist><listitem><itemizedlist><listitem><para> #: English/select_unpacker.xml:30 msgid "" -"To launch the compare without using any plugin, choose <guimenuitem><None></guimenuitem> in the <guilabel>File unpacker</guilabel> control." +"To launch the compare without using any plugin, choose <guimenuitem><" +"None></guimenuitem> in the <guilabel>File unpacker</guilabel> control." msgstr "" -"Per avviare il confronto senza utilizzare alcun plugin, scegli <guimenuitem ><Nessuno></guimenuitem > nel controllo <guilabel >Unpacker file</" +"Per avviare il confronto senza utilizzare alcun plugin, scegli <guimenuitem " +"><Nessuno></guimenuitem > nel controllo <guilabel >Unpacker file</" "guilabel >." #. type: Content of: <section><orderedlist><listitem><para> #: English/select_unpacker.xml:38 msgid "Click <guibutton>OK</guibutton> to close the Select Unpacker dialog." -msgstr "Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo Seleziona Unpacker." +msgstr "" +"Fai clic su <guibutton >OK</guibutton > per chiudere la finestra di dialogo " +"Seleziona Unpacker." From 1e40d3396afdd81a3dba8b3ffc96ef53c1b9fc50 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka <sdottaka@users.sourceforge.net> Date: Sun, 19 Apr 2026 14:05:56 +0900 Subject: [PATCH 07/10] WIP --- Src/7zCommon.cpp | 17 ++++++++++------- Src/7zCommon.h | 2 +- Src/MainFrm.cpp | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp index 3ea201491f1..7345d06a2c4 100644 --- a/Src/7zCommon.cpp +++ b/Src/7zCommon.cpp @@ -732,13 +732,16 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files) return res; } -void Merge7zInit() +void Merge7zInitFlags() { - m_Merge7z = { - { 0, 0, DllBuild_Merge7z, }, - "Merge7z\\Merge7z.dll", - "Merge7z", - nullptr - }; + 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 9b3698c4f21..f3a1d3ccdf1 100644 --- a/Src/7zCommon.h +++ b/Src/7zCommon.h @@ -106,5 +106,5 @@ struct DecompressResult HRESULT hr; }; DecompressResult DecompressArchive(HWND hWnd, const PathContext& infiles); -void Merge7zInit(); +void Merge7zInitFlags(); diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 1f126a2134b..552caf725fc 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1192,7 +1192,7 @@ bool CMainFrame::ShowDirDoc(IDirDoc * pDirDoc, int nFiles, const FileLocation fi GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, true); GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, true); - Merge7zInit(); + Merge7zInitFlags(); auto guard = make_scope_exit([&bOldArchiveEnable, &bOldArchiveProbeType]() { GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, bOldArchiveEnable); From 83af229fde4c55be7afec7f84c0e3b2ab8278ec0 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka <sdottaka@users.sourceforge.net> Date: Sun, 19 Apr 2026 14:22:11 +0900 Subject: [PATCH 08/10] Refactor: unify open parameters and move recurse to OpenFolderParams (#3326) (2) --- Src/MainFrm.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 552caf725fc..c58ae01bb2c 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1436,7 +1436,7 @@ static void AppendComparisonCommandLineParams( static bool AddToRecentDocs(const PathContext& paths, const unsigned flags[], const String desc[], - std::optional<bool> recurse, const String& filter, + const String& filter, const PackingInfo *infoUnpacker, const PrediffingInfo *infoPrediffer, UINT nID, const CMainFrame::OpenParams *pOpenParams, bool isSelfCompare = false) @@ -1501,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<const CMainFrame::OpenFolderParams*>(pOpenParams); + if (pOpenFolderParams && pOpenFolderParams->m_bRecurse.has_value()) + params += *pOpenFolderParams->m_bRecurse ? _T("/r ") : _T("/r- "); if (!filter.empty()) { String filter2 = filter; @@ -1682,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; @@ -1701,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; } @@ -3298,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; } From 12f1c730b317d6247fc7c3477cbf1d3035cb6e2f Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka <sdottaka@users.sourceforge.net> Date: Sun, 19 Apr 2026 18:25:58 +0900 Subject: [PATCH 09/10] Update Merge.rc --- Src/Merge.rc | 6 +++--- Translations/WinMerge/Arabic.po | 9 +++++++-- Translations/WinMerge/Basque.po | 9 +++++++-- Translations/WinMerge/Brazilian.po | 9 +++++++-- Translations/WinMerge/Bulgarian.po | 9 +++++++-- Translations/WinMerge/Catalan.po | 9 +++++++-- Translations/WinMerge/ChineseSimplified.po | 9 +++++++-- Translations/WinMerge/ChineseTraditional.po | 9 +++++++-- Translations/WinMerge/Corsican.po | 9 +++++++-- Translations/WinMerge/Croatian.po | 9 +++++++-- Translations/WinMerge/Czech.po | 9 +++++++-- Translations/WinMerge/Danish.po | 9 +++++++-- Translations/WinMerge/Dutch.po | 9 +++++++-- Translations/WinMerge/English.pot | 11 ++++++++--- Translations/WinMerge/Finnish.po | 9 +++++++-- Translations/WinMerge/French.po | 9 +++++++-- Translations/WinMerge/Galician.po | 9 +++++++-- Translations/WinMerge/German.po | 9 +++++++-- Translations/WinMerge/Greek.po | 9 +++++++-- Translations/WinMerge/Hebrew.po | 9 +++++++-- Translations/WinMerge/Hungarian.po | 9 +++++++-- Translations/WinMerge/Italian.po | 9 +++++++-- Translations/WinMerge/Japanese.po | 9 +++++++-- Translations/WinMerge/Korean.po | 9 +++++++-- Translations/WinMerge/Lithuanian.po | 9 +++++++-- Translations/WinMerge/Norwegian.po | 9 +++++++-- Translations/WinMerge/Persian.po | 9 +++++++-- Translations/WinMerge/Polish.po | 9 +++++++-- Translations/WinMerge/Portuguese.po | 9 +++++++-- Translations/WinMerge/Romanian.po | 9 +++++++-- Translations/WinMerge/Russian.po | 9 +++++++-- Translations/WinMerge/Serbian.po | 9 +++++++-- Translations/WinMerge/Sinhala.po | 9 +++++++-- Translations/WinMerge/Slovak.po | 9 +++++++-- Translations/WinMerge/Slovenian.po | 9 +++++++-- Translations/WinMerge/Spanish.po | 9 +++++++-- Translations/WinMerge/Swedish.po | 9 +++++++-- Translations/WinMerge/Tamil.po | 9 +++++++-- Translations/WinMerge/Turkish.po | 9 +++++++-- Translations/WinMerge/Ukrainian.po | 9 +++++++-- Translations/WinMerge/Vietnamese.po | 9 +++++++-- 41 files changed, 284 insertions(+), 84 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 70270fa5a17..56d1fee3cac 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -657,7 +657,7 @@ BEGIN MENUITEM "&Binary", ID_MERGE_COMPARE_HEX MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE - MENUITEM "&Folder", ID_MERGE_COMPARE_FOLDER + MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER MENUITEM "< Empty >", ID_NO_UNPACKER END MENUITEM SEPARATOR @@ -944,7 +944,7 @@ BEGIN MENUITEM "&Binary", ID_MERGE_COMPARE_HEX MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE - MENUITEM "&Folder", ID_MERGE_COMPARE_FOLDER + MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER MENUITEM "< Empty >", ID_NO_UNPACKER END MENUITEM SEPARATOR @@ -1182,7 +1182,7 @@ BEGIN MENUITEM "&Binary", ID_MERGE_COMPARE_HEX MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE - MENUITEM "&Folder", ID_MERGE_COMPARE_FOLDER + MENUITEM "A&rchive", ID_MERGE_COMPARE_FOLDER END END diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index e9aa9171b9a..f37bcf75ff0 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -517,9 +517,9 @@ msgstr "&صورة" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "إ&عادةتحميل\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 9e75a2d9e83..6c7be73bf3c 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -550,9 +550,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1221,6 +1221,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 894f1b192aa..7517c6def11 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -518,9 +518,9 @@ msgstr "&Imagem" msgid "&Webpage" msgstr "Página da &Web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1099,6 +1099,11 @@ msgstr "Re&carregar\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index db9bfc5c247..8d380e0db66 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -513,9 +513,9 @@ msgstr "&Изображения" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1094,6 +1094,11 @@ msgstr "Пре&зареждане\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index df540b9bb09..9502366c1ca 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -548,9 +548,9 @@ msgstr "&Imatge" msgid "&Webpage" msgstr "Pàgina &web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1219,6 +1219,11 @@ msgstr "Recarrega\tControl+F5" 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:673 #, c-format diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index ee192c64d2a..0ab1758de18 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -520,9 +520,9 @@ msgstr "图像(&I)" msgid "&Webpage" msgstr "网页(&W)" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1101,6 +1101,11 @@ msgstr "重新加载(&D)\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 0c9c2313bd9..0e6c23cb714 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -516,9 +516,9 @@ msgstr "圖片 (&I)" msgid "&Webpage" msgstr "網頁 (&W)" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "重新載入 (&D)\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 5fa1193e2c9..368e388332b 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -518,9 +518,9 @@ msgstr "&Fiura" msgid "&Webpage" msgstr "Pagina &web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1099,6 +1099,11 @@ msgstr "&Ricaricà\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 885da99d458..136b50f2345 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -547,9 +547,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1218,6 +1218,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 792c44b6c76..f2624df6ad1 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -547,9 +547,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1218,6 +1218,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 7f838195d71..441870fe7f4 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -548,9 +548,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1219,6 +1219,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 370598b0a63..216a113c179 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -514,9 +514,9 @@ msgstr "Afbeelding" msgid "&Webpage" msgstr "Webpagina" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1095,6 +1095,11 @@ msgstr "Opnieuw laden\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index b00281f3d59..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-13 06:57+0000\n" +"POT-Creation-Date: 2026-04-19 18:19+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n" @@ -510,9 +510,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1091,6 +1091,11 @@ msgstr "" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index 22498722125..11b9533013d 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -516,9 +516,9 @@ msgstr "&Kuva" msgid "&Webpage" msgstr "&Verkkosivu" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 21a4fc909b9..10630203b86 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -523,9 +523,9 @@ msgstr "&Image" msgid "&Webpage" msgstr "Page &Web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1104,6 +1104,11 @@ msgstr "Re&charger\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 64e4ed2c86b..9f4af8b456f 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -517,9 +517,9 @@ msgstr "&Imaxe" msgid "&Webpage" msgstr "Páxina &Web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "R&ecargar\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 349774ab353..71b27c7af3b 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -552,9 +552,9 @@ msgstr "Bil&d" msgid "&Webpage" msgstr "&Webseite" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1223,6 +1223,11 @@ msgstr "Neu&laden\tStrg+F5" 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:673 #, c-format diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 23a403a7c91..56d28c49275 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -546,9 +546,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1217,6 +1217,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Hebrew.po b/Translations/WinMerge/Hebrew.po index 4a70719de56..398a156aece 100644 --- a/Translations/WinMerge/Hebrew.po +++ b/Translations/WinMerge/Hebrew.po @@ -514,9 +514,9 @@ msgstr "תמונה" msgid "&Webpage" msgstr "דף אינטרנט" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1095,6 +1095,11 @@ msgstr "טען מחדש\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 9dc5719e8c5..ff940e75b60 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -549,9 +549,9 @@ msgstr "Kép" msgid "&Webpage" msgstr "Weboldal" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1220,6 +1220,11 @@ msgstr "Újratöltés\tCtrl+F5" 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:673 #, c-format diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index ced6a723794..998cef9b5ec 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -517,9 +517,9 @@ msgstr "&Immagine" msgid "&Webpage" msgstr "Pagina &web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "&Ricarica\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 3a02059bbe9..a591e9762b9 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -515,9 +515,9 @@ msgstr "画像(&I)" msgid "&Webpage" msgstr "&Webページ" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "フォルダー(&F)" @@ -1096,6 +1096,11 @@ msgstr "再読み込み(&D)\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 3b7c4dfed27..e90dccff35d 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -556,9 +556,9 @@ msgstr "이미지(&I)" msgid "&Webpage" msgstr "웹페이지(&W)" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1227,6 +1227,11 @@ msgstr "다시 불러오기(&D)\tCtrl+F5" 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:673 #, c-format diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 061d70f2343..e311a24ceea 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -516,9 +516,9 @@ msgstr "Pave&ikslėlis" msgid "&Webpage" msgstr "Ti&nklapis" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "&Atnaujinti\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 625658cde88..a9f14458acd 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -515,9 +515,9 @@ msgstr "&Bilde" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1096,6 +1096,11 @@ msgstr "Lastpån&ytt\tCtrl+F5" msgid "Reco&mpare As" msgstr "Sa&mmenlign på nytt som" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index c0ce0d0c743..9ca05416bd2 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -548,9 +548,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1219,6 +1219,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index fd3930977c3..476d8d40458 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -517,9 +517,9 @@ msgstr "Obraz" msgid "&Webpage" msgstr "Strona internetowa" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "Odśwież\tCtrl+F5" msgid "Reco&mpare As" msgstr "Porównaj ponownie jako" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index bf90a1fcf58..33fd56266fe 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -517,9 +517,9 @@ msgstr "Imagem" msgid "&Webpage" msgstr "&Página web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "Re&carregar\tCtrl+F5" msgid "Reco&mpare As" msgstr "Recomparar 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 164b875a283..69b07f4bdae 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -515,9 +515,9 @@ msgstr "&Imagine" msgid "&Webpage" msgstr "Pagină &web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1096,6 +1096,11 @@ msgstr "Reîncarcă\tCtrl+F5" msgid "Reco&mpare As" msgstr "Recompară ca" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 1490a0a3f03..f97dfa29baa 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -518,9 +518,9 @@ msgstr "Изображение" msgid "&Webpage" msgstr "&Веб-страница" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1099,6 +1099,11 @@ msgstr "&Обновить\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 58dae772e85..055354ffe28 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -545,9 +545,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1216,6 +1216,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 1f6e0fe22b3..62cd7c1d153 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -547,9 +547,9 @@ msgstr "" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1218,6 +1218,11 @@ msgstr "" 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:673 #, c-format diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 411a593a63b..5487749725b 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -516,9 +516,9 @@ msgstr "&Obrázok" msgid "&Webpage" msgstr "" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "Znovanačítať\tCtrl+F5" msgid "Reco&mpare As" msgstr "&Znovu porovnať ako" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index e6b9c1aec7a..f369860a8c9 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -516,9 +516,9 @@ msgstr "S&lika" msgid "&Webpage" msgstr "SP&letna stran" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "Znova nal&oži\tCtrl+F5" msgid "Reco&mpare As" msgstr "Znova primerjaj kot" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index d2882952549..0eb87f5f4d0 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -519,9 +519,9 @@ msgstr "&Imagen" msgid "&Webpage" msgstr "Página &Web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1100,6 +1100,11 @@ msgstr "R&ecargar\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 9e9f7069ce1..1ca30b6f07a 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -519,9 +519,9 @@ msgstr "Bild" msgid "&Webpage" msgstr "&Webbsida" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1100,6 +1100,11 @@ msgstr "Ladda om\tCtrl+F5" msgid "Reco&mpare As" msgstr "Jämför igen som" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index c173303d084..53c5bb1d57c 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -523,9 +523,9 @@ msgstr "படம்" msgid "&Webpage" msgstr "இணையப்பக்கம்" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1104,6 +1104,11 @@ msgstr "மீண்டும்ஏற்று\tகட்டு+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index d1c61a4135c..53467893a72 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -517,9 +517,9 @@ msgstr "&Görsel" msgid "&Webpage" msgstr "İnternet &sitesi" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1098,6 +1098,11 @@ msgstr "Yeniden yük&le\tCtrl+F5" msgid "Reco&mpare As" msgstr "&Farklı karşılaştır" +#. 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index b2b3bb1a16a..444600f96ba 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -516,9 +516,9 @@ msgstr "&Зображення" msgid "&Webpage" msgstr "&Вебсторінка" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "Пере&завантажити\tCtrl+F5" 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:673 msgid "&Undo\tCtrl+Z" diff --git a/Translations/WinMerge/Vietnamese.po b/Translations/WinMerge/Vietnamese.po index a5fac8ae988..d007907f917 100644 --- a/Translations/WinMerge/Vietnamese.po +++ b/Translations/WinMerge/Vietnamese.po @@ -516,9 +516,9 @@ msgstr "&Hình ảnh" msgid "&Webpage" msgstr "Trang &web" -#. IDR_POPUP_COMPARE, ID_MERGE_COMPARE_FOLDER +#. 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:660 Merge.rc:947 Merge.rc:1172 Merge.rc:1185 +#: Merge.rc:608 Merge.rc:1172 msgid "&Folder" msgstr "" @@ -1097,6 +1097,11 @@ msgstr "Nạp &lại\tCtrl+F5" msgid "Reco&mpare As" msgstr "So sánh &lại dưới dạng" +#. 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:673 msgid "&Undo\tCtrl+Z" From 51236dd2eea2d96390757359d89867c043e80e98 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka <sdottaka@users.sourceforge.net> Date: Sun, 19 Apr 2026 18:56:42 +0900 Subject: [PATCH 10/10] Update MergeCmdLine_test.cpp --- Testing/GoogleTest/CmdLine/MergeCmdLine_test.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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);