MergeEditView.*: Add 'Shell Menu' menu item in context menu

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 98da6e5..c78f08c 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -84,6 +84,7 @@ BEGIN
             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
@@ -804,6 +805,7 @@ END
 //\r
 // Accelerator\r
 //\r
+\r
 IDR_MERGEDOCTYPE ACCELERATORS\r
 BEGIN\r
     "1",            ID_NEXTDIFFLM,          VIRTKEY, ALT, NOINVERT\r

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index cfb73b7..63228a2 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -44,6 +44,7 @@
 #include "paths.h"
 #include "DropHandler.h"
 #include "DirDoc.h"
+#include "ShellContextMenu.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -189,6 +190,8 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx)
        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)
@@ -2995,6 +2998,34 @@ void CMergeEditView::OnWMGoto()
        }
 }
 
+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.
  */

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 1d6f7f6..be511f1 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -304,6 +304,8 @@ protected:
        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);

diff --git a/Src/resource.h b/Src/resource.h
index 30e4745..ba586a4 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -3,7 +3,7 @@
 // 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
@@ -620,9 +620,7 @@
 #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
@@ -901,7 +899,7 @@
 #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
@@ -1082,7 +1080,7 @@
 #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
@@ -1119,7 +1117,7 @@
 #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
@@ -1231,6 +1229,8 @@
 #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
@@ -1238,7 +1238,7 @@
 #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

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 02fef80..dc6fa83 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -113,6 +113,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&Honekin..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -543,7 +547,7 @@ msgstr "Hautatu &Hizkia..."
 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"
@@ -643,7 +647,7 @@ msgstr "Gorde E&zkerra"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Gorde E&skuina"
@@ -4231,7 +4235,7 @@ msgstr "Kakotxaz banandutako zerrenda"
 msgid "Tab-separated list"
 msgstr "Fitxaz banandutako zerrenda"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Arrunta"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 51b1555..a739676 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -113,6 +113,10 @@ msgstr "com o &Editor Externo\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "&com..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -543,7 +547,7 @@ msgstr "Selecionar a &Fonte..."
 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"
@@ -643,7 +647,7 @@ msgstr "Salvar &o da Esquerda"
 msgid "Save &Middle"
 msgstr "Salvar &o do Meio"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Salvar &o da Direita"
@@ -4255,7 +4259,7 @@ msgstr "Lista separada por vírgula"
 msgid "Tab-separated list"
 msgstr "Lista separada por aba"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Simples"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 440b604..27b36a0 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -110,6 +110,10 @@ msgstr "с &външен редактор\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "&със..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Избери &шрифт..."
 msgid "Use Default F&ont"
 msgstr "Използвай ш&рифт по подразбиране"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Размени листовете"
@@ -640,7 +644,7 @@ msgstr "Запиши &лявата част"
 msgid "Save &Middle"
 msgstr "Запази С&редната част"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Запиши &дясната част"
@@ -4166,7 +4170,7 @@ msgstr "Списък, разделен със запетая"
 msgid "Tab-separated list"
 msgstr "Списък, разделен с табулация"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Чист HTML"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 1ebafc7..15745d8 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -109,6 +109,10 @@ msgstr "amb l'&editor extern\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "a&mb..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -539,7 +543,7 @@ msgstr "&Tipus de lletra..."
 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"
@@ -639,7 +643,7 @@ msgstr "Desa l'&Esquerra"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Desa la D&reta"
@@ -4165,7 +4169,7 @@ msgstr "Llista delimitada per comes"
 msgid "Tab-separated list"
 msgstr "Llista delimitada per tabulacions"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML símple"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index a9ce64d..5560743 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -112,6 +112,10 @@ msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "选择程序(&W)..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -542,7 +546,7 @@ msgstr "选择字体(&F)..."
 msgid "Use Default F&ont"
 msgstr "使用默认字体(&O)"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "交换左右窗格(&A)"
@@ -642,7 +646,7 @@ msgstr "保存左侧(&L)"
 msgid "Save &Middle"
 msgstr "保存中间(&M)"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "保存右侧(&R)"
@@ -4168,7 +4172,7 @@ msgstr "逗号分隔的列表"
 msgid "Tab-separated list"
 msgstr "制表符分隔的列表"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "简单 HTML"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 2984700..ec7354e 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -112,6 +112,10 @@ msgstr "用外部編輯器(&E) \tCtrl+Alt+E"
 msgid "&with..."
 msgstr "用(&W)..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -544,7 +548,7 @@ msgstr "選取字型(&F)..."
 msgid "Use Default F&ont"
 msgstr "使用預設字型(&O)"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "窗格交換(&A)"
