PATCH: [ 1435361 ] Fix and cleanup project file code

  Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
   Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
   resource.h
  Src/Languages/*: Merge*.rc

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 04750f8..eb467b6 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,3 +1,10 @@
+2006-03-06 Perry
+ PATCH: [ 1435361 ] Fix and cleanup project file code
+  Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
+   Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
+   resource.h
+  Src/Languages/*: Merge*.rc
+
 2006-03-04 Perry
  PATCH: [ 1396506 ] customizable text colors
  Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)

diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp
index dfa2a8f..45533e1 100644 (file)
--- a/Src/DiffContext.cpp
+++ b/Src/DiffContext.cpp
@@ -57,8 +57,7 @@ static char THIS_FILE[]=__FILE__;
  * @param [in] pszRight Initial right-side path.
  */
 CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/)
-: m_bRecurse(FALSE)
-, m_piFilterGlobal(NULL)
+: m_piFilterGlobal(NULL)
 , m_piPluginInfos(NULL)
 , m_hDirFrame(NULL)
 , m_nCompMethod(-1)
@@ -87,7 +86,6 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src)
        // and then the temporary goes away
        // so the temporary never exists while the user is interacting with the GUI
 
-       m_bRecurse=src.m_bRecurse;
        m_paths.SetLeft(pszLeft);
        m_paths.SetRight(pszRight);
        m_pList = src.m_pList;

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index ea3bcab..2d5c429 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -87,7 +87,6 @@ public:
        void SetAbortable(IAbortable * piAbortable) { m_piAbortable = piAbortable; }
        const IAbortable * GetAbortable() const { return m_piAbortable; }
 
-       BOOL m_bRecurse;
        IDiffFilter * m_piFilterGlobal;
        IPluginInfos * m_piPluginInfos;
        HWND m_hDirFrame;

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 5cfd615..44c9bab 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -971,26 +971,27 @@ void CDirDoc::SetItemViewFlag(UINT flag, UINT mask)
  */
 void CDirDoc::OnSaveProject()
 {
-       CString strProjectFileName = GetMainFrame()->AskProjectFileName();
-       if (strProjectFileName.IsEmpty())
+       CString sProject = GetMainFrame()->AskProjectFileName();
+       if (sProject.IsEmpty())
                return;
 
        CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
-       ProjectFile pfile;
+       ProjectFile project;
 
        //set the member of the project file
-       pfile.SetLeft(m_pCtxt->GetLeftPath());
-       pfile.SetFilter(FilterNameOrMask);
-       pfile.SetRight(m_pCtxt->GetRightPath());
-       pfile.SetSubfolders(m_pCtxt->m_bRecurse);
+       project.SetLeft(m_pCtxt->GetLeftPath());
+       project.SetFilter(FilterNameOrMask);
+       project.SetRight(m_pCtxt->GetRightPath());
+       project.SetSubfolders(m_bRecursive);
 
-       CString err;
        //save the project
-       pfile.Save(strProjectFileName,&err);
-       if (!err.IsEmpty())
+       CString sErr;
+       if (!project.Save(sProject, &sErr))
        {
+               if (sErr.IsEmpty())
+                       sErr = LoadResString(IDS_UNK_ERROR_SAVING_PROJECT);
                CString msg;
-               AfxFormatString2(msg, IDS_ERROR_FILEOPEN, strProjectFileName, err);
+               AfxFormatString2(msg, IDS_ERROR_FILEOPEN, sProject, sErr);
                AfxMessageBox(msg, MB_ICONSTOP);
        }
 }

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 68bf197..4c138e9 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Pronto"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create empty documents\nNew Documents (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Alterar a impressora e as configurações de impressão\nConfigurar impressora"
     ID_FILE_PRINT           "Imprimir o documento ativo\nImprimir"
     ID_FILE_PRINT_PREVIEW   "Visualizar impressão\nVisualizar Impressão"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Sair do programa; pede para salvar documentos\nSair"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Abrir este documento"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Ativa o painel anterior\nPainel anterior"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Abre outra janela para o documento ativo\nNova Janela"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Divide a janela ativa em painéis\nDivide"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Apaga o texto selecionado\nApaga"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Refaz a última ação desfeita\nRefaz"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Exibe ou esconde a barra de ferramentas\nChavea Barra de Ferramentas"
     ID_VIEW_STATUS_BAR      "Exibe ou esconde a barra de status\nChavea Barra de Status"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Altera o tamanho da janela"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Ativar esta janela"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Fechar a visualização de impressão\nCancelar Preview"

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index ef1c3d6..538cb19 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1655,6 +1655,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Ãîòîå"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1665,6 +1666,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Ñúæäàé íîâ äîêóìåíò\nÍîâ äîêóìåíò (Ctrl+N)"
@@ -1676,8 +1678,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Ïðîìåíè íàñòðîèêèòå íà ïðèíòåðà è íàñòðîèêèòå çà ïðèíòèðàíå\nPrint Setup"
     ID_FILE_PRINT           "Ïðèíòèðàé òåêóùèÿ äîêóìåíò\nPrint"
     ID_FILE_PRINT_PREVIEW   "Ïðåäñòàâè ñòðàíèöàòà\nPrint Preview"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1687,6 +1700,7 @@ BEGIN
     ID_APP_EXIT             "Èçëèçàíå îò ïðèëîæåíèåòî; íàïîìíÿíå äà çàïàçèòå äîêóìåíòà\nÈçõîä"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Îòâàðÿíå íà òîçè äîêóìåíò"
@@ -1713,6 +1727,7 @@ BEGIN
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Îòâàðÿíå íà äðóã ïðîçîðåö çà òåêóùèÿ äîêóìåíò\nÍîâ ïðîçîðåö"
@@ -1723,6 +1738,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Ðàçäåëÿ òåêóùèÿ ïðîçîðåö\nÐàçäåëÿ"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Èçòðèâà èçáðàíîòî\nÈçòðèâà"
@@ -1738,12 +1754,14 @@ BEGIN
     ID_EDIT_REDO            "Âúðíè ïîñëåäíîòî äåéñòâèå\nÂúðíè (Ctrl+Ð)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Ïîêàçâàé èëè ñêðèâàé èíñòðóìåíòèòå\nÏîêàçâàíå íà èíñòðóìåíòèòå"
     ID_VIEW_STATUS_BAR      "Ïîêàçâàé èëè ñêðèâàé ñòàòóñà\nÑòàòóñ"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Ïðîìåíè ãîëåìèíàòà íà ïðîçîðåöà"
