• R/O
  • HTTP
  • SSH
  • HTTPS

winmerge-jp: Commit


Commit MetaInfo

Revision8c7b380a13d55c751d9399f5c3363ac95f122046 (tree)
Time2021-04-29 11:12:20
AuthorTakashi Sawanaka <sdottaka@user...>
CommiterTakashi Sawanaka

Log Message

Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h

Change Summary

Incremental Difference

--- a/Docs/Manual/EN/Command_line.xml
+++ b/Docs/Manual/EN/Command_line.xml
@@ -79,6 +79,40 @@
7979 <arg choice="opt" rep="norepeat"><option>/dr</option>
8080 <replaceable>rightdesc</replaceable></arg>
8181
82+ <arg choice="opt" rep="norepeat"><option>/al</option></arg>
83+
84+ <arg choice="opt" rep="norepeat"><option>/am</option></arg>
85+
86+ <arg choice="opt" rep="norepeat"><option>/ar</option></arg>
87+
88+ <arg choice="opt" rep="norepeat"><option>/noninteractive</option></arg>
89+
90+ <arg choice="opt" rep="norepeat"><option>/noprefs</option></arg>
91+
92+ <arg choice="opt" rep="norepeat"><option>/ignorews</option></arg>
93+
94+ <arg choice="opt" rep="norepeat"><option>/ignoreblanklines</option></arg>
95+
96+ <arg choice="opt" rep="norepeat"><option>/ignorecase</option></arg>
97+
98+ <arg choice="opt" rep="norepeat"><option>/ignoreeol</option></arg>
99+
100+ <arg choice="opt" rep="norepeat"><option>/ignorecodepage</option></arg>
101+
102+ <arg choice="opt" rep="norepeat"><option>/ignorecomments</option></arg>
103+
104+ <arg choice="opt" rep="norepeat"><option>/unpacker</option>
105+ <replaceable>unpacker name</replaceable></arg>
106+
107+ <arg choice="opt" rep="norepeat"><option>/prediffer</option>
108+ <replaceable>prediffer name</replaceable></arg>
109+
110+ <arg choice="opt" rep="norepeat"><option>/cp</option>
111+ <replaceable>codepage</replaceable></arg>
112+
113+ <arg choice="opt" rep="norepeat"><option>/cfg</option>
114+ <replaceable>name=value</replaceable></arg>
115+
82116 <arg choice="plain"
83117 rep="norepeat"><replaceable>leftpath</replaceable></arg>
84118
@@ -92,11 +126,9 @@
92126 rep="norepeat"><option>/o</option>
93127 <replaceable>outputpath</replaceable></arg>
94128
95- <arg choice="opt" rep="norepeat"><option>/al</option></arg>
96-
97- <arg choice="opt" rep="norepeat"><option>/am</option></arg>
98-
99- <arg choice="opt" rep="norepeat"><option>/ar</option></arg>
129+ <arg choice="opt"
130+ rep="norepeat"><option>/or</option>
131+ <replaceable>reportpath</replaceable></arg>
100132
101133 </cmdsynopsis></para>
102134
@@ -383,6 +415,111 @@
383415 </varlistentry>
384416
385417 <varlistentry>
418+ <term><option>/al</option></term>
419+ <listitem>
420+ <para>Auto-merges at the left side at startup.</para>
421+ </listitem>
422+ </varlistentry>
423+
424+ <varlistentry>
425+ <term><option>/am</option></term>
426+ <listitem>
427+ <para>Auto-merges at the middle side at startup.</para>
428+ </listitem>
429+ </varlistentry>
430+
431+ <varlistentry>
432+ <term><option>/ar</option></term>
433+ <listitem>
434+ <para>Auto-merges at the right side at startup.</para>
435+ </listitem>
436+ </varlistentry>
437+
438+ <varlistentry>
439+ <term><option>/noninteractive</option></term>
440+ <listitem>
441+ <para>TBD</para>
442+ </listitem>
443+ </varlistentry>
444+
445+ <varlistentry>
446+ <term><option>/noprefs</option></term>
447+ <listitem>
448+ <para>TBD</para>
449+ </listitem>
450+ </varlistentry>
451+
452+ <varlistentry>
453+ <term><option>/ignorews</option></term>
454+ <listitem>
455+ <para>TBD</para>
456+ </listitem>
457+ </varlistentry>
458+
459+ <varlistentry>
460+ <term><option>/ignoreblanklines</option></term>
461+ <listitem>
462+ <para>TBD</para>
463+ </listitem>
464+ </varlistentry>
465+
466+ <varlistentry>
467+ <term><option>/ignorecase</option></term>
468+ <listitem>
469+ <para>TBD</para>
470+ </listitem>
471+ </varlistentry>
472+
473+ <varlistentry>
474+ <term><option>/ignoreeol</option></term>
475+ <listitem>
476+ <para>TBD</para>
477+ </listitem>
478+ </varlistentry>
479+
480+ <varlistentry>
481+ <term><option>/ignorecodepage</option></term>
482+ <listitem>
483+ <para>TBD</para>
484+ </listitem>
485+ </varlistentry>
486+
487+ <varlistentry>
488+ <term><option>/ignorecomments</option></term>
489+ <listitem>
490+ <para>TBD</para>
491+ </listitem>
492+ </varlistentry>
493+
494+ <varlistentry>
495+ <term><option>/unpacker</option></term>
496+ <listitem>
497+ <para>TBD</para>
498+ </listitem>
499+ </varlistentry>
500+
501+ <varlistentry>
502+ <term><option>/prediffer</option></term>
503+ <listitem>
504+ <para>TBD</para>
505+ </listitem>
506+ </varlistentry>
507+
508+ <varlistentry>
509+ <term><option>/cp</option></term>
510+ <listitem>
511+ <para>TBD</para>
512+ </listitem>
513+ </varlistentry>
514+
515+ <varlistentry>
516+ <term><option>/cfg</option></term>
517+ <listitem>
518+ <para>TBD</para>
519+ </listitem>
520+ </varlistentry>
521+
522+ <varlistentry>
386523 <term><option>leftpath</option></term>
387524 <listitem>
388525 <para>Specifies the folder, file or project file to open on the left side.</para>
@@ -459,23 +596,9 @@
459596 </varlistentry>
460597
461598 <varlistentry>
462- <term><option>/al</option></term>
463- <listitem>
464- <para>Auto-merges at the left side at startup.</para>
465- </listitem>
466- </varlistentry>
467-
468- <varlistentry>
469- <term><option>/am</option></term>
599+ <term><option>/or</option></term>
470600 <listitem>
471- <para>Auto-merges at the middle side at startup.</para>
472- </listitem>
473- </varlistentry>
474-
475- <varlistentry>
476- <term><option>/ar</option></term>
477- <listitem>
478- <para>Auto-merges at the right side at startup.</para>
601+ <para>TBD</para>
479602 </listitem>
480603 </varlistentry>
481604
--- a/Docs/Manual/JP/Command_line.xml
+++ b/Docs/Manual/JP/Command_line.xml
@@ -79,6 +79,40 @@
7979 <arg choice="opt" rep="norepeat"><option>/dr</option>
8080 <replaceable>rightdesc</replaceable></arg>
8181
82+ <arg choice="opt" rep="norepeat"><option>/al</option></arg>
83+
84+ <arg choice="opt" rep="norepeat"><option>/am</option></arg>
85+
86+ <arg choice="opt" rep="norepeat"><option>/ar</option></arg>
87+
88+ <arg choice="opt" rep="norepeat"><option>/noninteractive</option></arg>
89+
90+ <arg choice="opt" rep="norepeat"><option>/noprefs</option></arg>
91+
92+ <arg choice="opt" rep="norepeat"><option>/ignorews</option></arg>
93+
94+ <arg choice="opt" rep="norepeat"><option>/ignoreblanklines</option></arg>
95+
96+ <arg choice="opt" rep="norepeat"><option>/ignorecase</option></arg>
97+
98+ <arg choice="opt" rep="norepeat"><option>/ignoreeol</option></arg>
99+
100+ <arg choice="opt" rep="norepeat"><option>/ignorecodepage</option></arg>
101+
102+ <arg choice="opt" rep="norepeat"><option>/ignorecomments</option></arg>
103+
104+ <arg choice="opt" rep="norepeat"><option>/unpacker</option>
105+ <replaceable>unpacker name</replaceable></arg>
106+
107+ <arg choice="opt" rep="norepeat"><option>/prediffer</option>
108+ <replaceable>prediffer name</replaceable></arg>
109+
110+ <arg choice="opt" rep="norepeat"><option>/cp</option>
111+ <replaceable>codepage</replaceable></arg>
112+
113+ <arg choice="opt" rep="norepeat"><option>/cfg</option>
114+ <replaceable>name=value</replaceable></arg>
115+
82116 <arg choice="plain"
83117 rep="norepeat"><replaceable>leftpath</replaceable></arg>
84118
@@ -92,11 +126,9 @@
92126 rep="norepeat"><option>/o</option>
93127 <replaceable>outputpath</replaceable></arg>
94128
95- <arg choice="opt" rep="norepeat"><option>/al</option></arg>
96-
97- <arg choice="opt" rep="norepeat"><option>/am</option></arg>
98-
99- <arg choice="opt" rep="norepeat"><option>/ar</option></arg>
129+ <arg choice="opt"
130+ rep="norepeat"><option>/or</option>
131+ <replaceable>reportpath</replaceable></arg>
100132
101133 </cmdsynopsis></para>
102134
@@ -382,6 +414,111 @@
382414 </varlistentry>
383415
384416 <varlistentry>
417+ <term><option>/al</option></term>
418+ <listitem>
419+ <para>起動時、左側で自動マージします。</para>
420+ </listitem>
421+ </varlistentry>
422+
423+ <varlistentry>
424+ <term><option>/am</option></term>
425+ <listitem>
426+ <para>起動時、中央で自動マージします。</para>
427+ </listitem>
428+ </varlistentry>
429+
430+ <varlistentry>
431+ <term><option>/ar</option></term>
432+ <listitem>
433+ <para>起動時、右側で自動マージします。</para>
434+ </listitem>
435+ </varlistentry>
436+
437+ <varlistentry>
438+ <term><option>/noninteractive</option></term>
439+ <listitem>
440+ <para>TBD</para>
441+ </listitem>
442+ </varlistentry>
443+
444+ <varlistentry>
445+ <term><option>/noprefs</option></term>
446+ <listitem>
447+ <para>TBD</para>
448+ </listitem>
449+ </varlistentry>
450+
451+ <varlistentry>
452+ <term><option>/ignorews</option></term>
453+ <listitem>
454+ <para>TBD</para>
455+ </listitem>
456+ </varlistentry>
457+
458+ <varlistentry>
459+ <term><option>/ignoreblanklines</option></term>
460+ <listitem>
461+ <para>TBD</para>
462+ </listitem>
463+ </varlistentry>
464+
465+ <varlistentry>
466+ <term><option>/ignorecase</option></term>
467+ <listitem>
468+ <para>TBD</para>
469+ </listitem>
470+ </varlistentry>
471+
472+ <varlistentry>
473+ <term><option>/ignoreeol</option></term>
474+ <listitem>
475+ <para>TBD</para>
476+ </listitem>
477+ </varlistentry>
478+
479+ <varlistentry>
480+ <term><option>/ignorecodepage</option></term>
481+ <listitem>
482+ <para>TBD</para>
483+ </listitem>
484+ </varlistentry>
485+
486+ <varlistentry>
487+ <term><option>/ignorecomments</option></term>
488+ <listitem>
489+ <para>TBD</para>
490+ </listitem>
491+ </varlistentry>
492+
493+ <varlistentry>
494+ <term><option>/unpacker</option></term>
495+ <listitem>
496+ <para>TBD</para>
497+ </listitem>
498+ </varlistentry>
499+
500+ <varlistentry>
501+ <term><option>/prediffer</option></term>
502+ <listitem>
503+ <para>TBD</para>
504+ </listitem>
505+ </varlistentry>
506+
507+ <varlistentry>
508+ <term><option>/cp</option></term>
509+ <listitem>
510+ <para>TBD</para>
511+ </listitem>
512+ </varlistentry>
513+
514+ <varlistentry>
515+ <term><option>/cfg</option></term>
516+ <listitem>
517+ <para>TBD</para>
518+ </listitem>
519+ </varlistentry>
520+
521+ <varlistentry>
385522 <term><option><replaceable>leftpath</replaceable></option></term>
386523 <listitem>
387524 <para>左側で開くフォルダやファイルを指定します。
@@ -460,23 +597,9 @@
460597 </varlistentry>
461598
462599 <varlistentry>
463- <term><option>/al</option></term>
464- <listitem>
465- <para>起動時、左側で自動マージします。</para>
466- </listitem>
467- </varlistentry>
468-
469- <varlistentry>
470- <term><option>/am</option></term>
600+ <term><option>/or</option></term>
471601 <listitem>
472- <para>起動時、中央で自動マージします。</para>
473- </listitem>
474- </varlistentry>
475-
476- <varlistentry>
477- <term><option>/ar</option></term>
478- <listitem>
479- <para>起動時、右側で自動マージします。</para>
602+ <para>TBD</para>
480603 </listitem>
481604 </varlistentry>
482605
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -21,14 +21,84 @@
2121 </head>
2222 <body>
2323 <h1 id="change-log">Change log</h1>
24-<h2 id="winmerge-21611---2021-03-28">WinMerge 2.16.11 - 2021-03-28</h2>
24+<h2 id="winmerge-21612---2021-04-29">WinMerge 2.16.12 - 2021-04-29</h2>
2525 <h3 id="general">General</h3>
2626 <ul>
27+<li>GUI textstrings: grammatical corrections (PR #722)</li>
28+<li>Added ARM64 support</li>
29+</ul>
30+<h3 id="file-compare">File compare</h3>
31+<ul>
32+<li>BugFix: Fix PHP syntax highlighting. (PR #751)</li>
33+<li>BugFix: Strings in a multi-line diff block were not be replaced correctly when the substitution filters&#39; regular expression contained ^</li>
34+<li>BugFix: Font size restoration with Ctrl+0 key did not work properly in Hi-DPI environment</li>
35+<li>BugFix: Fixed a rare crash when enabling syntax highlight</li>
36+<li>BugFix: Fixed an issue where inline scripts in HTML files were not highlighted correctly</li>
37+<li>Make the width of the &#39;Find what&#39; label in Find dialog a little wider (osdn.net #42063)</li>
38+<li>Fix conflicting accelerators (osdn.net #42064)</li>
39+<li>[Feature Request] Selection Count on Status Bar (#135)</li>
40+<li>Add C# 6.0 reserved words to style list (PR #719)</li>
41+<li>FR: Add a shortcut key go to next file (#721)</li>
42+<li>Update PHP syntax highlighting keyword list. (PR #724)</li>
43+<li>autoit.cpp - Macros &gt;&gt; User 1 ..... Variable &gt;&gt; User 2 (PR #749)</li>
44+<li>autoit.cpp - #CS #CE support (PR #753)</li>
45+<li>Interrupt a inline diff process when it takes too long</li>
46+<li>Make the color of characters that represent spaces and tabs lighter than other characters when the &quot;View Whitespace&quot; menu item is enabled</li>
47+<li>Added &quot;Open Parent Folder&quot; menu item to the context menu</li>
48+</ul>
49+<h3 id="folder-compare">Folder compare</h3>
50+<ul>
51+<li>BugFix: Copy confirmation dialog has overlapped Yes/No Button (#739)</li>
52+<li>BugFix: Comparison result was not updated by Swap operation in 3-way folder comparison (osdn.net #41901)</li>
53+</ul>
54+<h3 id="binary-compare">Binary compare</h3>
55+<ul>
56+<li>BugFix: Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.</li>
57+<li>BugFix: Only one pane was zoomed in/out in Ctrl+Mouse Wheel</li>
58+</ul>
59+<h3 id="image-compare">Image compare</h3>
60+<ul>
61+<li>BugFix: Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.</li>
62+<li>BugFix: The header bar widths were not calculated properly when the &#39;Split Vertically&#39; menu item is unchecked.</li>
63+</ul>
64+<h3 id="open-dialog">Open dialog</h3>
65+<ul>
66+<li>Make archive files openable as binary files from the pull-down menu.</li>
67+</ul>
68+<h3 id="archive-support">Archive support</h3>
69+<ul>
70+<li>BugFix: Fixed a rare crash when decompressing an archive file</li>
71+</ul>
72+<h3 id="plugins">Plugins</h3>
73+<ul>
74+<li>BugFix: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and DisplayXMLFiles (#755)</li>
75+</ul>
76+<h3 id="translations">Translations</h3>
77+<ul>
78+<li>Translation updates:
79+<ul>
80+<li>Brazilian (PR #711,#728,#729)</li>
81+<li>Dutch (PR #706)</li>
82+<li>Galician (PR #737)</li>
83+<li>German (PR #718,#752)</li>
84+<li>Hungarian (PR #712)</li>
85+<li>Japanese</li>
86+<li>Korean (PR #709)</li>
87+<li>Lithuanian (PR #708,#713,#738,#754)</li>
88+<li>Portuguese (PR #725)</li>
89+<li>Slovenian</li>
90+<li>Swedish (PR #720,#723)</li>
91+<li>Russian (PR #707)</li>
92+</ul></li>
93+</ul>
94+<h2 id="winmerge-21611---2021-03-28">WinMerge 2.16.11 - 2021-03-28</h2>
95+<h3 id="general-1">General</h3>
96+<ul>
2797 <li>Make all OK strings same case (PR #593)</li>
2898 <li>Tab bar: Added shadows to help distinguish between active and inactive tabs</li>
2999 <li>Added drop-down menu to Open and Save icon on toolbar</li>
30100 </ul>
31-<h3 id="file-compare">File compare</h3>
101+<h3 id="file-compare-1">File compare</h3>
32102 <ul>
33103 <li>BugFix: Basic syntax highlighter is broken (osdn.net #41440)</li>
34104 <li>BugFix: File is corrupted while saving differences in changed file (Ctrl+S) (#607)</li>
@@ -40,21 +110,21 @@
40110 <li>If -b or -w is also specified, -B now considers lines to be empty if they contain only white space (osdn.net #41355)</li>
41111 <li>Added BOM checkbox to the Codepage dialog.</li>
42112 </ul>
43-<h3 id="folder-compare">Folder compare</h3>
113+<h3 id="folder-compare-1">Folder compare</h3>
44114 <ul>
45115 <li>BugFix: Program crash if you close a tab with the folder from where you opened current file (#645)</li>
46116 <li>BugFix: The title bar path was not updated when swapping files in a Zip file.</li>
47117 <li>BugFix: The codepage specified in the Codepage dialog did not affect the files to be opened.</li>
48118 </ul>
49-<h3 id="image-compare">Image compare</h3>
119+<h3 id="image-compare-1">Image compare</h3>
50120 <ul>
51121 <li>BugFix: The image on the right does not open if the file exists only on the right (osdn.net #41721)</li>
52122 </ul>
53-<h3 id="open-dialog">Open dialog</h3>
123+<h3 id="open-dialog-1">Open dialog</h3>
54124 <ul>
55125 <li>Added Text, Table, Binary and Image menu items to the Compare button in the &quot;Select Files or Folders&quot; window</li>
56126 </ul>
57-<h3 id="archive-support">Archive support</h3>
127+<h3 id="archive-support-1">Archive support</h3>
58128 <ul>
59129 <li>Rar5 support (#644)</li>
60130 </ul>
@@ -62,7 +132,7 @@
62132 <ul>
63133 <li>BugFix: Fix an issue where custom colors are not saved. (PR #648)</li>
64134 </ul>
65-<h3 id="plugins">Plugins</h3>
135+<h3 id="plugins-1">Plugins</h3>
66136 <ul>
67137 <li>RCLocalizationHelper: Fix memory leaks (PR #596)</li>
68138 </ul>
@@ -70,7 +140,7 @@
70140 <ul>
71141 <li>Installer issue with Polish diacritics characters (#589)</li>
72142 </ul>
73-<h3 id="translations">Translations</h3>
143+<h3 id="translations-1">Translations</h3>
74144 <ul>
75145 <li>Translation updates:
76146 <ul>
@@ -103,7 +173,7 @@
103173 <li>Plugins.cpp function SearchScriptForMethodName can be improved (#690)</li>
104174 </ul>
105175 <h2 id="winmerge-21610---2021-01-30">WinMerge 2.16.10 - 2021-01-30</h2>
106-<h3 id="general-1">General</h3>
176+<h3 id="general-2">General</h3>
107177 <ul>
108178 <li>BugFix: Fixed processing that uses GetAsyncKeyState(). (GitHub PR #505)</li>
109179 <li>BugFix: Fixed the problem that the language setting is not applied to the context menu of the MDI tab when the language setting is changed. (GitHub PR #523)</li>
@@ -114,7 +184,7 @@
114184 (GitHub #530)</li>
115185 <li>Added the command line option &quot;/s-&quot; to ensure that another instance is always executed, ignoring the value of the &#39;Allow only one instance to run&#39; option.</li>
116186 </ul>
117-<h3 id="file-compare-1">File compare</h3>
187+<h3 id="file-compare-2">File compare</h3>
118188 <ul>
119189 <li>BugFix: WinMerge crashes with mouse double click (GitHub #531)</li>
120190 <li>BugFix: Fixed an issue where the message box &quot;The report has been created successfully.&quot; was displayed even if the report creation failed.</li>
@@ -127,7 +197,7 @@
127197 <li>Feature Request: Move To Next File option while comparing files #475 (GitHub PR #561)</li>
128198 <li>A new feature &quot;Ignored Substutions&quot; (GitHub PR #544,#549,#560) (&quot;Ignored Substitutions&quot; was renamed to &quot;Substitution Filters&quot;)</li>
129199 </ul>
130-<h3 id="folder-compare-1">Folder compare</h3>
200+<h3 id="folder-compare-2">Folder compare</h3>
131201 <ul>
132202 <li>BugFix: Winmerge crashes consistently when deleting files (GitHub #491)</li>
133203 <li>BugFix: Copy Folder does not copy subfolders and I don&#39;t see any option for it (GitHub #537)</li>
@@ -136,11 +206,11 @@
136206 <ul>
137207 <li>Added File -&gt; New -&gt; Table menu item</li>
138208 </ul>
139-<h3 id="binary-compare">Binary compare</h3>
209+<h3 id="binary-compare-1">Binary compare</h3>
140210 <ul>
141211 <li>Added File -&gt; New -&gt; Binary menu item</li>
142212 </ul>
143-<h3 id="image-compare-1">Image compare</h3>
213+<h3 id="image-compare-2">Image compare</h3>
144214 <ul>
145215 <li>Implement copy and paste images (GitHub PR #524)</li>
146216 <li>Added File -&gt; New -&gt; Image menu item</li>
@@ -158,7 +228,7 @@
158228 <ul>
159229 <li>BugFix: Crash when generating patch (GitHub #521)</li>
160230 </ul>
161-<h3 id="translations-1">Translations</h3>
231+<h3 id="translations-2">Translations</h3>
162232 <ul>
163233 <li>Translation updates:
164234 <ul>
@@ -189,7 +259,7 @@
189259 <li>Some more files should be added to the .gitignore file (GitHub #559)</li>
190260 </ul>
191261 <h2 id="winmerge-2169---2020-11-29">WinMerge 2.16.9 - 2020-11-29</h2>
192-<h3 id="general-2">General</h3>
262+<h3 id="general-3">General</h3>
193263 <ul>
194264 <li>BugFix: MainFrm.cpp: Toolbar was leaking image lists (GitHub PR #432)</li>
195265 <li>BugFix: The icons on a 43&quot; 4K screen are too small (GitHub #276)</li>
@@ -197,7 +267,7 @@
197267 <li>Update Merge.rc (GitHub #487)</li>
198268 <li>Improved startup time</li>
199269 </ul>
200-<h3 id="file-compare-2">File compare</h3>
270+<h3 id="file-compare-3">File compare</h3>
201271 <ul>
202272 <li>BugFix: [UI] Pane enlargement was reset after changing tab (GitHub #403)</li>
203273 <li>BugFix: Non-comment differences were sometimes ignored when the comment filter was enabled, (osdn.net #40488)</li>
@@ -212,14 +282,14 @@
212282 <li>Add the feature &quot;Go to Moved Line&quot; requested by #278 (GitHub PR #484)</li>
213283 <li>how to show white space with linebreak hidden? (GitHub #265) (Added View-&gt;View EOL menu item)</li>
214284 </ul>
215-<h3 id="folder-compare-2">Folder compare</h3>
285+<h3 id="folder-compare-3">Folder compare</h3>
216286 <ul>
217287 <li>BugFix: Pausing comparing doesn&#39;t pause immediately (GitHub #342)</li>
218288 <li>BugFix: Sorting on Comparison Result being done incorectly (GitHub #483)</li>
219289 <li>Commandline to display versions in the output report (GitHub #418)</li>
220290 <li>&quot;Don&#39;t ask again&quot; checkbox for the Confirm Copy dialog (GitHub PR #445)</li>
221291 </ul>
222-<h3 id="binary-compare-1">Binary compare</h3>
292+<h3 id="binary-compare-2">Binary compare</h3>
223293 <ul>
224294 <li>BugFix: Scrolling binary files (GitHub #456)</li>
225295 </ul>
@@ -231,7 +301,7 @@
231301 <ul>
232302 <li>BugFix: Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files. (GitHub PR #421)</li>
233303 </ul>
234-<h3 id="translations-2">Translations</h3>
304+<h3 id="translations-3">Translations</h3>
235305 <ul>
236306 <li>Translation updates:
237307 <ul>
@@ -260,12 +330,12 @@
260330 <li>Fix typo in memdc.h (GitHub PR #474)</li>
261331 </ul>
262332 <h2 id="winmerge-2168---2020-08-28">WinMerge 2.16.8 - 2020-08-28</h2>
263-<h3 id="general-3">General</h3>
333+<h3 id="general-4">General</h3>
264334 <ul>
265335 <li>BugFix: More space for some internationalized strings (GitHub #402)</li>
266336 <li>BugFix: Some improvements (GitHub #405,#411)</li>
267337 </ul>
268-<h3 id="file-compare-3">File compare</h3>
338+<h3 id="file-compare-4">File compare</h3>
269339 <ul>
270340 <li>BugFix: Ignore case option did not work when Diff algorithm was other than default</li>
271341 <li>BugFix: A white vertical rectangle was sometimes drawn in the selected area</li>
@@ -274,13 +344,13 @@
274344 <li>Extended F4 key movement range to the whole file</li>
275345 <li>Don&#39;t treat UTF-8 and UTF-8 with BOM the same when the &quot;Ignore codepage differences&quot; option is disabled</li>
276346 </ul>
277-<h3 id="folder-compare-3">Folder compare</h3>
347+<h3 id="folder-compare-4">Folder compare</h3>
278348 <ul>
279349 <li>BugFix: Appropriate error messages were not displayed when the file to be deleted no longer existed</li>
280350 <li>BugFix: &#39;Show Middle/Right Unique items&#39; menu item does not work properly in 3-way folder compare (osdn.net #40672)</li>
281351 <li>CTRL+Drag folders now has the opposite behavior of the current Include Subfolders option</li>
282352 </ul>
283-<h3 id="image-compare-2">Image compare</h3>
353+<h3 id="image-compare-3">Image compare</h3>
284354 <ul>
285355 <li>BugFix: Fix scrolling glitches (GitHub WinMerge/winimerge PR #8)</li>
286356 <li>Reduce flicker on resize (GitHub WinMerge/winimerge PR #9)</li>
@@ -308,7 +378,7 @@
308378 <li>BugFix: Lithuanian.po is missing (GitHub PR #415)</li>
309379 <li>New installer for per-user installation (WinMerge-2.16.8-x64-PerUser-Setup.exe)</li>
310380 </ul>
311-<h3 id="translations-3">Translations</h3>
381+<h3 id="translations-4">Translations</h3>
312382 <ul>
313383 <li>Translation updates:
314384 <ul>
@@ -326,7 +396,7 @@
326396 <li>Update Shortcut_keys.xml (GitHub PR #410)</li>
327397 </ul>
328398 <h2 id="winmerge-2167---2020-07-26">WinMerge 2.16.7 - 2020-07-26</h2>
329-<h3 id="general-4">General</h3>
399+<h3 id="general-5">General</h3>
330400 <ul>
331401 <li>BugFix: The icons on a 43&quot; 4K screen are too small (GitHub #276)</li>
332402 <li>BugFix: GUI glitches/bugs (GitHub #316)</li>
@@ -334,7 +404,7 @@
334404 <li>Add Solarized Dark/Light color scheme (GitHub #287)</li>
335405 <li>Compile WinMerge with ASLR and CFG enabled (GitHub #315)</li>
336406 </ul>
337-<h3 id="file-compare-4">File compare</h3>
407+<h3 id="file-compare-5">File compare</h3>
338408 <ul>
339409 <li>BugFix: Diff Pane issues (GitHub #307)</li>
340410 <li>BugFix: Codepage not updated on refresh (GitHub #320)</li>
@@ -353,7 +423,7 @@
353423 <ul>
354424 <li>Made it possible to display the contents of CSV and TSV files like spreadsheet software.</li>
355425 </ul>
356-<h3 id="folder-compare-4">Folder compare</h3>
426+<h3 id="folder-compare-5">Folder compare</h3>
357427 <ul>
358428 <li>BugFix: DST causes incorrect dates shown in Date column (GitHub #299)</li>
359429 <li>BugFix: Long filename issue (GitHub #339)</li>
@@ -366,11 +436,11 @@
366436 <li>Add a feature generating a patch from directories (#283) (GitHub PR #331)</li>
367437 <li>added bin and obj directories to C# filter (GitHub PR #365)</li>
368438 </ul>
369-<h3 id="image-compare-3">Image compare</h3>
439+<h3 id="image-compare-4">Image compare</h3>
370440 <ul>
371441 <li>BugFix: Scrolling behavior when dragging images is wrong (osdn.net #40205)</li>
372442 </ul>
373-<h3 id="open-dialog-1">Open dialog</h3>
443+<h3 id="open-dialog-2">Open dialog</h3>
374444 <ul>
375445 <li>BugFix: Open dialogs are sometimes left as garbage (osdn.net #40487)</li>
376446 <li>Browse button in the file/dir selection show wrong path (GitHub #346)</li>
@@ -379,7 +449,7 @@
379449 <ul>
380450 <li>BugFix: Pressing the [Compare/Binary] category button in the Options dialog twice will cause a crash. (osdn.net #40308)</li>
381451 </ul>
382-<h3 id="plugins-1">Plugins</h3>
452+<h3 id="plugins-2">Plugins</h3>
383453 <ul>
384454 <li>BugFix: Fix handling of line breaks in SortAscending, SortDescending (osdn.net PR #40266)</li>
385455 <li>BugFix: Error when comparing images in the CompareMSExcelFiles.sct plugin (osdn.net #40472)</li>
@@ -388,7 +458,7 @@
388458 <li>Add a plugin for Visio (osdn.net PR #40473)</li>
389459 <li>Plugin fixes for the new Table Compare (CompareMSExcelFiles.sct, IgnoreFieldsComma.dll, IgnoreFieldsTab.dll)</li>
390460 </ul>
391-<h3 id="archive-support-1">Archive support</h3>
461+<h3 id="archive-support-2">Archive support</h3>
392462 <ul>
393463 <li>BugFix: Crash when comparing encrypted 7z files (GitHub #367)</li>
394464 </ul>
@@ -396,7 +466,7 @@
396466 <ul>
397467 <li>Create the installer with Inno Setup 5.x since installers created with Inno Setup 6.0.x are identified as malware by multiple virus scanning engines</li>
398468 </ul>
399-<h3 id="translations-4">Translations</h3>
469+<h3 id="translations-5">Translations</h3>
400470 <ul>
401471 <li>Translation updates:
402472 <ul>
@@ -425,11 +495,11 @@
425495 <li>BugFix: Error on git repository cloning (GitHub #288)</li>
426496 </ul>
427497 <h2 id="winmerge-2166---2020-02-23">WinMerge 2.16.6 - 2020-02-23</h2>
428-<h3 id="general-5">General</h3>
498+<h3 id="general-6">General</h3>
429499 <ul>
430500 <li>Added CWindowsManagerDialog class for handling open tabs with Ctrl+Tab, now the application is behave just like professional editors (Visual Studio, Notepad++, etc.) to switch and activate the open tabs. (GitHub #247)</li>
431501 </ul>
432-<h3 id="file-compare-5">File compare</h3>
502+<h3 id="file-compare-6">File compare</h3>
433503 <ul>
434504 <li>BugFix: GhostTextBuffer: Don&#39;t unexpectedly bring back empty lines user wants to delete (GitHub #244)</li>
435505 <li>BugFix: Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes (GitHub #257)</li>
@@ -439,14 +509,14 @@
439509 <li>BugFix: Non-moved lines are treated as moved lines (osdn.net #39851)</li>
440510 <li>Add support for touchpad horizontal scroll (GitHub #254)</li>
441511 </ul>
442-<h3 id="image-compare-4">Image compare</h3>
512+<h3 id="image-compare-5">Image compare</h3>
443513 <ul>
444514 <li>BugFix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)</li>
445515 <li>Add support for SVG, PDF, WMF and EMF file types (Only available in WinMerge 64bit version on Windows 10)<br />
446516 Demo1: <a href="https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa">https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa</a><br />
447517 Demo2: <a href="https://gyazo.com/f5f267546db27f2dc801c00df8cb4251">https://gyazo.com/f5f267546db27f2dc801c00df8cb4251</a></li>
448518 </ul>
449-<h3 id="archive-support-2">Archive support</h3>
519+<h3 id="archive-support-3">Archive support</h3>
450520 <ul>
451521 <li>BugFix: Third tgz doesn&#39;t get fully extracted (first two do) (GitHub #263)</li>
452522 </ul>
@@ -458,7 +528,7 @@ Demo2: <a href="https://gyazo.com/f5f267546db27f2dc801c00df8cb4251">https://gyaz
458528 <ul>
459529 <li>BugFix: Fix spelling of Git (GitHub #246)</li>
460530 </ul>
461-<h3 id="translations-5">Translations</h3>
531+<h3 id="translations-6">Translations</h3>
462532 <ul>
463533 <li>New translation: Arabic (sf.net #3038)</li>
464534 <li>Translation updates:
@@ -482,7 +552,7 @@ Demo2: <a href="https://gyazo.com/f5f267546db27f2dc801c00df8cb4251">https://gyaz
482552 <li>Avoid some back and forth file path transcoding between UTF16 and UTF8 (GitHub #243)</li>
483553 </ul>
484554 <h2 id="winmerge-2165---2019-12-09">WinMerge 2.16.5 - 2019-12-09</h2>
485-<h3 id="file-compare-6">File compare</h3>
555+<h3 id="file-compare-7">File compare</h3>
486556 <ul>
487557 <li>BugFix: Suspicious lack of Release() calls in lwdisp.c (GitHub #171)</li>
488558 <li>BugFix: Performance using Unpacker (GitHub #180)</li>
@@ -495,14 +565,14 @@ Demo2: <a href="https://gyazo.com/f5f267546db27f2dc801c00df8cb4251">https://gyaz
495565 <li>Add support for color emoji (Only available in 64bit version) (To enable color emoji support, select DirectWrite* in Rendering mode combobox on Editor page in the Options dialog)<br />
496566 Demo: <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4</a></li>
497567 </ul>
498-<h3 id="folder-compare-5">Folder compare</h3>
568+<h3 id="folder-compare-6">Folder compare</h3>
499569 <ul>
500570 <li>BugFix: Crash when clicking Next Difference button after unchecking Show Different Items menu item</li>
501571 <li>Changed symbols in Newer/Older column for better visual clarity (GitHub #169)</li>
502572 <li>Add &quot;Ignore codepage differences&quot; to quick options (GitHub #197)</li>
503573 <li>Limit the window flashing count. (GitHub #206)</li>
504574 </ul>
505-<h3 id="image-compare-5">Image compare</h3>
575+<h3 id="image-compare-6">Image compare</h3>
506576 <ul>
507577 <li>BugFix: Image compare breaks when zoomed too much with large pictures (GitHub #188)</li>
508578 <li>BugFix: [Image compare] Zoom-in focuses on top-left corner instead of cursor position (GitHub #211)</li>
@@ -517,7 +587,7 @@ Demo: <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">https://gyazo
517587 <li>BugFix: Windows 10 shell integration not working (GitHub #176)</li>
518588 <li>Installer - Proposal - Separate Inno Setup strings from WinMerge installer strings (GitHub #167)</li>
519589 </ul>
520-<h3 id="translations-6">Translations</h3>
590+<h3 id="translations-7">Translations</h3>
521591 <ul>
522592 <li>Update Italian translation (GitHub #164, #165)</li>
523593 <li>Update Russian translation (GitHub #166)</li>
@@ -538,23 +608,23 @@ Demo: <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">https://gyazo
538608 <li>Small Manual tweaks (GitHub #190)</li>
539609 </ul>
540610 <h2 id="winmerge-2164---2019-07-28">WinMerge 2.16.4 - 2019-07-28</h2>
541-<h3 id="file-compare-7">File compare</h3>
611+<h3 id="file-compare-8">File compare</h3>
542612 <ul>
543613 <li>BugFix: coretools.cpp: linelen() should not truncate lines with embedded NULs (GitHub #156)</li>
544614 <li>BugFix: file compare : right-click doesn&#39;t select the diff under the mouse (GitHub #159)</li>
545615 <li>BugFix: Avoid an exception in GuessCodepageEncoding() when filepath equals &quot;NUL&quot; (GitHub #162)</li>
546616 <li>BugFix: Auto-indent did not work if the EOL-style was not CRLF</li>
547617 </ul>
548-<h3 id="folder-compare-6">Folder compare</h3>
618+<h3 id="folder-compare-7">Folder compare</h3>
549619 <ul>
550620 <li>BugFix: Generating HTML Folder Compare report including File Compare report did not complete (Bitbucket #15)</li>
551621 <li>BugFix: Compare Statistics dialog: The number of diff folders was counted in the number of diff files</li>
552622 </ul>
553-<h3 id="plugins-2">Plugins</h3>
623+<h3 id="plugins-3">Plugins</h3>
554624 <ul>
555625 <li>BugFix: PrediffLineFilter.sct: Wrong encoding for settings dialog (Bitbucket #16)</li>
556626 </ul>
557-<h3 id="translations-7">Translations</h3>
627+<h3 id="translations-8">Translations</h3>
558628 <ul>
559629 <li>Update Russian translation (Bitbucket PR #51)</li>
560630 <li>Update Italian translation (Bitbucket PR #52)</li>
@@ -566,13 +636,13 @@ Demo: <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">https://gyazo
566636 <li>Avoid some InnoSetup compiler warnings (Bitbucket PR #53)</li>
567637 </ul>
568638 <h2 id="winmerge-2163---2019-06-29">WinMerge 2.16.3 - 2019-06-29</h2>
569-<h3 id="general-6">General</h3>
639+<h3 id="general-7">General</h3>
570640 <ul>
571641 <li>BugFix: Slow startup with documents folder redirected to high-latency network drive (Bitbucket #155)</li>
572642 <li>Add VisualElementsManifest for Windows 10 start menu (Bitbucket PR #47)</li>
573643 <li>Reduce the size of the executable file</li>
574644 </ul>
575-<h3 id="file-compare-8">File compare</h3>
645+<h3 id="file-compare-9">File compare</h3>
576646 <ul>
577647 <li>BugFix: Location and Diff pane visibility broken in 2.16.1 (GitHub #138, Bitbucket #163, sf.net #2228)</li>
578648 <li>BugFix: Temporary files could not be created (GitHub #143, sf.net #2220)</li>
@@ -584,7 +654,7 @@ Demo: <a href="https://gyazo.com/7cbbbd2c1de195fcd214d588b21b21d4">https://gyazo
584654 <li>Add support for merging word level diffs in selection<br />
585655 Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif</a></li>
586656 </ul>
587-<h3 id="folder-compare-7">Folder compare</h3>
657+<h3 id="folder-compare-8">Folder compare</h3>
588658 <ul>
589659 <li>BugFix: WinMerge 3-Way Compare Bugs: Always Shows Unique Items. (GitHub #154)</li>
590660 <li>BugFix: WinMerge could not compare files that are opened in other applications</li>
@@ -597,7 +667,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
597667 <li>Supporting relative path in project file (Bitbucket #158)</li>
598668 <li>Allow multiple &lt;paths&gt; in project file</li>
599669 </ul>
600-<h3 id="image-compare-6">Image compare</h3>
670+<h3 id="image-compare-7">Image compare</h3>
601671 <ul>
602672 <li>BugFix: no message was displayed when file saving failed</li>
603673 <li>Implement Insertion/Deletion Detection<br />
@@ -613,14 +683,14 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
613683 <li>Allow per-user installation (only x64 installer)</li>
614684 <li>Don&#39;t install Files.txt and don&#39;t add &quot;Uninstall WinMerge&quot; to the start menu (Bitbuket #38)</li>
615685 </ul>
616-<h3 id="translations-8">Translations</h3>
686+<h3 id="translations-9">Translations</h3>
617687 <ul>
618688 <li>Update French translation (GitHub #149, #150)</li>
619689 <li>Update Lithuanian translation (Bitbucket PR #36, #40, #43, #46, #48, #50)</li>
620690 <li>Update Russian translation (Bitbucket PR #41, #42)</li>
621691 </ul>
622692 <h2 id="winmerge-2162---2019-04-04">WinMerge 2.16.2 - 2019-04-04</h2>
623-<h3 id="file-compare-9">File compare</h3>
693+<h3 id="file-compare-10">File compare</h3>
624694 <ul>
625695 <li>BugFix: Edit &gt; Replace &gt; All, Undo: should undo all (sf.net #2113)</li>
626696 <li>BugFix: Save As: default directory should be file&#39;s original directory (sf.net #2163)</li>
@@ -631,11 +701,11 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
631701 <li>BugFix: Crash when failed to load file</li>
632702 <li>Add syntax highlight for Lua (Bitbucket #114)</li>
633703 </ul>
634-<h3 id="folder-compare-8">Folder compare</h3>
704+<h3 id="folder-compare-9">Folder compare</h3>
635705 <ul>
636706 <li>BugFix: Compare results refresh incorrectly after deletions (sf.net #2217)</li>
637707 </ul>
638-<h3 id="archive-support-3">Archive Support</h3>
708+<h3 id="archive-support-4">Archive Support</h3>
639709 <ul>
640710 <li>Upgraded to 7-zip 19.00</li>
641711 </ul>
@@ -643,12 +713,12 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
643713 <ul>
644714 <li>Improve icon display at 120DPI</li>
645715 </ul>
646-<h3 id="image-compare-7">Image compare</h3>
716+<h3 id="image-compare-8">Image compare</h3>
647717 <ul>
648718 <li>BugFix: Zoom In/Out shortcuts don&#39;t update zoom level in location pane (Bitbucket #149)</li>
649719 <li>Zoom In/Out menu items for image compare (Bitbucket #148)</li>
650720 </ul>
651-<h3 id="open-dialog-2">Open dialog</h3>
721+<h3 id="open-dialog-3">Open dialog</h3>
652722 <ul>
653723 <li>Allow quoted filenames in &quot;Select Files or Folders&quot; (sf.net #1240, GitHub #137)</li>
654724 </ul>
@@ -660,7 +730,7 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
660730 <ul>
661731 <li>BugFix: Gibberish language during installation (Bitbucket #147)</li>
662732 </ul>
663-<h3 id="translations-9">Translations</h3>
733+<h3 id="translations-10">Translations</h3>
664734 <ul>
665735 <li>Update Catalan translation (Bitbucket PR #29)</li>
666736 <li>Update Italian translation (Bitbucket PR #32)</li>
@@ -668,19 +738,19 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
668738 <li>Update Simplified Chinese translation (Bitbucket PR #34)</li>
669739 </ul>
670740 <h2 id="winmerge-2161---2019-02-24">WinMerge 2.16.1 - 2019-02-24</h2>
671-<h3 id="general-7">General</h3>
741+<h3 id="general-8">General</h3>
672742 <ul>
673743 <li>Updated the copyright year to 2019, actually (GitHub #110)</li>
674744 <li>Prevent splitter view from claiming input focus (GitHub #127)</li>
675745 <li>Contributors.txt: Changed EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows Notepad. (Bitbucket PR #17)</li>
676746 </ul>
677-<h3 id="open-dialog-3">Open dialog</h3>
747+<h3 id="open-dialog-4">Open dialog</h3>
678748 <ul>
679749 <li>Alternatively to Swap buttons, allow drag &amp; drop between filetype icons (GitHub #118)</li>
680750 <li>Expose cleaner moving/resizing behavior esp. in non-maximized state (GitHub #119)</li>
681751 <li>Avoid retaining bogus filetype icons from previous selections (GitHub #122)</li>
682752 </ul>
683-<h3 id="file-compare-10">File compare</h3>
753+<h3 id="file-compare-11">File compare</h3>
684754 <ul>
685755 <li>BugFix: Extra blank displayed after left/right single/double quotes (Bitbucket #134)</li>
686756 <li>BugFix: Click doesn&#39;t trigger document to scroll in Location pane under circumstance (Bitbucket #140)</li>
@@ -694,12 +764,12 @@ Demo: <a href="https://gyazo.com/17d8773354d23b5ae51262f28b0f1f80">https://gyazo
694764 <li>Add support for merging word level diffs in selection<br />
695765 Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif</a></li>
696766 </ul>
697-<h3 id="folder-compare-9">Folder compare</h3>
767+<h3 id="folder-compare-10">Folder compare</h3>
698768 <ul>
699769 <li>BugFix: Unique files are not shown (Bitbucket #138)</li>
700770 <li>BugFix: Improve Hard-IO error handling, other bug fixes, cleanup, tweaks (GitHub #120)</li>
701771 </ul>
702-<h3 id="archive-support-4">Archive Support</h3>
772+<h3 id="archive-support-5">Archive Support</h3>
703773 <ul>
704774 <li>Upgraded to 7-zip 18.06 (Bitbucket #119)</li>
705775 </ul>
@@ -715,7 +785,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
715785 <ul>
716786 <li>BugFix: CreateTranslatedRcFiles needs an update (GitHub #113)</li>
717787 </ul>
718-<h3 id="translations-10">Translations</h3>
788+<h3 id="translations-11">Translations</h3>
719789 <ul>
720790 <li>Update Brazilian Portuguese translation (GitHub #108)</li>
721791 <li>Update Swedish translation (sf.net #3035, GitHub #112, #114)</li>
@@ -740,11 +810,11 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
740810 <li>Don&#39;t pass <code>DIFFITEM *</code> by casting to <code>uintptr_t</code> (GitHub #124, #125)</li>
741811 </ul>
742812 <h2 id="winmerge-2160---2018-11-23">WinMerge 2.16.0 - 2018-11-23</h2>
743-<h3 id="general-8">General</h3>
813+<h3 id="general-9">General</h3>
744814 <ul>
745815 <li>BugFix: Disabled icon on toolbar not gray out when running on XP</li>
746816 </ul>
747-<h3 id="file-compare-11">File compare</h3>
817+<h3 id="file-compare-12">File compare</h3>
748818 <ul>
749819 <li>BugFix: Copy to X and Advance&quot; not work in 3way-compare (Bitbucket #123)</li>
750820 <li>BugFix: File compare always showing different ending (GitHub #106)</li>
@@ -752,7 +822,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
752822 <li>BugFix: A crash (GitHub #104)</li>
753823 <li>Add separators to &quot;Zoom&quot; and &quot;Diff Context&quot; menus (Bitbucket PR #5)</li>
754824 </ul>
755-<h3 id="open-dialog-4">Open dialog</h3>
825+<h3 id="open-dialog-5">Open dialog</h3>
756826 <ul>
757827 <li>BugFix: Drag&amp;Drop in Open Dialog won&#39;t work correct (Bitbucket #125)</li>
758828 </ul>
@@ -760,13 +830,13 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
760830 <ul>
761831 <li>Drop ClearCase integration (Bitbucket PR #6)</li>
762832 </ul>
763-<h3 id="translations-11">Translations</h3>
833+<h3 id="translations-12">Translations</h3>
764834 <ul>
765835 <li>Add Lithuanian translation (Bitbucket #124)</li>
766836 <li>Update Portuguese translation (GitHub #102,#103)</li>
767837 </ul>
768838 <h2 id="winmerge-2155---2018-10-28">WinMerge 2.15.5 - 2018-10-28</h2>
769-<h3 id="general-9">General</h3>
839+<h3 id="general-10">General</h3>
770840 <ul>
771841 <li>Add support for very long path and file names (GitHub #87,#95,#99)</li>
772842 <li>Enable Ctrl+C shortcut key on the file path bar</li>
@@ -776,7 +846,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
776846 <li>Improve visual layout of Open dialog (GitHub #97)</li>
777847 <li>Add icon for &quot;New (3 panes)&quot; menu item (GitHub #97)</li>
778848 </ul>
779-<h3 id="file-compare-12">File compare</h3>
849+<h3 id="file-compare-13">File compare</h3>
780850 <ul>
781851 <li>Add Window/Split menu item</li>
782852 <li>Improve handling of last lines in files (GitHub #89,#90,#93)</li>
@@ -787,7 +857,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
787857 <li>BugFix: Various problems reading of files &gt; 2GB (GitHub #81)</li>
788858 <li>BugFix: Selecting files &quot;From MRU list&quot; again works correctly</li>
789859 </ul>
790-<h3 id="translations-12">Translations</h3>
860+<h3 id="translations-13">Translations</h3>
791861 <ul>
792862 <li>Update Italian translation (GitHub #86)</li>
793863 <li>Update Japanese translation (Bitbucket #3)</li>
@@ -804,7 +874,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
804874 <ul>
805875 <li>BugFix: Dot icon in a drop-down menu is not drawn correctly</li>
806876 </ul>
807-<h3 id="file-compare-13">File compare</h3>
877+<h3 id="file-compare-14">File compare</h3>
808878 <ul>
809879 <li>BugFix: Crash when reading a file in Google Drive File Stream (sf.net#2206)</li>
810880 <li>BugFix: Crash when removing ghost lines (GitHub #80)</li>
@@ -812,12 +882,12 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
812882 <li>Add Ctrl++/Ctrl+-(not numpad key) shortcut key to zoom in/out (sf.net#1727)</li>
813883 <li>Remove 2GB file size limit for 64-bit build (GitHub #81, #82)</li>
814884 </ul>
815-<h3 id="folder-compare-10">Folder compare</h3>
885+<h3 id="folder-compare-11">Folder compare</h3>
816886 <ul>
817887 <li>Add Pause button to Folder Compare Progress dialog (sf.net#828,#1222,#1237)</li>
818888 <li>Re-detect the file encoding when opening files (sf.net#2131)</li>
819889 </ul>
820-<h3 id="open-dialog-5">Open dialog</h3>
890+<h3 id="open-dialog-6">Open dialog</h3>
821891 <ul>
822892 <li>Add Options button to Open dialog</li>
823893 <li>Add Save Project button to Open dialog</li>
@@ -830,12 +900,12 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
830900 <ul>
831901 <li>BugFix: Garbled text was copied to the clipboard when generating a report on the clipboard (sf.net#2200)</li>
832902 </ul>
833-<h3 id="plugins-3">Plugins</h3>
903+<h3 id="plugins-4">Plugins</h3>
834904 <ul>
835905 <li>Add PrediffLineFilter.sct plugin</li>
836906 <li>Make ignored lines by Prediffer plugin colored</li>
837907 </ul>
838-<h3 id="translations-13">Translations</h3>
908+<h3 id="translations-14">Translations</h3>
839909 <ul>
840910 <li>Update Slovak translation (sf.net#2902)</li>
841911 <li>Update Portuguese translation (GitHub #84,#85)</li>
@@ -845,7 +915,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
845915 <li>Adapt to VS2017 version 15.6.1 (GitHub #79)</li>
846916 </ul>
847917 <h2 id="winmerge-2153---2018-03-04">WinMerge 2.15.3 - 2018-03-04</h2>
848-<h3 id="file-compare-14">File compare</h3>
918+<h3 id="file-compare-15">File compare</h3>
849919 <ul>
850920 <li>Fix assertion error when started on Windows XP</li>
851921 <li>Fix a problem that moved blocks are sometimes shown as normal diff blocks</li>
@@ -854,7 +924,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
854924 <li>Fix infinite loop when replacing ^ (sf.net#2094)</li>
855925 <li>Fix to show text that contains &amp; on message box, correctly (sf.net#2067)</li>
856926 </ul>
857-<h3 id="folder-compare-11">Folder compare</h3>
927+<h3 id="folder-compare-12">Folder compare</h3>
858928 <ul>
859929 <li>Fix a problem that unique files are invisible when comparing files using &#39;Date&#39; compare method</li>
860930 <li>Remove trailing garbage from a dragged text (Github#75)</li>
@@ -871,7 +941,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
871941 <ul>
872942 <li>Add support for HiDPI screens (Github #54)</li>
873943 </ul>
874-<h3 id="plugins-4">Plugins</h3>
944+<h3 id="plugins-5">Plugins</h3>
875945 <ul>
876946 <li>CompareMSExcelFiles.sct: Add &quot;Compare headers and footers&quot; checkbox to settings dialog (sf.net#2102)</li>
877947 </ul>
@@ -880,7 +950,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
880950 <li>Remove extra space in installer: &quot; Launch WinMerge&quot; (sf.net#2144)</li>
881951 <li>Add &quot;How to Apply These Terms to Your New Programs&quot; section into GPL.rtf (sf.net#2098)</li>
882952 </ul>
883-<h3 id="translations-14">Translations</h3>
953+<h3 id="translations-15">Translations</h3>
884954 <ul>
885955 <li>Add Finnish translation (sf.net#3031)</li>
886956 <li>Add Sinhala translation (sf.net#3032)</li>
@@ -903,7 +973,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
903973 <li>Add drop down menu to Options icon</li>
904974 <li>Add icons for 3-way merge functions</li>
905975 </ul>
906-<h3 id="open-dialog-6">Open dialog</h3>
976+<h3 id="open-dialog-7">Open dialog</h3>
907977 <ul>
908978 <li>Change window type of Open dialog from modal window to MDI child window</li>
909979 <li>Add Read-only checkbox to Open dialog</li>
@@ -943,7 +1013,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
9431013 <li>Remove &quot;Add Shell menu to context menu&quot; from &quot;Shell Integration&quot; page (WinMerge now always adds shell menu to context menu in Folder window)</li>
9441014 <li>Add &quot;Register shell extension&quot; button to &quot;Shell Integration&quot; page</li>
9451015 </ul>
946-<h3 id="folder-compare-12">Folder Compare</h3>
1016+<h3 id="folder-compare-13">Folder Compare</h3>
9471017 <ul>
9481018 <li>Add Multi-thread compare support for Full Contents or Quick Contents method</li>
9491019 <li>Color the background of items in list view</li>
@@ -964,7 +1034,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
9641034 <li>BugFix: Properly handle 3-way comparison of Binary files (Github #23)</li>
9651035 <li>BugFix: Use proper font for View&gt;Use Default Font menu item (GitHub #24)</li>
9661036 </ul>
967-<h3 id="file-compare-15">File Compare</h3>
1037+<h3 id="file-compare-16">File Compare</h3>
9681038 <ul>
9691039 <li>Add support for 3-way compare/merge</li>
9701040 <li>Add &quot;Diff Context&quot; menu to View menu to adjust the number of displayed diff context lines</li>
@@ -984,12 +1054,12 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
9841054 <li>BugFix: More on Issue #73 Fixed the -dl -dm and -dr description parameters for conflict files (for both 2 way and 3 way conflict files).(Bitbucket #1)</li>
9851055 <li>BugFix: Fix Memory Leak with Drop Targets (GitHub #26)</li>
9861056 </ul>
987-<h3 id="binary-compare-2">Binary Compare</h3>
1057+<h3 id="binary-compare-3">Binary Compare</h3>
9881058 <ul>
9891059 <li>Install binary file editor (frhed) component again by default</li>
9901060 <li>Make binary file editor undoable</li>
9911061 </ul>
992-<h3 id="image-compare-8">Image Compare</h3>
1062+<h3 id="image-compare-9">Image Compare</h3>
9931063 <ul>
9941064 <li>Add image file compare/merge support</li>
9951065 </ul>
@@ -1000,7 +1070,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
10001070 <li>Add icons to the HTML folder compare report</li>
10011071 <li>Change visual style of HTML report</li>
10021072 </ul>
1003-<h3 id="archive-support-5">Archive Support</h3>
1073+<h3 id="archive-support-6">Archive Support</h3>
10041074 <ul>
10051075 <li>Install 7-zip plugin by default</li>
10061076 </ul>
@@ -1008,7 +1078,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
10081078 <ul>
10091079 <li>Accept drag&amp;droped files or folders from various places like: Zip folder, FTP folder, Recycle bin, images in Web browser</li>
10101080 </ul>
1011-<h3 id="plugins-5">Plugins</h3>
1081+<h3 id="plugins-6">Plugins</h3>
10121082 <ul>
10131083 <li>Introduce new plugin type FILE_FOLDER_PACK_UNPACKER which allows unpacking data in a file to multiple files in a folder</li>
10141084 <li>Use FILE_FOLDER_PACK_UNPACKER plugin for decompressing archives</li>
@@ -1033,7 +1103,7 @@ Demo: <a href="https://i.gyazo.com/af18960bd1f121213a2cd9287cae9cf4.gif">https:/
10331103 <li>64-bit version of WinMerge is available</li>
10341104 <li>Install plugins by default</li>
10351105 </ul>
1036-<h3 id="translations-15">Translations</h3>
1106+<h3 id="translations-16">Translations</h3>
10371107 <ul>
10381108 <li>Update Portuguese translation (GitHub #2-17)</li>
10391109 <li>Update Korean translation (GitHub #45)</li>
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -1,5 +1,84 @@
11 # Change log
22
3+## WinMerge 2.16.12 - 2021-04-29
4+
5+### General
6+
7+- GUI textstrings: grammatical corrections (PR #722)
8+- Added ARM64 support
9+
10+### File compare
11+
12+- BugFix: Fix PHP syntax highlighting. (PR #751)
13+- BugFix: Strings in a multi-line diff block were not be replaced correctly
14+ when the substitution filters' regular expression contained ^
15+- BugFix: Font size restoration with Ctrl+0 key did not work properly in
16+ Hi-DPI environment
17+- BugFix: Fixed a rare crash when enabling syntax highlight
18+- BugFix: Fixed an issue where inline scripts in HTML files were not
19+ highlighted correctly
20+- Make the width of the 'Find what' label in Find dialog a little wider
21+ (osdn.net #42063)
22+- Fix conflicting accelerators (osdn.net #42064)
23+- [Feature Request] Selection Count on Status Bar (#135)
24+- Add C# 6.0 reserved words to style list (PR #719)
25+- FR: Add a shortcut key go to next file (#721)
26+- Update PHP syntax highlighting keyword list. (PR #724)
27+- autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (PR #749)
28+- autoit.cpp - #CS #CE support (PR #753)
29+- Interrupt a inline diff process when it takes too long
30+- Make the color of characters that represent spaces and tabs lighter than
31+ other characters when the "View Whitespace" menu item is enabled
32+- Added "Open Parent Folder" menu item to the context menu
33+
34+### Folder compare
35+
36+- BugFix: Copy confirmation dialog has overlapped Yes/No Button (#739)
37+- BugFix: Comparison result was not updated by Swap operation in 3-way folder
38+ comparison (osdn.net #41901)
39+
40+### Binary compare
41+
42+- BugFix: Next File or Previous File button on the toolbar did not work if the
43+ active window was a binary compare window or an image compare window.
44+- BugFix: Only one pane was zoomed in/out in Ctrl+Mouse Wheel
45+
46+### Image compare
47+
48+- BugFix: Next File or Previous File button on the toolbar did not work if the
49+ active window was a binary compare window or an image compare window.
50+- BugFix: The header bar widths were not calculated properly when the
51+ 'Split Vertically' menu item is unchecked.
52+
53+### Open dialog
54+
55+- Make archive files openable as binary files from the pull-down menu.
56+
57+### Archive support
58+
59+- BugFix: Fixed a rare crash when decompressing an archive file
60+
61+### Plugins
62+
63+- BugFix: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and
64+ DisplayXMLFiles (#755)
65+
66+### Translations
67+
68+- Translation updates:
69+ - Brazilian (PR #711,#728,#729)
70+ - Dutch (PR #706)
71+ - Galician (PR #737)
72+ - German (PR #718,#752)
73+ - Hungarian (PR #712)
74+ - Japanese
75+ - Korean (PR #709)
76+ - Lithuanian (PR #708,#713,#738,#754)
77+ - Portuguese (PR #725)
78+ - Slovenian
79+ - Swedish (PR #720,#723)
80+ - Russian (PR #707)
81+
382 ## WinMerge 2.16.11 - 2021-03-28
483
584 ### General
@@ -1057,7 +1136,7 @@
10571136 - Make plugins configurable with settings dialog of each plugin
10581137
10591138 ### Filters
1060- - Update *.flt files for Visual Studio 2015 and 2017
1139+ - Update \*.flt files for Visual Studio 2015 and 2017
10611140
10621141 ### Shell extension
10631142 - Display another WinMerge icon in Explorer's context menu when a folder is
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -20,24 +20,95 @@
2020 <![endif]-->
2121 </head>
2222 <body>
23-<h1 id="winmerge-21611-beta-release-notes">WinMerge 2.16.11 Beta Release Notes</h1>
23+<h1 id="winmerge-21612-release-notes">WinMerge 2.16.12 Release Notes</h1>
2424 <ul>
2525 <li><a href="#about-this-release">About This Release</a></li>
26+<li><a href="#what-is-new-in-21612">What Is New in 2.16.12?</a></li>
2627 <li><a href="#what-is-new-in-21611-beta">What Is New in 2.16.11 beta?</a></li>
2728 <li><a href="#known-issues">Known issues</a></li>
2829 </ul>
29-<p>March 2021</p>
30+<p>April 2021</p>
3031 <h2 id="about-this-release">About This Release</h2>
31-<p>This is a WinMerge beta release which is meant for preview the current state of WinMerge development. This release is not recommended for the production.</p>
32+<p>This is a WinMerge 2.16.12 stable release. This release replaces earlier WinMerge stable releases as a recommended release.</p>
3233 <p>Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/issues">bug-tracker</a>.</p>
33-<h2 id="what-is-new-in-21611-beta">What Is New in 2.16.11 Beta</h2>
34+<h2 id="what-is-new-in-21612">What Is New in 2.16.12</h2>
3435 <h3 id="general">General</h3>
3536 <ul>
37+<li>GUI textstrings: grammatical corrections (PR #722)</li>
38+<li>Added ARM64 support</li>
39+</ul>
40+<h3 id="file-compare">File compare</h3>
41+<ul>
42+<li>BugFix: Fix PHP syntax highlighting. (PR #751)</li>
43+<li>BugFix: Strings in a multi-line diff block were not be replaced correctly when the substitution filters&#39; regular expression contained ^</li>
44+<li>BugFix: Font size restoration with Ctrl+0 key did not work properly in Hi-DPI environment</li>
45+<li>BugFix: Fixed a rare crash when enabling syntax highlight</li>
46+<li>BugFix: Fixed an issue where inline scripts in HTML files were not highlighted correctly</li>
47+<li>Make the width of the &#39;Find what&#39; label in Find dialog a little wider (osdn.net #42063)</li>
48+<li>Fix conflicting accelerators (osdn.net #42064)</li>
49+<li>[Feature Request] Selection Count on Status Bar (#135)</li>
50+<li>Add C# 6.0 reserved words to style list (PR #719)</li>
51+<li>FR: Add a shortcut key go to next file (#721)</li>
52+<li>Update PHP syntax highlighting keyword list. (PR #724)</li>
53+<li>autoit.cpp - Macros &gt;&gt; User 1 ..... Variable &gt;&gt; User 2 (PR #749)</li>
54+<li>autoit.cpp - #CS #CE support (PR #753)</li>
55+<li>Interrupt a inline diff process when it takes too long</li>
56+<li>Make the color of characters that represent spaces and tabs lighter than other characters when the &quot;View Whitespace&quot; menu item is enabled</li>
57+<li>Added &quot;Open Parent Folder&quot; menu item to the context menu</li>
58+</ul>
59+<h3 id="folder-compare">Folder compare</h3>
60+<ul>
61+<li>BugFix: Copy confirmation dialog has overlapped Yes/No Button (#739)</li>
62+<li>BugFix: Comparison result was not updated by Swap operation in 3-way folder comparison (osdn.net #41901)</li>
63+</ul>
64+<h3 id="binary-compare">Binary compare</h3>
65+<ul>
66+<li>BugFix: Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.</li>
67+<li>BugFix: Only one pane was zoomed in/out in Ctrl+Mouse Wheel</li>
68+</ul>
69+<h3 id="image-compare">Image compare</h3>
70+<ul>
71+<li>BugFix: Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.</li>
72+<li>BugFix: The header bar widths were not calculated properly when the &#39;Split Vertically&#39; menu item is unchecked.</li>
73+</ul>
74+<h3 id="open-dialog">Open dialog</h3>
75+<ul>
76+<li>Make archive files openable as binary files from the pull-down menu.</li>
77+</ul>
78+<h3 id="archive-support">Archive support</h3>
79+<ul>
80+<li>BugFix: Fixed a rare crash when decompressing an archive file</li>
81+</ul>
82+<h3 id="plugins">Plugins</h3>
83+<ul>
84+<li>BugFix: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and DisplayXMLFiles (#755)</li>
85+</ul>
86+<h3 id="translations">Translations</h3>
87+<ul>
88+<li>Translation updates:
89+<ul>
90+<li>Brazilian (PR #711,#728,#729)</li>
91+<li>Dutch (PR #706)</li>
92+<li>Galician (PR #737)</li>
93+<li>German (PR #718,#752)</li>
94+<li>Hungarian (PR #712)</li>
95+<li>Japanese</li>
96+<li>Korean (PR #709)</li>
97+<li>Lithuanian (PR #708,#713,#738,#754)</li>
98+<li>Portuguese (PR #725)</li>
99+<li>Slovenian</li>
100+<li>Swedish (PR #720,#723)</li>
101+<li>Russian (PR #707)</li>
102+</ul></li>
103+</ul>
104+<h2 id="what-is-new-in-21611-beta">What Is New in 2.16.11 Beta</h2>
105+<h3 id="general-1">General</h3>
106+<ul>
36107 <li>Make all OK strings same case (PR #593)</li>
37108 <li>Tab bar: Added shadows to help distinguish between active and inactive tabs</li>
38109 <li>Added drop-down menu to Open and Save icon on toolbar</li>
39110 </ul>
40-<h3 id="file-compare">File compare</h3>
111+<h3 id="file-compare-1">File compare</h3>
41112 <ul>
42113 <li>BugFix: Basic syntax highlighter is broken (osdn.net #41440)</li>
43114 <li>BugFix: File is corrupted while saving differences in changed file (Ctrl+S) (#607)</li>
@@ -49,21 +120,21 @@
49120 <li>If -b or -w is also specified, -B now considers lines to be empty if they contain only white space (osdn.net #41355)</li>
50121 <li>Added BOM checkbox to the Codepage dialog.</li>
51122 </ul>
52-<h3 id="folder-compare">Folder compare</h3>
123+<h3 id="folder-compare-1">Folder compare</h3>
53124 <ul>
54125 <li>BugFix: Program crash if you close a tab with the folder from where you opened current file (#645)</li>
55126 <li>BugFix: The title bar path was not updated when swapping files in a Zip file.</li>
56127 <li>BugFix: The codepage specified in the Codepage dialog did not affect the files to be opened.</li>
57128 </ul>
58-<h3 id="image-compare">Image compare</h3>
129+<h3 id="image-compare-1">Image compare</h3>
59130 <ul>
60131 <li>BugFix: The image on the right does not open if the file exists only on the right (osdn.net #41721)</li>
61132 </ul>
62-<h3 id="open-dialog">Open dialog</h3>
133+<h3 id="open-dialog-1">Open dialog</h3>
63134 <ul>
64135 <li>Added Text, Table, Binary and Image menu items to the Compare button in the &quot;Select Files or Folders&quot; window</li>
65136 </ul>
66-<h3 id="archive-support">Archive support</h3>
137+<h3 id="archive-support-1">Archive support</h3>
67138 <ul>
68139 <li>Rar5 support (#644)</li>
69140 </ul>
@@ -71,7 +142,7 @@
71142 <ul>
72143 <li>BugFix: Fix an issue where custom colors are not saved. (PR #648)</li>
73144 </ul>
74-<h3 id="plugins">Plugins</h3>
145+<h3 id="plugins-1">Plugins</h3>
75146 <ul>
76147 <li>RCLocalizationHelper: Fix memory leaks (PR #596)</li>
77148 </ul>
@@ -79,7 +150,7 @@
79150 <ul>
80151 <li>Installer issue with Polish diacritics characters (#589)</li>
81152 </ul>
82-<h3 id="translations">Translations</h3>
153+<h3 id="translations-1">Translations</h3>
83154 <ul>
84155 <li>Translation updates:
85156 <ul>
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -1,18 +1,98 @@
1-# WinMerge 2.16.11 Beta Release Notes
1+# WinMerge 2.16.12 Release Notes
22
33 - [About This Release](#about-this-release)
4+- [What Is New in 2.16.12?](#what-is-new-in-21612)
45 - [What Is New in 2.16.11 beta?](#what-is-new-in-21611-beta)
56 - [Known issues](#known-issues)
67
7-March 2021
8+April 2021
89
910 ## About This Release
1011
11-This is a WinMerge beta release which is meant for preview the current state of
12-WinMerge development. This release is not recommended for the production.
12+This is a WinMerge 2.16.12 stable release.
13+This release replaces earlier WinMerge stable releases as a recommended release.
1314
1415 Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/issues">bug-tracker</a>.
1516
17+## What Is New in 2.16.12
18+
19+### General
20+
21+- GUI textstrings: grammatical corrections (PR #722)
22+- Added ARM64 support
23+
24+### File compare
25+
26+- BugFix: Fix PHP syntax highlighting. (PR #751)
27+- BugFix: Strings in a multi-line diff block were not be replaced correctly
28+ when the substitution filters' regular expression contained ^
29+- BugFix: Font size restoration with Ctrl+0 key did not work properly in
30+ Hi-DPI environment
31+- BugFix: Fixed a rare crash when enabling syntax highlight
32+- BugFix: Fixed an issue where inline scripts in HTML files were not
33+ highlighted correctly
34+- Make the width of the 'Find what' label in Find dialog a little wider
35+ (osdn.net #42063)
36+- Fix conflicting accelerators (osdn.net #42064)
37+- [Feature Request] Selection Count on Status Bar (#135)
38+- Add C# 6.0 reserved words to style list (PR #719)
39+- FR: Add a shortcut key go to next file (#721)
40+- Update PHP syntax highlighting keyword list. (PR #724)
41+- autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (PR #749)
42+- autoit.cpp - #CS #CE support (PR #753)
43+- Interrupt a inline diff process when it takes too long
44+- Make the color of characters that represent spaces and tabs lighter than
45+ other characters when the "View Whitespace" menu item is enabled
46+- Added "Open Parent Folder" menu item to the context menu
47+
48+### Folder compare
49+
50+- BugFix: Copy confirmation dialog has overlapped Yes/No Button (#739)
51+- BugFix: Comparison result was not updated by Swap operation in 3-way folder
52+ comparison (osdn.net #41901)
53+
54+### Binary compare
55+
56+- BugFix: Next File or Previous File button on the toolbar did not work if the
57+ active window was a binary compare window or an image compare window.
58+- BugFix: Only one pane was zoomed in/out in Ctrl+Mouse Wheel
59+
60+### Image compare
61+
62+- BugFix: Next File or Previous File button on the toolbar did not work if the
63+ active window was a binary compare window or an image compare window.
64+- BugFix: The header bar widths were not calculated properly when the
65+ 'Split Vertically' menu item is unchecked.
66+
67+### Open dialog
68+
69+- Make archive files openable as binary files from the pull-down menu.
70+
71+### Archive support
72+
73+- BugFix: Fixed a rare crash when decompressing an archive file
74+
75+### Plugins
76+
77+- BugFix: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and
78+ DisplayXMLFiles (#755)
79+
80+### Translations
81+
82+- Translation updates:
83+ - Brazilian (PR #711,#728,#729)
84+ - Dutch (PR #706)
85+ - Galician (PR #737)
86+ - German (PR #718,#752)
87+ - Hungarian (PR #712)
88+ - Japanese
89+ - Korean (PR #709)
90+ - Lithuanian (PR #708,#713,#738,#754)
91+ - Portuguese (PR #725)
92+ - Slovenian
93+ - Swedish (PR #720,#723)
94+ - Russian (PR #707)
95+
1696 ## What Is New in 2.16.11 Beta
1797
1898 ### General
--- a/Externals/crystaledit/editlib/ccrystaltextview.cpp
+++ b/Externals/crystaledit/editlib/ccrystaltextview.cpp
@@ -1510,7 +1510,7 @@ GetParseCookie (int nLineIndex)
15101510 L--;
15111511 L++;
15121512
1513- int nBlocks;
1513+ int nBlocks = 0;
15141514 while (L <= nLineIndex)
15151515 {
15161516 unsigned dwCookie = 0;
--- a/Externals/crystaledit/editlib/parsers/html.cpp
+++ b/Externals/crystaledit/editlib/parsers/html.cpp
@@ -23,6 +23,12 @@
2323 #define new DEBUG_NEW
2424 #endif
2525
26+static void AdjustCharPosInTextBlocks(CrystalLineParser::TEXTBLOCK* pBuf, int startBlock, int endBlock, int offset)
27+{
28+ for (int i = startBlock; i <= endBlock; ++i)
29+ pBuf[i].m_nCharPos += offset;
30+}
31+
2632 unsigned
2733 CrystalLineParser::ParseLineHtmlEx (unsigned dwCookie, const TCHAR *pszChars, int nLength, TEXTBLOCK * pBuf, int &nActualItems, int nEmbeddedLanguage)
2834 {
@@ -92,7 +98,10 @@ out:
9298 {
9399 const TCHAR *pszEnd = _tcsstr(pszChars + I, _T("</script>"));
94100 int nextI = pszEnd ? static_cast<int>(pszEnd - pszChars) : nLength;
95- dwCookie = ParseLineJavaScript(dwCookie & ~COOKIE_BLOCK_SCRIPT, pszChars + I, nextI - I, pBuf, nActualItems);
101+ int nActualItemsEmbedded = 0;
102+ dwCookie = ParseLineJavaScript(dwCookie & ~COOKIE_BLOCK_SCRIPT, pszChars + I, nextI - I, pBuf + nActualItems, nActualItemsEmbedded);
103+ AdjustCharPosInTextBlocks(pBuf, nActualItems, nActualItems + nActualItemsEmbedded - 1, I);
104+ nActualItems += nActualItemsEmbedded;
96105 if (!pszEnd)
97106 dwCookie |= COOKIE_BLOCK_SCRIPT;
98107 else
@@ -106,7 +115,10 @@ out:
106115 {
107116 const TCHAR *pszEnd = _tcsstr(pszChars + I, _T("</style>"));
108117 int nextI = pszEnd ? static_cast<int>(pszEnd - pszChars) : nLength;
109- dwCookie = ParseLineCss(dwCookie & ~COOKIE_BLOCK_STYLE, pszChars + I, nextI - I, pBuf, nActualItems);
118+ int nActualItemsEmbedded = 0;
119+ dwCookie = ParseLineCss(dwCookie & ~COOKIE_BLOCK_STYLE, pszChars + I, nextI - I, pBuf + nActualItems, nActualItemsEmbedded);
120+ AdjustCharPosInTextBlocks(pBuf, nActualItems, nActualItems + nActualItemsEmbedded - 1, I);
121+ nActualItems += nActualItemsEmbedded;
110122 if (!pszEnd)
111123 dwCookie |= COOKIE_BLOCK_STYLE;
112124 else
@@ -129,7 +141,10 @@ out:
129141 case SRC_PHP: pParseLineFunc = ParseLinePhpLanguage; break;
130142 default: pParseLineFunc = ParseLineJavaScript; break;
131143 }
132- dwCookie = pParseLineFunc(dwCookie & ~COOKIE_EXT_USER1, pszChars + I, nextI - I, pBuf, nActualItems);
144+ int nActualItemsEmbedded = 0;
145+ dwCookie = pParseLineFunc(dwCookie & ~COOKIE_EXT_USER1, pszChars + I, nextI - I, pBuf + nActualItems, nActualItemsEmbedded);
146+ AdjustCharPosInTextBlocks(pBuf, nActualItems, nActualItems + nActualItemsEmbedded - 1, I);
147+ nActualItems += nActualItemsEmbedded;
133148 if (!pszEnd)
134149 dwCookie |= COOKIE_EXT_USER1;
135150 else
--- a/SetVersion.cmd
+++ b/SetVersion.cmd
@@ -1,8 +1,8 @@
11 set MAJOR=2
22 set MINOR=16
3-set REVISION=10
4-set PATCHLEVEL=10
5-set STRPRIVATEBUILD="jp-10"
3+set REVISION=12
4+set PATCHLEVEL=1
5+set STRPRIVATEBUILD="jp-1"
66
77 set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
88 rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -121,6 +121,7 @@ CMergeDoc::CMergeDoc()
121121 , m_bAutoMerged(false)
122122 , m_nGroups(0)
123123 , m_pView{nullptr}
124+, m_bAutomaticRescan(false)
124125 {
125126 DIFFOPTIONS options = {0};
126127
@@ -137,6 +138,8 @@ CMergeDoc::CMergeDoc()
137138 }
138139
139140 m_bEnableRescan = true;
141+ m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
142+
140143 // COleDateTime m_LastRescan
141144 curUndo = undoTgt.begin();
142145 m_nDiffContext = GetOptionsMgr()->GetInt(OPT_DIFF_CONTEXT);
@@ -3186,6 +3189,8 @@ void CMergeDoc::RefreshOptions()
31863189 {
31873190 DIFFOPTIONS options = {0};
31883191
3192+ m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
3193+
31893194 m_diffWrapper.SetDetectMovedBlocks(GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS));
31903195 Options::DiffOptions::Load(GetOptionsMgr(), options);
31913196
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -312,6 +312,7 @@ public:
312312 }
313313 std::optional<bool> GetEnableTableEditing() const { return m_bEnableTableEditing; }
314314 void SetEnableTableEditing(std::optional<bool> bEnableTableEditing) { m_bEnableTableEditing = bEnableTableEditing; }
315+ bool GetAutomaticRescan() const { return m_bAutomaticRescan; }
315316
316317 // implementation methods
317318 private:
@@ -345,6 +346,13 @@ protected:
345346 bool m_bHasSyncPoints;
346347 bool m_bAutoMerged;
347348 std::optional<bool> m_bEnableTableEditing;
349+ /**
350+ * Are automatic rescans enabled?
351+ * If automatic rescans are enabled then we rescan files after edit
352+ * events, unless timer suppresses rescan. We suppress rescans within
353+ * certain time from previous rescan.
354+ */
355+ bool m_bAutomaticRescan;
348356 // friend access
349357 friend class RescanSuppress;
350358
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -64,7 +64,6 @@ CMergeEditView::CMergeEditView()
6464 , m_nThisGroup(0)
6565 , m_bDetailView(false)
6666 , m_piMergeEditStatus(nullptr)
67-, m_bAutomaticRescan(false)
6867 , fTimerWaitingForIdle(0)
6968 , m_lineBegin(0)
7069 , m_lineEnd(-1)
@@ -2339,7 +2338,7 @@ void CMergeEditView::OnEditOperation(int nAction, LPCTSTR pszText, size_t cchTex
23392338 pDoc->UpdateHeaderPath(m_nThisPane);
23402339
23412340 // If automatic rescan enabled, rescan after edit events
2342- if (m_bAutomaticRescan)
2341+ if (pDoc->GetAutomaticRescan())
23432342 {
23442343 // keep document up to date
23452344 // (Re)start timer to rescan only when user edits text
@@ -3464,8 +3463,6 @@ void CMergeEditView::RefreshOptions()
34643463 RENDERING_MODE nRenderingMode = static_cast<RENDERING_MODE>(GetOptionsMgr()->GetInt(OPT_RENDERING_MODE));
34653464 SetRenderingMode(nRenderingMode);
34663465
3467- m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
3468-
34693466 if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
34703467 SetInsertTabs(true);
34713468 else
@@ -4282,9 +4279,6 @@ void CMergeEditView::DocumentsLoaded()
42824279 SetTopMargin(false);
42834280 }
42844281
4285- // Enable/disable automatic rescan (rescanning after edit)
4286- EnableRescan(GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN));
4287-
42884282 // SetTextType will revert to language dependent defaults for tab
42894283 SetTabSize(GetOptionsMgr()->GetInt(OPT_TAB_SIZE));
42904284 SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -72,13 +72,6 @@ public:
7272 IMergeEditStatus * m_piMergeEditStatus; /**< interface to status bar */
7373
7474 protected:
75- /**
76- * Are automatic rescans enabled?
77- * If automatic rescans are enabled then we rescan files after edit
78- * events, unless timer suppresses rescan. We suppress rescans within
79- * certain time from previous rescan.
80- */
81- bool m_bAutomaticRescan;
8275 /// first line of diff (first displayable line)
8376 int m_lineBegin;
8477 /// last line of diff (last displayable line)
@@ -102,7 +95,6 @@ private:
10295 // Operations
10396 public:
10497 void RefreshOptions();
105- bool EnableRescan(bool bEnable);
10698 bool IsReadOnly(int pane) const;
10799 void ShowDiff(bool bScroll, bool bSelectText);
108100 virtual void OnEditOperation(int nAction, LPCTSTR pszText, size_t cchText) override;
@@ -374,16 +366,6 @@ inline CMergeDoc* CMergeEditView::GetDocument()
374366 #endif
375367
376368 /**
377- * @brief Enable/Disable automatic rescanning
378- */
379-inline bool CMergeEditView::EnableRescan(bool bEnable)
380-{
381- bool bOldValue = m_bAutomaticRescan;
382- m_bAutomaticRescan = bEnable;
383- return bOldValue;
384-}
385-
386-/**
387369 * @brief Check if cursor is inside difference.
388370 * @return true if cursor is inside difference.
389371 */
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
3737 </head>
3838 <body>
3939 <h1>Translations Status</h1>
40-<p>Status from <strong>2021-04-20</strong>:</p>
40+<p>Status from <strong>2021-04-27</strong>:</p>
4141 <h2>WinMerge</h2>
4242 <table class="status">
4343 <tr>
@@ -187,11 +187,11 @@
187187 <tr>
188188 <td class="left">German</td>
189189 <td class="right">1030</td>
190- <td class="right translated">1029</td>
190+ <td class="right translated">1030</td>
191191 <td class="right fuzzy">0</td>
192- <td class="right untranslated">1</td>
192+ <td class="right untranslated">0</td>
193193 <td class="right">100 %</td>
194- <td class="center">2021-04-04</td>
194+ <td class="center">2021-04-24</td>
195195 </tr>
196196 <tr>
197197 <td class="left">Greek</td>
@@ -245,7 +245,7 @@
245245 <td class="right fuzzy">0</td>
246246 <td class="right untranslated">0</td>
247247 <td class="right">100 %</td>
248- <td class="center">2021-04-19</td>
248+ <td class="center">2021-04-26</td>
249249 </tr>
250250 <tr>
251251 <td class="left">Norwegian</td>
@@ -331,11 +331,11 @@
331331 <tr>
332332 <td class="left">Slovenian</td>
333333 <td class="right">1030</td>
334- <td class="right translated">1027</td>
334+ <td class="right translated">1030</td>
335335 <td class="right fuzzy">0</td>
336- <td class="right untranslated">3</td>
336+ <td class="right untranslated">0</td>
337337 <td class="right">100 %</td>
338- <td class="center">2021-03-02</td>
338+ <td class="center">2021-04-24</td>
339339 </tr>
340340 <tr>
341341 <td class="left">Spanish</td>
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,6 +1,6 @@
11 # Translations Status
22
3-Status from **2021-04-20**:
3+Status from **2021-04-27**:
44
55 ## WinMerge
66
@@ -21,13 +21,13 @@ Status from **2021-04-20**:
2121 | Finnish | 1030 | 914 | 0 | 116 | 89 % | |
2222 | French | 1030 | 1027 | 0 | 3 | 100 % | 2021-02-10 |
2323 | Galician | 1030 | 1030 | 0 | 0 | 100 % | 2021-04-18 |
24-| German | 1030 | 1029 | 0 | 1 | 100 % | 2021-04-04 |
24+| German | 1030 | 1030 | 0 | 0 | 100 % | 2021-04-24 |
2525 | Greek | 1030 | 613 | 0 | 417 | 60 % | |
2626 | Hungarian | 1030 | 1027 | 0 | 3 | 100 % | 2021-03-15 |
2727 | Italian | 1030 | 917 | 0 | 113 | 89 % | 2019-07-12 |
2828 | Japanese | 1030 | 1030 | 0 | 0 | 100 % | 2021-03-31 |
2929 | Korean | 1030 | 998 | 0 | 32 | 97 % | 2021-03-30 |
30-| Lithuanian | 1030 | 1030 | 0 | 0 | 100 % | 2021-04-19 |
30+| Lithuanian | 1030 | 1030 | 0 | 0 | 100 % | 2021-04-26 |
3131 | Norwegian | 1030 | 642 | 0 | 388 | 62 % | |
3232 | Persian | 1030 | 653 | 0 | 377 | 63 % | 2013-08-15 |
3333 | Polish | 1030 | 1018 | 0 | 12 | 99 % | |
@@ -37,7 +37,7 @@ Status from **2021-04-20**:
3737 | Serbian | 1030 | 641 | 0 | 389 | 62 % | |
3838 | Sinhala | 1030 | 571 | 63 | 396 | 62 % | 2010-12-12 |
3939 | Slovak | 1030 | 987 | 0 | 43 | 96 % | 2020-11-02 |
40-| Slovenian | 1030 | 1027 | 0 | 3 | 100 % | 2021-03-02 |
40+| Slovenian | 1030 | 1030 | 0 | 0 | 100 % | 2021-04-24 |
4141 | Spanish | 1030 | 883 | 0 | 147 | 86 % | 2020-04-03 |
4242 | Swedish | 1030 | 1029 | 0 | 1 | 100 % | 2021-04-10 |
4343 | Turkish | 1030 | 983 | 0 | 47 | 95 % | 2020-09-08 |
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,6 +1,6 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <status>
3- <update>2021-04-20</update>
3+ <update>2021-04-27</update>
44 <translations project="WinMerge">
55 <translation>
66 <language>Arabic</language>
@@ -308,12 +308,12 @@
308308 <translation>
309309 <language>German</language>
310310 <file>German.po</file>
311- <update>2021-04-04</update>
311+ <update>2021-04-24</update>
312312 <strings>
313313 <count>1030</count>
314- <translated>1029</translated>
314+ <translated>1030</translated>
315315 <fuzzy>0</fuzzy>
316- <untranslated>1</untranslated>
316+ <untranslated>0</untranslated>
317317 </strings>
318318 <translators>
319319 <translator maintainer="1">
@@ -454,7 +454,7 @@
454454 <translation>
455455 <language>Lithuanian</language>
456456 <file>Lithuanian.po</file>
457- <update>2021-04-19</update>
457+ <update>2021-04-26</update>
458458 <strings>
459459 <count>1030</count>
460460 <translated>1030</translated>
@@ -668,12 +668,12 @@
668668 <translation>
669669 <language>Slovenian</language>
670670 <file>Slovenian.po</file>
671- <update>2021-03-02</update>
671+ <update>2021-04-24</update>
672672 <strings>
673673 <count>1030</count>
674- <translated>1027</translated>
674+ <translated>1030</translated>
675675 <fuzzy>0</fuzzy>
676- <untranslated>3</untranslated>
676+ <untranslated>0</untranslated>
677677 </strings>
678678 <translators>
679679 <translator>
--- a/Version.h
+++ b/Version.h
@@ -1,5 +1,5 @@
1-#define FILEVER 2,16,10,10
2-#define PRODUCTVER 2,16,10,10
3-#define STRFILEVER "2.16.10.10"
4-#define STRPRODUCTVER "2.16.10.10"
5-#define STRPRIVATEBUILD "jp-10"
1+#define FILEVER 2,16,12,1
2+#define PRODUCTVER 2,16,12,1
3+#define STRFILEVER "2.16.12.1"
4+#define STRPRODUCTVER "2.16.12.1"
5+#define STRPRIVATEBUILD "jp-1"
Show on old repository browser