Folder Compare: Add 'Parent Folder' menu item in 'Open Left/Middle/Right' menu

diff --git a/Src/DirActions.h b/Src/DirActions.h
index 297d691..b4af2a5 100644 (file)
--- a/Src/DirActions.h
+++ b/Src/DirActions.h
@@ -296,6 +296,12 @@ struct DirActions
                return (di.diffcode.diffcode != 0 && ::IsItemOpenableOnWith(di, SideToIndex(m_ctxt, src)));
        }
 
+       template <SIDE_TYPE src>
+       bool IsParentFolderOpenable(const DIFFITEM& di) const
+       {
+               return (di.diffcode.diffcode != 0 && di.diffcode.exists(SideToIndex(m_ctxt, src)));
+       }
+
        bool IsItemFile(const DIFFITEM& di) const
        {
                return (di.diffcode.diffcode != 0 && !di.diffcode.isDirectory());

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 6355cf9..b5ddc14 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -166,14 +166,20 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT, OnUpdateCtxtDirOpen<SIDE_LEFT>)
        ON_COMMAND(ID_DIR_OPEN_LEFT_WITH, OnCtxtDirOpenWith<SIDE_LEFT>)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_WITH, OnUpdateCtxtDirOpenWith<SIDE_LEFT>)
+       ON_COMMAND(ID_DIR_OPEN_LEFT_PARENT_FOLDER, OnCtxtDirOpenParentFolder<SIDE_LEFT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_LEFT_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder<SIDE_LEFT>)
        ON_COMMAND(ID_DIR_OPEN_MIDDLE, OnCtxtDirOpen<SIDE_MIDDLE>)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE, OnUpdateCtxtDirOpen<SIDE_MIDDLE>)
        ON_COMMAND(ID_DIR_OPEN_MIDDLE_WITH, OnCtxtDirOpenWith<SIDE_MIDDLE>)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_WITH, OnUpdateCtxtDirOpenWith<SIDE_MIDDLE>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_MIDDLE_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder<SIDE_MIDDLE>)
+       ON_COMMAND(ID_DIR_OPEN_MIDDLE_PARENT_FOLDER, OnCtxtDirOpenParentFolder<SIDE_MIDDLE>)
        ON_COMMAND(ID_DIR_OPEN_RIGHT, OnCtxtDirOpen<SIDE_RIGHT>)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT, OnUpdateCtxtDirOpen<SIDE_RIGHT>)
        ON_COMMAND(ID_DIR_OPEN_RIGHT_WITH, OnCtxtDirOpenWith<SIDE_RIGHT>)
        ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_WITH, OnUpdateCtxtDirOpenWith<SIDE_RIGHT>)
+       ON_COMMAND(ID_DIR_OPEN_RIGHT_PARENT_FOLDER, OnCtxtDirOpenParentFolder<SIDE_RIGHT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_OPEN_RIGHT_PARENT_FOLDER, OnUpdateCtxtDirOpenParentFolder<SIDE_RIGHT>)
        ON_COMMAND(ID_POPUP_OPEN_WITH_UNPACKER, OnCtxtOpenWithUnpacker)
        ON_UPDATE_COMMAND_UI(ID_POPUP_OPEN_WITH_UNPACKER, OnUpdateCtxtOpenWithUnpacker)
        ON_COMMAND(ID_DIR_OPEN_LEFT_WITHEDITOR, OnCtxtDirOpenWithEditor<SIDE_LEFT>)
@@ -1654,6 +1660,16 @@ void CDirView::DoOpenWithEditor(SIDE_TYPE stype)
        theApp.OpenFileToExternalEditor(file);
 }
 
+void CDirView::DoOpenParentFolder(SIDE_TYPE stype)
+{
+       int sel = GetSingleSelectedItem();
+       if (sel == -1) return;
+       String file = GetSelectedFileName(SelBegin(), stype, GetDiffContext());
+       if (file.empty()) return;
+       String parentFolder = paths::GetParentPath(file);
+       ShellExecute(::GetDesktopWindow(), _T("open"), parentFolder.c_str(), 0, 0, SW_SHOWNORMAL);
+}
+
 /// User chose (context menu) open left
 template<SIDE_TYPE stype>
 void CDirView::OnCtxtDirOpen()