@@ -644,7 +648,7 @@ msgstr "儲存左邊(&L)"
 msgid "Save &Middle"
 msgstr "儲存中間(&M)"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "儲存右邊(&R)"
@@ -4237,7 +4241,7 @@ msgstr "逗號分隔列表"
 msgid "Tab-separated list"
 msgstr "跳格號分隔列表"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "單純 HTML"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index d951e52..80be2cf 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&s..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Izbor &fonta..."
 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"
@@ -640,7 +644,7 @@ msgstr "&Lijevu datoteku"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "&Desnu datoteku"
@@ -4228,7 +4232,7 @@ msgstr "Popis odvojen zarezom"
 msgid "Tab-separated list"
 msgstr "Popis odvojen tabulatorom"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Jednostavni HTML"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 2e1f382..be38490 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&zvolit..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Vybrat písmo..."
 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"
@@ -640,7 +644,7 @@ msgstr "Uložit &levý"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Uložit p&ravý"
@@ -4168,7 +4172,7 @@ msgstr "Seznam oddělený čárkami"
 msgid "Tab-separated list"
 msgstr "Seznam oddělený tabelátory"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Soubor HTML"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index dee1b46..0bd47c3 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -111,6 +111,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&med..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "Vælg &skrifttype..."
 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"
@@ -641,7 +645,7 @@ msgstr "Gem &venstre"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Gem &højre"
@@ -4260,7 +4264,7 @@ msgstr "Komma opdelt liste"
 msgid "Tab-separated list"
 msgstr "Tab opdelt liste"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Simpel HTML"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 153863b..f9b85bd 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -112,6 +112,10 @@ msgstr "met externe editor\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "met..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -542,7 +546,7 @@ msgstr "Lettertype kiezen..."
 msgid "Use Default F&ont"
 msgstr "Standaard lettertype gebruiken"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Vensters wisselen"
@@ -642,7 +646,7 @@ msgstr "Links opslaan"
 msgid "Save &Middle"
 msgstr "Midden opslaan"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Rechts opslaan"
@@ -4293,7 +4297,7 @@ msgstr "Komma-gescheiden lijst"
 msgid "Tab-separated list"
 msgstr "Tab-gescheiden lijst"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Simpele HTML"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index c532e35..6afe3e9 100644 (file)
--- 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: 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"
@@ -86,6 +86,10 @@ msgstr ""
 msgid "&with..."
 msgstr ""
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 msgid "View &Differences"
 msgstr ""
@@ -431,7 +435,7 @@ msgstr ""
 msgid "Use Default F&ont"
 msgstr ""
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 msgid "Sw&ap Panes"
 msgstr ""
 
@@ -511,7 +515,7 @@ msgstr ""
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 msgid "Save &Right"
 msgstr ""
 
@@ -3307,7 +3311,7 @@ msgstr ""
 msgid "Tab-separated list"
 msgstr ""
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 msgid "Simple HTML"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 46b675b..7e1a1c4 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -107,6 +107,10 @@ msgstr ""
 msgid "&with..."
 msgstr "ohjelmalla..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -537,7 +541,7 @@ msgstr "Valitse fontti"
 msgid "Use Default F&ont"
 msgstr "Käytä oletusfonttia"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Vaihda ruudut"
@@ -637,7 +641,7 @@ msgstr "Ta&llenna vasen"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Tallenna oikea"
@@ -4034,7 +4038,7 @@ msgstr "Pilkuilla erotettu lista"
 msgid "Tab-separated list"
 msgstr "Sarkain erotettu lista"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Yksinkertainen HTML"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 38812e2..221704d 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -114,6 +114,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&avec..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -544,7 +548,7 @@ msgstr "Choisir une &police..."
 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"
@@ -644,7 +648,7 @@ msgstr "Enregistrer à &gauche"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Enregistrer à &droite"
@@ -4231,7 +4235,7 @@ msgstr "Liste délimitée par des virgules"
 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"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index d4f2a00..69c7550 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&con..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Escoller &fonte..."
 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"
