Add "Open Parent Folder" menu item to the file compare window's context menu

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 11231d2..c8dc6ff 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -1801,8 +1801,7 @@ void CDirView::DoOpenParentFolder(SIDE_TYPE stype)
        DirItemIterator dirBegin = SelBegin();
        String file = GetSelectedFileName(dirBegin, stype, GetDiffContext());
        if (file.empty()) return;
-       String parentFolder = paths::GetParentPath(file);
-       ShellExecute(::GetDesktopWindow(), _T("open"), parentFolder.c_str(), 0, 0, SW_SHOWNORMAL);
+       theApp.OpenParentFolder(file.c_str());
 }
 
 /// User chose (context menu) open left

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 676ec6f..24e057a 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -829,6 +829,15 @@ void CMergeApp::OpenFileOrUrl(LPCTSTR szFile, LPCTSTR szUrl)
 }
 
 /**
+ * @brief Open parent folder
+ */
+void CMergeApp::OpenParentFolder(LPCTSTR szFile)
+{
+       String parentFolder = paths::GetParentPath(szFile);
+       ShellExecute(::GetDesktopWindow(), _T("open"), parentFolder.c_str(), 0, 0, SW_SHOWNORMAL);
+}
+
+/**
  * @brief Show Help - this is for opening help from outside mainframe.
  * @param [in] helpLocation Location inside help, if `nullptr` main help is opened.
  */

diff --git a/Src/Merge.h b/Src/Merge.h
index 6c5f0c1..714933f 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -88,7 +88,8 @@ public:
        FileFilterHelper * GetGlobalFileFilter() { return m_pGlobalFileFilter.get(); }
        void ShowHelp(LPCTSTR helpLocation = nullptr);
        void OpenFileToExternalEditor(const String& file, int nLineNumber = 1);
-       void OpenFileOrUrl(LPCTSTR szFile, LPCTSTR szUrl);
+       static void OpenFileOrUrl(LPCTSTR szFile, LPCTSTR szUrl);
+       static void OpenParentFolder(LPCTSTR szFile);
        bool CreateBackup(bool bFolder, const String& pszPath);
        int HandleReadonlySave(String& strSavePath, bool bMultiFile, bool &bApplyToAll);
        bool GetMergingMode() const;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index bb723f2..8b5e24a 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -95,6 +95,7 @@ BEGIN
             MENUITEM "With &Registered Application", ID_FILE_OPEN_REGISTERED\r
             MENUITEM "With &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR\r
             MENUITEM "&With...",                    ID_FILE_OPEN_WITH\r
+            MENUITEM "Open &Parent Folder...",      ID_FILE_OPEN_PARENT_FOLDER\r
         END\r
         MENUITEM "S&hell Menu",                 ID_FILE_SHELLMENU\r
     END\r

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index b622651..8a6594b 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -221,6 +221,7 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx)
        ON_COMMAND(ID_FILE_OPEN_REGISTERED, OnOpenFile)
        ON_COMMAND(ID_FILE_OPEN_WITHEDITOR, OnOpenFileWithEditor)
        ON_COMMAND(ID_FILE_OPEN_WITH, OnOpenFileWith)
+       ON_COMMAND(ID_FILE_OPEN_PARENT_FOLDER, OnOpenParentFolder)
        ON_COMMAND(ID_SWAPPANES_SWAP12, OnViewSwapPanes12)
        ON_COMMAND(ID_SWAPPANES_SWAP23, OnViewSwapPanes23)
        ON_COMMAND(ID_SWAPPANES_SWAP13, OnViewSwapPanes13)
