- Use POCO C++ libraries instead of pcre, expat and scew. They use
pcre, expat internally
diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index c397d7500d5..c5a439e66a3 100644
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -1,5 +1,62 @@
# Change log
+## WinMerge 2.16.43 - 2024-10-23
+
+### General
+
+- BugFix: WinMerge incorrectly states "The selected files are identical" (#2408)
+- Implement Menu Bar as a Toolbar (PR #2400)
+- Add support for placing the tab bar on the title bar (PR #2428)
+- Add One-Hand mice wheel scroll diff and merge (PR #2435)
+
+### File compare
+
+- BugFix: Wrong syntax highlighting for TeX files (#2415)
+- BugFix: Text replacement result is wrong. (#2422)
+- Copy Selected Difference to Clipboard (PR #2429)
+- Added Ada parser and default file associations (#2452)
+- Added C++20 modules default file associations cppm and ixx (PR #2464)
+- Anti-aliasing has been applied to the lines that connect moved blocks in the
+ location pane.
+
+### Folder compare
+
+- BugFix: ExitCode always 2 with /enableexitcode with no apparent issues (#2450)
+
+### Options dialog
+
+- Add a "Defaults" button to the "Options (Project)" dialog. (PR #2401)
+- Add a "Defaults" button to the "Options (Backup Files)" dialog. (PR #2406)
+- Add a "Defaults" button to the "Options (Codepage)" dialog. (PR #2448)
+- Add a "Defaults" button to the "Options (General)" dialog. (PR #2453)
+
+### Plugins
+
+- Create CompareEscapedJavaPropertiesFiles.sct (PR #2455)
+
+### Manual
+
+- Update documentation for "Include unique subfolders contents" setting (PR #2396)
+
+### Translations
+
+- Translation updates:
+ - Brazilian (PR #2397,#2431,#2439,#2454,#2460,#2468)
+ - Chinese Simplified (PR #2394,#2461,#2469)
+ - Dutch (PR #2474)
+ - French (PR #2399,#2444)
+ - Hungarian (PR #2433,#2440,#2458,#2472)
+ - Italian (PR #2393,#2438,#2446,#2447,#2457,#2467,#2470)
+ - Japanese
+ - Korean (PR #2426,#2459,#2473)
+ - Lithuanian (PR #2436,#2443,#2462,#2471)
+ - Portuguese (PR #2410,#2441)
+ - Russian (PR #2462)
+
+### Internals
+
+- Make InsertLineNumberInPOFiles.bat and RenewPOFiles.bat work again
+
## WinMerge 2.16.42.1 - 2024-07-28
### General
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index e4cf184c2c8..6197f2da2e4 100644
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -24,155 +24,86 @@
-July 2024
+October 2024
About This Release
-This is a WinMerge 2.16.42.1 stable release. This release replaces
-earlier WinMerge stable releases as a recommended release.
+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.
Please submit bug reports to our bug-tracker.
-What Is New in 2.16.42.1
+What Is New in 2.16.43 Beta
General
-- BugFix: Digital signature was not added to version 2.16.42.
-
-Translations
-
-- Translation updates:
-
-- Chinese Simplified (PR #2394)
-- Italian (PR #2393)
-
-
-What Is New in 2.16.42
-General
-
-- Enable Rounded Corners for WinMerge Menu on Windows 11 (PR
-#2364)
-- Introduce a flat status bar without separator lines. (PR #2377)
-
-Folder compare
-
-- BugFix: Folder comparison status not accurately reflected in toolbar
-(#2374)
-- BugFix: Status of folder comparison not correctly reflected by tab
-icon after Refresh (F5) (#2383)
+- BugFix: WinMerge incorrectly states "The selected files are
+identical" (#2408)
+- Implement Menu Bar as a Toolbar (PR #2400)
+- Add support for placing the tab bar on the title bar (PR #2428)
+- Add One-Hand mice wheel scroll diff and merge (PR #2435)
File compare
-- Replace - more intelligent choice of replace in (whole file vs
-selection) (#2368)
-
-Image compare
-
-- BugFix: Image Comparison : In Alpha Animation, dialogs hang winmerge
-(#2370)
-- BugFix: Fixed an issue where the right edge of the status bar
-appeared white.
-- Added the ability to change the blink interval and overlay animation
-interval.
-
-Plugins
-
-- Make the gpt4-o-mini model selectable in the AIConvertText plugin
-settings window
+- BugFix: Wrong syntax highlighting for TeX files (#2415)
+- BugFix: Text replacement result is wrong. (#2422)
+- Copy Selected Difference to Clipboard (PR #2429)
+- Added Ada parser and default file associations (#2452)
+- Added C++20 modules default file associations cppm and ixx (PR
+#2464)
+- Anti-aliasing has been applied to the lines that connect moved
+blocks in the location pane.
-Archive support
-
-Translations
-
-- Translation updates:
-
-- Chinese Simplified (PR #2392)
-- Brazilian (PR #2391)
-- Hungarian (PR #2388)
-- Lithuanian (PR #2390)
-
-
-What Is New in 2.16.41 Beta
-General
-
-- Made the tabs in the tab bar rounded like Firefox.
-
-File compare
-
-- Added support for F# (FSharp) language syntax highlight (PR
-#2298)
-- Improved F# parsing, support for multi-line comments (PR #2301)
-- Multi line comment fix (PR #2303)
-- Multi line comment fix part 2 (PR #2309)
-- Typescript files to use JavaScript highlighting as default (PR
-#2312)
-
-Folder compare
+Folder compare
-- BugFix: Refresh selected shows wrong file names being compared
-(#2338)
-- BugFix: Selected files changes on expanding a folder that is upper
-on the tree (#2359)
+- BugFix: ExitCode always 2 with /enableexitcode with no apparent
+issues (#2450)
Options dialog
-- BugFix: Options - Syntax color settings get reverted when
-"Customized text colors" settings is touched. (#2355)
-- Add a "Defaults" button to the "Options (Editor > Compare/Merge)"
-dialog. (PR #2348)
-- Add a "Defaults" button to the "Options (Archive Support)" dialog.
-(PR #2362)
+- Add a "Defaults" button to the "Options (Project)" dialog. (PR
+#2401)
+- Add a "Defaults" button to the "Options (Backup Files)" dialog. (PR
+#2406)
+- Add a "Defaults" button to the "Options (Codepage)" dialog. (PR
+#2448)
+- Add a "Defaults" button to the "Options (General)" dialog. (PR
+#2453)
-Plugins
-
-- BugFix: Fixed the plugin pipeline not being configured correctly in
-the Select Plugin dialog.
-- Add a text conversion plugin using OpenAI API (PR #2258)
-- Update jq to 1.7.1
-- Update md4c to 0.5.2
-
-Archive support
+Plugins
-- Update 7-Zip to 24.05
+- Create CompareEscapedJavaPropertiesFiles.sct (PR #2455)
-Installer
+Manual
-- BugFix; WinMerge 2.16.40 - Installer - Missing version and
-archicteure info (#2300)
+- Update documentation for "Include unique subfolders contents"
+setting (PR #2396)
-Translations
+Translations
- Translation updates:
-- Brazilian (PR #2308)
-- Chinese Simplified (PR #2306,#2310,#2314,#2352)
-- Corsican (PR #2361)
-- French (PR #2354)
-- German (PR #2349)
-- Hungarian (PR #2307)
-- Italian (PR #2299)
-- Lithuanian (PR #2318,#2320)
+- Brazilian (PR #2397,#2431,#2439,#2454,#2460,#2468)
+- Chinese Simplified (PR #2394,#2461,#2469)
+- Dutch (PR #2474)
+- French (PR #2399,#2444)
+- Hungarian (PR #2433,#2440,#2458,#2472)
+- Italian (PR #2393,#2438,#2446,#2447,#2457,#2467,#2470)
- Japanese
-- Korean (PR #2333)
-- Polish (PR #2313)
-- Portuguese (PR #2321)
-- Turkish (PR #2315)
+- Korean (PR #2426,#2459,#2473)
+- Lithuanian (PR #2436,#2443,#2462,#2471)
+- Portuguese (PR #2410,#2441)
+- Russian (PR #2462)
Internals
-- Update GitHub Actions CI (#2304)
-- Fix some typos (#2305)
-- Update POCO C++ Libraries to 1.13.3
-- Update boost to 1.85.0
-- Update Google C++ Testing Framework to 1.14.0
+- Make InsertLineNumberInPOFiles.bat and RenewPOFiles.bat work
+again
Known issues
diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index aec3297e1e6..5b1bb6f7bb3 100644
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -1,138 +1,74 @@
-# WinMerge 2.16.42.1 Release Notes
+# WinMerge 2.16.43 Beta Release Notes
- [About This Release](#about-this-release)
-- [What Is New in 2.16.42.1](#what-is-new-in-216421)
-- [What Is New in 2.16.42](#what-is-new-in-21642)
-- [What Is New in 2.16.41 beta?](#what-is-new-in-21641-beta)
+- [What Is New in 2.16.43 beta?](#what-is-new-in-21643-beta)
- [Known issues](#known-issues)
-July 2024
+October 2024
## About This Release
-This is a WinMerge 2.16.42.1 stable release.
-This release replaces earlier WinMerge stable releases as a recommended release.
+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.
Please submit bug reports to our bug-tracker.
-## What Is New in 2.16.42.1
+## What Is New in 2.16.43 Beta
### General
-- BugFix: Digital signature was not added to version 2.16.42.
-
-### Translations
-
-- Translation updates:
- - Chinese Simplified (PR #2394)
- - Italian (PR #2393)
-
-## What Is New in 2.16.42
-
-### General
-
-- Enable Rounded Corners for WinMerge Menu on Windows 11 (PR #2364)
-- Introduce a flat status bar without separator lines. (PR #2377)
-
-### Folder compare
-
-- BugFix: Folder comparison status not accurately reflected in toolbar (#2374)
-- BugFix: Status of folder comparison not correctly reflected by tab icon after
- Refresh (F5) (#2383)
+- BugFix: WinMerge incorrectly states "The selected files are identical" (#2408)
+- Implement Menu Bar as a Toolbar (PR #2400)
+- Add support for placing the tab bar on the title bar (PR #2428)
+- Add One-Hand mice wheel scroll diff and merge (PR #2435)
### File compare
-- Replace - more intelligent choice of replace in (whole file vs selection) (#2368)
-
-### Image compare
-
-- BugFix: Image Comparison : In Alpha Animation, dialogs hang winmerge (#2370)
-- BugFix: Fixed an issue where the right edge of the status bar appeared white.
-- Added the ability to change the blink interval and overlay animation interval.
-
-### Plugins
-
-- Make the gpt4-o-mini model selectable in the AIConvertText plugin settings
- window
-
-### Archive support
-
-- Update 7-Zip to 24.07
-
-### Translations
-
-- Translation updates:
- - Chinese Simplified (PR #2392)
- - Brazilian (PR #2391)
- - Hungarian (PR #2388)
- - Lithuanian (PR #2390)
-
-## What Is New in 2.16.41 Beta
-
-### General
-
-- Made the tabs in the tab bar rounded like Firefox.
-
-### File compare
-
-- Added support for F# (FSharp) language syntax highlight (PR #2298)
-- Improved F# parsing, support for multi-line comments (PR #2301)
-- Multi line comment fix (PR #2303)
-- Multi line comment fix part 2 (PR #2309)
-- Typescript files to use JavaScript highlighting as default (PR #2312)
+- BugFix: Wrong syntax highlighting for TeX files (#2415)
+- BugFix: Text replacement result is wrong. (#2422)
+- Copy Selected Difference to Clipboard (PR #2429)
+- Added Ada parser and default file associations (#2452)
+- Added C++20 modules default file associations cppm and ixx (PR #2464)
+- Anti-aliasing has been applied to the lines that connect moved blocks in the
+ location pane.
### Folder compare
-- BugFix: Refresh selected shows wrong file names being compared (#2338)
-- BugFix: Selected files changes on expanding a folder that is upper on the
- tree (#2359)
+- BugFix: ExitCode always 2 with /enableexitcode with no apparent issues (#2450)
### Options dialog
-- BugFix: Options - Syntax color settings get reverted when
- "Customized text colors" settings is touched. (#2355)
-- Add a "Defaults" button to the "Options (Editor > Compare/Merge)" dialog. (PR #2348)
-- Add a "Defaults" button to the "Options (Archive Support)" dialog. (PR #2362)
+- Add a "Defaults" button to the "Options (Project)" dialog. (PR #2401)
+- Add a "Defaults" button to the "Options (Backup Files)" dialog. (PR #2406)
+- Add a "Defaults" button to the "Options (Codepage)" dialog. (PR #2448)
+- Add a "Defaults" button to the "Options (General)" dialog. (PR #2453)
### Plugins
-- BugFix: Fixed the plugin pipeline not being configured correctly in the Select Plugin dialog.
-- Add a text conversion plugin using OpenAI API (PR #2258)
-- Update jq to 1.7.1
-- Update md4c to 0.5.2
-
-### Archive support
-
-- Update 7-Zip to 24.05
+- Create CompareEscapedJavaPropertiesFiles.sct (PR #2455)
-### Installer
+### Manual
-- BugFix; WinMerge 2.16.40 - Installer - Missing version and archicteure info (#2300)
+- Update documentation for "Include unique subfolders contents" setting (PR #2396)
### Translations
- Translation updates:
- - Brazilian (PR #2308)
- - Chinese Simplified (PR #2306,#2310,#2314,#2352)
- - Corsican (PR #2361)
- - French (PR #2354)
- - German (PR #2349)
- - Hungarian (PR #2307)
- - Italian (PR #2299)
- - Lithuanian (PR #2318,#2320)
+ - Brazilian (PR #2397,#2431,#2439,#2454,#2460,#2468)
+ - Chinese Simplified (PR #2394,#2461,#2469)
+ - Dutch (PR #2474)
+ - French (PR #2399,#2444)
+ - Hungarian (PR #2433,#2440,#2458,#2472)
+ - Italian (PR #2393,#2438,#2446,#2447,#2457,#2467,#2470)
- Japanese
- - Korean (PR #2333)
- - Polish (PR #2313)
- - Portuguese (PR #2321)
- - Turkish (PR #2315)
+ - Korean (PR #2426,#2459,#2473)
+ - Lithuanian (PR #2436,#2443,#2462,#2471)
+ - Portuguese (PR #2410,#2441)
+ - Russian (PR #2462)
### Internals
-- Update GitHub Actions CI (#2304)
-- Fix some typos (#2305)
-- Update POCO C++ Libraries to 1.13.3
-- Update boost to 1.85.0
-- Update Google C++ Testing Framework to 1.14.0
+- Make InsertLineNumberInPOFiles.bat and RenewPOFiles.bat work again
## Known issues
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 7f46bf6c403..1304217133a 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1,9 +1,9 @@
# This file is part from WinMerge
# Released under the "GNU General Public License"
-#
+#
# Translators:
# Thomas De Rocker, 2024
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