@@ -640,7 +644,7 @@ msgstr "Gardar banda esquerda"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Gardar banda &dereita"
@@ -4223,7 +4227,7 @@ msgstr "Listaxe separada por comas"
 msgid "Tab-separated list"
 msgstr "Listaxe separada por tabulacións"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simple"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 5273ca1..ef149a5 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -110,6 +110,10 @@ msgstr "Mit &externem Editor\tStrg+Alt+E"
 msgid "&with..."
 msgstr "&Mit..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Schrift &auswählen..."
 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"
@@ -640,7 +644,7 @@ msgstr "&Links speichern"
 msgid "Save &Middle"
 msgstr "&Mitte speichern"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "&Rechts speichern"
@@ -4255,7 +4259,7 @@ msgstr "Komma-getrennte Liste"
 msgid "Tab-separated list"
 msgstr "Tab-getrennte Liste"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Einfaches HTML"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 16cc7fd..e1a3190 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -109,6 +109,10 @@ msgstr ""
 msgid "&with..."
 msgstr "με..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -539,7 +543,7 @@ msgstr "Επιλογή &Γραμματοσειράς..."
 msgid "Use Default F&ont"
 msgstr "Χρήση Προκα&θορισμένης Γραμματοσειράς"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Αντι&μετάθεση Πεδίων"
@@ -639,7 +643,7 @@ msgstr "Αποθήκευση Α&ριστερού"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Αποθήκευση Δε&ξιού"
@@ -4201,7 +4205,7 @@ msgstr "Κατάλογος με κόμμα ως χαρακτήρα διαχωρ
 msgid "Tab-separated list"
 msgstr "Κατάλογος με στηλοθέτη ως χαρακτήρα διαχωρισμού"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Απλό HTML"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 736f8f2..ca46c91 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&Egyéb programmal..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Betűtípus..."
 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"
@@ -640,7 +644,7 @@ msgstr "&Bal oldal mentése"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "&Jobb oldal mentése"
@@ -4138,7 +4142,7 @@ msgstr "Vesszővel elválasztott lista"
 msgid "Tab-separated list"
 msgstr "Tabulált lista"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Egyszerű HTML"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 59ce52d..100265e 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&con..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "&Carattere..."
 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"
@@ -640,7 +644,7 @@ msgstr "Sa&lva sinistro"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Salva dest&ro"
@@ -4195,7 +4199,7 @@ msgstr "Lista separata da virgole"
 msgid "Tab-separated list"
 msgstr "Lista separata da Tab"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML semplice"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index fc9979c..78e2084 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -93,6 +93,10 @@ msgstr "外部エディタで(&E)\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "プログラムの選択(&W)..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr "シェルメニュー"
+
 #: Merge.rc:1A8FADD3
 msgid "View &Differences"
 msgstr "差異を表示(&D)"
@@ -438,7 +442,7 @@ msgstr "フォントの選択(&F)..."
 msgid "Use Default F&ont"
 msgstr "デフォルト フォントを使用(&O)"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 msgid "Sw&ap Panes"
 msgstr "ペインの交換(&A)"
 
@@ -518,7 +522,7 @@ msgstr "左側のファイルを保存(&L)"
 msgid "Save &Middle"
 msgstr "中央のファイルを保存(&M)"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 msgid "Save &Right"
 msgstr "右側のファイルを保存(&R)"
 
@@ -3577,7 +3581,7 @@ msgstr "CSV 形式"
 msgid "Tab-separated list"
 msgstr "TAB 区切り形式"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 msgid "Simple HTML"
 msgstr "シンプルな HTML 形式"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 9d76427..04415ee 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -114,6 +114,10 @@ msgstr "외부 편집기로(&E)\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "프로그램 선택(&W)..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -544,7 +548,7 @@ msgstr "글꼴 선택(&F)..."
 msgid "Use Default F&ont"
 msgstr "기본 글꼴 사용(&O)"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "창 맞바꾸기(&A)"
@@ -644,7 +648,7 @@ msgstr "왼쪽 저장(&L)"
 msgid "Save &Middle"
 msgstr "가운데 저장(&M)"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "오른쪽 저장(&R)"
@@ -4255,7 +4259,7 @@ msgstr "쉼표로 분리된 목록"
 msgid "Tab-separated list"
 msgstr "탭으로 분리된 목록"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "단순한 HTML"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 44cc1b6..44b6089 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -95,6 +95,10 @@ msgstr "su Išoriniu r&edaktoriumi\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "&su..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 msgid "View &Differences"
 msgstr "Ro&dyti skirtumus"