@@ -3897,6 +3898,21 @@ void CMergeEditView::OnOpenFileWithEditor()
 }
 
 /**
+ * @brief Open parent folder of active file
+ */
+void CMergeEditView::OnOpenParentFolder()
+{
+       CMergeDoc * pDoc = GetDocument();
+       ASSERT(pDoc != nullptr);
+
+       String sFileName = pDoc->m_filePaths[m_nThisPane];
+       if (sFileName.empty())
+               return;
+
+       theApp.OpenParentFolder(sFileName.c_str());
+}
+
+/**
  * @brief Force repaint of the location pane.
  */
 void CMergeEditView::RepaintLocationPane()

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 9ce5c9e..f50e893 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -343,6 +343,7 @@ protected:
        afx_msg void OnOpenFile();
        afx_msg void OnOpenFileWith();
        afx_msg void OnOpenFileWithEditor();
+       afx_msg void OnOpenParentFolder();
        afx_msg void OnViewSwapPanes12();
        afx_msg void OnViewSwapPanes23();
        afx_msg void OnViewSwapPanes13();

diff --git a/Src/resource.h b/Src/resource.h
index ca3026e..cc8877a 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -740,6 +740,7 @@
 #define ID_FILE_OPEN_REGISTERED         32944\r
 #define ID_FILE_OPEN_WITHEDITOR         32945\r
 #define ID_FILE_OPEN_WITH               32946\r
+#define ID_FILE_OPEN_PARENT_FOLDER      32947\r
 #define ID_STATUS_MERGINGMODE           32960\r
 #define ID_STATUS_DIFFNUM               32961\r
 #define ID_STATUS_RIGHTDIR_RO           32962\r

diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
index 86cb9c9..48e9553 100644 (file)
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
 </head>
 <body>
 <h1>Translations Status</h1>
-<p>Status from <strong>2021-04-18</strong>:</p>
+<p>Status from <strong>2021-04-20</strong>:</p>
 <h2>WinMerge</h2>
 <table class="status">
   <tr>
@@ -155,7 +155,7 @@
     <td class="right fuzzy">0</td>
     <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-04-18</td>
+    <td class="center">2021-04-20</td>
   </tr>
   <tr>
     <td class="left">Finnish</td>
@@ -178,11 +178,11 @@
   <tr>
     <td class="left">Galician</td>
     <td class="right">1030</td>
-    <td class="right translated">1029</td>
+    <td class="right translated">1030</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">1</td>
+    <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-04-01</td>
+    <td class="center">2021-04-18</td>
   </tr>
   <tr>
     <td class="left">German</td>
@@ -223,9 +223,9 @@
   <tr>
     <td class="left">Japanese</td>
     <td class="right">1030</td>
-    <td class="right translated">1029</td>
+    <td class="right translated">1030</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">1</td>
+    <td class="right untranslated">0</td>
     <td class="right">100 %</td>
     <td class="center">2021-03-31</td>
   </tr>
@@ -241,11 +241,11 @@
   <tr>
     <td class="left">Lithuanian</td>
     <td class="right">1030</td>
-    <td class="right translated">1029</td>
+    <td class="right translated">1030</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">1</td>
+    <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-04-01</td>
+    <td class="center">2021-04-19</td>
   </tr>
   <tr>
     <td class="left">Norwegian</td>

diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index f07ce92..dbd0dfc 100644 (file)
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,6 +1,6 @@
 # Translations Status
 
-Status from **2021-04-18**:
+Status from **2021-04-20**:
 
 ## WinMerge
 
@@ -17,17 +17,17 @@ Status from **2021-04-18**:
 | Czech                |  1030 |        613 |     0 |          417 |     60 % |             |
 | Danish               |  1030 |        650 |     0 |          380 |     63 % |  2013-01-13 |
 | Dutch                |  1030 |       1027 |     0 |            3 |    100 % |  2018-09-06 |
-| English              |  1031 |       1031 |     0 |            0 |    100 % |  2021-04-18 |
+| English              |  1031 |       1031 |     0 |            0 |    100 % |  2021-04-20 |
 | Finnish              |  1030 |        914 |     0 |          116 |     89 % |             |
 | French               |  1030 |       1027 |     0 |            3 |    100 % |  2021-02-10 |
