From f162d8523d581865ece9278969529687f5d2faa7 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sat, 25 Nov 2023 11:05:00 +0900
Subject: [PATCH] Update ChangeLog&ReleaseNotes (6)

---
 Docs/Users/ChangeLog.html    | 82 +++++++++++++++++++-----------------
 Docs/Users/ChangeLog.md      |  7 +++
 Docs/Users/ReleaseNotes.html |  7 ++-
 Docs/Users/ReleaseNotes.md   |  7 ++-
 4 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
index 1f38d413d53..8fc67fce82f 100644
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -23,9 +23,15 @@
 <h1 id="change-log">Change log</h1>
 <h2 id="winmerge-21636---2023-11-27">WinMerge 2.16.36 - 2023-11-27</h2>
 <h3 id="translations">Translations</h3>
+<h3 id="file-filter">File filter</h3>
+<ul>
+<li>Bugfix: Modify the &quot;File Filters&quot; dialog. (#2118)</li>
+</ul>
+<h3 id="translations-1">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
+<li>Portuguese (PR #2119)</li>
 <li>Slovenian</li>
 <li>Turkish (PR #2116)</li>
 </ul></li>
@@ -63,7 +69,7 @@ <h3 id="installer">Installer</h3>
 <li>BugFix: fix bug of Registry path (PR #2086)</li>
 <li>BugFix: &quot;Register Windows 11 Shell Extension&quot; fails because PowerShell script doesn&#39;t escape special chars correctly (#2109)</li>
 </ul>
-<h3 id="translations-1">Translations</h3>
+<h3 id="translations-2">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -106,7 +112,7 @@ <h3 id="substitution-filters">Substitution filters</h3>
 <ul>
 <li>Modify the &quot;Substitution Filters&quot; dialog. (PR #2068)</li>
 </ul>
-<h3 id="translations-2">Translations</h3>
+<h3 id="translations-3">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -168,7 +174,7 @@ <h3 id="manual">Manual</h3>
 <ul>
 <li>Manual: Use po4a for manual translation (PR #1994) (#499)</li>
 </ul>
-<h3 id="translations-3">Translations</h3>
+<h3 id="translations-4">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -218,7 +224,7 @@ <h3 id="archive-support">Archive support</h3>
 <ul>
 <li>Update 7-Zip to 23.01 (PR #1913)</li>
 </ul>
-<h3 id="translations-4">Translations</h3>
+<h3 id="translations-5">Translations</h3>
 <ul>
 <li>New translation: Tamil (PR #1946)</li>
 <li>Translation updates:
@@ -263,7 +269,7 @@ <h3 id="installer-1">Installer</h3>
 <ul>
 <li>Silent install blocked (#1852)</li>
 </ul>
-<h3 id="translations-5">Translations</h3>
+<h3 id="translations-6">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -331,7 +337,7 @@ <h3 id="installer-2">Installer</h3>
 <ul>
 <li>BugFix: Unsuccessful installation, Portable Win32 version (#1802)</li>
 </ul>
-<h3 id="translations-6">Translations</h3>
+<h3 id="translations-7">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -410,7 +416,7 @@ <h3 id="installer-3">Installer</h3>
 <li>The ShellExtension*.dll file is now renamed before installation to prevent installation failure when Explorer is loading ShellExtension*.dll.</li>
 <li>Added IgnoreLeadingLineNumbers plugin to non-x86 installers</li>
 </ul>
-<h3 id="translations-7">Translations</h3>
+<h3 id="translations-8">Translations</h3>
 <ul>
 <li>BugFix: Fix an issue where some messages are not translated. (PR #1712)</li>
 <li>Translation updates:
@@ -473,7 +479,7 @@ <h3 id="plugins-4">Plugins</h3>
 <li>ApacheTika: Updated Apache Tika to version 2.6.0</li>
 <li>ApacheTika: If Java is not installed, OpenJDK 19.0.2 will now be downloaded and used.</li>
 </ul>
-<h3 id="translations-8">Translations</h3>
+<h3 id="translations-9">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -522,7 +528,7 @@ <h3 id="options-dialog-4">Options dialog</h3>
 <ul>
 <li>Added Auto-reload modified files option (PR #1611)</li>
 </ul>
-<h3 id="translations-9">Translations</h3>
+<h3 id="translations-10">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -598,7 +604,7 @@ <h3 id="patch-generator-dialog">Patch Generator dialog</h3>
 <ul>
 <li>BugFix: The command line section in the generated patch file was garbled (osdn.net #45935)</li>
 </ul>
-<h3 id="translations-10">Translations</h3>
+<h3 id="translations-11">Translations</h3>
 <ul>
 <li>BugFix: Fix an issue where the following message displayed when two files are identical in a 3-way folder comparison is not translated. (PR #1535)</li>
 <li>Translation updates:
@@ -657,7 +663,7 @@ <h3 id="archive-support-1">Archive support</h3>
 <ul>
 <li>Update 7-Zip to 22.01 (#1425)</li>
 </ul>
-<h3 id="translations-11">Translations</h3>
+<h3 id="translations-12">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -714,7 +720,7 @@ <h3 id="options-dialog-6">Options dialog</h3>
 <ul>
 <li>New setting to decide when to save/restore hidden items when project is saved/loaded (PR #1377)</li>
 </ul>
-<h3 id="translations-12">Translations</h3>
+<h3 id="translations-13">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -798,7 +804,7 @@ <h3 id="shell-extension-1">Shell extension</h3>
 <li>BugFix: Fix an issue where the WinMerge menu displayed in the&quot;Show more options&quot; menu of the Windows 11 Explorer context menu is not an advanced menu, even though the advanced menu is enabled.</li>
 <li>BugFix: Fix the problem that the WinMerge icon is not correctly displayed on the taskbar when WinMerge is started from the Windows 11 context menu.</li>
 </ul>
-<h3 id="translations-13">Translations</h3>
+<h3 id="translations-14">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -880,7 +886,7 @@ <h3 id="manual-1">Manual</h3>
 <ul>
 <li>BugFix: Help file: Small issue for plugins (#1309)</li>
 </ul>
-<h3 id="translations-14">Translations</h3>
+<h3 id="translations-15">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -956,7 +962,7 @@ <h3 id="plugins-9">Plugins</h3>
 <ul>
 <li>BugFix: Select Plugin Dialog: Fix the problem that the plugin arguments are deleted by clicking the &quot;Add pipe&quot; button after entering them.</li>
 </ul>
-<h3 id="translations-15">Translations</h3>
+<h3 id="translations-16">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1044,7 +1050,7 @@ <h3 id="manual-2">Manual</h3>
 <ul>
 <li>BugFix: &quot;Quick compare limit&quot; and &quot;Binary compare limit&quot; settings don&#39;t have the expected (and documented) purpose (#1100)</li>
 </ul>
-<h3 id="translations-16">Translations</h3>
+<h3 id="translations-17">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1115,7 +1121,7 @@ <h3 id="shell-extension-2">Shell extension</h3>
 <ul>
 <li>ShellExtension for Windows 11: Implemented advanced menu</li>
 </ul>
-<h3 id="translations-17">Translations</h3>
+<h3 id="translations-18">Translations</h3>
 <ul>
 <li>New translation:
 <ul>
@@ -1188,7 +1194,7 @@ <h3 id="manual-3">Manual</h3>
 <ul>
 <li>Where to report documentation/help errors? (#1004)</li>
 </ul>
-<h3 id="translations-18">Translations</h3>
+<h3 id="translations-19">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1262,7 +1268,7 @@ <h3 id="shell-extension-4">Shell extension</h3>
 <li>BugFix: Right click - compare - is unclear (#249)</li>
 <li>Added a new DLL (WinMergeContextMenu.dll) for the Windows 11 Explorer context menu (currently unstable and not registered by default) (PR #954)</li>
 </ul>
-<h3 id="translations-19">Translations</h3>
+<h3 id="translations-20">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1361,7 +1367,7 @@ <h3 id="installer-5">Installer</h3>
 <ul>
 <li>Installer integrates with TortoiseGit and TortoiseSVN despite being told not to (#878)</li>
 </ul>
-<h3 id="translations-20">Translations</h3>
+<h3 id="translations-21">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1459,7 +1465,7 @@ <h3 id="plugins-15">Plugins</h3>
 </ul></li>
 </ul></li>
 </ul>
-<h3 id="translations-21">Translations</h3>
+<h3 id="translations-22">Translations</h3>
 <ul>
 <li>BugFix: Fix an issue where a message is not translated.(PR #763)</li>
 <li>Translation updates:
@@ -1528,7 +1534,7 @@ <h3 id="plugins-16">Plugins</h3>
 <ul>
 <li>BugFix: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and DisplayXMLFiles (#755)</li>
 </ul>
-<h3 id="translations-22">Translations</h3>
+<h3 id="translations-23">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1595,7 +1601,7 @@ <h3 id="installer-6">Installer</h3>
 <ul>
 <li>Installer issue with Polish diacritics characters (#589)</li>
 </ul>
-<h3 id="translations-23">Translations</h3>
+<h3 id="translations-24">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1683,7 +1689,7 @@ <h3 id="patch-generator-dialog-2">Patch Generator dialog</h3>
 <ul>
 <li>BugFix: Crash when generating patch (GitHub #521)</li>
 </ul>
-<h3 id="translations-24">Translations</h3>
+<h3 id="translations-25">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1756,7 +1762,7 @@ <h3 id="patch-generator-dialog-3">Patch Generator dialog</h3>
 <ul>
 <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>
 </ul>
-<h3 id="translations-25">Translations</h3>
+<h3 id="translations-26">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1833,7 +1839,7 @@ <h3 id="installer-7">Installer</h3>
 <li>BugFix: Lithuanian.po is missing (GitHub PR #415)</li>
 <li>New installer for per-user installation (WinMerge-2.16.8-x64-PerUser-Setup.exe)</li>
 </ul>
-<h3 id="translations-26">Translations</h3>
+<h3 id="translations-27">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1921,7 +1927,7 @@ <h3 id="installer-8">Installer</h3>
 <ul>
 <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>
 </ul>
-<h3 id="translations-27">Translations</h3>
+<h3 id="translations-28">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
@@ -1983,7 +1989,7 @@ <h3 id="installer-9">Installer</h3>
 <ul>
 <li>BugFix: Fix spelling of Git (GitHub #246)</li>
 </ul>
-<h3 id="translations-28">Translations</h3>
+<h3 id="translations-29">Translations</h3>
 <ul>
 <li>New translation: Arabic (sf.net #3038)</li>
 <li>Translation updates:
@@ -2042,7 +2048,7 @@ <h3 id="installer-10">Installer</h3>
 <li>BugFix: Windows 10 shell integration not working (GitHub #176)</li>
 <li>Installer - Proposal - Separate Inno Setup strings from WinMerge installer strings (GitHub #167)</li>
 </ul>
-<h3 id="translations-29">Translations</h3>
+<h3 id="translations-30">Translations</h3>
 <ul>
 <li>Update Italian translation (GitHub #164, #165)</li>
 <li>Update Russian translation (GitHub #166)</li>
@@ -2079,7 +2085,7 @@ <h3 id="plugins-19">Plugins</h3>
 <ul>
 <li>BugFix: PrediffLineFilter.sct: Wrong encoding for settings dialog (Bitbucket #16)</li>
 </ul>
-<h3 id="translations-30">Translations</h3>
+<h3 id="translations-31">Translations</h3>
 <ul>
 <li>Update Russian translation (Bitbucket PR #51)</li>
 <li>Update Italian translation (Bitbucket PR #52)</li>
@@ -2138,7 +2144,7 @@ <h3 id="installer-11">Installer</h3>
 <li>Allow per-user installation (only x64 installer)</li>
 <li>Don&#39;t install Files.txt and don&#39;t add &quot;Uninstall WinMerge&quot; to the start menu (Bitbuket #38)</li>
 </ul>
-<h3 id="translations-31">Translations</h3>
+<h3 id="translations-32">Translations</h3>
 <ul>
 <li>Update French translation (GitHub #149, #150)</li>
 <li>Update Lithuanian translation (Bitbucket PR #36, #40, #43, #46, #48, #50)</li>
@@ -2185,7 +2191,7 @@ <h3 id="installer-12">Installer</h3>
 <ul>
 <li>BugFix: Gibberish language during installation (Bitbucket #147)</li>
 </ul>
-<h3 id="translations-32">Translations</h3>
+<h3 id="translations-33">Translations</h3>
 <ul>
 <li>Update Catalan translation (Bitbucket PR #29)</li>
 <li>Update Italian translation (Bitbucket PR #32)</li>
@@ -2240,7 +2246,7 @@ <h3 id="shell-extension-6">Shell extension</h3>
 <ul>
 <li>BugFix: CreateTranslatedRcFiles needs an update (GitHub #113)</li>
 </ul>
-<h3 id="translations-33">Translations</h3>
+<h3 id="translations-34">Translations</h3>
 <ul>
 <li>Update Brazilian Portuguese translation (GitHub #108)</li>
 <li>Update Swedish translation (sf.net #3035, GitHub #112, #114)</li>
@@ -2285,7 +2291,7 @@ <h3 id="installer-13">Installer</h3>
 <ul>
 <li>Drop ClearCase integration (Bitbucket PR #6)</li>
 </ul>
-<h3 id="translations-34">Translations</h3>
+<h3 id="translations-35">Translations</h3>
 <ul>
 <li>Add Lithuanian translation (Bitbucket #124)</li>
 <li>Update Portuguese translation (GitHub #102,#103)</li>
@@ -2312,7 +2318,7 @@ <h3 id="file-compare-34">File compare</h3>
 <li>BugFix: Various problems reading of files &gt; 2GB (GitHub #81)</li>
 <li>BugFix: Selecting files &quot;From MRU list&quot; again works correctly</li>
 </ul>
-<h3 id="translations-35">Translations</h3>
+<h3 id="translations-36">Translations</h3>
 <ul>
 <li>Update Italian translation (GitHub #86)</li>
 <li>Update Japanese translation (Bitbucket #3)</li>
@@ -2360,7 +2366,7 @@ <h3 id="plugins-20">Plugins</h3>
 <li>Add PrediffLineFilter.sct plugin</li>
 <li>Make ignored lines by Prediffer plugin colored</li>
 </ul>
-<h3 id="translations-36">Translations</h3>
+<h3 id="translations-37">Translations</h3>
 <ul>
 <li>Update Slovak translation (sf.net#2902)</li>
 <li>Update Portuguese translation (GitHub #84,#85)</li>
@@ -2405,7 +2411,7 @@ <h3 id="installer-14">Installer</h3>
 <li>Remove extra space in installer: &quot; Launch WinMerge&quot; (sf.net#2144)</li>
 <li>Add &quot;How to Apply These Terms to Your New Programs&quot; section into GPL.rtf (sf.net#2098)</li>
 </ul>
-<h3 id="translations-37">Translations</h3>
+<h3 id="translations-38">Translations</h3>
 <ul>
 <li>Add Finnish translation (sf.net#3031)</li>
 <li>Add Sinhala translation (sf.net#3032)</li>
@@ -2558,7 +2564,7 @@ <h3 id="installer-15">Installer</h3>
 <li>64-bit version of WinMerge is available</li>
 <li>Install plugins by default</li>
 </ul>
-<h3 id="translations-38">Translations</h3>
+<h3 id="translations-39">Translations</h3>
 <ul>
 <li>Update Portuguese translation (GitHub #2-17)</li>
 <li>Update Korean translation (GitHub #45)</li>
diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index 098ebcea82b..4037c35ec60 100644
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -4,7 +4,14 @@
 
 ### Translations
 
+### File filter
+
+- Bugfix: Modify the "File Filters" dialog. (#2118) 
+
+### Translations
+
 - Translation updates:
+  - Portuguese (PR #2119)
   - Slovenian
   - Turkish (PR #2116)
 
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index 99389374a11..5ee9c63a5fb 100644
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -20,7 +20,7 @@
   <![endif]-->
 </head>
 <body>
-<h1 id="winmerge-21634-release-notes">WinMerge 2.16.34 Release Notes</h1>
+<h1 id="winmerge-21636-release-notes">WinMerge 2.16.36 Release Notes</h1>
 <ul>
 <li><a href="#about-this-release">About This Release</a></li>
 <li><a href="#what-is-new-in-21636">What Is New in 2.16.36?</a></li>
@@ -32,10 +32,15 @@ <h2 id="about-this-release">About This Release</h2>
 <p>This is a WinMerge 2.16.36 stable release. This release replaces earlier WinMerge stable releases as a recommended release.</p>
 <p>Please submit bug reports to our bug-tracker.</p>
 <h2 id="what-is-new-in-21636">What Is New in 2.16.36</h2>
+<h3 id="file-filter">File filter</h3>
+<ul>
+<li>Bugfix: Modify the &quot;File Filters&quot; dialog. (#2118)</li>
+</ul>
 <h3 id="translations">Translations</h3>
 <ul>
 <li>Translation updates:
 <ul>
+<li>Portuguese (PR #2119)</li>
 <li>Slovenian</li>
 <li>Turkish (PR #2116)</li>
 </ul></li>
diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index c9548060dd6..aa2da357f6c 100644
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -1,4 +1,4 @@
-# WinMerge 2.16.34 Release Notes
+# WinMerge 2.16.36 Release Notes
 
 - [About This Release](#about-this-release)
 - [What Is New in 2.16.36?](#what-is-new-in-21636)
@@ -16,9 +16,14 @@ Please submit bug reports to our bug-tracker.
 
 ## What Is New in 2.16.36
 
+### File filter
+
+- Bugfix: Modify the "File Filters" dialog. (#2118) 
+
 ### Translations
 
 - Translation updates:
+  - Portuguese (PR #2119)
   - Slovenian
   - Turkish (PR #2116)