PATCH: [ 1170267 ] Website changes for new stable release 2.2.2

diff --git a/Web/2.2/changes.txt b/Web/2.2/changes.txt
index 2d71773..4de0156 100644 (file)
--- a/Web/2.2/changes.txt
+++ b/Web/2.2/changes.txt
@@ -1,3 +1,258 @@
+2005-03-23 2.2.2 Stable Release
+
+2005-03-22 Kimmo
+ BUG: [ 1143619 ] Unicode chars in filename display as '_'
+  Src: Merge.rc
+  Src/Languages: Merge*.rc
+ BUG: [ 1162037 ] Missing localization (German)
+  Add couple of accel keys (patch from Tim)
+   Src/Languages/German: MergeGerman.rc
+ PATCH: [ 1165515 ] Improve drawing location pane moved block lines
+  Src: LocationView.cpp LocationView.h
+ BUG: [ 1154153 ] Poor font choice for default font
+  Fix submitted by Takashi Sawanaka
+  Src: MainFrm.cpp
+
+2005-03-21 Kimmo
+ PATCH: [ 1160064 ] Undo for Copy All
+  Src: MergeDoc.cpp MergeDoc.h
+
+2005-03-19 Perry
+ PATCH: [ 964676 ] rc file lacks bytes after DIALOGEX defs
+  Src: Merge.rc
+  Src/Languages: Merge*.rc
+
+2005-03-18 Perry
+ PATCH: [ 967230 ] Initialize default language from locale
+  Src/Common: LanguageSelect.cpp LanguageSelect.h
+
+2005-03-17 Jochen
+ Pass LANGID to Merge7z::Initialize as HIWORD(dwFlags)
+  Src: 7zCommon.cpp
+
+2005-03-16 Kimmo
+ PATCH: [ 1147039 ] experimental patch for colored word diff
+  Merge some translated strings from trunk (from Takashi Sawanaka)
+   Languages: Japanese/MergeJapanese.rc
+ PATCH: [ 1158136 ] Spanish translation revised
+  Submitted by Jesus M. Delgado 'Mack'
+   Languages/Spanish: MergeSpanish.rc
+
+2005-03-16 Tim
+ PATCH: [ 1156198 ] Non-standard html in developer docs
+  Docs/Developers: readme-developers-*.html
+
+2005-03-14 Kimmo
+ BUG: [ 1162374 ] Recent WinMerge doesn't support NT4
+  Src/Common: UniFile.cpp
+ PATCH: [ 1159112 ] Swedish translation revision
+  Submitted by Hans Eriksson
+  Languages/Swedish: MergeSwedish.rc
+
+2005-03-13 Jochen
+ Read 7-Zip version from 7zip_pad.xml
+ Add archive support related stuff to ConfigLog
+ Provide substitute for DlgDirList, which does not handle long filenames on Windows 98
+  (should fix BUG [1090513])
+  Src new files: dllpstub.cpp dllpstub.h markdown.cpp markdown.h
+  Src: Merge.dsp 7zCommon.cpp 7zCommon.h ConfigLog.cpp ConfigLog.h paths.cpp paths.h
+  Src/common: version.cpp version.h
+
+2005-03-13 Perry
+ PATCH: [ 1103542 ] Declare _MBCS in ANSI builds
+  Src: Merge.dsp
+
+2005-03-11 Kimmo
+ Fix invalid compare for VSS dialog returnvalue
+  Src: MainFrm.cpp
+
+2005-03-10 Kimmo
+ PATCH: [ 1158456 ] Fix setting font for headerbar editcontrols
+  Src: EditorFilepathBar.cpp EditorFilepathBar.h
+ PATCH: [ 1158484 ] Fix assert from headerbar-setactive() when closing views
+  Src: EditorFilepathBar.cpp EditorFilepathBar.h
+
+2005-03-09 Kimmo
+ PATCH: [ 1153870 ] Disable redrawing dir compare view while adding items
+  Src: DirDoc.cpp
+
+2005-03-08 Kimmo
+ Merge UniFile file open/stat changes from trunk:
+ PATCH: [ 1124380 ] Use _tstati64() in UniLocalFile::DoGetFileStatus()
+  Common: UniFile.cpp UniFile.h
+ PATCH: [ 1144059 ] Allow getting filestatus from open file in UniXXXFile
+  Common: UniFile.cpp UniFile.h
+ Remove line missed in patch [ 1144588 ] Remove show bak files setting from configlog
+  Src: MainFrm.cpp
+
+2005-03-08 Perry
+ PATCH [ 1151951 ] Alter getRightFilepath for root paths
+  Src: DiffContext.cpp
+ PATCH [ 1151949 ] Fix CDirDoc::FindItemFromPaths for root
+  Src: DirDoc.cpp
+
+2005-03-05 Perry
+ PATCH [ 1157015 ] Spanish translation update
+  (Backport from cvs trunk)
+  Languages: MergeSpanish.rc
+
+2005-03-03 Kimmo
+ BUG: [ 975226 ] Editor: Always refresh with Del-Key
+  Fix submitted by Takashi Sawanaka
+  Src: MergeEditView.cpp
+
+2005-03-02 Kimmo
+ PATCH: [ 1153091 ] Fix selecting default font from View menu
+  Src: MainFrm.cpp MainFrm.h OptionsDef.h
+
+2005-02-28 Perry
+ BUG [ 1144425 ] German: Options/codepage dlg needs adjust
+  (Fix by Tim Gerundt)
+  Languages: MergeGerman.rc
+
+2005-02-27 Perry
+ PATCH: [ 1152967 ] Fix re_match_2 declaration warnings
+  Src/diffutils/lib: REGEX.C
+
+2005-02-26 Jochen
+ PATCH: [ 1152256 ] UniFile may fail to read last line
+  Src/Common: UniFile.cpp
+
+2005-02-25 Kimmo
+ PATCH: [ 1123539 ] Small improvement for code creating backup copy
+  Src: MainFrm.cpp
+
+2005-02-24 Kimmo
+ PATCH: [ 1149365 ] Check linenumber to goto for upper limit
+  Src: MergeEditView.cpp
+ PATCH: [ 1149388 ] Check for previous compare text before find again
+  Src/editlib: ccrystaltextview.cpp
+
+2005-02-22 Kimmo
+ PATCH: [ 1145522 ] fix crash on search
+  Submitted by Takashi Sawanaka
+  Src/editlib: ccrystaltextview.cpp
+
+2005-02-20 Kimmo
+ PATCH: [ 1144588 ] Remove show bak files setting from configlog
+  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp OptionsDef.h
+
+2005-02-11 Kimmo
+ PATCH: [ 1112111 ] Confusing message for identical scratchpads
+  Src: MergeDoc.cpp
+
+2005-02-08 Kimmo
+ PATCH: [ 1117375 ] Rememer status/toolbar visible status
+  Src: MainFrm.cpp MainFrm.h OptionsDef.h
+
+2005-01-30 Jochen
+ PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue) UniFile part
+  Src: MergeDoc.cpp
+  Src/common: UniFile.cpp UniFile.h
+
+2005-01-30 Kimmo
+ Merge Location Pane improvements from CVS trunk/2.3
+ PATCH: [ 1094474 ] Visible area indicator for location pane
+ PATCH: [ 1105640 ] Properly update locationpane visible area indicator
+  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
+
+2005-01-27 Kimmo
+ PATCH: [ 1106383 ] Show few chars of 'context' when horizontal scrolling lines
+  Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
+  View scrolling optimisation from Takashi Sawanaka
+  Src/editlib: ccrystaltextview.cpp
+
+2005-01-23 Kimmo
+ Update MASM filter file
+  Submitted by Matt Bossard (to forum)
+  Filters: MASM.flt
+
+2005-01-21 Perry
+ PATCH: [ 1048412 ] Log font info in configuration
+  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+ Also remove old variable bDetectCodepage in MISCSETTINGS struct.
+
+2005-01-20 Kimmo
+ PATCH: [ 1086745 ] Find- and Replace-dialogs to remember strings too
+  Src/editlib: ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
+   cfindtextdlg.cpp cfindtextdlg.h
+ Add new MASM filter file
+  Submitted by Matt Bossard (to forum)
+  Filters new file: MASM.flt
+
+2005-01-14 Kimmo
+ PATCH: [ 1101919 ] Russian Readme.rtf
+  Submitted by Dmitriy S. Aleshkowskiy
+  Docs/Users/Languages: Read Me-Russian.rtf
+  InnoSetup: WinMerge Localized.iss
+
+2005-01-13 Kimmo
+ PATCH: [ 1100462 ] Center find result in file compare
+  Src/editlib: ccrystaltextview.cpp
+
+2005-01-11 Kimmo
+ PATCH: [ 1053475 ] Exponentially grow long lines when reading
+  Submitted by Perry
+  Src/Common: UniFile.cpp UniFile.h
+  Src: Merge.dsp MergeDoc.cpp
+ BUG: [ 1064942 ] Copyright notice????
+  Bumped copyright year to continue through 2005
+   Src: Merge.rc
+
+2005-01-08 Kimmo
+ PATCH: [ 1098340 ] crash rarely when starting many winmerge continuously
+  Anonymous submission
+  Src: FileFilterMgr.cpp
+ PATCH: [ 1088049 ] Ask about saving when Window/Close is selected
+  Src: MergeEditView.cpp MergeEditView.h
+
+2005-01-05 Kimmo
+ PATCH: [ 1094467 ] Update contributors: Tim is now developer
+  Docs/Users: Contributors.txt
+
+2004-12-27 Tim
+ RFE: [ 1085099 ] 'fileskip.bmp' looks to similar like 'equal.bmp'
+  Src/res: fileskip.bmp
+  Languages: fileskip.bmp
+
+2004-12-19 Kimmo
+ PATCH: [ 1065462 ] Show all skipped items when selected so
+  Src: DirDoc.cpp
+
+2004-12-17 Kimmo
+ PATCH: [ 1086601 ] Dircompare statepane miscounting skipped items
+  Src: DirCompStateBar.cpp
+ PATCH: [ 1068011 ] Partial French translation
+  Submitted by Matthieu Pupat
+  Src/Languages/French: MergeFrench.rc
+  Docs/Users: Contributors.txt
+ PATCH: [ 1058142 ] update coloring of batch file
+  Submitted by Andre Arpin
+  Src/editlib: batch.cpp
+ PATCH: [ 1057062 ] Separate Skipped flags from compare result flags
+  Src: DiffContext.h DirCompStateBar.cpp DirDoc.cpp DirScan.cpp
+   DirView.cpp DirViewColItems.cpp
+
+2004-12-04 Kimmo
+ PATCH: [ 1078505 ] Use DOS eol as filename/pathname clipboard separator
+  Src: DirView.cpp
+
+2004-12-03 Kimmo
+ PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
+  Additional optimisation from Takashi Sawanaka
+  Src/editlib: ccrystaltextview.cpp
+
+2004-12-01 Kimmo
+ PATCH: [ 1075591 ] Disable file filter edit button for no filter selection
+  Src: FileFiltersDlg.cpp FileFiltersDlg.h
+
+2004-11-17 Kimmo
+ PATCH: [ 1067374 ] Norwegian translation for 2.2.0
+  Submitted by Hans Fr. Nordhaug
+  Src/Languages/Norwegian: MergeNorwegian.rc
+
+
 2004-11-10 2.2 Stable Release
 
 2004-11-10 Kimmo