-| Galician             |  1030 |       1029 |     0 |            1 |    100 % |  2021-04-01 |
+| Galician             |  1030 |       1030 |     0 |            0 |    100 % |  2021-04-18 |
 | German               |  1030 |       1029 |     0 |            1 |    100 % |  2021-04-04 |
 | Greek                |  1030 |        613 |     0 |          417 |     60 % |             |
 | Hungarian            |  1030 |       1027 |     0 |            3 |    100 % |  2021-03-15 |
 | Italian              |  1030 |        917 |     0 |          113 |     89 % |  2019-07-12 |
-| Japanese             |  1030 |       1029 |     0 |            1 |    100 % |  2021-03-31 |
+| Japanese             |  1030 |       1030 |     0 |            0 |    100 % |  2021-03-31 |
 | Korean               |  1030 |        998 |     0 |           32 |     97 % |  2021-03-30 |
-| Lithuanian           |  1030 |       1029 |     0 |            1 |    100 % |  2021-04-01 |
+| Lithuanian           |  1030 |       1030 |     0 |            0 |    100 % |  2021-04-19 |
 | Norwegian            |  1030 |        642 |     0 |          388 |     62 % |             |
 | Persian              |  1030 |        653 |     0 |          377 |     63 % |  2013-08-15 |
 | Polish               |  1030 |       1018 |     0 |           12 |     99 % |             |

diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml
index 46b5a61..0b14afe 100644 (file)
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <status>
-  <update>2021-04-18</update>
+  <update>2021-04-20</update>
   <translations project="WinMerge">
     <translation>
       <language>Arabic</language>
@@ -229,7 +229,7 @@
     <translation template="1">
       <language>English</language>
       <file>English.pot</file>
-      <update>2021-04-18</update>
+      <update>2021-04-20</update>
       <strings>
         <count>1031</count>
         <translated>1031</translated>
@@ -288,12 +288,12 @@
     <translation>
       <language>Galician</language>
       <file>Galician.po</file>
-      <update>2021-04-01</update>
+      <update>2021-04-18</update>
       <strings>
         <count>1030</count>
-        <translated>1029</translated>
+        <translated>1030</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>0</untranslated>
       </strings>
       <translators>
         <translator>
@@ -407,9 +407,9 @@
       <update>2021-03-31</update>
       <strings>
         <count>1030</count>
-        <translated>1029</translated>
+        <translated>1030</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>0</untranslated>
       </strings>
       <translators>
         <translator>
@@ -454,12 +454,12 @@
     <translation>
       <language>Lithuanian</language>
       <file>Lithuanian.po</file>
-      <update>2021-04-01</update>
+      <update>2021-04-19</update>
       <strings>
         <count>1030</count>
-        <translated>1029</translated>
+        <translated>1030</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>0</untranslated>
       </strings>
       <translators>
         <translator>

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 55403f6..ca57f4f 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -93,6 +93,9 @@ msgstr "باستخدام &محرر نصي خارجي\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "با&ستخدام..."
 
+msgid "Open &Parent Folder..."
+msgstr "المجلد الأساسي..."
+
 msgid "S&hell Menu"
 msgstr "&قائمة البرنامج الوسيطي (الغلاف)"
 
@@ -794,9 +797,6 @@ msgstr "&فتح الجزء الأيسر"
 msgid "with &External Editor"
 msgstr "باستخدام محرر خارجي"
 
-msgid "Open &Parent Folder..."
-msgstr "المجلد الأساسي..."
-
 msgid "Open Midd&le"
 msgstr "ف&تح الجزء الأوسط"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 66a6586..0bd6ca8 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -107,6 +107,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Honekin..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -999,9 +1002,6 @@ msgstr "&Ireki Ezkerrekoa"
 msgid "with &External Editor"
 msgstr "&Kanpoko Editorearekin"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 6d68c8b..5ef24a8 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -106,6 +106,9 @@ msgstr "Com o &Editor Externo\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Com..."
 
+msgid "Open &Parent Folder..."
+msgstr "Abrir Pasta &Parente..."
+
 msgid "S&hell Menu"
 msgstr "Menu de Conte&xto"
 