@@ -440,7 +444,7 @@ msgstr "Parinkti &šriftą..."
 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"
 
@@ -520,7 +524,7 @@ msgstr "Išsaugoti &kairįjį"
 msgid "Save &Middle"
 msgstr "Išsaugoti &vidurinį"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 msgid "Save &Right"
 msgstr "Išsaugoti &dešinįjį"
 
@@ -3531,7 +3535,7 @@ msgstr "Kableliais sudalintas sąrašas"
 msgid "Tab-separated list"
 msgstr "TAB simboliais sudalintas sąrašas"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 msgid "Simple HTML"
 msgstr "Paprastas HTML"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index bdf10da..656434f 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&med..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Velg &skrifttype..."
 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"
@@ -640,7 +644,7 @@ msgstr "Lagre &venstre"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Lagre &høyre"
@@ -4228,7 +4232,7 @@ msgstr "Komma-separert liste"
 msgid "Tab-separated list"
 msgstr "Tab-separarert liste"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Enkel HTML"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 3377dc3..fc9e33b 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -111,6 +111,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&w با ..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "&F انتخاب قلم  "
 msgid "Use Default F&ont"
 msgstr "&o استفاده از قلم پيش فرض "
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "&a تعويض چهارگوشها "
@@ -641,7 +645,7 @@ msgstr "&L ذخيره سمت چپي "
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "&R ذخيره سمت راستي "
@@ -4263,7 +4267,7 @@ msgstr " فهرستي که با کاما جدا شده باشد "
 msgid "Tab-separated list"
 msgstr " فهرست جداشده با کليد جهش "
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr " ساده اچ تي ام ال"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index d0bd6bc..f2d06d1 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -111,6 +111,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&w..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "Wybierz czcionkę..."
 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"
@@ -641,7 +645,7 @@ msgstr "Zapisz &lewą"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Zapisz &prawą"
@@ -4229,7 +4233,7 @@ msgstr "Lista z przecinkami"
 msgid "Tab-separated list"
 msgstr "Lista z tabulatorami"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Prosty HTML"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index a751263..069b60b 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -110,6 +110,10 @@ msgstr "com editor externo\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "com..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Selecionar &Fonte..."
 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"
@@ -640,7 +644,7 @@ msgstr "Guardar Esquerda"
 msgid "Save &Middle"
 msgstr "Guardar &Meio"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Guardar Direita"
@@ -4036,7 +4040,7 @@ msgstr "Lista separada por vírgulas"
 msgid "Tab-separated list"
 msgstr "Lista de separadores"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simples"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 435fa91..7e93711 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&cu..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "Selectează &font..."
 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"
@@ -640,7 +644,7 @@ msgstr "Sa&lvare stânga"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Salvare d&reapta"
@@ -4202,7 +4206,7 @@ msgstr "Listă separată-de-virgule"
 msgid "Tab-separated list"
 msgstr "Listă separată-de-tab-uri"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simplu"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 70fd3ee..44b37d3 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -113,6 +113,10 @@ msgstr "внешним редактором\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "с помощью..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -543,7 +547,7 @@ msgstr "Выбрать &Шрифт..."
 msgid "Use Default F&ont"
 msgstr "Использовать шрифт по &умолчанию"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Поменять панели местами"
@@ -643,7 +647,7 @@ msgstr "Сохранить с&лева"
 msgid "Save &Middle"
 msgstr "Сохранить посередине"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Сохранить с&права"
@@ -4228,7 +4232,7 @@ msgstr "Список с разделителем Запятая"
 msgid "Tab-separated list"
 msgstr "Список с разделителем Табуляция"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Простой HTML"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index f1b73f5..b3b68a0 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -109,6 +109,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&са"
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -539,7 +543,7 @@ msgstr "Изабери &слова..."
 msgid "Use Default F&ont"
 msgstr "Користи подразумевана слова"
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "З&амени табле"
@@ -639,7 +643,7 @@ msgstr "Сачувај &леву"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Сачувај &десну"
@@ -4202,7 +4206,7 @@ msgstr "Списак је одвојен зарезом"
 msgid "Tab-separated list"
 msgstr "Списак је одвојен језичком"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Једноставни HTML"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 5b660f0..67bea8d 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -107,6 +107,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&සමග"
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -537,7 +541,7 @@ msgstr " මුද්‍රණ අකුරු &වර්ගය තෝරන්
 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"