diff --git a/Web/2.2/index.php b/Web/2.2/index.php
index 151e39d..9746797 100644 (file)
--- a/Web/2.2/index.php
+++ b/Web/2.2/index.php
@@ -29,8 +29,8 @@
 <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
 
 <h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-exe.zip">binary zip package</a> into the desired location, and run
 <code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
 <p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p>
 

diff --git a/Web/WinMergePAD.xml b/Web/WinMergePAD.xml
index 48407aa..f5fc256 100644 (file)
--- a/Web/WinMergePAD.xml
+++ b/Web/WinMergePAD.xml
@@ -34,15 +34,15 @@
        </Company_Info>
        <Program_Info>
                <Program_Name>WinMerge</Program_Name>
-               <Program_Version>2.2.0</Program_Version>
-               <Program_Release_Month>11</Program_Release_Month>
-               <Program_Release_Day>10</Program_Release_Day>
-               <Program_Release_Year>2004</Program_Release_Year>
+               <Program_Version>2.2.2</Program_Version>
+               <Program_Release_Month>03</Program_Release_Month>
+               <Program_Release_Day>23</Program_Release_Day>
+               <Program_Release_Year>2005</Program_Release_Year>
                <Program_Cost_Dollars>0</Program_Cost_Dollars>
                <Program_Cost_Other_Code />
                <Program_Cost_Other />
                <Program_Type>Freeware</Program_Type>