@@ -997,9 +1000,6 @@ msgstr "&Abrir a Esquerda"
 msgid "with &External Editor"
 msgstr "com &o Editor Externo"
 
-msgid "Open &Parent Folder..."
-msgstr "Abrir Pasta &Parente..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Abrir o do Me&io"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index c9b8aab..501122c 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -89,6 +89,9 @@ msgstr "С &външен редактор\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&С…"
 
+msgid "Open &Parent Folder..."
+msgstr "&Родителска папка…"
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -790,9 +793,6 @@ msgstr "&Отвори в ляво"
 msgid "with &External Editor"
 msgstr "с &Външен Редактор"
 
-msgid "Open &Parent Folder..."
-msgstr "&Родителска папка…"
-
 msgid "Open Midd&le"
 msgstr "Отвори сре&ден"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index cdcf667..9d8e1ec 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -103,6 +103,9 @@ msgstr "Amb l'&editor extern\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "A&mb..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -996,9 +999,6 @@ msgstr "Obre l'&esquerra"
 msgid "with &External Editor"
 msgstr "amb l'&editor extern"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 390948c..af8dd41 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -95,6 +95,9 @@ msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "选择程序(&W)..."
 
+msgid "Open &Parent Folder..."
+msgstr "打开上层文件夹(&P)..."
+
 msgid "S&hell Menu"
 msgstr "外壳菜单(&S)"
 
@@ -796,9 +799,6 @@ msgstr "打开左侧(&O)"
 msgid "with &External Editor"
 msgstr "用外部编辑器(&E)"
 
-msgid "Open &Parent Folder..."
-msgstr "打开上层文件夹(&P)..."
-
 msgid "Open Midd&le"
 msgstr "打开中间(&L)"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index a07d838..d34b881 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -106,6 +106,9 @@ msgstr "用外部編輯器(&E) \tCtrl+Alt+E"
 msgid "&With..."
 msgstr "用(&W)..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -1005,9 +1008,6 @@ msgstr "開啟左邊(&O)"
 msgid "with &External Editor"
 msgstr "用外在編輯器(&E)"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "開啟中間(&L)"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 94fc23c..4c2158f 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -104,6 +104,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&S..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -997,9 +1000,6 @@ msgstr "&Otvori lijevi"
 msgid "with &External Editor"
 msgstr "&vanjskim uređivačem"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 12f3fee..2bb8040 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -104,6 +104,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Zvolit..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -997,9 +1000,6 @@ msgstr "Otevřít &levé"
 msgid "with &External Editor"
 msgstr "externím &editorem"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 7318e23..e41f981 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -105,6 +105,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Med..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -998,9 +1001,6 @@ msgstr "&Åben venstre"
 msgid "with &External Editor"
 msgstr "med en &ekstern editor"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index dcc1517..4221fa0 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -93,6 +93,9 @@ msgstr "Met externe editor\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "Met..."
 
+msgid "Open &Parent Folder..."
+msgstr "Bovenliggende map openen..."
+
 msgid "S&hell Menu"
 msgstr "Shellmenu"
 
@@ -794,9 +797,6 @@ msgstr "Links openen"
 msgid "with &External Editor"
 msgstr "met externe editor"
 
-msgid "Open &Parent Folder..."
-msgstr "Bovenliggende map openen..."
-
 msgid "Open Midd&le"
 msgstr "Midden openen"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 063038f..f2c9005 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: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-04-18 15:21+0000\n"
+"POT-Creation-Date: 2021-04-20 21:03+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -86,6 +86,9 @@ msgstr ""
 msgid "&With..."
 msgstr ""
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -787,9 +790,6 @@ msgstr ""
 msgid "with &External Editor"
 msgstr ""
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 msgid "Open Midd&le"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index fe294cf..bbb1fb1 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -102,6 +102,9 @@ msgstr "Ulkois&ella editorilla\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Ohjelmalla..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr "&Liittymävalikko"
 