@@ -1762,6 +1780,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Activate this window"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index b6f34fb..c23fb85 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1656,6 +1656,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Preparat"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1666,6 +1667,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Crea un document nou\nNou (Control-N)"
@@ -1677,8 +1679,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Canvia la impressora i les opcions d'impressió\nConfiguració d'impressió"
     ID_FILE_PRINT           "Imprimeix el document actiu\nImprimeix"
     ID_FILE_PRINT_PREVIEW   "Visualitza pàgines senceres\nVisualització prèvia de la impressió"
-    ID_FILE_OPENPROJECT     "Obre un fitxer de projecte\nFitxer de projecte (Control+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Torna a fer visibles tots els elements amagats"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Obre un fitxer de projecte\nFitxer de projecte (Control+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Desa els camins i les opcions actuals a un fitxer de projecte\nDesa fitxer de projecte"
 END
 
@@ -1688,6 +1701,7 @@ BEGIN
     ID_APP_EXIT             "Surt de l'aplicació i us demana que deseu els documents\nSurt"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Obre aquest document"
@@ -1714,6 +1728,7 @@ BEGIN
     ID_PREV_PANE            "Canvia de nou a la subfinestra anterior\nSubfinestra prèvia"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Obre una altra finestra per al document actiu\nFinestra nova"
@@ -1724,6 +1739,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Divideix la finestra activa en subfinestres\nDivideix"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Suprimeix la selecció\nSuprimeix"
@@ -1739,12 +1755,14 @@ BEGIN
     ID_EDIT_REDO            "Refà la darrera acció desfeta\nRefés (Control+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Mostra o amaga la barra d'eines\nBarra d'eines"
     ID_VIEW_STATUS_BAR      "Mostra o amaga la barra d'estat\nBarra d'estat"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Canvia la mida de la finestra"
@@ -1763,6 +1781,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Activa aquesta finestra"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Tanca el mode de visualització prèvia\nTanca"

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 4f43785..b46ba37 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1639,6 +1639,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "¾ÍÐ÷"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1649,6 +1650,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "н¨Ò»¸ö¿ÕÎĵµ\nн¨ (Ctrl+N)"
@@ -1660,8 +1662,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "¸ü¸Ä´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n´òÓ¡É趨"
     ID_FILE_PRINT           "´òÓ¡µ±Ç°Îļþ\n´òÓ¡"
     ID_FILE_PRINT_PREVIEW   "Ô¤ÀÀ´òÓ¡µÄЧ¹û\n´òÓ¡Ô¤ÀÀ"
-    ID_FILE_OPENPROJECT     "´ò¿ª¹¤³ÌÎļþ\n´ò¿ª¹¤³Ì (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "ÖØÐÂÏÔʾËùÓÐÒþ²ØµÄÏîÄ¿"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "´ò¿ª¹¤³ÌÎļþ\n´ò¿ª¹¤³Ì (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1671,6 +1684,7 @@ BEGIN
     ID_APP_EXIT             "Í˳öÓ¦ÓóÌÐò£»Ìáʾ±£´æÎļþ\nÍ˳ö"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "´ò¿ªÕâ¸öÎļþ"
@@ -1697,6 +1711,7 @@ BEGIN
     ID_PREV_PANE            "Çл»µ½ÉÏÒ»¸ö´°¿Ú\nÉÏÒ»´°¿Ú"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Ϊµ±Ç°Îļþ´ò¿ªÁíÒ»¸ö´°¿Ú\nд°¿Ú"
@@ -1707,6 +1722,7 @@ BEGIN
     ID_WINDOW_SPLIT         "·Ö¸îµ±Ç°´°¿Ú\n·Ö¸î"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Çå³ýÑ¡ÖеÄÄÚÈÝ\nɾ³ý"
@@ -1722,12 +1738,14 @@ BEGIN
     ID_EDIT_REDO            "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\nÖظ´"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "ÏÔʾ»òÒþ²Ø¹¤¾ßÀ¸\nÇл»¹¤¾ßÀ¸"
     ID_VIEW_STATUS_BAR      "ÏÔʾ»òÒþ²Ø״̬À¸\nÇл»×´Ì¬À¸"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "¸ü¸Ä´°¿Ú´óС"
@@ -1746,6 +1764,7 @@ BEGIN
     AFX_IDS_MDICHILD        "ÆôÓÃÕâ¸ö´°¿Ú"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "¹Ø±Õ´òÓ¡Ô¤ÀÀģʽ\nÈ¡ÏûÔ¤ÀÀ"

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 0f4efe2..e6fe14b 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "´Nºü"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "«Ø¥ßªÅ¤å¥ó\n·s¤å¥ó (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n¦C¦L³]©w"
     ID_FILE_PRINT           "¦C¦L§@¥Î¤¤¤å¥ó\n¦C¦L"
     ID_FILE_PRINT_PREVIEW   "Åã¥Ü¾ã­¶\n¹wÄý¦C¦L"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Â÷¶}À³¥Îµ{¦¡¡F´£¥Ü­nÀx¦s¤å¥ó\nµ²§ô"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "¶}±Ò³o­Ó¤å¥ó"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "¤Á´«¦^¤W¤@­Óµøµ¡\n¤W¤@µøµ¡"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "¬°§@¥Î¤¤¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n·sµøµ¡"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "¤À³Î¥Ø«eµøµ¡\n¤À³Î"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "²M°£¿ï¨úªº½d³ò\n§R°£"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "­«°µ¤§«e¥¼§¹¦¨ªº°Ê§@\n­«°µ"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Åã¥Ü©ÎÁôÂäu¨ã¦C\n¤Á´«¤u¨ã¦C"
     ID_VIEW_STATUS_BAR      "Åã¥Ü©ÎÁôÂꬺA¦C\n¤Á´«ª¬ºA¦C"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "§ó§ïµøµ¡¤j¤p"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "±Ò¥Î³o­Óµøµ¡"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n¨ú®ø¹wÄý"

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 0c8b47b..a98e64e 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Pøipraven"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Vytvoøí nové dokumenty\nNové dokumenty (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Zmìní mo\9enosti tiskárny\nNastavení tisku"
     ID_FILE_PRINT           "Vytiskne aktivní dokument\nTisk"
     ID_FILE_PRINT_PREVIEW   "Zobrazí celé stránky\nNáhled tisku"
-    ID_FILE_OPENPROJECT     "Otevøe projekt ze souboru\nOtevøít projekt (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Znovu zviditelní v\9aechny skryté polo\9eky"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Otevøe projekt ze souboru\nOtevøít projekt (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Ulo\9eí aktuální cesty a volby do souboru projektu\nUlo\9eit projekt"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Ukonèí aplikaci; dotá\9ee se na ulo\9eení dokumentù\nKonec"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Otevøe tento dokument"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Pøepne do pøedchozího panelu v oknì\nPøedchozí panel"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Otevøe jiné okno pro aktivní dokument\nNové okno"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Rozdìlí aktivní okno do panelù\nRozdìlit"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Vyma\9ee výbìr\nVymazat"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Znovu provede pøedtím vrácenou akci\nZnovu (Ctrl+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Zobrazí nebo skryje panel nástrojù\nPanel nástrojù"
     ID_VIEW_STATUS_BAR      "Zobrazí nebo skryje stavový øádek\nStavový øádek"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Mìní velikost okna"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktivovat toto okno"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Ukonèí re\9eim náhledu tisku\nZru\9ait náhled"

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index ddfadc8..8515136 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Klar"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Opret tomme dokumenter\nNye dokumenter (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Ændrer printer og printerens indstillinger\nPrinter setup"
     ID_FILE_PRINT           "Print det aktive dokument\nPrint"
     ID_FILE_PRINT_PREVIEW   "Vis de fulde sider\nPrinter preview"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Afslut programmet; spørger om man vil gemme dokumenter\nAfslut"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Åben dette dokument"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Skift til det tidligere vindue\nTidligere vindue"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Åben et nyt vindue til det aktive dokument\nNyt vindue"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Del det aktive vindue\nDel"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Slet det valgte\nSlet"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Gendan den tidligere fortrudte handling\nGendan fortrudt"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Vis eller gem værktøjslinjen\nVis værktøjslinjen"
     ID_VIEW_STATUS_BAR      "Vis eller gem statuslinjen\nVis statuslinjen"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Ændre vinduesstørrelse"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktiver dette vindue"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Luk print preview\nAfbryd preview"

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index ba3d994..404a9ce 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Gereed"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Lege documenten aanmaken\nNieuwe documenten (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "De printerinstellingen wijzigen.\nPrinterinstellingen"
     ID_FILE_PRINT           "Actief document afdrukken.\nAfdrukken"
     ID_FILE_PRINT_PREVIEW   "Afdrukvoorbeeld.\nAfdruk voorbeeld"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Applicatie afsluiten, vraagt naar opslaan documenten\nAfsluiten"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Dit document openen"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Ga naar het vorige venster deel.\nVorige deel"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Een nieuw venster voor het actieve document openen.\nNieuw venster."
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Het actieve venster splitsen.\nSplitsen"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "De selectie wissen.\nWissen"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Ongedaangemaakte actie opnieuw uitvoeren.\nOpnieuw"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "De werkbalk tonen of verbergen\nWerkbalk"
     ID_VIEW_STATUS_BAR      "De statusbalk tonen of verbergen\nStatusbalk"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "De grootte van het venster wijzigen"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Dit venster activeren"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Afdrukvoorbeeld sluiten.\nAfsluiten voorbeeld"

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index edc6131..addad0b 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Bereit"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "ER"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "MA"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Erzeugt leere Dokumente.\nNeue Dokumente (Strg+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Ändert die Druckerkonfiguration.\nDrucker einrichten"
     ID_FILE_PRINT           "Druckt das aktive Dokument.\nDrucken"
     ID_FILE_PRINT_PREVIEW   "Zeigt die Druckvorschau an.\nDruckvorschau"
-    ID_FILE_OPENPROJECT     "Öffnet eine Projektdatei.\nProjektdatei (Strg+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Zeigt alle versteckten Objekte wieder an."
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Öffnet eine Projektdatei.\nProjektdatei (Strg+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Verläßt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\nBeenden"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Öffnet dieses Dokument."
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Springt zum vorherigen Fensterausschnitt zurück.\nVorheriger Ausschnitt"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Öffnet ein weiteres Fenster für das aktive Dokument.\nNeues Fenster"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Teilt das aktive Fenster in Ausschnitte.\nTeilen"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Löscht die Markierung.\nLöschen"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Wiederholt die vorher rückgängig gemachte Aktion.\nWiederherstellen (Strg+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Blendet die Symbolleiste ein oder aus.\nSymbolleiste ein-/ausschalten"
     ID_VIEW_STATUS_BAR      "Blendet die Statusleiste ein oder aus.\nStatusleiste ein-/ausschalten"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Ändert die Fenstergröße."
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktiviert dieses Fenster."
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Beendet die Seitenansicht.\nSeitenansicht beenden"

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 60ea3ca..f193304 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Kész"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Új dokumentumok létrehozása\nÚj dokumentum (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "A nyomtató és a nyomtatási opciók megváltoztatása\nNyomtatóbeállítás"
     ID_FILE_PRINT           "Az aktív dokumentum nyomtatása\nNyomtatás"
     ID_FILE_PRINT_PREVIEW   "Az oldalak megjelenítése\nNyomtatási elõnézet"
-    ID_FILE_OPENPROJECT     "Projekt fájl megnyitása\nProjekt fájl (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Minden rejtett elem legyen újból látható"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Projekt fájl megnyitása\nProjekt fájl (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "A program bezárása; a nem mentett fájlok elmentésének lehetõségével\nKilépés"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "A dokumentum megnyitása"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Váltás az elõzõ ablak paneljára\nElõzõ panel"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Új ablak nyitása az aktív dokumentumhoz\nÚj ablak"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Az aktív ablak felbontása panelekre\nFelbontás"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "A kijelölés törlése\nTörlés"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Az utoljára visszavont mûvelet megismétlése\nMégis (Ctrl+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Megmutatja vagy elrejti az Eszköztárat\nEszköztár"
     ID_VIEW_STATUS_BAR      "Megmutatja vagy elrejti az Állapotsort\nÁllapotsor"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Az ablak méretének változtatása"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Ennek az ablaknak az aktiválása"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "A Nyomtatási elõnézet bezárása\nNyomtatási elõnézet bezárása"

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 5594fb6..4db3b8c 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Pronto"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EST"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REG"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Crea due nuovi documenti vuoti\nNuovi documenti (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Modifica le impostazioni relative alla stampante e alla stampa\nImposta stampante"
     ID_FILE_PRINT           "Stampa il documento attivo\nStampa"
     ID_FILE_PRINT_PREVIEW   "Visualizza le pagine per intero\nAnteprima di stampa"
-    ID_FILE_OPENPROJECT     "Apre un file di progetto\nFile di progetto (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Rende nuovamente visibili tutti gli oggetti nascosti"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Apre un file di progetto\nFile di progetto (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Esce dall'applicazione e chiede di salvare i documenti\nEsci"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Apre questo documento"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Ritorna al riquadro della finestra precedente\nRiquadro precedente"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Apre un'altra finestra per il documento attivo\nNuova finestra"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Divide la finestra attiva in riquadri\nDividi"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Cancella la selezione\nCancella"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Ripristina l'azione precedentemente annullata\nRipristina"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Mostra o nasconde la barra degli strumenti\nMostra/nascondi barra degli strumenti"
     ID_VIEW_STATUS_BAR      "Mostra o nasconde la barra di stato\nMostra/nascondi barra di stato"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Modifica le dimensioni della finestra"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Attiva questa finestra"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Chiude la modalità anteprima di stampa\nAnnulla anteprima"

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 946a2b1..d83f91d 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "\83\8c\83f\83B"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "\8bL\98^"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "\90V\82µ\82¢\83h\83L\83\85\83\81\83\93\83g\82ð\90¶\90¬\82µ\82Ü\82·\n\90V\8bK\83h\83L\83\85\83\81\83\93\83g (Ctrl-N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "\83v\83\8a\83\93\83^/\88ó\8dü\83I\83v\83V\83\87\83\93\82Ì\95Ï\8dX\n\88ó\8dü\90Ý\92è"
     ID_FILE_PRINT           "\8dì\8bÆ\92\86\82Ì\83h\83L\83\85\83\81\83\93\83g\82ð\88ó\8dü\82µ\82Ü\82·\n\88ó\8dü"
     ID_FILE_PRINT_PREVIEW   "\88ó\8dü\83C\83\81\81[\83W\82ð\95\\8e¦\82µ\82Ü\82·\n\88ó\8dü\83v\83\8c\83r\83\85\81["
-    ID_FILE_OPENPROJECT     "\83v\83\8d\83W\83F\83N\83g\82ð\8aJ\82«\82Ü\82·\n\83v\83\8d\83W\83F\83N\83g\82ð\8aJ\82­ (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "\94ñ\95\\8e¦\82É\82µ\82½\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "\83v\83\8d\83W\83F\83N\83g\82ð\8aJ\82«\82Ü\82·\n\83v\83\8d\83W\83F\83N\83g\82ð\8aJ\82­ (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\8fI\97¹\82µ\81A\83t\83@\83C\83\8b\82Ì\95Û\91¶\82ð\8ew\8e¦\82µ\82Ü\82·\n\8fI\97¹"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "\8ew\92è\82Ì\83t\83@\83C\83\8b\82ð\8aJ\82­"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "\91O\82Ì\83E\83B\83\93\83h\83E\83y\83C\83\93\82É\90Ø\82è\91Ö\82¦\82Ü\82·\n\91O\82Ì\83y\83C\83\93"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "\8dì\8bÆ\92\86\82Ì\83E\83B\83\93\83h\83E\82ð\95¡\8eÊ\82µ\82Ä\95\\8e¦\82µ\82Ü\82·\n\90V\8bK\83E\83B\83\93\83h\83E"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "\8dì\8bÆ\92\86\82Ì\83E\83B\83\93\83h\83E\82ð\95ª\8a\84\82µ\82Ü\82·\n\95ª\8a\84"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "\91I\91ð\94Í\88Í\82ð\8fÁ\8b\8e\82µ\82Ü\82·\n\8dí\8f\9c"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "\92¼\91O\82É\8ds\82Á\82½\93®\8dì\82ð\8cJ\82è\95Ô\82·\n\8cJ\82è\95Ô\82· (Ctrl+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "\83c\81[\83\8b\83o\81[\82Ì\95\\8e¦/\94ñ\95\\8e¦\82ð\90Ø\82è\91Ö\82¦\82Ü\82·\n\83c\81[\83\8b\83o\81[\95\\8e¦\82Ì\83g\83O\83\8b"
     ID_VIEW_STATUS_BAR      "\83X\83e\81[\83^\83X\83o\81[\82Ì\95\\8e¦/\94ñ\95\\8e¦\82ð\90Ø\82è\91Ö\82¦\82Ü\82·\n\83X\83e\81[\83^\83X\83o\81[\95\\8e¦\82Ì\83g\83O\83\8b"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "\83E\83B\83\93\83h\83E\82Ì\83T\83C\83Y\82ð\95Ï\8dX"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "\8ew\92è\82Ì\83E\83B\83\93\83h\83E\82ð\95\\8e¦"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "\88ó\8dü\83v\83\8c\83r\83\85\81[\83\82\81[\83h\82ð\8fI\97¹\82µ\82Ü\82·\n\83v\83\8c\83r\83\85\81[\82Ì\83L\83\83\83\93\83Z\83\8b"

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 94620bd..df1a911 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Áغñ"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "ºó ¹®¼­¸¦ »ý¼ºÇÕ´Ï´Ù\n»õ¹®¼­ (Ctrl-N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "ÇÁ¸°Å͸¦ ¹Ù²Ù°Å³ª Àμ⠿ɼÇÀ» ¼öÁ¤ÇÕ´Ï´Ù.\nÀμ⠼³Á¤"
     ID_FILE_PRINT           "ÇöÀç ¹®¼­¸¦ ÀμâÇÕ´Ï´Ù.\nÀμâ"
     ID_FILE_PRINT_PREVIEW   "¹Ì¸® º¸±â\n¹Ì¸® º¸±â"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "ÇÁ·Î±×·¥À» Á¾·áÇÕ´Ï´Ù.\nÁ¾·á"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "¼±Åà ¹®¼­ ¿­±â"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "ÀÌÀü â(pane)À¸·Î À̵¿ÇÕ´Ï´Ù.\nÀÌÀü â(pane)"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "»õ âÀ¸·Î ¹®¼­¸¦ ¿±´Ï´Ù.\n»õ âÀ¸·Î"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "ÇöÀç âÀ» ºÐÇÒÇÕ´Ï´Ù.\nºÐÇÒ"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "¼±Åà ¿µ¿ªÀ» »èÁ¦ÇÕ´Ï´Ù.\n»èÁ¦"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "´Ù½Ã ½ÇÇàÇÕ´Ï´Ù.\n´Ù½Ã ½ÇÇà"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Åø¹Ù¸¦ º¸°Å³ª ¼û±é´Ï´Ù.\nÅø¹Ù º¸±â"
     ID_VIEW_STATUS_BAR      "»óÅ ǥ½ÃÁÙÀ» º¸°Å³ª ¼û±é´Ï´Ù.\n»óÅÂÇ¥½ÃÁÙ º¸±â"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "âÀÇ Å©±â¸¦ Á¶Á¤ÇÕ´Ï´Ù."
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "ÀÌ Ã¢À» È°¼ºÈ­ÇÕ´Ï´Ù."
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "¹Ì¸®º¸±â¸¦ Á¾·áÇÕ´Ï´Ù.\n¹Ì¸®º¸±â Á¾·á"

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index f55d032..a9151d2 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Klar"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Opprett et tomt dokument\nNytt dokument (Ctrl-N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Endrer skriver og skriverens indstillinger\nSkriveroppsett"
     ID_FILE_PRINT           "Skriv ut det aktive dokumentet\nSkriv ut"
     ID_FILE_PRINT_PREVIEW   "Vis de fulle sidene\nUtskriftsforhåndsvisning"
-    ID_FILE_OPENPROJECT     "Åpne prosjektfil\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Åpne prosjektfil\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Avslutt programmet; spør om man vil lagre dokumenter\nAvslutt"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Åpne dette dokumentet"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Skift til det forrige vinduet\nForrige vindu"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Åpne et nytt vindu til det aktive dokumentet\nNytt vindu"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Del det aktive vinduet\nDel"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Slett det valgte\nSlett"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Gjenopprett den forrige handlingen\nGjenopprett"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Vis eller skjul verktøylinjen\nVis verktøylinjen"
     ID_VIEW_STATUS_BAR      "Vis eller skjul statuslinjen\nVis statuslinjen"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Endre vindusstørrelse"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktiver dette vinduet"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Lukk utskriftsforhåndsvisning\nAvbryt forhåndsvisning"

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 3ebb11e..f2ce7cd 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Gotowe"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Utwórz nowy dokument\nNowy"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Zmieñ opcje drukarki i wydruku\nUstawienia wydruku"
     ID_FILE_PRINT           "Wydrukuj bie¿¹cy dokument\nDrukuj"
     ID_FILE_PRINT_PREVIEW   "Wy\9cwietl cale strony\nPodgl¹d wydruku"
-    ID_FILE_OPENPROJECT     "Otwórz plik projektu\nPlik projektu (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Poka¿ wszystkie ukryte elementy"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Otwórz plik projektu\nPlik projektu (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Wyjd\9f z programu; program pyta, czy zachowaæ dokumenty\nWyjd\9f"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Otwórz ten dokument"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Wróæ do poprzedniego panelu\nPoprzedni panel"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Otwórz aktywny dokument w nowym oknie\nNowe okno"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Podziel aktywne okno na panele\nPodziel"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Wyma¿ wybór\nWyma¿"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Powtórz cofniêt¹ czynno\9cæ\nPowtórz"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Poka¿ lub ukryj pasek narzêdzi\nPrze³¹cz pasek narzêdzi"
     ID_VIEW_STATUS_BAR      "Poka¿ lub ukryj pasek stanu\nPrze³¹cz pasek stanu"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Zmieñ rozmiar okna"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktywuj to okno"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Zamknij podgl¹d wydruku\nAnuluj podgl¹d"

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index c0a4cf1..88ce427 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Ãîòîâî"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Ñîçäàòü ïóñòûå äîêóìåíòû\nNew Documents (Ctrl-N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Èçìåíèòü íàñòðîéêè ïðèíòåðà è ïå÷àòè\nPrint Setup"
     ID_FILE_PRINT           "Ïå÷àòàòü àêòèâíûé äîêóìåíò\nPrint"
     ID_FILE_PRINT_PREVIEW   "Ïîêàçûâàòü ïîëíûå ñòðàíèöû\nPrint Preview"
-    ID_FILE_OPENPROJECT     "Îòêðûòü ôàéë ïðîåêòà\nÔàéë ïðîåêòà (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Îòêðûòü ôàéë ïðîåêòà\nÔàéë ïðîåêòà (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Âûéòè èç ïðîãðàììû; Ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ\nExit"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Îòêðûòü ýòîò äîêóìåíò"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùþþ îêîííóþ ïàíåëü\nPrevious Pane"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Îòêðûòü àêòèâíûé äîêóìåíò â íîâîì îêíå\nNew Window"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Ðàçäåëèòü àêòèâíîå îêíî íà ïàíåëè\nSplit"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Î÷èñòèòü âûäåëåíèå\nErase"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Âåðíóòü îòìåíåííîå äåéñòâèå\nRedo"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Ïîêàçàòü èëè ñïðÿòàòü ïàíåëü èíñòðóìåíòîâ\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Ïîêàçàòü èëè ñïðÿòàòü ñòðîêó ñîñòîÿíèé\nToggle StatusBar"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Èçìåíèòü ðàçìåð îêíà"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Àêòèâèðîâàòü ýòî îêíî"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Çàêðûòü îêíî ïðåäïðîñìîòðà ïå÷àòè\nCancel Preview"

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 133b610..5e6e862 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Pripravený"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create empty documents\nNew Documents (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Zmeni\9d tlaèiareò a parametre tlaèe\nNastavenie tlaèiarne"
     ID_FILE_PRINT           "Vytlaèi\9d aktívny dokument\nTlaè"
     ID_FILE_PRINT_PREVIEW   "Náh¾ad\nPreh¾ad pred tlaèou"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Ukonèi\9d program s otázkou na ulo\9eenie súborov\nKoniec"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Otvori\9d dokument"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Prepnú\9d na predchádzajúce okno\nPredchádzajúce okno"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Otvori\9d ïal\9aie okno s aktuálnym dokumentom\nNové okno"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Rozdeli\9d aktívne okno\nRozdeli\9d"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Vymaza\9d výber\nZmaza\9d"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Obnovi\9d poslednú odvolanú akciu\nRedo"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Zobrazi\9d alebo skry\9d panel nástrojov\nPanel nástrojov"
     ID_VIEW_STATUS_BAR      "Zobrazi\9d nebo skry\9d stavový riadok\nStavový riadok"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Zmeni\9d ve¾kos\9d okna"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktivova\9d toto okno"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Zatvori\9d náh¾ad tlaèe\nZru\9a náh¾ad"

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index e90020c..390809d 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Listo"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Crear documentos vacios\nNuevo Documento (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Cambiar la impresora y las opciones de impresión\nConfigurar impresora"
     ID_FILE_PRINT           "Imprimir el documento activo\nImprimir"
     ID_FILE_PRINT_PREVIEW   "Mostrar vista preliminar\nVista preliminar"
-    ID_FILE_OPENPROJECT     "Abrir ficheros del proyecto\nProyecto (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Abrir ficheros del proyecto\nProyecto (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Cerrar la aplicación\nSalir"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Abre este documento"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Cambia al panel anterior\nPanel Anterior"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Abre una nueva ventana para el documento activo\nNueva Ventana"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Dividir la ventana activa en paneles\nDividir"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Borrar la selección\nBorrar"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Rehacer\nRehacer"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Muestra la barra de herramientas\nBarra de Herramientas"
     ID_VIEW_STATUS_BAR      "Muestra la Barra de Estado\nBarra de Estado"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Cambiar el tamaño de la ventana"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Activar esta ventana"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Cerrar previsualización\nCancelar previsualización"

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 71b2e2e..4cd7b1f 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Klar"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Skapar nya dokument\nNya Dokument (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Ändrar skrivare och skrivarens inställningar\nSkrivarinställningar"
     ID_FILE_PRINT           "Skriver ut det aktiva dokumentet\nSkriv ut"
     ID_FILE_PRINT_PREVIEW   "Visar helsida\nFörhandsgranska"
-    ID_FILE_OPENPROJECT     "Öppna Projektfil\nProjektfil(Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Gör alla dolda objekt synliga igen"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Öppna Projektfil\nProjektfil(Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Sparar aktuella sökvägar och inställningar till Projektfil\nSpara Projektfil"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Avslutar WinMerge och frågar om du vill spara dokument\nAvsluta"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Öppna det här dokumentet"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Växlar till förra fönstret\nFörra fönstret"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Öppnar ett nytt fönster med det aktiva dokumentet\nNytt fönster"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Delar det aktiva fönstret\nDela"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Tar bort den markerade texten\nTa bort"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Gör om den tidigare ångrade åtgärden\nGör om"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Visar eller gömmer verktygsfältet\nVäxla verktygsfält"
     ID_VIEW_STATUS_BAR      "Visar eller gömmer statusfältet\nVäxla statusfältet"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Ändra fönsterstorlek"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Aktiverar det här fönstret"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Aktiverar det här fönstret"

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 50ca058..99c42a4 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -1637,6 +1637,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1647,6 +1648,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create empty documents\nNew Documents (Ctrl+N)"
@@ -1658,8 +1660,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Change the printer and printing options\nPrint Setup"
     ID_FILE_PRINT           "Print the active document\nPrint"
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1669,6 +1682,7 @@ BEGIN
     ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
@@ -1695,6 +1709,7 @@ BEGIN
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
@@ -1705,6 +1720,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
@@ -1720,12 +1736,14 @@ BEGIN
     ID_EDIT_REDO            "Redo the previously undone action\nRedo (Ctrl+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
@@ -1744,6 +1762,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Activate this window"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index a45de2b..282b016 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2009,24 +2009,11 @@ void CMainFrame::OnDropFiles(HDROP dropInfo)
        gLog.Write(LOGLEVEL::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."),
                files[0], files[1]);
 
-       if (wNumFilesDropped == 1)
+       // Check if they dropped a project file
+       if (wNumFilesDropped == 1 && theApp.IsProjectFile(files[0]))
        {
-               // Load project file if appropriate extension
-               CString sExt;
-               SplitFilename(files[0], NULL, NULL, &sExt);
-               if (sExt.CompareNoCase(PROJECTFILE_EXT) == 0)
-               {
-                       CStringArray filesArray;
-                       BOOL bRecursive = FALSE;
-                       filesArray.Add(files[0]);
-                       filesArray.Add(files[0]);
-                       // LoadProjectFile requires two files
-                       if (theApp.LoadProjectFile(filesArray, bRecursive))
-                       {
-                               DoFileOpen(filesArray[0], filesArray[1], FFILEOPEN_NONE, FFILEOPEN_NONE, bRecursive);
-                               return;
-                       }
-               }
+               theApp.LoadAndOpenProjectFile(files[0]);
+               return;
        }
 
        DoFileOpen(files[0], files[1], FFILEOPEN_NONE, FFILEOPEN_NONE, ctrlKey);
@@ -2528,38 +2515,20 @@ void CMainFrame::OnViewToolbar()
  */
 void CMainFrame::OnFileOpenproject()
 {
-       CString strFileName;
+       CString sFilepath;
        CString title;
        VERIFY(title.LoadString(IDS_OPEN_TITLE));
        
        // get the default projects path
        CString strProjectPath = m_options.GetString(OPT_PROJECTS_PATH);
-       if (!SelectFile(strFileName, strProjectPath, title, IDS_PROJECTFILES, TRUE))
+       if (!SelectFile(sFilepath, strProjectPath, title, IDS_PROJECTFILES, TRUE))
                return;
        
-       strProjectPath = paths_GetParentPath(strFileName);
+       strProjectPath = paths_GetParentPath(sFilepath);
        // store this as the new project path
        m_options.SaveOption(OPT_PROJECTS_PATH,strProjectPath);
 
-       CStringArray files;
-       files.Add(strFileName);
-       files.Add("");
-       
-       BOOL bRecursive = TRUE;
-       //load the project file
-       if (theApp.LoadProjectFile(files,bRecursive))
-       {
-               //if the project file is read begin to compare
-               DWORD dwLeftFlags = FFILEOPEN_NONE;
-               DWORD dwRightFlags = FFILEOPEN_NONE;
-               //check if the paths are empty
-               if (!files[0].IsEmpty())
-                       dwLeftFlags |= FFILEOPEN_PROJECT;
-               if (!files[1].IsEmpty())
-                       dwRightFlags |= FFILEOPEN_PROJECT;
-               m_strSaveAsPath = _T("");
-               DoFileOpen(files[0], files[1], dwLeftFlags, dwRightFlags, bRecursive);
-       }
+       theApp.LoadAndOpenProjectFile(sFilepath);
 }
 
 /**

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index dbb7cd8..e9e01f4 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -596,67 +596,60 @@ void CMergeApp::OnHelp()
        GetMainFrame()->ShowHelp();
 }
 
+
+/**
+ * @brief Is specified file a project file?
+ */
+bool CMergeApp::IsProjectFile(const CString & filepath) const
+{
+       CString sExt;
+       SplitFilename(filepath, NULL, NULL, &sExt);
+       if (sExt.CompareNoCase(PROJECTFILE_EXT) == 0)
+               return true;
+       else
+               return false;
+}
+
 /** 
- * @brief Read paths and filter from project file.
+ * @brief Read project and perform comparison specified
  *
  * Tries to find project file in files[0] and files[1] by extension
  * If cannot find one, returns FALSE
  */
-BOOL CMergeApp::LoadProjectFile(CStringArray & files, BOOL & recursive)
+bool CMergeApp::LoadAndOpenProjectFile(const CString & sProject)
 {
-       CString filterPrefix;
-       CString err;
-       ProjectFile pfile;
-       CString ProjectFileName;
-       CString ext;
+       if (sProject.IsEmpty())
+               return false;
 
-       // Look for project file in files[0] and files[1]
-
-       if (files.GetSize() < 2)
-               return FALSE; // code further down assumes files[0] and files[1] exist
-
-       SplitFilename(files[0], NULL, NULL, &ext);
-       if (ext.CompareNoCase(PROJECTFILE_EXT) == 0)
+       ProjectFile project;
+       CString sErr;
+       if (!project.Read(sProject, &sErr))
        {
-               ProjectFileName = files[0];
+               if (sErr.IsEmpty())
+                       sErr = LoadResString(IDS_UNK_ERROR_READING_PROJECT);
+               CString msg;
+               AfxFormatString2(msg, IDS_ERROR_FILEOPEN, sProject, sErr);
+               AfxMessageBox(msg, MB_ICONSTOP);
+               return false;
        }
-       else
+       CString sLeft, sRight;
+       BOOL bRecursive=FALSE;
+       project.GetPaths(sLeft, sRight, bRecursive);
+       if (project.HasFilter())
        {
-               SplitFilename(files[1], NULL, NULL, &ext);
-               if (ext.CompareNoCase(PROJECTFILE_EXT) == 0)
-                       ProjectFileName = files[1];
-               else
-                       return FALSE;
+               CString filter = project.GetFilter();
+               filter.TrimLeft();
+               filter.TrimRight();
+               m_globalFileFilter.SetFilter(filter);
        }
 
-       // We found project file, and stored it in ProjectFileName
+       DWORD dwLeftFlags = (sLeft.IsEmpty() ? FFILEOPEN_NONE : FFILEOPEN_PROJECT);
+       DWORD dwRightFlags = (sRight.IsEmpty() ? FFILEOPEN_NONE : FFILEOPEN_PROJECT);
 
-       if (!ProjectFileName.IsEmpty())
-       {
-               if (!pfile.Read(ProjectFileName, &err))
-               {
-                       if (!err.IsEmpty())
-                       {
-                               CString msg;
-                               AfxFormatString2(msg, IDS_ERROR_FILEOPEN, ProjectFileName, err);
-                               AfxMessageBox(msg, MB_ICONSTOP);
-                       }
-                       return FALSE;
-               }
-               else
-               {
-                       pfile.GetPaths(files[0], files[1], recursive);
-                       if (pfile.HasFilter())
-                       {
-                               CString filter = pfile.GetFilter();
-                               filter.TrimLeft();
-                               filter.TrimRight();
-                               m_globalFileFilter.SetFilter(filter);
-                       }
-               }
-               return TRUE;
-       }
-       return FALSE;
+       WriteProfileInt(_T("Settings"), _T("Recurse"), bRecursive);
+       
+       BOOL rtn = GetMainFrame()->DoFileOpen(sLeft, sRight, dwLeftFlags, dwRightFlags, bRecursive);
+       return !!rtn;
 }
 
 /**

diff --git a/Src/Merge.h b/Src/Merge.h
index 5f71d88..5568c14 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -96,10 +96,10 @@ protected:
        CString GetUsageDescription();
        // End MergeArgs.cpp
 
-       BOOL LoadProjectFile(CStringArray & files, BOOL & recursive);
-       void ReloadMenu();
-
+       bool LoadAndOpenProjectFile(const CString & sFilepath);
+       bool IsProjectFile(const CString & filepath) const;
 
+       void ReloadMenu();
 
        //{{AFX_MSG(CMergeApp)
        afx_msg void OnAppAbout();

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 1449c8d..53d04b0 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1639,6 +1639,7 @@ BEGIN
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
+// Generic status bar strings
 STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
@@ -1649,6 +1650,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
+// Generic File menu commands
 STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create empty documents\nNew Documents (Ctrl+N)"
@@ -1660,8 +1662,19 @@ BEGIN
     ID_FILE_PRINT_SETUP     "Change the printer and printing options\nPrint Setup"
     ID_FILE_PRINT           "Print the active document\nPrint"
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
-    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+END
+
+STRINGTABLE
+BEGIN
     ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+END
+
+// WinMerge Project Files
+STRINGTABLE
+BEGIN
+    ID_FILE_OPENPROJECT     "Open project file\nProject file (Ctrl+J)"
+    IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
+    IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
     ID_FILE_SAVEPROJECT     "Save current paths and options to project file\nSave Project File"
 END
 
@@ -1671,6 +1684,7 @@ BEGIN
     ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
 END
 
+// MRU list
 STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
@@ -1697,6 +1711,7 @@ BEGIN
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
+// Generic window menu commands
 STRINGTABLE
 BEGIN
     ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
@@ -1707,6 +1722,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
+// Generic Edit commands
 STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
@@ -1722,12 +1738,14 @@ BEGIN
     ID_EDIT_REDO            "Redo the previously undone action\nRedo (Ctrl+Y)"
 END
 
+// View bar commands
 STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
+// Windows System menu
 STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
@@ -1746,6 +1764,7 @@ BEGIN
     AFX_IDS_MDICHILD        "Activate this window"
 END
 
+// Print Preview
 STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"

diff --git a/Src/MergeArgs.cpp b/Src/MergeArgs.cpp
index abc5938..dd0bbde 100644 (file)
--- a/Src/MergeArgs.cpp
+++ b/Src/MergeArgs.cpp
@@ -71,13 +71,13 @@ static ArgSetting f_ArgSettings[] =
 void
 CMergeApp::ParseArgsAndDoOpen(int argc, TCHAR *argv[], CMainFrame* pMainFrame)
 {
-       CStringArray files;
        UINT nFiles=0;
+       DWORD dwLeftFlags = FFILEOPEN_CMDLINE;
+       DWORD dwRightFlags = FFILEOPEN_CMDLINE;
        BOOL recurse=FALSE;
-       files.SetSize(2);
-       DWORD dwLeftFlags = FFILEOPEN_NONE;
-       DWORD dwRightFlags = FFILEOPEN_NONE;
        CString prediffer;
+       CStringArray files;
+       files.SetSize(2);
 
        // Split commandline arguments into files & flags & recursive flag
 
@@ -102,39 +102,34 @@ CMergeApp::ParseArgsAndDoOpen(int argc, TCHAR *argv[], CMainFrame* pMainFrame)
                ParseCCaseArgs(argc, argv, pMainFrame, files, nFiles, dwLeftFlags, dwRightFlags);
        }
 
-       // LoadProjectFiles returns false if neither argument is a project file
-       if (LoadProjectFile(files, recurse))
-       {
-               if (!files[0].IsEmpty())
-                       dwLeftFlags |= FFILEOPEN_PROJECT;
-               if (!files[1].IsEmpty())
-                       dwRightFlags |= FFILEOPEN_PROJECT;
-               pMainFrame->m_strSaveAsPath = _T("");
-               pMainFrame->DoFileOpen(files[0], files[1],
-                       dwLeftFlags, dwRightFlags, recurse);
-       }
-       else if (nFiles>2)
+       pMainFrame->m_strSaveAsPath = _T("");
+
+       if (nFiles>2)
        {
-               dwLeftFlags |= FFILEOPEN_CMDLINE;
-               dwRightFlags |= FFILEOPEN_CMDLINE;
                pMainFrame->m_strSaveAsPath = files[2];
                pMainFrame->DoFileOpen(files[0], files[1],
                        dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
        }
        else if (nFiles>1)
        {
-               dwLeftFlags |= FFILEOPEN_CMDLINE;
-               dwRightFlags |= FFILEOPEN_CMDLINE;
-               pMainFrame->m_strSaveAsPath = _T("");
+               DWORD dwLeftFlags = FFILEOPEN_CMDLINE;
+               DWORD dwRightFlags = FFILEOPEN_CMDLINE;
                pMainFrame->DoFileOpen(files[0], files[1],
                        dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
        }
-       else if (nFiles>0)
+       else if (nFiles==1)
        {
-               dwLeftFlags |= FFILEOPEN_CMDLINE;
-               pMainFrame->m_strSaveAsPath = _T("");
-               pMainFrame->DoFileOpen(files[0], _T(""),
-                       dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
+               CString sFilepath = files[0];
+               if (IsProjectFile(sFilepath))
+               {
+                       LoadAndOpenProjectFile(sFilepath);
+               }
+               else
+               {
+                       dwRightFlags = FFILEOPEN_NONE;
+                       pMainFrame->DoFileOpen(sFilepath, _T(""),
+                               dwLeftFlags, dwRightFlags, recurse, NULL, prediffer);
+               }
        }
 }
 

diff --git a/Src/ProjectFile.cpp b/Src/ProjectFile.cpp
index f5674b2..b0f23e5 100755 (executable)
--- a/Src/ProjectFile.cpp
+++ b/Src/ProjectFile.cpp
@@ -34,15 +34,18 @@ ProjectFile::ProjectFile()
 /** 
  * @brief Get message from exception into sError, or else throw it.
  *
- * If this successfully extracts the error description into the string, it simply returns FALSE
- * If it fails to extract the error description, it rethrows the exception
+ * If caller provided the address of an error string (sError),
+ *  this populates the error string (if possible) and returns FALSE
+ *
+ * If caller did not provide the address of an error string (sError==NULL)
+ *  this rethrows the error
  */
 static BOOL NTAPI False(CException *e, CString *sError)
 {
        if (sError == NULL)
                throw e;
-       TCHAR szError[1024];
-       e->GetErrorMessage(szError, 1024);
+       TCHAR szError[4096] = _T("");
+       e->GetErrorMessage(szError, sizeof(szError)/sizeof(szError[0]));
        *sError = szError;
        e->Delete();
        return FALSE;
@@ -50,6 +53,8 @@ static BOOL NTAPI False(CException *e, CString *sError)
 
 /** 
  * @brief Open given path-file and read data from it to member variables.
+ *
+ * Errors are returned in sError, unless it is NULL, in which case they are thrown
  */
 BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
 {

diff --git a/Src/resource.h b/Src/resource.h
index 3cdaff9..49d84be 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -695,6 +695,8 @@
 #define IDS_VCS_CLEARCASE               18500
 #define IDS_BREAK_ON_WHITESPACE         18501
 #define IDS_BREAK_ON_PUNCTUATION        18502
+#define IDS_UNK_ERROR_READING_PROJECT   18510
+#define IDS_UNK_ERROR_SAVING_PROJECT    18511
 #define IDD_LANGUAGE_SELECT             30000
 #define IDS_AFRIKAANS                   30003
 #define IDS_ALBANIAN                    30004