@@ -1675,6 +1691,13 @@ void CDirView::OnCtxtDirOpenWithEditor()
        DoOpenWithEditor(stype);
 }
 
+/// User chose (context menu) open left parent folder
+template<SIDE_TYPE stype>
+void CDirView::OnCtxtDirOpenParentFolder()
+{
+       DoOpenParentFolder(stype);
+}
+
 /// Update context menuitem "Open left | with editor"
 template<SIDE_TYPE stype>
 void CDirView::OnUpdateCtxtDirOpenWithEditor(CCmdUI* pCmdUI)
@@ -1709,6 +1732,14 @@ void CDirView::OnUpdateCtxtDirOpenWith(CCmdUI* pCmdUI)
        pCmdUI->Enable(counts.count > 0 && counts.total == 1);
 }
 
+// Enable/disable Open Parent Folder menu choice on context menu
+template<SIDE_TYPE stype>
+void CDirView::OnUpdateCtxtDirOpenParentFolder(CCmdUI* pCmdUI)
+{
+       Counts counts = Count(&DirActions::IsParentFolderOpenable<stype>);
+       pCmdUI->Enable(counts.count > 0 && counts.total == 1);
+}
+
 // Used for Open
 void CDirView::DoUpdateOpen(SELECTIONTYPE selectionType, CCmdUI* pCmdUI)
 {

diff --git a/Src/DirView.h b/Src/DirView.h
index de67def..a6069d4 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -140,6 +140,7 @@ private:
        void DoOpen(SIDE_TYPE stype);
        void DoOpenWith(SIDE_TYPE stype);
        void DoOpenWithEditor(SIDE_TYPE stype);
+       void DoOpenParentFolder(SIDE_TYPE stype);
        void DoUpdateOpen(SELECTIONTYPE selectionType, CCmdUI* pCmdUI);
        void ConfirmAndPerformActions(FileActionScript & actions);
        void PerformActionList(FileActionScript & actions);
@@ -260,6 +261,10 @@ protected:
        template<SIDE_TYPE stype>
        afx_msg void OnUpdateCtxtDirOpenWithEditor(CCmdUI* pCmdUI);
        template<SIDE_TYPE stype>
+       afx_msg void OnCtxtDirOpenParentFolder();
+       template<SIDE_TYPE stype>
+       afx_msg void OnUpdateCtxtDirOpenParentFolder(CCmdUI* pCmdUI);
+       template<SIDE_TYPE stype>
        afx_msg void OnCtxtDirCopyTo();
        template<SIDE_TYPE stype>
        afx_msg void OnUpdateCtxtDirCopyTo(CCmdUI* pCmdUI);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index c81b745..dfa959c 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -653,18 +653,21 @@ BEGIN
             MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT\r
             MENUITEM "with &External Editor",       ID_DIR_OPEN_LEFT_WITHEDITOR\r
             MENUITEM "&with...",                    ID_DIR_OPEN_LEFT_WITH\r
+            MENUITEM "&Parent Folder",              ID_DIR_OPEN_LEFT_PARENT_FOLDER\r
         END\r
         POPUP "Open Midd&le"\r
         BEGIN\r
             MENUITEM "with &Registered Application", ID_DIR_OPEN_MIDDLE\r
             MENUITEM "with &External Editor",       ID_DIR_OPEN_MIDDLE_WITHEDITOR\r
             MENUITEM "&with...",                    ID_DIR_OPEN_MIDDLE_WITH\r
+            MENUITEM "&Parent Folder",              ID_DIR_OPEN_MIDDLE_PARENT_FOLDER\r
         END\r
         POPUP "O&pen Right"\r
         BEGIN\r
             MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT\r
             MENUITEM "with &External Editor",       ID_DIR_OPEN_RIGHT_WITHEDITOR\r
             MENUITEM "&with...",                    ID_DIR_OPEN_RIGHT_WITH\r
+            MENUITEM "&Parent Folder",              ID_DIR_OPEN_RIGHT_PARENT_FOLDER\r
         END\r
         MENUITEM SEPARATOR\r
         POPUP "Cop&y Pathnames"\r

diff --git a/Src/resource.h b/Src/resource.h
index c13ad50..37de78b 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -731,19 +731,22 @@
 #define ID_DIR_OPEN_LEFT                17701\r
 #define ID_DIR_OPEN_LEFT_WITHEDITOR     17702\r
 #define ID_DIR_OPEN_LEFT_WITH           17703\r
-#define ID_DIR_OPEN_MIDDLE              17704\r
-#define ID_DIR_OPEN_MIDDLE_WITHEDITOR   17705\r
-#define ID_DIR_OPEN_MIDDLE_WITH         17706\r
-#define ID_DIR_OPEN_RIGHT               17707\r
-#define ID_DIR_OPEN_RIGHT_WITHEDITOR    17708\r
-#define ID_DIR_OPEN_RIGHT_WITH          17709\r
-#define ID_DIR_COPY_FILENAMES           17710\r
-#define ID_DIR_COPY_PATHNAMES_LEFT      17711\r
-#define ID_DIR_COPY_PATHNAMES_MIDDLE    17712\r
-#define ID_DIR_COPY_PATHNAMES_RIGHT     17713\r
-#define ID_DIR_COPY_PATHNAMES_BOTH      17714\r
-#define ID_DIR_COPY_PATHNAMES_ALL       17715\r
-#define IDS_ERROR_EXECUTE_FILE          17716\r
+#define ID_DIR_OPEN_LEFT_PARENT_FOLDER  17704\r
+#define ID_DIR_OPEN_MIDDLE              17705\r
+#define ID_DIR_OPEN_MIDDLE_WITHEDITOR   17706\r
+#define ID_DIR_OPEN_MIDDLE_WITH         17707\r
+#define ID_DIR_OPEN_MIDDLE_PARENT_FOLDER 17708\r
+#define ID_DIR_OPEN_RIGHT               17709\r
+#define ID_DIR_OPEN_RIGHT_WITHEDITOR    17710\r
+#define ID_DIR_OPEN_RIGHT_WITH          17711\r
+#define ID_DIR_OPEN_RIGHT_PARENT_FOLDER 17712\r
+#define ID_DIR_COPY_FILENAMES           17713\r
+#define ID_DIR_COPY_PATHNAMES_LEFT      17714\r
+#define ID_DIR_COPY_PATHNAMES_MIDDLE    17715\r
+#define ID_DIR_COPY_PATHNAMES_RIGHT     17716\r
+#define ID_DIR_COPY_PATHNAMES_BOTH      17717\r
+#define ID_DIR_COPY_PATHNAMES_ALL       17718\r
+#define IDS_ERROR_EXECUTE_FILE          17719\r
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      17731\r
 #define IDS_COLHDR_FILENAME             17751\r
 #define IDS_COLHDR_DIR                  17752\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index f90edfd..ccb73c6 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1124,6 +1124,11 @@ msgstr "&Ezkutatu Gaiak"
 msgid "&Open Left"
 msgstr "&Ireki Ezkerrekoa"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1974,7 +1979,7 @@ msgstr "&Zurigunea"
 msgid "&Compare"
 msgstr "Al&deratu"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ezikusi aldaketa"
@@ -2443,7 +2448,7 @@ msgstr "(Eraginak)"
 msgid "Select Codepage for"
 msgstr "Hautatu Kode-orrialdea"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Agiria Gertatzen:"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 1e77e91..649c223 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1123,6 +1123,11 @@ msgstr "&Esconder os Itens"
 msgid "&Open Left"
 msgstr "&Abrir a Esquerda"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1973,7 +1978,7 @@ msgstr "Espa
 msgid "&Compare"
 msgstr "&Comparar"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorar a mudança"
@@ -2442,7 +2447,7 @@ msgstr "(Afeta)"
 msgid "Select Codepage for"
 msgstr "Selecionar o Código da Página para"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Carregamento do Arquivo:"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 4f3c967..64ea354 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1121,6 +1121,11 @@ msgstr "&
 msgid "&Open Left"
 msgstr "&Îòâîðè â ëÿâî"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "
 msgid "&Compare"
 msgstr "&Ñðàâíÿâàíå"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Èãíîðèðàé ïðîìåíèòå"
@@ -2436,7 +2441,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "Èçáåðåòå êîäèðîâêà çà"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Çàðåæäàíå íà ôàéë:"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 495dc52..f499328 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1120,6 +1120,11 @@ msgstr "&Amaga els elements"
 msgid "&Open Left"
 msgstr "Obre l'&esquerra"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1970,7 +1975,7 @@ msgstr "Espais en blanc"
 msgid "&Compare"
 msgstr "Compara els &espais"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignora els &canvis en els espais"
@@ -2435,7 +2440,7 @@ msgstr "(Afecta)"
 msgid "Select Codepage for"
 msgstr "Selecciona pàgina de codis per a"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Càrrega de fitxers:"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index e90ed7e..50a13c0 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1121,6 +1121,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "´ò¿ª×ó²à(&O)"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "
 msgid "&Compare"
 msgstr "¶Ô±È¿Õ°×ºÍÖƱí·û(&C)"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "ºöÂԿհ׺ÍÖƱí·û¸ü¸Ä(&I)"
@@ -2436,7 +2441,7 @@ msgstr "(Ӱ
 msgid "Select Codepage for"
 msgstr "Ñ¡ÔñҪʹÓõĴúÂëÒ³"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "´ò¿ªÎļþ(&F):"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 4a7fa4f..e723f1b 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1128,6 +1128,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "¶}±Ò¥ªÃä(&O)"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1980,7 +1985,7 @@ msgstr "
 msgid "&Compare"
 msgstr "¤ñ¹ïªÅ¥Õ³B(&W)"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "©¿²¤ªÅ¥Õ¼Æ¶q¤§Åܰʦӳy¦¨ªº®t²§(&H)"
@@ -2450,7 +2455,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "¿ï©w½s½X­¶µ¹"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "­n¸ü¤JªºÀÉ®×(&F)¡G"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 2d2a638..786c55f 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1121,6 +1121,11 @@ msgstr "&Sakrij stavke"
 msgid "&Open Left"
 msgstr "&Otvori lijevi"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Skriveni znaci i razmaci"
 msgid "&Compare"
 msgstr "&Usporedi"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Zanemari &izmjene"
@@ -2440,7 +2445,7 @@ msgstr "(Primjeni na)"
 msgid "Select Codepage for"
 msgstr "Odabir kodne stranice za"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Uèitavanje datoteke:"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 6e77fba..db7c785 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1121,6 +1121,11 @@ msgstr "&Skr
 msgid "&Open Left"
 msgstr "Otevøít &levé"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1973,7 +1978,7 @@ msgstr "Pr
 msgid "&Compare"
 msgstr "P&orovnávat"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignorovat &zmìny"
@@ -2438,7 +2443,7 @@ msgstr "(ovlivn
 msgid "Select Codepage for"
 msgstr "Zvolte kódování pro"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Naètení souboru:"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index f736b97..4d5b2e4 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1122,6 +1122,11 @@ msgstr "&Skjul emner"
 msgid "&Open Left"
 msgstr "&Åben venstre"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1976,7 +1981,7 @@ msgstr "Mellemrum"
 msgid "&Compare"
 msgstr "&Sammenlign"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorer ændringer"
@@ -2447,7 +2452,7 @@ msgstr "(P
 msgid "Select Codepage for"
 msgstr "Vælg codepage til"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Fil Indlæsning:"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 991f194..6e35ead 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1123,6 +1123,11 @@ msgstr "Items verbergen"
 msgid "&Open Left"
 msgstr "Links &openen"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1977,7 +1982,7 @@ msgstr "Witruimte"
 msgid "&Compare"
 msgstr "&Vergelijken"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Wijzigingen negeren"
@@ -2448,7 +2453,7 @@ msgstr "(Aanpassingen)"
 msgid "Select Codepage for"
 msgstr "Selecteer codetabel voor"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Bestanden laden:"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index a26d5d6..4e7ea19 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2017-02-26 23:50+0000\n"
+"POT-Creation-Date: 2017-03-05 12:02+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1117,6 +1117,11 @@ msgstr ""
 msgid "&Open Left"
 msgstr ""
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1967,7 +1972,7 @@ msgstr ""
 msgid "&Compare"
 msgstr ""
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr ""
@@ -2432,7 +2437,7 @@ msgstr ""
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr ""

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index f467862..9d723db 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1125,6 +1125,11 @@ msgstr "D&issimuler l'
 msgid "&Open Left"
 msgstr "Ouvrir à &gauche"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1975,7 +1980,7 @@ msgstr "Caract
 msgid "&Compare"
 msgstr "C&omparer"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignorer les chan&gements"
@@ -2444,7 +2449,7 @@ msgstr "(Concern
 msgid "Select Codepage for"
 msgstr "Sélectionner le code de page pour"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Chargement de fichier:"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 7cbace3..603d8a4 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1121,6 +1121,11 @@ msgstr "&Agochar elementos"
 msgid "&Open Left"
 msgstr "&Abrir arquivo esquerdo"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Espazo en branco"
 msgid "&Compare"
 msgstr "&Comparar"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorar trocos"
@@ -2441,7 +2446,7 @@ msgstr "(Afecta)"
 msgid "Select Codepage for"
 msgstr "Selecciona a páxina de códigos para"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Cargar o arquivo:"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 7093e45..3871dd9 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1124,6 +1124,11 @@ msgstr "Objekte v&erstecken"
 msgid "&Open Left"
 msgstr "Ö&ffne links"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1976,7 +1981,7 @@ msgstr "Leerzeichen"
 msgid "&Compare"
 msgstr "&Vergleichen"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Änderung &ignorieren"
@@ -2445,7 +2450,7 @@ msgstr "(Betrifft)"
 msgid "Select Codepage for"
 msgstr "Zeichensatz auswählen für"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Datei laden:"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 63df071..d7e224c 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1120,6 +1120,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "¢íïéãìá Á&ñéóôåñïý"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1970,7 +1975,7 @@ msgstr "
 msgid "&Compare"
 msgstr "&Óýãêñéóç"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ç ìåôáâïëÞ íá á&ãíïåßôáé"
@@ -2435,7 +2440,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "ÅðéëïãÞ Êùäéêïóåëßäáò ãéá"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "ÁíÜ&ãíùóç Áñ÷åßïõ:"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 8397249..f404592 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1121,6 +1121,11 @@ msgstr "Elemek &rejt
 msgid "&Open Left"
 msgstr "&Bal oldal megnyitása"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Sz
 msgid "&Compare"
 msgstr "&Összehasonlítás"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Változtatások kihagyása"
@@ -2436,7 +2441,7 @@ msgstr ""
 msgid "Select Codepage for"
 msgstr "Kódlap kiválasztása"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Fájl töltése:"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 0c78e82..171df43 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1121,6 +1121,11 @@ msgstr "&Nascondi elementi"
 msgid "&Open Left"
 msgstr "Apri &file di sinistra"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Spazi bianchi"
 msgid "&Compare"
 msgstr "&Confronta"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignora cambiamenti"
@@ -2436,7 +2441,7 @@ msgstr "(Coinvolge)"
 msgid "Select Codepage for"
 msgstr "Scegli codice di pagina per"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Caricamento &file:"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 59faf44..7f8fa17 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1122,6 +1122,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "\8d¶\82ð\8aJ\82­(&O)"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr "\90e\83t\83H\83\8b\83_(&P)"
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1980,7 +1985,7 @@ msgstr "
 msgid "&Compare"
 msgstr "\94ä\8ar\82·\82é(&C)"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "\95Ï\8dX\82ð\96³\8e\8b\82·\82é(&I)"
@@ -2455,7 +2460,7 @@ msgstr "(Affects)"
 msgid "Select Codepage for"
 msgstr "\83R\81[\83h\83y\81[\83W\82Ì\91I\91ð"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "\83t\83@\83C\83\8b\93Ç\8d\9e\82Ý(&F):"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 1561605..759b21c 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1122,6 +1122,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "¿ÞÂÊ ÆÄÀÏ ¿­±â(&O)"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1972,7 +1977,7 @@ msgstr "
 msgid "&Compare"
 msgstr "°ø¹é ºñ±³(&W)"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "º¯°æ ³»¿ë ¹«½Ã(&H)"
@@ -2437,7 +2442,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "ÄÚµåÆäÀÌÁö ¼±ÅÃ:"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "¿­ ¶§ÀÇ ÄÚµåÆäÀÌÁö(&F):"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 4cf8aab..b510279 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1121,6 +1121,11 @@ msgstr "&Skjul objekter"
 msgid "&Open Left"
 msgstr "&Åpne venstre"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Blanktegn"
 msgid "&Compare"
 msgstr "S&ammenlign"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignorer e&ndringer"
@@ -2440,7 +2445,7 @@ msgstr "(P
 msgid "Select Codepage for"
 msgstr "Velg tegnsett til"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Fil-lasting:"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index bd00d98..a9b894b 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1120,6 +1120,11 @@ msgstr "&H 
 msgid "&Open Left"
 msgstr "&O ÈÇÒ\98ÑÏä ÓãÊ \8d\81í "
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1970,7 +1975,7 @@ msgstr " 
 msgid "&Compare"
 msgstr "&C åãÓäÌí / ãÞÇíÓå \98ÑÏä "
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&I \8dÔã \81æÔí ÇÒ ÊÛííÑ "
@@ -2439,7 +2444,7 @@ msgstr " - 
 msgid "Select Codepage for"
 msgstr " ÇäÊÎÇÈ ÕÝÍå \98Ï ÈÑÇí "
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&F ÈÇÑ\90ÐÇÑí \81ÑæäÏå : "

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 5cec1d7..2377fab 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1122,6 +1122,11 @@ msgstr "U&kryj elementy"
 msgid "&Open Left"
 msgstr "O&twórz lew¹"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1972,7 +1977,7 @@ msgstr "Bia
 msgid "&Compare"
 msgstr "&Porównaj"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignoruj &zmiany"
@@ -2441,7 +2446,7 @@ msgstr "(dzia
 msgid "Select Codepage for"
 msgstr "Wybierz stronê kodow¹ dla"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&£adowanie pliku:"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 960de08..007c5dd 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1121,6 +1121,11 @@ msgstr "Ocultar itens"
 msgid "&Open Left"
 msgstr "Abrir Esquerda"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Espa
 msgid "&Compare"
 msgstr "Comparar"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignorar alteração"
@@ -2436,7 +2441,7 @@ msgstr "(Afecta)"
 msgid "Select Codepage for"
 msgstr "Seleccionar página de código para"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Carregar &Ficheiro:"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index d941018..85bbf99 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1121,6 +1121,11 @@ msgstr "Ascunde e&lementele"
 msgid "&Open Left"
 msgstr "Deschide stâ&nga"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Blanc"
 msgid "&Compare"
 msgstr "&Comparã"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorã schimbare"
@@ -2436,7 +2441,7 @@ msgstr "(Afecteaz
 msgid "Select Codepage for"
 msgstr "Selecteazã codare caractere pentru"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Încãrcare &fiºier:"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 25a2c4d..87691d6 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1123,6 +1123,11 @@ msgstr "&
 msgid "&Open Left"
 msgstr "Îòêðûòü ëåâûé ôàéë"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1973,7 +1978,7 @@ msgstr "
 msgid "&Compare"
 msgstr "Ó÷èòûâàòü &íåâèäèìûå"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Èãíîðèðîâàòü èçìåíåííûå íåâèäèìûå"
@@ -2442,7 +2447,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "Âûáðàòü êîäîâóþ ñòðàíèöó äëÿ"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Çàãðóçêà ôàéëà:"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index f3176b1..04c0694 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1120,6 +1120,11 @@ msgstr "&
 msgid "&Open Left"
 msgstr "&Îòâîðè ëåâó"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1970,7 +1975,7 @@ msgstr "
 msgid "&Compare"
 msgstr "&Óïîðåäè"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Çàíåìàð&è ïðîìåíå"
@@ -2439,7 +2444,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "Îäàáåðè êîäíó ñòðàíó çà"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Ó&÷èòàâà\9cå äàòîòåêå:"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 85e4403..c0c35a0 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1121,6 +1121,11 @@ msgstr "&Skry
 msgid "&Open Left"
 msgstr "&Otvori\9d ¾avý"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Netla
 msgid "&Compare"
 msgstr "Porovnáva\9d &netlaèite¾né znaky"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Ignorova\9d &zmeny v prázdnom mieste"
@@ -2436,7 +2441,7 @@ msgstr "(Ovplyv
 msgid "Select Codepage for"
 msgstr "Zvo¾te kódovú stránku pre"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Naèítanie súboru:"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 4a297dd..cd454f6 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1122,6 +1122,11 @@ msgstr "&Skrij predmete"
 msgid "&Open Left"
 msgstr "&Odpri levo"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1974,7 +1979,7 @@ msgstr "Prazen znak"
 msgid "&Compare"
 msgstr "&Primerjaj"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignoriraj spremembe"
@@ -2443,7 +2448,7 @@ msgstr "(Spremeni)"
 msgid "Select Codepage for"
 msgstr "Izberi kodno tabelo datoteke za"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&nalaganje datoteke:"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index c16971c..f7dd71c 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1123,6 +1123,11 @@ msgstr "&Ocultar elementos"
 msgid "&Open Left"
 msgstr "Abrir archivo &Izquierdo"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1973,7 +1978,7 @@ msgstr "Espacios en blanco"
 msgid "&Compare"
 msgstr "&Comparar"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorar cambios"
@@ -2442,7 +2447,7 @@ msgstr "(Afectar)"
 msgid "Select Codepage for"
 msgstr "Seleccione página de códigos para"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Carga de archivos:"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index b187a35..9be3efe 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1121,6 +1121,11 @@ msgstr "&D
 msgid "&Open Left"
 msgstr "&Öppna vänster"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1971,7 +1976,7 @@ msgstr "Mellanslag"
 msgid "&Compare"
 msgstr "Jämför &mellanslag"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Ignorera mellanslagsskillnader "
@@ -2440,7 +2445,7 @@ msgstr "(P
 msgid "Select Codepage for"
 msgstr "Välj Codepage för"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Filöppnande:"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index c78bce0..e026428 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1121,6 +1121,11 @@ msgstr "
 msgid "&Open Left"
 msgstr "S&ola Aç"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1974,7 +1979,7 @@ msgstr "Bo
 msgid "&Compare"
 msgstr "&Karþýlaþtýr"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "&Deðiþikliði yok say"
@@ -2443,7 +2448,7 @@ msgstr "(Etkiler)"
 msgid "Select Codepage for"
 msgstr "Þunun için Kod Sayfasý Seçin"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "&Dosya Yükleniyor:"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 107bc44..78a6433 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1122,6 +1122,11 @@ msgstr "&
 msgid "&Open Left"
 msgstr "&³äêðèòè ë³âèé ôàéë"
 
+#: Merge.rc:5A9A713C
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
 #: Merge.rc:761E6872
 #, c-format
 msgid "Open Midd&le"
@@ -1972,7 +1977,7 @@ msgstr "
 msgid "&Compare"
 msgstr "Âðàõîâóâàòè &ïðîïóñêè"
 
-#: Merge.rc:5A9A713C
+#: Merge.rc:5A9A713D
 #, c-format
 msgid "&Ignore change"
 msgstr "Íåõòóâàòè çì³íåíèìè ïðîïóñêàìè"
@@ -2441,7 +2446,7 @@ msgstr "(
 msgid "Select Codepage for"
 msgstr "Âèáðàòè ñòîð³íêó êîäóâàííÿ äëÿ"
 
-#: Merge.rc:5A9A713D
+#: Merge.rc:5A9A713E
 #, c-format
 msgid "&File Loading:"
 msgstr "Çàâàíò. ôàéëó:"