@@ -997,9 +1000,6 @@ msgstr "Avaa vasen"
 msgid "with &External Editor"
 msgstr "ulkoisella &editorilla"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Avaa ke&skimmäinen"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index e5012c7..174ba9f 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -111,6 +111,9 @@ msgstr "Avec un éditeur &externe\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Avec..."
 
+msgid "Open &Parent Folder..."
+msgstr "Ouvrir dossier& parent..."
+
 msgid "S&hell Menu"
 msgstr "Menu S&hell"
 
@@ -1004,9 +1007,6 @@ msgstr "Ouvrir à &Gauche"
 msgid "with &External Editor"
 msgstr "avec l'éditeur &externe"
 
-msgid "Open &Parent Folder..."
-msgstr "Ouvrir dossier& parent..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Ouvrir Mi&lieu"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index acba7b7..3af8dd5 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -105,6 +105,9 @@ msgstr "Co &Editor Externo\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Con…"
 
+msgid "Open &Parent Folder..."
+msgstr "Abrir Cartafol &Pai…"
+
 msgid "S&hell Menu"
 msgstr "Menú conte&xtual"
 
@@ -998,9 +1001,6 @@ msgstr "&Abrir arquivo esquerdo"
 msgid "with &External Editor"
 msgstr "cun &editor externo"
 
-msgid "Open &Parent Folder..."
-msgstr "Abrir Cartafol &Pai…"
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Abrir arquivo &central"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 53d00c7..113ae7d 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -104,6 +104,9 @@ msgstr "Mit &externem Editor\tStrg+Alt+E"
 msgid "&With..."
 msgstr "&Mit..."
 
+msgid "Open &Parent Folder..."
+msgstr "&Elternordner öffnen..."
+
 msgid "S&hell Menu"
 msgstr "S&hell-Menü"
 
@@ -997,9 +1000,6 @@ msgstr "Links ö&ffnen"
 msgid "with &External Editor"
 msgstr "Mit &externem Editor\tStrg+Alt+E"
 
-msgid "Open &Parent Folder..."
-msgstr "&Elternordner öffnen..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "&Mitte öffnen"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 2954585..887d85e 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -103,6 +103,9 @@ msgstr ""
 msgid "&With..."
 msgstr "Με..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -996,9 +999,6 @@ msgstr "Άνοιγμα Α&ριστερού"
 msgid "with &External Editor"
 msgstr "μ&ε άλλη Εφαρμογή"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 26b46a2..b104319 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -106,6 +106,9 @@ msgstr "Külső szerkesztővel\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Egyéb programmal..."
 
+msgid "Open &Parent Folder..."
+msgstr "Szölőkönyvtár megnyitása..."
+
 msgid "S&hell Menu"
 msgstr "Intéző menü"
 
@@ -999,9 +1002,6 @@ msgstr "Bal megnyitása"
 msgid "with &External Editor"
 msgstr "&Külső szerkesztővel"
 
-msgid "Open &Parent Folder..."
-msgstr "Szölőkönyvtár megnyitása..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Középső megnyitása"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 2e14765..0a016cd 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -92,6 +92,9 @@ msgstr "Con l'&editor esterno\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Con..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr "Men&u shell"
 
@@ -793,9 +796,6 @@ msgstr "Apri &file a sinistra"
 msgid "with &External Editor"
 msgstr "con l'editor &esterno"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 msgid "Open Midd&le"
 msgstr "Apri file &centrale"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 1757e6c..8ce72ae 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -93,6 +93,9 @@ msgstr "外部エディターで(&E)\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "プログラムの選択(&W)..."
 
+msgid "Open &Parent Folder..."
+msgstr "親フォルダーを開く(&P)..."
+
 msgid "S&hell Menu"
 msgstr "シェルメニュー(&H)"
 
@@ -794,9 +797,6 @@ msgstr "左側を開く(&O)"
 msgid "with &External Editor"
 msgstr "外部エディターで(&E)"
 