-               <Program_Release_Status>Major Update</Program_Release_Status>
+               <Program_Release_Status>Minor Update</Program_Release_Status>
                <Program_Install_Support>Install and Uninstall</Program_Install_Support>
                <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support>
                <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,Portuguese,Romanian,Russian,Spanish,Swedish</Program_Language>
@@ -55,13 +55,13 @@
                <Includes_VB_Runtime>N</Includes_VB_Runtime>
                <Includes_DirectX>N</Includes_DirectX>
                <File_Info>
-                       <Filename_Versioned>WinMerge-2.2.0-Setup.exe</Filename_Versioned>
-                       <Filename_Previous>WinMergeSetup202.exe</Filename_Previous>
+                       <Filename_Versioned>WinMerge-2.2.2-Setup.exe</Filename_Versioned>
+                       <Filename_Previous>WinMerge-2.2.0-Setup.exe</Filename_Previous>
                        <Filename_Generic>WinMergeSetup.exe</Filename_Generic>
                        <Filename_Long>WinMergeSetup.exe</Filename_Long>
-                       <File_Size_Bytes>2813971</File_Size_Bytes>
-                       <File_Size_K>2748</File_Size_K>
-                       <File_Size_MB>2.68</File_Size_MB>
+                       <File_Size_Bytes>2722237</File_Size_Bytes>
+                       <File_Size_K>2658</File_Size_K>
+                       <File_Size_MB>2.60</File_Size_MB>
                </File_Info>
                <Expire_Info>
                        <Has_Expire_Info>N</Has_Expire_Info>