@@ -637,7 +641,7 @@ msgstr "වම්පස සුරක්ෂිත කරන්න"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "දකුණුපස සුරක්ෂිත කරන්න"
@@ -4223,7 +4227,7 @@ msgstr "Comma-separated list"
 msgid "Tab-separated list"
 msgstr "Tab-separated list"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Simple HTML"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 3ce4454..239a489 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -110,6 +110,10 @@ msgstr ""
 msgid "&with..."
 msgstr "Čí&m..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -540,7 +544,7 @@ msgstr "&Zvoliť písmo..."
 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"
@@ -640,7 +644,7 @@ msgstr "Uložiť ľ&avý"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Uložiť &pravý"
@@ -4228,7 +4232,7 @@ msgstr "Zoznam oddelený čiarkami"
 msgid "Tab-separated list"
 msgstr "Zoznam oddelený tabulátormi"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Jednoduché HTML"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 2431f45..d2949db 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -111,6 +111,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&z ..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "Izberite &pisavo ..."
 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"
@@ -641,7 +645,7 @@ msgstr "Shrani &levo datoteko"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Shrani &desno"
@@ -4232,7 +4236,7 @@ msgstr "Seznam, ločen z vejicami"
 msgid "Tab-separated list"
 msgstr "Seznam, ločen s tabulatorji"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Enostavni HTML"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 5008aac..fd924be 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -112,6 +112,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&con..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -542,7 +546,7 @@ msgstr "Seleccionar &Fuente..."
 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"
@@ -642,7 +646,7 @@ msgstr "Guardar lado &Izquierdo"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Guardar lado &Derecho"
@@ -4230,7 +4234,7 @@ msgstr "Lista separada por comas"
 msgid "Tab-separated list"
 msgstr "Lista separada por tabuladores"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Simple"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 9c372cb..6be3b28 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -112,6 +112,10 @@ msgstr "med Extern Redigerare\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "med ..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -542,7 +546,7 @@ msgstr "Välj Teckensnitt ..."
 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"
@@ -642,7 +646,7 @@ msgstr "Spara Vänster fil"
 msgid "Save &Middle"
 msgstr "Spara Mitter fil"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Spara Höger fil"
@@ -4282,7 +4286,7 @@ msgstr "Komma-skild lista"
 msgid "Tab-separated list"
 msgstr "Tab-skild lista"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Enkel HTML"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 5360a87..147e1c2 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -111,6 +111,10 @@ msgstr "Dış Düz&enleyici ile\tCtrl+Alt+E"
 msgid "&with..."
 msgstr "&Birlikte Aç..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "Ya&zı Türünü Seçin..."
 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"
@@ -641,7 +645,7 @@ msgstr "So&lu Kaydet"
 msgid "Save &Middle"
 msgstr "&Ortayı Kaydet"
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "&Sağı Kaydet"
@@ -4198,7 +4202,7 @@ msgstr "Virgül ile ayrılmış liste"
 msgid "Tab-separated list"
 msgstr "Sekme ile ayrılmış liste"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Basit HTML"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 73b6e16..c7c8768 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -111,6 +111,10 @@ msgstr ""
 msgid "&with..."
 msgstr "&за допомогою..."
 
+#: Merge.rc:2E3BFCA1
+msgid "S&hell Menu"
+msgstr ""
+
 #: Merge.rc:1A8FADD3
 #, c-format
 msgid "View &Differences"
@@ -541,7 +545,7 @@ msgstr "Вибрати &шрифт..."
 msgid "Use Default F&ont"
 msgstr "Використовувати &звичайний шрифт "
 
-#: Merge.rc:2E3BFCA1
+#: Merge.rc:2E3BFCA2
 #, c-format
 msgid "Sw&ap Panes"
 msgstr "Пом&іняти панелі місцями"
@@ -641,7 +645,7 @@ msgstr "Зб&ерегти файл зліва"
 msgid "Save &Middle"
 msgstr ""
 
-#: Merge.rc:2E3BFCA2
+#: Merge.rc:2E3BFCA3
 #, c-format
 msgid "Save &Right"
 msgstr "Збе&регти файл справа"
@@ -4227,7 +4231,7 @@ msgstr "Список, розділений комами"
 msgid "Tab-separated list"
 msgstr "Список, розділений табуляторами"
 
-#: Merge.rc:2E3BFCA3
+#: Merge.rc:2E3BFCA4
 #, c-format
 msgid "Simple HTML"
 msgstr "Простий HTML"