PATCH: [ 943149 ] Contributors fix

diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
index ce0ba17..e820a70 100644 (file)
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -1,6 +1,108 @@
-Please leave "Contributors.rtf" in RTF format this is necessary for compatiblity with our Inno Setup installer.  "Contributors.rtf" is used by the installer on the "information" page during installation.  Please do not add tables or bullets to this file, neither seem to display correctly inside of Inno Setup which has its own bug-ridden engine for displaying RTF files.  Also please leave the font choice, sizes, and color schemes as they are, or ask me for permission to do otherwise providing your reasoning.  
 
-Thanks,
-Seier Blackburn
-MyPurchases@Yahoo.com 
-(All e-mail should contain WinMerge in the title)
\ No newline at end of file
+People who have contributed to WinMerge
+---------------------------------------
+
+Original developer, project admin:
+* Dean Grimm
+
+Project lead:
+* Christian List
+
+Other developers:
+* Laurent Ganier
+* Dennis Limm
+* Chris Mumford
+* Perry Rapp
+* Jochen Tucht
+* Kimmo Varis
+
+
+Localization:
+* Bulgarian:   
+  Sld
+
+* Catalan:     
+  Jordi Vilar
+
+* Simplified Chinese:
+  Liaobin
+
+* Traditional Chinese:
+  Koko
+
+* Czech:
+  Jiri Tax
+
+* Danish:
+  Christian List
+
+* Dutch:
+  Ronald Schaap
+
+* French:      
+  Gil Andre 
+  Laurent Ganier
+    
+* German:      
+  Tim Gerundt
+  Winfried Peter
+  Joerg Schneider   
+    
+* Italian:     
+  Michele Merega
+             
+* Korean:
+  Sukjoon
+           
+* Norwegian:   
+  Hans Fredrik Nordhaug
+            
+* Polish:      
+  Pawe Wawrzyszko
+
+* Portuguese (Brazilian):      
+  Wender Firmino
+
+* Russian:     
+  Dmitriy S. Aleshkowskiy
+              
+* Slovak:      
+  Majvan
+             
+* Spanish:     
+  Dean Grimm
+             
+* Swedish:     
+  Göran Håkansson
+  Hans Eriksson
+
+
+Other Contributors:  
+* Christian "Seier" Blackburn (Installer)
+* Gilbert Wellisch
+* Harry Mckame
+* Hern Chen
+* Marvin Gouw
+* Michael Richter
+* Steve Beaudoin
+* Tim Gerundt
+* Tim Musschoot
+* Vikrant
+* Vincent Osele
+
+
+WinMerge includes code from:
+* Paul DiLascia (CStaticLink) 
+* Michael Dunn (CShellFileOp)
+* Michael P. Mehl (CMessageBoxDialog)
+* Cristi Posea (CSizingControlBar)
+* Ferdinand Prantl (CrystalEditor syntax rules)
+* Henry Spencer (CRegExp)
+* Andrei Stcherbatchenko (CrystalEditor)
+
+
+*** NOTE ***
+If your name is missing please send email us to:
+winmerge-support@lists.sourceforge.net
+
+Thanks!

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index ead30b3..14013bf 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,114,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 3ec4b6f..8eed9c6 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -376,14 +376,9 @@ BEGIN
     LTEXT           "Ïîñåòè ñòðàíèöàòà íà WinMerge!",IDC_WWW,7,119,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
-    LTEXT           "Syntax Highlighting Edit View by Andrei Stcherbatchenko ",
-                    IDC_STATIC,7,71,209,8
-    LTEXT           "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81,
-                    209,8
-    LTEXT           "Other major contributors include:",IDC_STATIC,7,91,209,
-                    8
-    LTEXT           "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier",
-                    IDC_STATIC,7,101,209,8
+    LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index fcd3b02..b978d47 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index a9b83c2..55fb925 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -370,8 +370,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 1ccdd25..31fcc16 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index f121191..1021f99 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -372,8 +372,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 57d85b7..766ea17 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 8c15ac3..79adebf 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -372,8 +372,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,72,184,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 3c5f70c..2afd47b 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -372,8 +372,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 1d5f877..6ba165b 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -379,8 +379,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Öffnen...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 368, 126

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 6ba97fd..ec14980 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,184,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 79e3f01..e4c52dd 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -336,8 +336,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index c611b2b..467f6d5 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index b926a86..1d9a8cd 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 9357bd7..cbf8c6b 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -383,8 +383,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 370, 126

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 1afd6ce..bfd23cd 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -372,8 +372,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 366, 126

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index f5470c9..4a630bd 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 610b77e..f9ac0b2 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -370,8 +370,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
     LTEXT           "[VERSION COPYRIGHT FINNS HÄR]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors listas i",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Öppna...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 9e93b63..eb9788e 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -752,7 +752,7 @@ void CAboutDlg::OnBnClickedOpenContributors()
 {
        CString defPath = GetModulePath();
        // Don't add quotation marks yet, CFile doesn't like them
-       CString docPath = defPath + _T("\\Docs\\Contributors.rtf");
+       CString docPath = defPath + _T("\\contributors.txt");
        HINSTANCE ret = 0;
        
        CFileStatus status;
@@ -762,7 +762,7 @@ void CAboutDlg::OnBnClickedOpenContributors()
                // includes spaces
                docPath.Insert(0, _T("\""));
                docPath.Insert(docPath.GetLength(), _T("\""));
-               ret = ShellExecute(m_hWnd, NULL, _T("wordpad"), docPath, defPath, SW_SHOWNORMAL);
+               ret = ShellExecute(m_hWnd, NULL, _T("notepad"), docPath, defPath, SW_SHOWNORMAL);
 
                // values < 32 are errors (ref to MSDN)
                if ((int)ret < 32)
@@ -772,7 +772,7 @@ void CAboutDlg::OnBnClickedOpenContributors()
                        if ((int)ret < 32)
                        {
                                CString msg;
-                               AfxFormatString1(msg, IDS_CANNOT_EXECUTE_FILE, _T("WordPad.exe"));
+                               AfxFormatString1(msg, IDS_CANNOT_EXECUTE_FILE, _T("Notepad.exe"));
                                AfxMessageBox(msg, MB_OK | MB_ICONSTOP);
                        }
                }

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 81e2ca7..e82bc33 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -371,8 +371,8 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
     LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Contributors are listed in",IDC_STATIC,7,81,208,8
-    LTEXT           "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8
-    PUSHBUTTON      "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
+    LTEXT           "Contributors.txt",IDC_STATIC,7,91,153,8
+    PUSHBUTTON      "Show...",IDC_OPEN_CONTRIBUTORS,165,95,50,14
 END
 
 IDD_OPEN DIALOGEX 0, 0, 364, 126

diff --git a/Src/readme.txt b/Src/readme.txt
index 9e14198..7cb4b66 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,10 @@
+2004-04-29 Kimmo
+ PATCH: [ 943149 ] Contributors fix
+  Src: Merge.cpp Merge.rc
+  Languages: *.rc
+  Docs/Users/Contributors.txt
+  Removed: Docs/Users/Contributors.rtf
+
 2004-04-28 Kimmo
  PATCH: [ 937947 ] Open-dialog improvements (no codepage controls)
   Src: Merge.rc OpenDlg.cpp OpenDlg.h resource.h