<title>What's new in 2.2</title>
<sect2>
<title>Unicode support</title>
- <para>WinMerge 2.2 is distributed with ANSI executable (<filename>WinMerge.exe</filename>) for Windows 95/98/ME and Unicode executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP. Unicode executable supports UCS-2 and UTF-8 files and filenames.</para>
+ <para>WinMerge 2.2 is distributed with an ANSI executable (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP. The unicode executable supports UCS-2 and UTF-8 files and filenames.</para>
<note>
- <para>It is unfortunate that two executable files are needed. But there is no currently way to get only one executable working. MS Unicode layer does not help WinMerge since WinMerge needs to be comparing files in different codepages.</para>
+ <para>It is unfortunate that two executable files are needed. But there is no current way to get only one executable working. MS Unicode layer does not help WinMerge since WinMerge needs to be able to compare files in different codepages.</para>
</note>
</sect2>
<sect2>
<title>Archive support</title>
- <para>WinMerge 2.2 can open and save several archive
types. Archive support requires installing 7-zip. Refer to <filename>Read Me.rtf</filename> file for info about compatible 7-zip version. 7-zip can be downloaded from <ulink url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
+ <para>WinMerge 2.2 can open and save several archive
types. Archive support requires installing 7-zip. Refer to <filename>Read Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip can be downloaded from <ulink url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
</sect2>
<sect2>
<title>Shell integration</title>
- <para>WinMerge 2.2 can be integrated into Windows Shell. Shell integration adds "<guimenuitem>WinMerge</guimenuitem>" menuitem to Windows Explorer's context menu for easy and fast comparing files and directories.</para>
+ <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to Windows Explorer's context menu for easy and fast comparing files and directories.</para>
</sect2>
<sect2>
<title>Selecting filter from commandline</title>
</sect2>
<sect2>
<title>Project files</title>
- <para>WinMerge can read paths to open from project files. Project files are simple XML files storing one or two paths, and also possibly choice of which filter to use and whether to include subfolders.</para>
+ <para>WinMerge can read paths to open from project files. Project files are simple XML files storing one or two paths, and also possibly the choice of which filter to use and whether to include subfolders.</para>
</sect2>
<sect2>
<title>Generating patches</title>
</sect2>
<sect2>
<title>Plugins</title>
- <para>Plugins are now supported to preprocess files before actual compare or to extend editor functionality. Plugins can be programmed using several languages supporting COM. Example plugins are included.</para>
+ <para>Plugins are now supported to preprocess files before actual comparison, or to extend editor functionality. Plugins can be programmed using several languages supporting COM. Example plugins are included.</para>
</sect2>
<sect2>
<title>Improved directory compare</title>
<para>Many new features and improvements:</para>
<itemizedlist>
<listitem>
- <para>More columns added (e.g. file sizes and attributes), shown columns can be selected and reordered.</para>
+ <para>More columns have been added (e.g. file sizes and attributes), and columns may be reordered, hidden, and displayed.</para>
</listitem>
<listitem>
- <para>Filtered items have now own category (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set to hidden/visible from <guimenu>View</guimenu>-menu.</para>
+ <para>Filtered items now have a distinct category (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set to hidden/visible from <guimenu>View</guimenu>-menu.</para>
</listitem>
<listitem>
- <para>Floating statusbar during compare process, compare can be stopped and files/dirs compared so far are shown.</para>
+ <para>There is a new floating statusbar during the compare process, and comparison may be aborted, and the the files/dirs compared so far are shown.</para>
</listitem>
<listitem>
<para>Newer file/directory is indicated with asterisk (<guilabel>*</guilabel>) in date field.</para>
<para>One or both directories can be set read-only, preventing accidental overwriting.</para>
</listitem>
<listitem>
- <para>Selected items count is shown in statusbar.</para>
+ <para>The number of selected items is shown in the statusbar.</para>
</listitem>
</itemizedlist>
</sect2>
<para>Fixed "<guilabel>Ignore blank lines</guilabel>" feature.</para>
</listitem>
<listitem>
- <para>Enchanged EOL handling (files can contain different EOL styles in one file).</para>
+ <para>Enhanced EOL handling (files can contain different EOL styles in one file).</para>
</listitem>
<listitem>
<para>Linenumber, current column and char, line length and char count shown in statusbar.</para>
OSDN Git Service
