+++ /dev/null
-Please leave "Read Me.rtf" in RTF format this is necessary for compatiblity with our Inno Setup installer. Info.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. Another issue is the creation of hyperlinks. Don't allow MS Word or whatever you're using to create a hyperlink, just use plain text to represent your URLs. If you're URL becomes a hyperlink:
-(Word 2000 Instructions)
-1. Right-click over the blue hyperlink
-2. Click "Hyperlink >" --> "Remove Hyperlink". Inno Setup itself will detect that these are URLs and make them hyperlinks. I will also bug this so Inno Setup will support hyperlinks natively.
-
-Thanks,
-Seier Blackburn
-MyPurchases@Yahoo.com
-(All e-mail should contain WinMerge in the title)
--- /dev/null
+WINMERGE
+
+WinMerge is Open Source file compare and merge utility which runs on
+all modern Windows versions. Some features require additional installs
+or components.
+
+Latest WinMerge version and other WinMerge information is available at
+http://winmerge.org
+
+Quick start to WinMerge:
+Read online-manual Quick-start chapter to get started with WinMerge:
+http://www.winmerge.org/2.2/manual/quickstart.html
+
+HTML Manual:
+Manual is available online at
+http://www.winmerge.org/2.2/manual/
+it is also possibly installed (if choosed so) locally and downloadable
+separately from http://www.winmerge.org/ (see documentation)
+
+Archive Support:
+WinMerge uses 7-Zip for archive file support. 7-Zip (http://www.7-zip.org)
+is Open Source archive tool. To install archive file support, download
+7-Zip plugin installer from http://www.winmerge.org/.
+
+Installing archive support:
+It is recommended to Install 7-Zip application. If this cannot be done for
+some reason, 7-zip plugin installer can install only needed files to
+enable archive file support. Note that it DOES NOT allow stand-alone
+use of 7-Zip, only archive support for WinMerge.
+
+Scripts Support:
+If you would like to work with scripts you\92ll need to have the Windows
+Scripting Host installed. If you receive any errors relating to your
+scripts please visit
+http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
+to make sure that your Scripting Host is both up to date and not corrupted.
+
+Support:
+Developers are answering questions in Sourceforge.net's WinMerge forums:
+http://sourceforge.net/forum/?group_id=13216
+
+Bugs and feature requests:
+Bugs and suggestions for new features should be submitted into bug and
+RFE trackers at sourceforge.net.
+
+Bug tracker:
+http://sourceforge.net/tracker/?group_id=13216&atid=113216
+When reporting a bug, please tell us WinMerge version number!
+WinMerge versions 2.2.0 and later can output 'Configuration Log' from
+menu Help/Configuration. Please attach this info (as file attachment) to
+bug report, it has a lots of useful information for developers.
+
+RFE (feature request) tracker:
+http://sourceforge.net/tracker/?group_id=13216&atid=363216
+
+
+WinMerge developers
+++ /dev/null
-<TABLE BORDER="1">
- <TR BGCOLOR="#0099CC">
- <TH COLSPAN="2" NOWRAP SCOPE="col">Name</TH>
- <TH NOWRAP SCOPE="col">Description</TH>
- <TH NOWRAP SCOPE="col">Editor</TH>
- <TH NOWRAP SCOPE="col">Primary Contact </TH>
- <TH NOWRAP SCOPE="col">Date</TH>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfolder.gif" ALT="Folder Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Art</TD>
- <TD>Contains all artwork used by the installer</TD>
- <TD><A HREF="http://www.ulead.com/pi/trial.htm" TITLE="Download the PhotoImpact Trial Version" TARGET="_blank">Ulead PhotoImpact 6+</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD NOWRAP>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfolder.gif" ALT="Folder Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Output</TD>
- <TD>Contains the compiled installer, once you've compiled one. It will look something like "WinMerge 2.1.5.15.exe" </TD>
- <TD NOWRAP><A HREF="http://www.jrsoftware.org/isdl.php" TITLE="Download Inno Setup" TARGET="_blank">Inno Setup 4.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD NOWRAP>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfolder.gif" ALT="Folder Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Runtimes</TD>
- <TD>This contains the application runtimes required by WinMerge and its dependencies. These are distributed with the installer, since some portion of the WinMerge application won't run without them. </TD>
- <TD NOWRAP><A HREF="http://www.Microsoft.com/ie" TITLE="Download Internet Explorer 5.0+" TARGET="_blank">MHT Capable Web Browser</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD NOWRAP>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>WinMerge.iss</TD>
- <TD>This is the Inno Setup script used to create the installer.</TD>
- <TD NOWRAP><A HREF="http://www.jrsoftware.org/isdl.php" TITLE="Download Inno Setup" TARGET="_blank">Inno Setup 4.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD NOWRAP>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Scraps.iss</TD>
- <TD>This file is full code that either doesn't work, or was written and can't be used at this time, but still may one day prove useful. Hence the name scraps.</TD>
- <TD><A HREF="http://www.jrsoftware.org/isdl.php" TITLE="Download Inno Setup" TARGET="_blank">Inno Setup 4.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD NOWRAP>WinMerge Alpha.iss</TD>
- <TD>This is identical to WinMerge.iss</TD>
- <TD NOWRAP><A HREF="http://www.jrsoftware.org/isdl.php" TITLE="Download Inno Setup" TARGET="_blank">Inno Setup 4.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD NOWRAP>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD NOWRAP>Setup Helper.Au3</TD>
- <TD>This AutoIt 3 script is used by the installer to remove the shell extension without having to restart windows </TD>
- <TD><A HREF="http://www.hiddensoft.com/autoit3/" TARGET="_blank" TITLE="Download AutoIt">AutoIt 3.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Setup Helper.exe</TD>
- <TD>This is a compiled version of the AutoIT 3.0 "Installer Helper.Au3" script.</TD>
- <TD><A HREF="http://www.hiddensoft.com/autoit3/" TARGET="_blank" TITLE="Download AutoIt">AutoIt 3.X</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>*.REG</TD>
- <TD>These files are to be used as templates for integrating (via the installer) with some program that supports WinMerge. </TD>
- <TD>Any Binary Capable Text Editor (Notepad)</TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Art/Gold Watch.ico</TD>
- <TD>Gold Watch.ico is from AutoIt3 3.0.100. The icon is part of an open-source development tool and is therefore asumed to be free for use of any kind. </TD>
- <TD><A HREF="http://www.microangelo.us/" TITLE="Download MicroAngelo" TARGET="_blank">Any 256 Color Icon Editor </A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Art/*.RLE</TD>
- <TD>RLE Files are 256 Color Bitmaps that utilize Run Length Encoding or RLE compression. </TD>
- <TD NOWRAP><A HREF="http://www.ulead.com/pi/trial.htm" TITLE="Download the PhotoImpact Trial Version" TARGET="_blank">Any RLE Capable Photo Editor</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfolder.gif" ALT="Folder Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Art/Src</TD>
- <TD>Contains the source art files, these files are uncompressed and are generally created in proprietary tools.</TD>
- <TD><A HREF="http://www.ulead.com/pi/trial.htm" TITLE="Download the PhotoImpact Trial Version" TARGET="_blank">Ulead PhotoImpact 6+</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
- <TR>
- <TD><IMG SRC="../Docs/Users/Manual/screenshots/rfile.gif" ALT="File Icon" WIDTH="16" HEIGHT="16"></TD>
- <TD>Art/Src/*.UFO</TD>
- <TD>These are Ulead PhotoImpact 6 files that have *.RLE analogs in the parent Art folder. </TD>
- <TD><A HREF="http://www.ulead.com/pi/trial.htm" TITLE="Download the PhotoImpact Trial Version" TARGET="_blank">Ulead PhotoImpact 6+</A></TD>
- <TD NOWRAP><A HREF="Mailto:Christian_Blackburn@Hotmail.com">Seier</A></TD>
- <TD>2004-03-24</TD>
- </TR>
-</TABLE>
DisableStartupPrompt=yes
AllowNoIcons=yes
InfoBeforeFile=..\Docs\users\GPL.rtf
-InfoAfterFile=..\Docs\users\Read Me.rtf
+InfoAfterFile=..\Docs\users\ReadMe.txt
OutputBaseFilename=WinMerge-{#AppVersion}-Setup
;Localizations:
Name: Bulgarian; MessagesFile: Languages\Bulgarian.isl
-Name: Catalan; MessagesFile: Languages\Catalan.isl; InfoAfterFile: ..\Docs\Users\Languages\Read Me-Catalan.rtf
+Name: Catalan; MessagesFile: Languages\Catalan.isl
Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl
Name: Chinese_Traditional; MessagesFile: Languages\Chinese_Traditional.isl
Name: Czech; MessagesFile: Languages\Czech.isl
Name: Norwegian; MessagesFile: Languages\Norwegian.isl
Name: Polish; MessagesFile: Languages\Polish.isl
Name: Portuguese; MessagesFile: Languages\Brazilian_Portuguese.isl
-Name: Russian; MessagesFile: Languages\Russian.isl; InfoAfterFile: ..\Docs\Users\Languages\Read Me-Russian.rtf
+Name: Russian; MessagesFile: Languages\Russian.isl
Name: Slovak; MessagesFile: Languages\Slovak.isl
Name: Spanish; MessagesFile: Languages\Spanish.isl
-Name: Swedish; MessagesFile: Languages\Swedish.isl; InfoAfterFile: ..\Docs\Users\Languages\Read Me-Swedish.rtf
+Name: Swedish; MessagesFile: Languages\Swedish.isl
[Messages]
Source: ..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
;Documentation
-Source: ..\Docs\Users\Read Me.rtf; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
+Source: ..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
Source: ..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
Source: ..\Build\Manual\*; DestDir: {app}\Docs\Manual\; Flags: overwritereadonly recursesubdirs uninsremovereadonly sortfilesbyextension; Components: docs
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
;WinMerge (ANSI) for WinMerge.exe in NT-windows
Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core
-Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\Read Me.rtf; IconFileName: {win}\NOTEPAD.EXE
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\Plugins.txt; Filename: {app}\Docs\Plugins.txt; Check: InstallPluginsText
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\Manual\index.html; Components: docs
Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
+2005-05-13 Kimmo
+ PATCH: [ 1201434 ] New ReadMe.txt
+ Innosetup: WinMerge Localized.iss
+ Innosetup removed file: Read Me.htm
+ Users/Docs new file: ReadMe.txt
+ Users/Docs removed files: Read me.txt Read Me.rtf
+
2005-05-13 Perry
PATCH: [ 1201029 ] Catalan translation update
Src/Languages/Catalan: MergeCatalan.rc
OSDN Git Service
