+2005-05-31 2.2.4 Stable Release
+
+2005-05-26 Kimmo
+ BUG: [ 1198263 ] MergeKorean translation credit wrong?
+ Src/Languages/Korean: MergeKorean.rc
+
+2005-05-20 Kimmo
+ PATCH: [ 1203680 ] Fix tab adding spaces in unicode builds
+ Src/editlib: ccrystaltextview.cpp
+
+2005-05-18 Perry
+ Update language count (19->21, three occurrences)
+ Docs/Developers/readme-developers.html.
+ Note that sourceforge tracker doesn't display tabs.
+ Docs/Developers/readme-developers.html.
+
+2005-05-15 Perry
+ PATCH: [ 1201961 ] Japanese translation update
+ (typo fix for earlier version of same patch, IDC_EOL_SENSITIVE)
+ Src/Languages/Japanese: MergeJapanese.rc
+
+2005-05-14 Perry
+ PATCH: [ 1199600 ] Minor update to text encoding docs in manual
+ Docs/Users/Manual/Text_encoding.xml
+ PATCH: [ 1201961 ] Japanese translation update
+ Src/Languages/Japanese: MergeJapanese.rc
+ PATCH: [ 1107484 ] Fix broken version columns
+ Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h
+ DirViewColItems.cpp
+ BUG: [ 1157554 ] MergeKorean IDD_FILEFILTERS not DIALOGEX
+ Src/Languages/Korean: MergeKorean.rc
+
+2005-05-12 Kimmo
+ BUG: [ 1198435 ] Comma missing from ID_LOCBAR_GOTODIFF menuitem
+ Src: Merge.rc
+ Src/Languages: *.rc
+ PATCH: [ 1175065 ] Use view lines when scrolling from location pane
+ Src: LocationView.cpp LocationView.h MergeEditView.cpp
+
+2005-05-12 Perry
+ BUG: [ 1193163 ] "Gerenate Patch" deletes the original files if UTF-8/16
+ Added argument (areTempFiles) to method SetCompareFiles, and used in RunFileDiff.
+ (also BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
+ Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchDlg.cpp PatchTool.cpp
+
+2005-05-11 Kimmo
+ Update Contributors list
+ Docs/Users: Contributors.txt
+
+2005-05-11 Perry
+ BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files
+ Bail out of OlecharToUTF8 if BOM not UCS-2 (to avoid scrambling text).
+ Src/Common: multiformatText.cpp
+ Improve comments heading & in OlecharToUTF8
+ Src/Common: multiformatText.cpp
+
+2005-05-09 Perry
+ BUG [ 1197964 ] MergeBulgarian string versioninfo translated
+ Src/Languages: MergeBulgarian.rc MergeGerman.rc
+ BUG [ 1193561 ] v2.2, version copyrights not all up-to-date
+ Adjusted all to say 1996-2005 just as English
+ Src/Languages: Merge*.rc
+
+2005-05-08 Perry
+ PATCH: [ 1188063 ] UTF-8 file saving problem, the file header BOM missing.
+ Src/Common: UniFile.cpp
+ BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
+ Src: PatchDlg.cpp
+
+2005-05-07 Perry
+ Synchronizing MergeTurkish.rc to Merge.rc
+ (removing obsolete keywords, accepting DS_SETFONT from Merge.rc,
+ removing trailing spaces, bitmap ids to symbolic,
+ adding stringtable comments)
+ Src/Languages/Turkish: MergeTurkish.rc
+
+2005-05-05 Kimmo
+ PATCH: [ 1195530 ] Fix hiding sorted column
+ Src: DirViewColHandler.cpp
+
+2005-05-03 Kimmo
+ PATCH: [ 1189875 ] Small cleanup for line replace code
+ Src: MergeDoc.cpp
+ PATCH: [ 1193447 ] Optimise location pane update.
+ Src: LocationView.cpp
+ BUG: [ 1181399 ] When a modified file is locked, Retry should be an option
+ Don't close unsaved documents when 'No' button is selected
+ Src: MergeDoc.cpp
+
+2005-05-01 Perry
+ PATCH: [ 1188377 ] all of the menu contents is translated in turkish
+ Initial upload of Turkish rc (menus translated) exactly as submitted by Ozkan.
+ New Src/Languages/Turkish
+ Add appropriate AFX_TARG_TRK and LANG_TURKISH declarations to MergeTurkish.rc
+ Src/Languages/Turkish: MergeTurkish.rc
+ Convert Turkish Merge.rc2 from English one to translated one (no editlib include)
+ Add Turkish to BuildAll.bat
+ Src/Languages: BuildAll.bat
+ Src/Languages/Turkish/res: Merge.rc2
+ Fix language code in version info in Turkish (needed for LanguageSelect).
+ Src/Languages/Turkish/MergeTurkish.rc
+ PATCH: [ 1193560 ] v2.2: MergeHungarian doesn't compile (IDS_VCS_NONE)
+ Synch Hungarian resource.h to German resource.h, to get new IDS strings.
+
+2005-04-28 Tim
+ PATCH: [ 1190544 ] Translated Read Me-German.rtf
+ Docs/Users/Languages: Read Me-German.rtf
+
+2005-04-28 Kimmo
+ BUG: [ 1181883 ] Inconsistent behavior: select font vs. Use default
+ Src: MainFrm.cpp MainFrm.h
+
+2005-04-25 Kimmo
+ BUG: [ 1179790 ] ReadMe-Hungarian.rtf file is missing
+ docs/Users/Languages new file: Read Me-Hungarian.rtf
+
+2005-04-24 Kimmo
+ BUG: [ 1183031 ] Shared file give "parameter not correct error"
+ Additional fix from Perry
+ Src/Common: UniFile.cpp
+
+2005-04-23 Kimmo
+ BUG: [ 1183031 ] Shared file give "parameter not correct error"
+ Fix from Robin Sandlin and Perry
+ Src/Common: UniFile.cpp
+
+2005-04-22 Kimmo
+ Correct Polish translator name in Contributors list
+ Docs/Users: Contributors.txt
+ PATCH: [ 1183772 ] Update Italian translation + readme
+ Submitted by Andrea Decorte
+ Docs/users/Languages: Read Me-Italian.rtf
+ PATCH: [ 1184023 ] Syntax highlighting for Inno Setup files
+ Submitted by Tim
+ Src: Merge.dsp
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
+ Src/editlib new file: innosetup.cpp
+
+2005-04-18 Kimmo
+ PATCH: [ 1183669 ] Updated ReadMe-ChineseTraditional.rtf
+ From Koko
+ Docs/users/Languages: Read Me-Chinese_Traditional.rtf
+ PATCH: [ 1183481 ] Updated Polish translation
+ From Pawel Wawrzysko
+ Src/Languages/Polish: MergePolish.rc
+ Docs/users/Languages: Read Me-Polish.rtf
+ InnoSetup/Languages: Pölish.isl
+
+2005-04-17
+ PATCH: [ 1179941 ] Syntax highlighting for NSIS files
+ Submitted by Tim
+ Src: Merge.dsp
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
+ Src/editlib new file: nsis.cpp
+
+2005-04-13 Kimmo
+ PATCH: [ 1180768 ] Russian translation update
+ Submitted by Dmitriy Aleshkowskiy
+ Src/Languages/Russian: MergeRussian.rc
+ PATCH: [ 1181157 ] Swedish translation update
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
+2005-04-13 Perry
+ PATCH: [ 1145016 ] i18n the version control strings
+ Src: Merge.rc PropVss.cpp PropVss.h resource.h
+ Languages: resource.h Merge*.rc
+
+2005-04-05 Kimmo
+ PATCH: [ 1176574 ] catalan translation update (setup)
+ Submitted by Jordi Vilar
+ InnoSetup: WinMerge Localized.iss
+ InnoSetup/Languages: Catalan.isl
+ Docs/Users/Languages: Read Me-Catalan.rtf
+ PATCH [ 1176741 ] Swedish ReadMe-Swedish.rtf file
+ Submitted by Hans Eriksson
+ Docs/Users/Languages: Read Me-Swedish.rtf
+ Update contributors file (Add Dutch and French translators)
+ Docs/Users: Contributors.txt
+
+2005-04-03 Perry
+ PATCH: [ 1155977 ] Log scriptlet plugin errors
+ Src: Plugins.cpp
+
+2005-04-02 Kimmo
+ PATCH: [ 1172679 ] French translation
+ Submitted by: Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+ PATCH: [ 1174935 ] Russian translation update
+ Submitted by Dmitriy Aleshkowskiy
+ Src/Languages/Russian: MergeRussian.rc
+ PATCH: [ 1175319 ] Dutch translation update
+ Submitted by Michel Coene
+ Src/Languages/Dutch: MergeDutch.rc
+
+2005-04-01 Kimmo
+ PATCH: [ 1173072 ] hungarian translation for current beta (2.3.2.0)
+ Submitted by Márton Balázs
+ Src/Languages/Hungarian: MergeHungarian.rc
+
+2005-03-29 Kimmo
+ PATCH: [ 1171805 ] Update italian translation
+ Submitted by Andrea Decorte
+ InnoSetup/Languages: Italian.isl
+ PATCH: [ 1159465 ] Add Jesus (Mack) to contributors/Spanish
+ Submitted by Perry
+ Users/Docs: Contributors.txt
+ PATCH: [ 1172427 ] Norwegian translation for 2.2.2 / CVS head
+ Submitted by Hans Fr. Nordhaug
+ Src/Languages/Norwegian: MergeNorwegian.rc
+
2005-03-23 2.2.2 Stable Release
2005-03-22 Kimmo
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.2.2</Program_Version>
- <Program_Release_Month>03</Program_Release_Month>
- <Program_Release_Day>23</Program_Release_Day>
+ <Program_Version>2.2.4</Program_Version>
+ <Program_Release_Month>05</Program_Release_Month>
+ <Program_Release_Day>31</Program_Release_Day>
<Program_Release_Year>2005</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
<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>
+ <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
<Program_Change_Info />
<Program_Specific_Category>Utilities</Program_Specific_Category>
<Program_Category_Class>System Utilities::Other</Program_Category_Class>
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.2.2-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.2.0-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.2.4-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.2.2-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2722237</File_Size_Bytes>
- <File_Size_K>2658</File_Size_K>
- <File_Size_MB>2.60</File_Size_MB>
+ <File_Size_Bytes>2745688</File_Size_Bytes>
+ <File_Size_K>2681</File_Size_K>
+ <File_Size_MB>2.62</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
<Keywords>diff,merge,text files,differencing,syncronize</Keywords>
<Char_Desc_45>Compare and merge files or directories</Char_Desc_45>
<Char_Desc_80>WinMerge is side-by-side difference display and merge, for files or directories</Char_Desc_80>
- <Char_Desc_250>WinMerge is a tool for visual difference display and merging, for both files and directories. Unicode support. Flexible syntax coloring editor. Windows Shell integration. Regexp filtering. Side-by-side line diff and in-line word diff visualisation.</Char_Desc_250>
- <Char_Desc_450>WinMerge is a tool for visual difference display and merging, for both files and directories. WinMerge has Unicode support, Flexible syntax coloring editor, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and in-line word difference visualisation. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.</Char_Desc_450>
- <Char_Desc_2000>WinMerge is a tool for visual difference display and merging, for both files and directories. It is highly useful for determing what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and in-line word difference visualisation.A file map shows the overall file differences in a location pane. The user interface is translated into several languages.</Char_Desc_2000>
+ <Char_Desc_250>WinMerge is a tool for visual difference display and merging, for both files and directories. Unicode support. Flexible syntax coloring editor. Windows Shell integration. Regexp filtering. Side-by-side line diff. Highlights differences inside lines.</Char_Desc_250>
+ <Char_Desc_450>WinMerge is a tool for visual difference display and merging, for both files and directories. WinMerge has Unicode support, Flexible syntax coloring editor, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.</Char_Desc_450>
+ <Char_Desc_2000>WinMerge is a tool for visual difference display and merging, for both files and directories. It is highly useful for determing what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.</Char_Desc_2000>
</English>
</Program_Descriptions>
<Web_Info>
<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.2-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
<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.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.2.4 - latest stable version</h2>
+<p><a href="2.2/index.php">WinMerge 2.2.4</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.4-Setup.exe">Download WinMerge 2.2.4 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>
<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.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
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-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.4-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>
<h2>Using WinMerge</h2>
<p>You can use the <a href="2.2/manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=281681">download</a> a copy.</p>
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy.</p>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
OSDN Git Service