-msgid "Open &Parent Folder..."
-msgstr "親フォルダーを開く(&P)..."
-
 msgid "Open Midd&le"
 msgstr "中央を開く(&L)"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 62d3b0d..e20bdb8 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -109,6 +109,9 @@ msgstr "외부 편집기로(&E)\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "프로그램 선택(&W)..."
 
+msgid "Open &Parent Folder..."
+msgstr "상위 폴더 열기(&P)"
+
 msgid "S&hell Menu"
 msgstr "쉘 메뉴(&S)"
 
@@ -1002,9 +1005,6 @@ msgstr "왼쪽 열기(&O)"
 msgid "with &External Editor"
 msgstr "외부 편집기로(&E)"
 
-msgid "Open &Parent Folder..."
-msgstr "상위 폴더 열기(&P)"
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "가운데 열기(&L)"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 1cff3c3..ec1c472 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -95,6 +95,9 @@ msgstr "Su Išoriniu r&edaktoriumi\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Su..."
 
+msgid "Open &Parent Folder..."
+msgstr "Atverti &tėvinį katalogą..."
+
 msgid "S&hell Menu"
 msgstr "&Sistemos meniu"
 
@@ -796,9 +799,6 @@ msgstr "&Atverti kairįjį"
 msgid "with &External Editor"
 msgstr "su išoriniu r&edaktoriumi"
 
-msgid "Open &Parent Folder..."
-msgstr "Atverti &tėvinį katalogą..."
-
 msgid "Open Midd&le"
 msgstr "Atverti &vidurinį"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index b0ffadc..bb27cb0 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -104,6 +104,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Med..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -997,9 +1000,6 @@ msgstr "&Åpne venstre"
 msgid "with &External Editor"
 msgstr "med &eksternt redigeringsprogram"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 3d0bb52..59a0c64 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -105,6 +105,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&w با ..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -998,9 +1001,6 @@ msgstr "&O بازکردن سمت چپي "
 msgid "with &External Editor"
 msgstr "&E با ويرايشگر بيروني "
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 4dcc52c..8efd8b0 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -92,6 +92,9 @@ msgstr "W zewnętrznym edytorze\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "Z..."
 
+msgid "Open &Parent Folder..."
+msgstr "Otwórz nadrzędny katalog"
+
 msgid "S&hell Menu"
 msgstr "Menu powłoki"
 
@@ -793,9 +796,6 @@ msgstr "&Otwórz lewą"
 msgid "with &External Editor"
 msgstr "w zewnętrznym &edytorze"
 
-msgid "Open &Parent Folder..."
-msgstr "Otwórz nadrzędny katalog"
-
 msgid "Open Midd&le"
 msgstr "Otwórz środkową"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index a0a7b17..d39a7cc 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -95,6 +95,9 @@ msgstr "Com editor externo\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "Com..."
 
+msgid "Open &Parent Folder..."
+msgstr "Abrir &Pasta principal..."
+
 msgid "S&hell Menu"
 msgstr "Menu da S&hell"
 
@@ -796,9 +799,6 @@ msgstr "Abrir Esquerda"
 msgid "with &External Editor"
 msgstr "com Editor &Externo"
 
-msgid "Open &Parent Folder..."
-msgstr "Abrir &Pasta principal..."
-
 msgid "Open Midd&le"
 msgstr "Abrir Meio"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index bad6d33..18fd786 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -104,6 +104,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Cu..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -997,9 +1000,6 @@ msgstr "Deschide stâ&nga"
 msgid "with &External Editor"
 msgstr "cu editor &extern"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 32cd7ef..c89c8fd 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -94,6 +94,9 @@ msgstr "Внешним редактором\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "С помощью..."
 
+msgid "Open &Parent Folder..."
+msgstr "Открыть &родительскую папку..."
+
 msgid "S&hell Menu"
 msgstr "Меню оболочки"
 
@@ -795,9 +798,6 @@ msgstr "Открыть левый"
 msgid "with &External Editor"
 msgstr "внешним редактором"
 