@@ -92,7 +92,7 @@
                        <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
                </Application_URLs>
                <Download_URLs>
-                       <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-Setup.exe</Primary_Download_URL>
+                       <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-Setup.exe</Primary_Download_URL>
                        <Secondary_Download_URL />
                        <Additional_Download_URL_1 />
                        <Additional_Download_URL_2 />

diff --git a/Web/developer/l10n/status.php b/Web/developer/l10n/status.php
index 793ba12..889ecb3 100644 (file)
--- a/Web/developer/l10n/status.php
+++ b/Web/developer/l10n/status.php
@@ -118,8 +118,11 @@ releases.</p>
   print("</table>\n");
 ?>
 
-<p>Release 2.0 language versions also works with release 2.0.2.<br />
-Release 1.4 language versions also works with release 1.7.</p>
+<ul>
+  <li>Release 2.2 language versions also works with release 2.2.2.</li>
+  <li>Release 2.0 language versions also works with release 2.0.2.</li>
+  <li>Release 1.4 language versions also works with release 1.7.</li>
+</ul>
 
 <p>If you would like to update any of these translations or add another translation, then please follow <a href="instructions.php">these instructions</a>.</p>
 <?php

diff --git a/Web/index.php b/Web/index.php
index 8dd31f5..ecdceb6 100644 (file)
--- a/Web/index.php
+++ b/Web/index.php
@@ -28,9 +28,9 @@
 <p><img src="2.2/images/screenshot.gif" alt="Screenshot of WinMerge"></p>
 <p>See the <a href="2.2/screenshots.php">screenshots page</a> for more screenshots.</p>
 
-<h2>WinMerge 2.2 - latest stable version</h2>
-<p><a href="2.2/index.php">WinMerge 2.2</a> is the latest stable version, and it is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-Setup.exe">Download WinMerge 2.2 Installer</a></p>
+<h2>WinMerge 2.2.2 - latest stable version</h2>
+<p><a href="2.2/index.php">WinMerge 2.2.2</a> is the latest stable version, and it is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-Setup.exe">Download WinMerge 2.2.2 Installer</a></p>
 
 <h2>WinMerge 2.0.2 - older stable version</h2>
 <p><a href="2.0/index.php">WinMerge 2.0.2</a> is an older version.</p>
@@ -48,8 +48,8 @@
 <p><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup.exe">Download WinMerge 1.7 Installer</a></p>
 
 <h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.2-exe.zip">binary zip package</a> into the desired location, and run
 <code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
 <p>For more details please look at the <a href="2.2/manual/installing.html">Installation section</a> from the <a href="2.2/manual/index.html">Manual</a>.</p>
 

diff --git a/Web/readme.txt b/Web/readme.txt
index a095645..c58348a 100644 (file)
--- a/Web/readme.txt
+++ b/Web/readme.txt
@@ -1,3 +1,9 @@
+2005-03-25 Tim
+ PATCH: [ 1170267 ] Website changes for new stable release 2.2.2
+  Web: index.php WinMergePAD.xml
+  Web\2.2: changes.txt index.php
+  Web\developer\l10n: status.php
+
 2005-03-23 Tim
  RFE: [ 1169348 ] Update for translation statuses
   Web\developer\l10n: status.xml