}
/// Format commandline used to start WinMerge
-static String FormatCmdLine(const String &winmergePath,
+static String FormatCmdLine(DWORD verb, const String &winmergePath,
const std::vector<String>& paths, BOOL bAlterSubFolders)
{
String strCommandline = winmergePath.empty() ? _T("") : _T("\"") + winmergePath + _T("\"");
if (paths.size() > 2)
strCommandline += _T(" \"") + paths[2] + _T("\"");
+ if (verb == WinMergeContextMenu::CMD_COMPARE_AS)
+ strCommandline += _T(" /show-compare-as-menu");
+
return strCommandline;
}
CComVariant(nShowCmd));
}
-static BOOL LaunchWinMerge(const String &winmergePath,
+static BOOL LaunchWinMerge(DWORD verb, const String &winmergePath,
const std::vector<String>& paths, BOOL bAlterSubFolders, IUnknown* pSite)
{
if (pSite)
{
- String strCommandLine = FormatCmdLine(_T(""), paths, bAlterSubFolders);
+ String strCommandLine = FormatCmdLine(verb, _T(""), paths, bAlterSubFolders);
if (SUCCEEDED(ShellExecuteFromExplorer(pSite, winmergePath.c_str(), strCommandLine.c_str())))
return TRUE;
}
- String strCommandLine = FormatCmdLine(winmergePath, paths, bAlterSubFolders);
+ String strCommandLine = FormatCmdLine(verb, winmergePath, paths, bAlterSubFolders);
// Finally start a new WinMerge process
BOOL retVal = FALSE;
}
else if (GetLastError() == ERROR_ELEVATION_REQUIRED)
{
- String strCommandLine = FormatCmdLine(_T(""), paths, bAlterSubFolders);
+ String strCommandLine = FormatCmdLine(verb, _T(""), paths, bAlterSubFolders);
HINSTANCE hInstance = ShellExecute(nullptr, _T("runas"), winmergePath.c_str(), strCommandLine.c_str(), 0, SW_SHOWNORMAL);
if (reinterpret_cast<intptr_t>(hInstance) < 32)
return FALSE;
// Allow re-selecting first item or selecting second item
case MENU_ONESEL_PREV:
list.push_back({ enabled, icon, CMD_COMPARE, IDS_COMPARE, GetResourceString(IDS_COMPARE) });
+ if ((m_dwContextMenuEnabled & EXT_COMPARE_AS) != 0 && !isdir)
+ list.push_back({ enabled, icon, CMD_COMPARE_AS, IDS_COMPARE_AS, GetResourceString(IDS_COMPARE_AS) });
list.push_back({ enabled, icon, CMD_SELECT_MIDDLE, IDS_SELECT_MIDDLE, GetResourceString(IDS_SELECT_MIDDLE) });
list.push_back({ enabled, icon, CMD_RESELECT_LEFT, IDS_RESELECT_LEFT, GetResourceString(IDS_RESELECT_LEFT) });
break;
// Allow re-selecting first item or selecting second item
case MENU_ONESEL_TWO_PREV:
list.push_back({ enabled, icon, CMD_COMPARE, IDS_COMPARE, GetResourceString(IDS_COMPARE) });
+ if ((m_dwContextMenuEnabled & EXT_COMPARE_AS) != 0 && !isdir)
+ list.push_back({ enabled, icon, CMD_COMPARE_AS, IDS_COMPARE_AS, GetResourceString(IDS_COMPARE_AS) });
list.push_back({ enabled, icon, CMD_RESELECT_LEFT, IDS_RESELECT_LEFT, GetResourceString(IDS_RESELECT_LEFT) });
break;
case MENU_THREESEL:
default:
list.push_back({ enabled, icon, CMD_COMPARE, IDS_COMPARE, GetResourceString(IDS_COMPARE) });
+ if ((m_dwContextMenuEnabled & EXT_COMPARE_AS) != 0 && !isdir)
+ list.push_back({ enabled, icon, CMD_COMPARE_AS, IDS_COMPARE_AS, GetResourceString(IDS_COMPARE_AS) });
break;
}
return list;
if (!PathFileExists(strWinMergePath.c_str()))
return S_FALSE;
- if (verb == CMD_COMPARE)
+ if (verb == CMD_COMPARE || verb == CMD_COMPARE_AS)
{
bCompare = TRUE;
switch (m_dwMenuState)
if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0)
bAlterSubFolders = TRUE;
- return LaunchWinMerge(strWinMergePath, m_strPaths, bAlterSubFolders, m_pSite) ? S_OK : S_FALSE;
+ return LaunchWinMerge(verb, strWinMergePath, m_strPaths, bAlterSubFolders, m_pSite) ? S_OK : S_FALSE;
}
/**
{
EXT_ENABLED = 0x01, /**< ShellExtension enabled/disabled. */
EXT_ADVANCED = 0x02, /**< Advanced menuitems enabled/disabled. */
+ EXT_COMPARE_AS = 0x04, /**< Show Compare As menu. */
};
enum
{
CMD_COMPARE,
CMD_COMPARE_ELLIPSIS,
+ CMD_COMPARE_AS,
CMD_SELECT_LEFT,
CMD_SELECT_MIDDLE,
CMD_RESELECT_LEFT,
#define IDS_PROJNAME 100
#define IDS_CONTEXT_MENU 101
#define IDR_WINMERGESHELL 102
+#define IDS_COMPARE_AS 103
#define IDS_COMPARE 104
#define IDS_COMPARE_ELLIPSIS 105
#define IDS_SELECT_LEFT 106
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,18,5,0\r
- PRODUCTVERSION 1,18,5,0\r
+ FILEVERSION 1,18,6,0\r
+ PRODUCTVERSION 1,18,6,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BEGIN\r
VALUE "CompanyName", "https://winmerge.org"\r
VALUE "FileDescription", "WinMerge Shell Integration library"\r
- VALUE "FileVersion", "1.18.5.0"\r
+ VALUE "FileVersion", "1.18.6.0"\r
VALUE "InternalName", "ShellExtension"\r
- VALUE "LegalCopyright", "Copyright 2003-2022"\r
+ VALUE "LegalCopyright", "Copyright 2003-2023"\r
VALUE "OriginalFilename", "ShellExtension.DLL"\r
VALUE "ProductName", "WinMerge Shell Integration library"\r
- VALUE "ProductVersion", "1.18.5.0"\r
+ VALUE "ProductVersion", "1.18.6.0"\r
END\r
END\r
BLOCK "VarFileInfo"\r
STRINGTABLE\r
BEGIN\r
IDS_PROJNAME "ShellExtension"\r
- IDS_CONTEXT_MENU "&WinMerge"\r
+ IDS_CONTEXT_MENU "Win&Merge"\r
+ IDS_COMPARE_AS "Compare &As"\r
IDS_COMPARE "&Compare"\r
IDS_COMPARE_ELLIPSIS "Compare&..."\r
IDS_SELECT_LEFT "Select &Left"\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,5,0
- PRODUCTVERSION 1,0,5,0
+ FILEVERSION 1,0,6,0
+ PRODUCTVERSION 1,0,6,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BEGIN
VALUE "CompanyName", "https://winmerge.org"
VALUE "FileDescription", "WinMerge Shell Integration library"
- VALUE "FileVersion", "1.0.5.0"
+ VALUE "FileVersion", "1.0.6.0"
VALUE "InternalName", "WinMergeContextMenu"
- VALUE "LegalCopyright", "Copyright 2021-2022"
+ VALUE "LegalCopyright", "Copyright 2021-2023"
VALUE "OriginalFilename", "WinMergeContextMenu.dll"
VALUE "ProductName", "WinMerge Shell Integration library"
- VALUE "ProductVersion", "1.0.5.0"
+ VALUE "ProductVersion", "1.0.6.0"
END
END
BLOCK "VarFileInfo"
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
- IDS_CONTEXT_MENU "&WinMerge"
+ IDS_CONTEXT_MENU "Win&Merge"
+ IDS_COMPARE_AS "Compare &As"
IDS_COMPARE "&Compare"
IDS_COMPARE_ELLIPSIS "Compare&..."
IDS_SELECT_LEFT "Select &Left"
, WinMergeExplorerCommandBase(&m_contextMenu)
{
}
- const wchar_t* Title() override { return L"&WinMerge"; }
+ const wchar_t* Title() override { return L"Win&Merge"; }
const int IconId(_In_opt_ IShellItemArray* selection) override
{
auto paths = GetPaths(selection);
#define IDS_PROJNAME 100
#define IDS_CONTEXT_MENU 101
#define IDR_WINMERGESHELL 102
+#define IDS_COMPARE_AS 103
#define IDS_COMPARE 104
#define IDS_COMPARE_ELLIPSIS 105
#define IDS_SELECT_LEFT 106
CAPTION "Shell Integration"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Explorer",IDC_STATIC,7,6,270,144\r
- CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,240,10\r
+ GROUPBOX "Explorer",IDC_STATIC,7,6,270,156\r
CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,250,10\r
- PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,250,14\r
- PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,250,14\r
- PUSHBUTTON "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,80,250,14\r
- PUSHBUTTON "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,96,250,14\r
- PUSHBUTTON "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,112,250,14\r
- PUSHBUTTON "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,128,250,14\r
+ CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,240,10\r
+ CONTROL "Enable &Compare As menu",IDC_EXPLORER_COMPARE_AS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,42,240,10\r
+ PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,60,250,14\r
+ PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,76,250,14\r
+ PUSHBUTTON "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,92,250,14\r
+ PUSHBUTTON "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,108,250,14\r
+ PUSHBUTTON "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,124,250,14\r
+ PUSHBUTTON "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,140,250,14\r
END\r
\r
IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 285, 242\r
/// Flags for enabling and mode of extension
#define CONTEXT_F_ENABLED 0x01
#define CONTEXT_F_ADVANCED 0x02
+#define CONTEXT_F_COMPARE_AS 0x04
// registry values
static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
: OptionsPanel(optionsMgr, PropShell::IDD)
, m_bContextAdded(false)
, m_bContextAdvanced(false)
+, m_bContextCompareAs(false)
{
}
//{{AFX_DATA_MAP(PropShell)
DDX_Check(pDX, IDC_EXPLORER_CONTEXT, m_bContextAdded);
DDX_Check(pDX, IDC_EXPLORER_ADVANCED, m_bContextAdvanced);
+ DDX_Check(pDX, IDC_EXPLORER_COMPARE_AS, m_bContextCompareAs);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(PropShell, OptionsPanel)
//{{AFX_MSG_MAP(PropShell)
ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer)
+ ON_BN_CLICKED(IDC_EXPLORER_ADVANCED, OnAddToExplorerAdvanced)
ON_BN_CLICKED(IDC_REGISTER_SHELLEXTENSION, OnRegisterShellExtension)
ON_BN_CLICKED(IDC_UNREGISTER_SHELLEXTENSION, OnUnregisterShellExtension)
ON_BN_CLICKED(IDC_REGISTER_SHELLEXTENSION_PERUSER, OnRegisterShellExtensionPerUser)
if (dwContextEnabled & CONTEXT_F_ADVANCED)
m_bContextAdvanced = true;
+
+ if (dwContextEnabled & CONTEXT_F_COMPARE_AS)
+ m_bContextCompareAs = true;
}
/// Set registry values for ShellExtension
UpdateButtons();
}
+void PropShell::OnAddToExplorerAdvanced()
+{
+ CompareAsContextMenuCheck();
+ UpdateButtons();
+}
+
/// Saves given path to registry for ShellExtension, and Context Menu settings
void PropShell::SaveMergePath()
{
else
dwContextEnabled &= ~CONTEXT_F_ADVANCED;
+ if (m_bContextCompareAs)
+ dwContextEnabled |= CONTEXT_F_COMPARE_AS;
+ else
+ dwContextEnabled &= ~CONTEXT_F_COMPARE_AS;
+
retVal = reg.WriteDword(f_RegValueEnabled, dwContextEnabled);
if (retVal != ERROR_SUCCESS)
{
{
CheckDlgButton(IDC_EXPLORER_ADVANCED, FALSE);
m_bContextAdvanced = false;
+ CompareAsContextMenuCheck();
+ }
+}
+
+void PropShell::CompareAsContextMenuCheck()
+{
+ if (!IsDlgButtonChecked(IDC_EXPLORER_ADVANCED))
+ {
+ CheckDlgButton(IDC_EXPLORER_COMPARE_AS, FALSE);
+ m_bContextCompareAs = false;
}
}
EnableDlgItem(IDC_UNREGISTER_WINMERGECONTEXTMENU, registerdWinMergeContextMenu && win11);
EnableDlgItem(IDC_EXPLORER_ADVANCED,
(registered || registeredPerUser || registerdWinMergeContextMenu) && IsDlgButtonChecked(IDC_EXPLORER_CONTEXT));
+ EnableDlgItem(IDC_EXPLORER_COMPARE_AS,
+ (registered || registeredPerUser || registerdWinMergeContextMenu) && IsDlgButtonChecked(IDC_EXPLORER_ADVANCED));
}
void PropShell::OnRegisterShellExtension()
enum { IDD = IDD_PROPPAGE_SHELL };
bool m_bContextAdded;
bool m_bContextAdvanced;
+ bool m_bContextCompareAs;
// Overrides
protected:
protected:
virtual BOOL OnInitDialog() override;
afx_msg void OnAddToExplorer();
+ afx_msg void OnAddToExplorerAdvanced();
afx_msg void OnRegisterShellExtension();
afx_msg void OnUnregisterShellExtension();
afx_msg void OnRegisterShellExtensionPerUser();
void GetContextRegValues();
void AdvancedContextMenuCheck();
+ void CompareAsContextMenuCheck();
void UpdateButtons();
DECLARE_MESSAGE_MAP()
#define IDC_SEL_DIFFERENCE_TEXT_COLOR 1048\r
#define IDC_EXPLORER_CONTEXT 1049\r
#define IDC_EXPLORER_ADVANCED 1050\r
-#define IDC_TRIVIAL_DIFF_USE_TEXT_COLOR 1051\r
-#define IDC_TRIVIAL_DIFF_TEXT_COLOR 1052\r
-#define IDC_MOVEDBLOCK_COLOR 1053\r
-#define IDC_MOVEDBLOCK_USE_TEXT_COLOR 1054\r
-#define IDC_MOVEDBLOCK_TEXT_COLOR 1055\r
-#define IDC_MOVEDBLOCK_DELETED_COLOR 1056\r
-#define IDC_SEL_MOVEDBLOCK_COLOR 1057\r
-#define IDC_SEL_MOVEDBLOCK_USE_TEXT_COLOR 1058\r
-#define IDC_SEL_MOVEDBLOCK_TEXT_COLOR 1059\r
-#define IDC_SEL_MOVEDBLOCK_DELETED_COLOR 1060\r
-#define IDC_UP 1061\r
-#define IDC_DOWN 1062\r
+#define IDC_EXPLORER_COMPARE_AS 1051\r
+#define IDC_TRIVIAL_DIFF_USE_TEXT_COLOR 1052\r
+#define IDC_TRIVIAL_DIFF_TEXT_COLOR 1053\r
+#define IDC_MOVEDBLOCK_COLOR 1054\r
+#define IDC_MOVEDBLOCK_USE_TEXT_COLOR 1055\r
+#define IDC_MOVEDBLOCK_TEXT_COLOR 1056\r
+#define IDC_MOVEDBLOCK_DELETED_COLOR 1057\r
+#define IDC_SEL_MOVEDBLOCK_COLOR 1058\r
+#define IDC_SEL_MOVEDBLOCK_USE_TEXT_COLOR 1059\r
+#define IDC_SEL_MOVEDBLOCK_TEXT_COLOR 1060\r
+#define IDC_SEL_MOVEDBLOCK_DELETED_COLOR 1061\r
+#define IDC_UP 1062\r
+#define IDC_DOWN 1063\r
#define IDC_MIXED_EOL 1064\r
#define IDC_DIFF_FILE1 1065\r
#define IDC_DIFF_FILE2 1066\r
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Comparar"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Comparar&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Selecionar &Esquerda"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Selecionar &Meio"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Re-selecionar &Esquerda"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Compara"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Compara&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Selecciona l'&Esquerra"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Selecciona el del &Mig"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Torna a seleccionar l'&Esquerra"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "比较(&C)"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "比较(&.)..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "选择左侧(&L)"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "选择中间(&M)"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "再选择左侧(&L)"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "比較 (&C)"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "比較&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "選擇左側 (&L)"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "選擇中間 (&M)"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "重新選擇左側 (&L)"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Paragunà"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Paragunà&…"
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Selezziunà à &manca"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Selezziunà à u ¢ru"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Riselezziunà à &manca"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "Vergelijken"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Vergelijken..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Links selecteren"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Midden selecteren"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Links opnieuw selecteren"
msgstr ""
"Project-Id-Version: WinMerge Shell Extension\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-09-08 23:40+0000\n"
+"POT-Creation-Date: 2023-02-19 00:07+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Comparer"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Comparer&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Sélectionner &Gauche"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Sélectionner &Milieu"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Re-sélectionner &Gauche"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Comparar"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Comparar&…"
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Seleccionar &Esquerda"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Seleccionar &Medio"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Volver a seleccionar &Esquerda"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "Vergleichen"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Vergleichen..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Links auswählen"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Mitte auswählen"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Links erneut auswählen"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr "WinMerge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "Összehasonlítás"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Összehasonlítás..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Bal választása"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Középső választása"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Bal újra választása"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr "形式を指定して比較(&A)"
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "比較(&C)"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "比較&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "左側として選択(&L)"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "中央として選択(&M)"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "左側として再選択(&L)"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr "WinMerge(&W)"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "비교(&C)"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "비교(&E)..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "왼쪽 선택(&L)"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "가운데 선택(&M)"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "왼쪽 다시 선택(&L)"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Lyginti"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Lyginti&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Parinkti &Kairįjį"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Parinkti &Vidurinį"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Iš naujo parinkti &Kairįjį"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Porównaj"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Porównaj&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Zaznacz &lewy"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Zaznacz &środkowy"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Zaznacz ponownie &lewy"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Comparar"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Comparar&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Selecionar à &esquerda"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Selecionar o do &meio"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Selecionar novamente à &esquerda"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Сравнить"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Сравнить&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Выбрать &левый"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Выбрать &средний"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Перевыбрать &левый"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "Pri&merjaj"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Primerjaj&..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Izberi &levo"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Izberi &srednjo"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Znova izberi &levo"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr ""
#: ShellExtension.rc:113
#, c-format
-msgid "&Compare"
+msgid "Compare &As"
msgstr ""
#: ShellExtension.rc:114
#, c-format
-msgid "Compare&..."
+msgid "&Compare"
msgstr ""
#: ShellExtension.rc:115
#, c-format
-msgid "Select &Left"
+msgid "Compare&..."
msgstr ""
#: ShellExtension.rc:116
#, c-format
-msgid "Select &Middle"
+msgid "Select &Left"
msgstr ""
#: ShellExtension.rc:117
#, c-format
+msgid "Select &Middle"
+msgstr ""
+
+#: ShellExtension.rc:118
+#, c-format
msgid "Re-select &Left"
msgstr ""
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
+msgid "Win&Merge"
msgstr "WinMerge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "Jämför"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Jämför..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Välj Vänster"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Välj Mitter"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "Åter-välj Vänster"
#| msgid "WinMerge"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Karşılaştır"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "Karşılaştı&r..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "So&lu seç"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "&Ortayı seç"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "So&lu yeniden seç"
#: ShellExtension.rc:112
#, c-format
-msgid "&WinMerge"
-msgstr "&WinMerge"
+msgid "Win&Merge"
+msgstr "Win&Merge"
#: ShellExtension.rc:113
#, c-format
+msgid "Compare &As"
+msgstr ""
+
+#: ShellExtension.rc:114
+#, c-format
msgid "&Compare"
msgstr "&Сравнить"
-#: ShellExtension.rc:114
+#: ShellExtension.rc:115
#, c-format
msgid "Compare&..."
msgstr "С&равнить..."
-#: ShellExtension.rc:115
+#: ShellExtension.rc:116
#, c-format
msgid "Select &Left"
msgstr "Сравнить с&лева"
-#: ShellExtension.rc:116
+#: ShellExtension.rc:117
#, c-format
msgid "Select &Middle"
msgstr "Сравнить по се&редине"
-#: ShellExtension.rc:117
+#: ShellExtension.rc:118
#, c-format
msgid "Re-select &Left"
msgstr "&Пересравнить слева"
msgid "Explorer"
msgstr "المستكشف"
+msgid "&Add to context menu"
+msgstr "الإ&ضافة للقائمة المنزلقة"
+
msgid "E&nable advanced menu"
msgstr "تفعيل القائمة المتقدمة"
-msgid "&Add to context menu"
-msgstr "الإ&ضافة للقائمة المنزلقة"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "ت&سجيل امتداد الطرفية"
msgstr "Bilaketa"
#, c-format
+msgid "&Add to context menu"
+msgstr "Gehitu &hitzinguru menura"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Gaitu &menu aurreratua"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Gehitu &hitzinguru menura"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Explorer"
+msgid "&Add to context menu"
+msgstr "&Adicionar ao menu de contexto"
+
msgid "E&nable advanced menu"
msgstr "A&tivar o menu avançado"
-msgid "&Add to context menu"
-msgstr "&Adicionar ao menu de contexto"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registrar a extensão do shell"
msgid "Explorer"
msgstr "Explorer"
+msgid "&Add to context menu"
+msgstr "Добавяне в &контекстуалното меню"
+
msgid "E&nable advanced menu"
msgstr "Включване на &разширено меню"
-msgid "&Add to context menu"
-msgstr "Добавяне в &контекстуалното меню"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Регистриране на разширение на обвивката"
msgstr "Explorador de fitxers"
#, c-format
+msgid "&Add to context menu"
+msgstr "Afegeix al menú contextual"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Habilita el &menú avançat"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Afegeix al menú contextual"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "资源管理器"
+msgid "&Add to context menu"
+msgstr "添加到上下文菜单(&A)"
+
msgid "E&nable advanced menu"
msgstr "启用高级菜单(&N)"
-msgid "&Add to context menu"
-msgstr "添加到上下文菜单(&A)"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "注册系统扩展(&R)"
msgstr "檔案總管"
#, c-format
+msgid "&Add to context menu"
+msgstr "加到右鍵選單 (&A)"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "啟用進階選單 (&N)"
-#, c-format
-msgid "&Add to context menu"
-msgstr "加到右鍵選單 (&A)"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Espluratore"
+msgid "&Add to context menu"
+msgstr "&Aghjunghje à u listinu cuntestuale"
+
msgid "E&nable advanced menu"
msgstr "Attivà u listinu &espertu"
-msgid "&Add to context menu"
-msgstr "&Aghjunghje à u listinu cuntestuale"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "A&rregistramentu di l’estensione Shell"
msgstr "Explorer"
#, c-format
+msgid "&Add to context menu"
+msgstr "&Dodaj u kontekstni izbornik"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Omogući &napredni izbornik."
-#, c-format
-msgid "&Add to context menu"
-msgstr "&Dodaj u kontekstni izbornik"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr "Průzkumník"
#, c-format
+msgid "&Add to context menu"
+msgstr "Přidat do &systémové místní nabídky"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Povolit &rozšířenou nabídku"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Přidat do &systémové místní nabídky"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr "Explorer"
#, c-format
+msgid "&Add to context menu"
+msgstr "&Tilføj til kontekstmenu"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "&Aktiver den avancerede menu"
-#, c-format
-msgid "&Add to context menu"
-msgstr "&Tilføj til kontekstmenu"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Verkenner"
+msgid "&Add to context menu"
+msgstr "Aan contextmenu toevoegen"
+
msgid "E&nable advanced menu"
msgstr "Geavanceerd menu inschakelen"
-msgid "&Add to context menu"
-msgstr "Aan contextmenu toevoegen"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Shell-extensie registreren"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-01-14 12:20+0000\n"
+"POT-Creation-Date: 2023-02-19 08:57+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "Explorer"
msgstr ""
+msgid "&Add to context menu"
+msgstr ""
+
msgid "E&nable advanced menu"
msgstr ""
-msgid "&Add to context menu"
+msgid "Enable &Compare As menu"
msgstr ""
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Resurssienhallinta"
+msgid "&Add to context menu"
+msgstr "Lisää pikavalikkoon"
+
msgid "E&nable advanced menu"
msgstr "Ota käyttöön Lisäasetukset-valikko"
-msgid "&Add to context menu"
-msgstr "Lisää pikavalikkoon"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Rekisteröi liittymälaajennus"
msgstr "Explorateur"
#, c-format
+msgid "&Add to context menu"
+msgstr "&Ajouter au menu contextuel"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "&Activer le menu avancé"
-#, c-format
-msgid "&Add to context menu"
-msgstr "&Ajouter au menu contextuel"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr "Explorador"
#, c-format
+msgid "&Add to context menu"
+msgstr "Añ&adir ao menú contextual"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Habilitar me&nú avanzado"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Añ&adir ao menú contextual"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr "Explorer"
#, c-format
+msgid "&Add to context menu"
+msgstr "&Zum Kontextmenü hinzufügen"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "&Erweitertes Menü verwenden"
-#, c-format
-msgid "&Add to context menu"
-msgstr "&Zum Kontextmenü hinzufügen"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr ""
#, c-format
+msgid "&Add to context menu"
+msgstr ""
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Ενεργοποίηση εξειδικευμένων επιλογών"
-#, c-format
-msgid "&Add to context menu"
+msgid "Enable &Compare As menu"
msgstr ""
#, c-format
msgstr "Intéző"
#, c-format
+msgid "&Add to context menu"
+msgstr "Hozzáadás a Windows helyi menühöz"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "&Bővített menü engedélyezése"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Hozzáadás a Windows helyi menühöz"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Esplora risorse"
+msgid "&Add to context menu"
+msgstr "&Aggiungi al menu contestuale"
+
msgid "E&nable advanced menu"
msgstr "Abilita menu a&vanzato"
-msgid "&Add to context menu"
-msgstr "&Aggiungi al menu contestuale"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registra estensione shell"
msgid "Explorer"
msgstr "エクスプローラー"
+msgid "&Add to context menu"
+msgstr "コンテキストメニューに追加する(&A)"
+
msgid "E&nable advanced menu"
msgstr "拡張メニューを有効にする(&N)"
-msgid "&Add to context menu"
-msgstr "ã\82³ã\83³ã\83\86ã\82ã\82¹ã\83\88ã\83¡ã\83\8bã\83¥ã\83¼ã\81«è¿½å\8a ã\81\99ã\82\8b(&A)"
+msgid "Enable &Compare As menu"
+msgstr "ã\80\8cå½¢å¼\8fã\82\92æ\8c\87å®\9aã\81\97ã\81¦æ¯\94è¼\83ã\80\8dã\83¡ã\83\8bã\83¥ã\83¼ã\82\92æ\9c\89å\8a¹ã\81«ã\81\99ã\82\8b(&C)"
msgid "&Register shell extension"
msgstr "シェル拡張を登録(&R)"
msgstr "탐색기"
#, c-format
+msgid "&Add to context menu"
+msgstr "상황에 맞는 메뉴에 추가(&A)"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "계단식 메뉴 사용(&N)"
-#, c-format
-msgid "&Add to context menu"
-msgstr "상황에 맞는 메뉴에 추가(&A)"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "„Explorer“'is"
+msgid "&Add to context menu"
+msgstr "&Pridėti į kontekstinį meniu"
+
msgid "E&nable advanced menu"
msgstr "Įju&ngti išplėstinį meniu"
-msgid "&Add to context menu"
-msgstr "&Pridėti į kontekstinį meniu"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registruoti aplinkos plėtinį"
msgid "Explorer"
msgstr "Utforsker"
+msgid "&Add to context menu"
+msgstr "Le&gg til i høyreklikkmeny"
+
msgid "E&nable advanced menu"
msgstr "&Aktiver avansert meny"
-msgid "&Add to context menu"
-msgstr "Le&gg til i høyreklikkmeny"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr ""
msgstr " جستجوگر "
#, c-format
+msgid "&Add to context menu"
+msgstr "&A افزودن به گزينگان / فهرست متن"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "&n فعال کردن گزينگان / فهرست پيشرفته "
-#, c-format
-msgid "&Add to context menu"
-msgstr "&A افزودن به گزينگان / فهرست متن"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Eksplorator"
+msgid "&Add to context menu"
+msgstr "Dodaj do menu kontekstowego"
+
msgid "E&nable advanced menu"
msgstr "Włącz menu zaawansowane"
-msgid "&Add to context menu"
-msgstr "Dodaj do menu kontekstowego"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Zarejestruj rozszerzenie powłoki"
msgid "Explorer"
msgstr "Explorador"
+msgid "&Add to context menu"
+msgstr "&Adicionar ao menu de contexto"
+
msgid "E&nable advanced menu"
msgstr "Ativar menu avançado"
-msgid "&Add to context menu"
-msgstr "&Adicionar ao menu de contexto"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registar a extensão do contexto"
msgstr ""
#, c-format
+msgid "&Add to context menu"
+msgstr ""
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Activează me&niul contextual avansat"
-#, c-format
-msgid "&Add to context menu"
+msgid "Enable &Compare As menu"
msgstr ""
#, c-format
msgid "Explorer"
msgstr "Проводник"
+msgid "&Add to context menu"
+msgstr "&Добавить в контекстное меню"
+
msgid "E&nable advanced menu"
msgstr "В&ключить расширенное меню"
-msgid "&Add to context menu"
-msgstr "&Добавить в контекстное меню"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Зарегистрировать shell"
msgstr "Истраживач"
#, c-format
+msgid "&Add to context menu"
+msgstr "Додај у 'изборни оквир'"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "Омогући &напредни избор"
-#, c-format
-msgid "&Add to context menu"
-msgstr "Додај у 'изборни оквир'"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgstr "ගවේශනය"
#, c-format
+msgid "&Add to context menu"
+msgstr "& පද සම්බන්ධයට එකතු වීම "
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "& උසස් ලේඛනයට බලය පැවරීම"
-#, c-format
-msgid "&Add to context menu"
-msgstr "& පද සම්බන්ධයට එකතු වීම "
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"
msgid "Explorer"
msgstr "Prieskumník"
+msgid "&Add to context menu"
+msgstr "Prid&ať do ponuky súvislosti"
+
msgid "E&nable advanced menu"
msgstr "Po&voliť rozšírenú ponuku"
-msgid "&Add to context menu"
-msgstr "Prid&ať do ponuky súvislosti"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Za®istrovať rozšírenie prostredia"
msgid "Explorer"
msgstr "Raziskovalec"
+msgid "&Add to context menu"
+msgstr "&Dodaj v priročni meni"
+
msgid "E&nable advanced menu"
msgstr "Omogoči &napredni meni"
-msgid "&Add to context menu"
-msgstr "&Dodaj v priročni meni"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registriraj končnico lupine"
msgid "Explorer"
msgstr "Explorador"
+msgid "&Add to context menu"
+msgstr "&Agregar al menú contextual"
+
msgid "E&nable advanced menu"
msgstr "Habilitar menú ava&nzado"
-msgid "&Add to context menu"
-msgstr "&Agregar al menú contextual"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "&Registrar extensión de shell"
msgid "Explorer"
msgstr "Utforskaren"
+msgid "&Add to context menu"
+msgstr "Lägg till i innehållsmeny"
+
msgid "E&nable advanced menu"
msgstr "Visa avancerad meny"
-msgid "&Add to context menu"
-msgstr "Lägg till i innehållsmeny"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Registrera filändelse"
msgid "Explorer"
msgstr "WinMerge sağ tık menüsünde görüntülensin"
+msgid "&Add to context menu"
+msgstr "S&ağ tık menüsüne eklensin"
+
msgid "E&nable advanced menu"
msgstr "Gelişmiş me&nü kullanılsın"
-msgid "&Add to context menu"
-msgstr "S&ağ tık menüsüne eklensin"
+msgid "Enable &Compare As menu"
+msgstr ""
msgid "&Register shell extension"
msgstr "Kabuk &eklentisi kaydını ekle"
msgstr "Провідник"
#, c-format
+msgid "&Add to context menu"
+msgstr "&Додати до контекстного меню"
+
+#, c-format
msgid "E&nable advanced menu"
msgstr "В&вімкнути розширене меню"
-#, c-format
-msgid "&Add to context menu"
-msgstr "&Додати до контекстного меню"
+msgid "Enable &Compare As menu"
+msgstr ""
#, c-format
msgid "&Register shell extension"