-msgid "Open &Parent Folder..."
-msgstr "Открыть &родительскую папку..."
-
 msgid "Open Midd&le"
 msgstr "Открыть средний"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index e8a2fd6..c23f40e 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -103,6 +103,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&Са"
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -994,9 +997,6 @@ msgstr "&Отвори леву"
 msgid "with &External Editor"
 msgstr "са др&угим уређивачем"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index fbbb3c3..457dd17 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -101,6 +101,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&සමග"
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -994,9 +997,6 @@ msgstr "වම් පස විවෘත කරන්න"
 msgid "with &External Editor"
 msgstr "බාහිර සම්බන්ධකය සමග"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 0d98dbd..87865e9 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -95,6 +95,9 @@ msgstr "&externým editorom\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "čí&m..."
 
+msgid "Open &Parent Folder..."
+msgstr "Otvoriť &nadradený priečinok..."
+
 msgid "S&hell Menu"
 msgstr "&Vzhľad ponuky"
 
@@ -796,9 +799,6 @@ msgstr "&Otvoriť ľavý"
 msgid "with &External Editor"
 msgstr "&externým editorom"
 
-msgid "Open &Parent Folder..."
-msgstr "Otvoriť &nadradený priečinok..."
-
 msgid "Open Midd&le"
 msgstr "Otvoriť &stredný"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 685a597..ba932ea 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -105,6 +105,9 @@ msgstr "Z zu&nanjim urejevalnikom\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Z..."
 
+msgid "Open &Parent Folder..."
+msgstr "Nad&rejena mapa..."
+
 msgid "S&hell Menu"
 msgstr "Meni &lupine"
 
@@ -997,9 +1000,6 @@ msgstr "&Odpri levo"
 msgid "with &External Editor"
 msgstr "z &zunanjim urejevalnikom"
 
-msgid "Open &Parent Folder..."
-msgstr "Nad&rejena mapa..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Odpri s&rednjo"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index f764a92..f20f167 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -96,6 +96,9 @@ msgstr "Con &Editor Externo\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Con..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -797,9 +800,6 @@ msgstr "Abrir archivo &Izquierdo"
 msgid "with &External Editor"
 msgstr "con un Editor &Externo"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 msgid "Open Midd&le"
 msgstr "Abrir archivo &Medio"
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index b0ec9fc..895ebdf 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -106,6 +106,9 @@ msgstr "Med Extern Redigerare\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "Med ..."
 
+msgid "Open &Parent Folder..."
+msgstr "Öppna Föräldermapp ..."
+
 msgid "S&hell Menu"
 msgstr "GränssnittsMeny"
 
@@ -999,9 +1002,6 @@ msgstr "Öppna Vänster"
 msgid "with &External Editor"
 msgstr "med Extern Redigerare"
 
-msgid "Open &Parent Folder..."
-msgstr "Öppna Föräldermapp ..."
-
 #, c-format
 msgid "Open Midd&le"
 msgstr "Öppna Mitter"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index e6531bc..f639437 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -92,6 +92,9 @@ msgstr "Dış düz&enleyici ile\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "&Birlikte aç..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr "&Sağ Tık Menüsü"
 
@@ -793,9 +796,6 @@ msgstr "S&ola Aç"
 msgid "with &External Editor"
 msgstr "Dış Düz&enleyici ile"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 msgid "Open Midd&le"
 msgstr "O&rtaya Aç"
 

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 0dd3144..f1d41d0 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -105,6 +105,9 @@ msgstr ""
 msgid "&With..."
 msgstr "&За допомогою..."
 
+msgid "Open &Parent Folder..."
+msgstr ""
+
 msgid "S&hell Menu"
 msgstr ""
 
@@ -998,9 +1001,6 @@ msgstr "&Відкрити лівий файл"
 msgid "with &External Editor"
 msgstr "зо&внішнім редактором"
 
-msgid "Open &Parent Folder..."
-msgstr ""
-
 #, c-format
 msgid "Open Midd&le"
 msgstr ""