MENUITEM "with &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR\r
MENUITEM "&with...", ID_FILE_OPEN_WITH\r
END\r
+ MENUITEM "S&hell Menu", ID_FILE_SHELLMENU\r
END\r
END\r
\r
//\r
// Accelerator\r
//\r
+\r
IDR_MERGEDOCTYPE ACCELERATORS\r
BEGIN\r
"1", ID_NEXTDIFFLM, VIRTKEY, ALT, NOINVERT\r
#include "paths.h"
#include "DropHandler.h"
#include "DirDoc.h"
+#include "ShellContextMenu.h"
#ifdef _DEBUG
#define new DEBUG_NEW
ON_COMMAND(ID_WINDOW_CHANGE_PANE, OnChangePane)
ON_COMMAND(ID_NEXT_PANE, OnChangePane)
ON_COMMAND(ID_EDIT_WMGOTO, OnWMGoto)
+ ON_COMMAND(ID_FILE_SHELLMENU, OnShellMenu)
+ ON_UPDATE_COMMAND_UI(ID_FILE_SHELLMENU, OnUpdateShellMenu)
ON_COMMAND_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnScripts)
ON_COMMAND(ID_NO_PREDIFFER, OnNoPrediffer)
ON_UPDATE_COMMAND_UI(ID_NO_PREDIFFER, OnUpdateNoPrediffer)
}
}
+void CMergeEditView::OnShellMenu()
+{
+ CFrameWnd *pFrame = GetTopLevelFrame();
+ ASSERT(pFrame != nullptr);
+ BOOL bAutoMenuEnableOld = pFrame->m_bAutoMenuEnable;
+ pFrame->m_bAutoMenuEnable = FALSE;
+
+ String path = GetDocument()->m_filePaths[m_nThisPane];
+ std::unique_ptr<CShellContextMenu> pContextMenu(new CShellContextMenu(0x9000, 0x9FFF));
+ pContextMenu->Initialize();
+ pContextMenu->AddItem(paths::GetParentPath(path), paths::FindFileName(path));
+ pContextMenu->RequeryShellContextMenu();
+ CPoint point;
+ ::GetCursorPos(&point);
+ HWND hWnd = GetSafeHwnd();
+ BOOL nCmd = TrackPopupMenu(pContextMenu->GetHMENU(), TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y, 0, hWnd, nullptr);
+ if (nCmd)
+ pContextMenu->InvokeCommand(nCmd, hWnd);
+ pContextMenu->ReleaseShellContextMenu();
+
+ pFrame->m_bAutoMenuEnable = bAutoMenuEnableOld;
+}
+
+void CMergeEditView::OnUpdateShellMenu(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(!GetDocument()->m_filePaths[m_nThisPane].empty());
+}
+
/**
* @brief Reload options.
*/
afx_msg void OnUpdateR2LNext(CCmdUI* pCmdUI);
afx_msg void OnChangePane();
afx_msg void OnWMGoto();
+ afx_msg void OnShellMenu();
+ afx_msg void OnUpdateShellMenu(CCmdUI* pCmdUI);
afx_msg void OnScripts(UINT nID );
afx_msg void OnUpdateNoPrediffer(CCmdUI* pCmdUI);
afx_msg void OnUpdatePrediffer(CCmdUI* pCmdUI);
// Used by Merge.rc\r
//\r
#define IDR_MAINFRAME 100\r
-#define IDB_TOOLBAR_ENABLED8BIT 100 // = IDR_MAINFRAME\r
+#define IDB_TOOLBAR_ENABLED8BIT 100\r
#define IDR_MERGEPROJECT 101\r
#define IDR_POPUP_EDITOR_HEADERBAR 102\r
#define IDR_POPUP_PLUGINS_SETTINGS 103\r
#define IDS_OPEN_ALLINVALID 17210\r
#define IDS_OPEN_UNPACKERDISABLED 17211\r
#define IDS_OPEN_MISMATCH 17212\r
-\r
#define IDS_OPEN_RIGHTINVALID3 17213\r
-\r
#define IDS_ERROR_FILE_NOT_FOUND 17216\r
#define IDS_ERROR_FILE_NOT_UNPACKED 17217\r
#define IDS_ERROR_FILEOPEN 17221\r
#define IDS_TEXT_REPORT_FILES 18540\r
#define IDS_HTML_REPORT_FILES 18541\r
#define IDS_XML_REPORT_FILES 18542\r
-#define ID_EDIT_MARK 21406 // editcmd.h\r
+#define ID_EDIT_MARK 21406\r
#define IDS_EOL_DOS 30400\r
#define IDS_EOL_MAC 30401\r
#define IDS_EOL_UNIX 30402\r
#define ID_VIEW_FILEMARGIN 33150\r
#define ID_VIEW_CHANGESCHEME 33151\r
#define ID_COLORSCHEME_FIRST 33152\r
-#define IDS_COLORSCHEME_PLAIN 33152 // = ID_COLORSCHEME_FIRST\r
+#define IDS_COLORSCHEME_PLAIN 33152\r
#define IDS_COLORSCHEME_ASP 33153\r
#define IDS_COLORSCHEME_BASIC 33154\r
#define IDS_COLORSCHEME_BATCH 33155\r
#define IDS_COLORSCHEME_VERILOG 33186\r
#define IDS_COLORSCHEME_VHDL 33187\r
#define IDS_COLORSCHEME_XML 33188\r
-#define ID_COLORSCHEME_LAST 33188 // = IDS_COLORSCHEME_XML\r
+#define ID_COLORSCHEME_LAST 33188\r
#define ID_TOOLBAR_NONE 33194\r
#define ID_TOOLBAR_SMALL 33195\r
#define ID_TOOLBAR_BIG 33196\r
#define ID_FILE_PROJECT_MRU_LAST 33644\r
#define IDS_CREATE_FOLDER 33645\r
#define IDS_CREATE_FOLDER_ERROR 33646\r
+#define ID__SHELLMENU 33647\r
+#define ID_FILE_SHELLMENU 33648\r
\r
// Next default values for new objects\r
// \r
#ifndef APSTUDIO_READONLY_SYMBOLS\r
#define _APS_3D_CONTROLS 1\r
#define _APS_NEXT_RESOURCE_VALUE 248\r
-#define _APS_NEXT_COMMAND_VALUE 33647\r
+#define _APS_NEXT_COMMAND_VALUE 33649\r
#define _APS_NEXT_CONTROL_VALUE 8828\r
#define _APS_NEXT_SYMED_VALUE 116\r
#endif\r
msgid "&with..."
msgstr "&Honekin..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Erabili Berezko H&izkia"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Trukatu Panelak"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Gorde E&skuina"
msgid "Tab-separated list"
msgstr "Fitxaz banandutako zerrenda"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML Arrunta"
msgid "&with..."
msgstr "&com..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Usar a Fonte P&adrão"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Tr&ocar os Painéis"
msgid "Save &Middle"
msgstr "Salvar &o do Meio"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Salvar &o da Direita"
msgid "Tab-separated list"
msgstr "Lista separada por aba"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML Simples"
msgid "&with..."
msgstr "&със..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Използвай ш&рифт по подразбиране"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Размени листовете"
msgid "Save &Middle"
msgstr "Запази С&редната част"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Запиши &дясната част"
msgid "Tab-separated list"
msgstr "Списък, разделен с табулация"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Чист HTML"
msgid "&with..."
msgstr "a&mb..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Empra el tipus de lletra del &sistema"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Intercanvia les subfinestres"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Desa la D&reta"
msgid "Tab-separated list"
msgstr "Llista delimitada per tabulacions"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML símple"
msgid "&with..."
msgstr "选择程序(&W)..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "使用默认字体(&O)"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "交换左右窗格(&A)"
msgid "Save &Middle"
msgstr "保存中间(&M)"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "保存右侧(&R)"
msgid "Tab-separated list"
msgstr "制表符分隔的列表"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "简单 HTML"
msgid "&with..."
msgstr "用(&W)..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "使用預設字型(&O)"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "窗格交換(&A)"
msgid "Save &Middle"
msgstr "儲存中間(&M)"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "儲存右邊(&R)"
msgid "Tab-separated list"
msgstr "跳格號分隔列表"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "單純 HTML"
msgid "&with..."
msgstr "&s..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Koristi standardni f&ont"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Zamijeni panele"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "&Desnu datoteku"
msgid "Tab-separated list"
msgstr "Popis odvojen tabulatorom"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Jednostavni HTML"
msgid "&with..."
msgstr "&zvolit..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Použít výchozí písmo"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Z&aměnit panely"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Uložit p&ravý"
msgid "Tab-separated list"
msgstr "Seznam oddělený tabelátory"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Soubor HTML"
msgid "&with..."
msgstr "&med..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Brug standard s&krifttype"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "By&t vinduer"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Gem &højre"
msgid "Tab-separated list"
msgstr "Tab opdelt liste"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Simpel HTML"
msgid "&with..."
msgstr "met..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Standaard lettertype gebruiken"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Vensters wisselen"
msgid "Save &Middle"
msgstr "Midden opslaan"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Rechts opslaan"
msgid "Tab-separated list"
msgstr "Tab-gescheiden lijst"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Simpele HTML"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-03-30 21:22+0000\n"
+"POT-Creation-Date: 2019-04-11 07:50+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "&with..."
msgstr ""
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
msgid "View &Differences"
msgstr ""
msgid "Use Default F&ont"
msgstr ""
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
msgid "Sw&ap Panes"
msgstr ""
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
msgid "Save &Right"
msgstr ""
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
msgid "Simple HTML"
msgstr ""
msgid "&with..."
msgstr "ohjelmalla..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Käytä oletusfonttia"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Vaihda ruudut"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Tallenna oikea"
msgid "Tab-separated list"
msgstr "Sarkain erotettu lista"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Yksinkertainen HTML"
msgid "&with..."
msgstr "&avec..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "&Utiliser la police par défaut"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Intervertir les fenêtres"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Enregistrer à &droite"
msgid "Tab-separated list"
msgstr "Liste délimitée par des tabulations"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Format HTML"
msgid "&with..."
msgstr "&con..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Empregar fonte pr&edefinida"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "In&tercambiar paneis"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Gardar banda &dereita"
msgid "Tab-separated list"
msgstr "Listaxe separada por tabulacións"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML simple"
msgid "&with..."
msgstr "&Mit..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Standard-Schrift &verwenden"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Ausschnitt v&ertauschen"
msgid "Save &Middle"
msgstr "&Mitte speichern"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "&Rechts speichern"
msgid "Tab-separated list"
msgstr "Tab-getrennte Liste"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Einfaches HTML"
msgid "&with..."
msgstr "με..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Χρήση Προκα&θορισμένης Γραμματοσειράς"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Αντι&μετάθεση Πεδίων"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Αποθήκευση Δε&ξιού"
msgid "Tab-separated list"
msgstr "Κατάλογος με στηλοθέτη ως χαρακτήρα διαχωρισμού"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Απλό HTML"
msgid "&with..."
msgstr "&Egyéb programmal..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Alapértelmezett betűtípus használata"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Panelek megcserélése"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "&Jobb oldal mentése"
msgid "Tab-separated list"
msgstr "Tabulált lista"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Egyszerű HTML"
msgid "&with..."
msgstr "&con..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "&Utilizza carattere predefinito"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Sc&ambia pannelli"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Salva dest&ro"
msgid "Tab-separated list"
msgstr "Lista separata da Tab"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML semplice"
msgid "&with..."
msgstr "プログラムの選択(&W)..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr "シェルメニュー"
+
#: Merge.rc:1A8FADD3
msgid "View &Differences"
msgstr "差異を表示(&D)"
msgid "Use Default F&ont"
msgstr "デフォルト フォントを使用(&O)"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
msgid "Sw&ap Panes"
msgstr "ペインの交換(&A)"
msgid "Save &Middle"
msgstr "中央のファイルを保存(&M)"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
msgid "Save &Right"
msgstr "右側のファイルを保存(&R)"
msgid "Tab-separated list"
msgstr "TAB 区切り形式"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
msgid "Simple HTML"
msgstr "シンプルな HTML 形式"
msgid "&with..."
msgstr "프로그램 선택(&W)..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "기본 글꼴 사용(&O)"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "창 맞바꾸기(&A)"
msgid "Save &Middle"
msgstr "가운데 저장(&M)"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "오른쪽 저장(&R)"
msgid "Tab-separated list"
msgstr "탭으로 분리된 목록"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "단순한 HTML"
msgid "&with..."
msgstr "&su..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
msgid "View &Differences"
msgstr "Ro&dyti skirtumus"
msgid "Use Default F&ont"
msgstr "Naud&oti numatytąjį šriftą"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
msgid "Sw&ap Panes"
msgstr "Sukeisti pol&angius"
msgid "Save &Middle"
msgstr "Išsaugoti &vidurinį"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
msgid "Save &Right"
msgstr "Išsaugoti &dešinįjį"
msgid "Tab-separated list"
msgstr "TAB simboliais sudalintas sąrašas"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
msgid "Simple HTML"
msgstr "Paprastas HTML"
msgid "&with..."
msgstr "&med..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Bruk standard s&krifttype"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Bytt om paneler"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Lagre &høyre"
msgid "Tab-separated list"
msgstr "Tab-separarert liste"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Enkel HTML"
msgid "&with..."
msgstr "&w با ..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "&o استفاده از قلم پيش فرض "
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&a تعويض چهارگوشها "
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "&R ذخيره سمت راستي "
msgid "Tab-separated list"
msgstr " فهرست جداشده با کليد جهش "
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr " ساده اچ تي ام ال"
msgid "&with..."
msgstr "&w..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Przywróć domyślną czcionkę"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Za&mień panele"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Zapisz &prawą"
msgid "Tab-separated list"
msgstr "Lista z tabulatorami"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Prosty HTML"
msgid "&with..."
msgstr "com..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Usar Fonte Pre&definida"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Trocar Janelas"
msgid "Save &Middle"
msgstr "Guardar &Meio"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Guardar Direita"
msgid "Tab-separated list"
msgstr "Lista de separadores"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML simples"
msgid "&with..."
msgstr "&cu..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Utilizează font im&plicit"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Interschimbă p&anourile"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Salvare d&reapta"
msgid "Tab-separated list"
msgstr "Listă separată-de-tab-uri"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML simplu"
msgid "&with..."
msgstr "с помощью..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Использовать шрифт по &умолчанию"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Поменять панели местами"
msgid "Save &Middle"
msgstr "Сохранить посередине"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Сохранить с&права"
msgid "Tab-separated list"
msgstr "Список с разделителем Табуляция"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Простой HTML"
msgid "&with..."
msgstr "&са"
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Користи подразумевана слова"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "З&амени табле"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Сачувај &десну"
msgid "Tab-separated list"
msgstr "Списак је одвојен језичком"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Једноставни HTML"
msgid "&with..."
msgstr "&සමග"
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Use Default F&ont"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, fuzzy, c-format
msgid "Sw&ap Panes"
msgstr "Sw&ap Panes"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "දකුණුපස සුරක්ෂිත කරන්න"
msgid "Tab-separated list"
msgstr "Tab-separated list"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Simple HTML"
msgid "&with..."
msgstr "Čí&m..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Použiť základné písm&o"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Vymeniť panely"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Uložiť &pravý"
msgid "Tab-separated list"
msgstr "Zoznam oddelený tabulátormi"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Jednoduché HTML"
msgid "&with..."
msgstr "&z ..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Uporabite privzeto pi&savo"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Zam&enjaj okvirja"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Shrani &desno"
msgid "Tab-separated list"
msgstr "Seznam, ločen s tabulatorji"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Enostavni HTML"
msgid "&with..."
msgstr "&con..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Usar F&uente del Siste&ma"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Intercambiar paneles"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Guardar lado &Derecho"
msgid "Tab-separated list"
msgstr "Lista separada por tabuladores"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "HTML Simple"
msgid "&with..."
msgstr "med ..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Använd FörvalsTeckensnitt"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Växla Rutor"
msgid "Save &Middle"
msgstr "Spara Mitter fil"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Spara Höger fil"
msgid "Tab-separated list"
msgstr "Tab-skild lista"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Enkel HTML"
msgid "&with..."
msgstr "&Birlikte Aç..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Varsayılan Yazı &Türü Kullanılsın"
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "&Panoların Yerini Değiştir"
msgid "Save &Middle"
msgstr "&Ortayı Kaydet"
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "&Sağı Kaydet"
msgid "Tab-separated list"
msgstr "Sekme ile ayrılmış liste"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Basit HTML"
msgid "&with..."
msgstr "&за допомогою..."
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgid "Use Default F&ont"
msgstr "Використовувати &звичайний шрифт "
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Sw&ap Panes"
msgstr "Пом&іняти панелі місцями"
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
#, c-format
msgid "Save &Right"
msgstr "Збе&регти файл справа"
msgid "Tab-separated list"
msgstr "Список, розділений табуляторами"
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
#, c-format
msgid "Simple HTML"
msgstr "Простий HTML"