Merge branch 'master' into improve-substitution-filters

Docs/Users/ChangeLog.md

@@ -1,5 +1,80 @@
 # Change log
 
+## WinMerge 2.16.33 - 2023-09-20
+
+### General
+
+- Reduce startup time and decrease the usage of Win32 user objects.
+
+### File compare
+
+- BugFix: Cannot compare one-line file (#1972)
+- BugFix:  "Current Difference" specified by double-clicking cannot merge
+    using the "Copy to Right (or Left)" menu. (#1980)
+- BugFix: Wimerge saves changes to the wrong file (#1985) (PR #1988)
+- BugFix: "Ignore comment differences" still compares inline comments (#2008)
+- Update Rust syntax highlighting keyword list. (PR #1998)
+- [Feature Request] Both Shell Menu (#1986) (PR #2021)
+
+### Table compare
+
+- When "Use First Line as Header" is enabled, make the header display the
+    first line regardless of the scroll position when the first line is hidden.
+- Generate reports in tabular format for table comparisons. (PR #1983)
+
+### Folder compare
+
+- BugFix: Fixed an issue where Differences, Left/Right EOL columns, etc. were
+    displayed as undefined values when the file comparison method was
+    Full Contents or Quick Contents and the file size exceeded 64MB.
+- BugFix: Fix the problem that when comparing with the BinaryContents compare
+    method, the contents of the files are identical, but if one side is a
+    symbolic link, it is judged to be different. (#1976)
+- Add Expand Different Subfolders menu item (#1382) (PR #1964)
+- Allow Diff algorithms (patience, histogram) other than default to be applied
+    to folder comparisons (PR #2015) (#2002)
+- Show confirmation message when closing a window that took a long time
+    to compare folders
+
+### Substitution filters
+
+- Avoid infinite loops in the RegularExpression::subst() function when 
+    the length of the string matching the pattern is 0
+
+### Options dialog
+
+-  Execute the "pause" command to prevent the error message from disappearing
+     if the registration of the ShellExtension for Windows 11 fails
+
+### Plugins
+
+- BugFix: WinMerge cannot successfully disable some of its Plugins (#2012)
+- Update jq to version 1.7
+
+### Manual
+
+- Manual: Use po4a for manual translation (PR #1994) (#499)
+
+### Translations
+
+- Translation updates:
+  - Brazilian (PR #1969,#2001,#2025)
+  - Chinese Traditional (PR #1953,#1971,#2017,#2026)
+  - Corsican (PR #2022)
+  - German (PR #1952,#1977,#1989)
+  - Hungarian (PR #1968,#1999)
+  - Japanese
+  - Korean (PR #1979,#2030)
+  - Lithuanian (PR #1974,#2018,#2027)
+  - Polish (PR #1990)
+  - Portuguese (PR #1973,#2014)
+  - Slovenian
+  - Ukrainian (PR #1955)
+
+### Internals
+
+- Optimize inserts in std containers using reserve (PR #2000)
+
 ## WinMerge 2.16.32 - 2023-07-27
 
 ### General

Docs/Users/ReleaseNotes.md

@@ -1,114 +1,93 @@
-# WinMerge 2.16.32 Release Notes
+# WinMerge 2.16.33 Beta Release Notes
 
 - [About This Release](#about-this-release)
-- [What Is New in 2.16.32?](#what-is-new-in-21632)
-- [What Is New in 2.16.31 beta?](#what-is-new-in-21631-beta)
+- [What Is New in 2.16.33 beta?](#what-is-new-in-21633-beta)
 - [Known issues](#known-issues)
 
-July 2023
+September 2023
 
 ## About This Release
 
-This is a WinMerge 2.16.32 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.32
+## What Is New in 2.16.33 Beta
 
 ### General
 
-- BugFix: Export/Import settings bug with Substitution Filters (#1925)
+- Reduce startup time and decrease the usage of Win32 user objects.
 
 ### File compare
 
-- BugFix: Save function doesn't work if the path length exceeds 248
-    characters (#1923)
-- BugFix: Redundant confirmation "The selected files are identical" (#1902)
-- Update Python syntax highlighting keyword list. (PR #1938)
+- BugFix: Cannot compare one-line file (#1972)
+- BugFix:  "Current Difference" specified by double-clicking cannot merge
+    using the "Copy to Right (or Left)" menu. (#1980)
+- BugFix: Wimerge saves changes to the wrong file (#1985) (PR #1988)
+- BugFix: "Ignore comment differences" still compares inline comments (#2008)
+- Update Rust syntax highlighting keyword list. (PR #1998)
+- [Feature Request] Both Shell Menu (#1986) (PR #2021)
 
-### Folder compare
-
-- BugFix: Treeview scrolls to the wrong position. (#1915)
-- Allow changing the number of CPU cores to use while doing folder comparison
-    (PR #1945)
-
-### Webpage compare
-
-- Add support for generating report files (PR #1941)
-
-### Command line
-
-- Compare folders recursively if "Include subfolders" is checked in the
-    Options dialog even if the /r command line option is not specified.
-    (PR #1914)
+### Table compare
 
-### Archive support
+- When "Use First Line as Header" is enabled, make the header display the
+    first line regardless of the scroll position when the first line is hidden.
+- Generate reports in tabular format for table comparisons. (PR #1983)
 
-- Update 7-Zip to 23.01 (PR #1913)
-
-### Translations
-
-- New translation: Tamil (PR #1946)
-- Translation updates:
-  - Brazilian (PR #1948)
-  - Chinese Traditional (PR #1940)
-  - Corsican (PR #1933)
-  - French (PR #1927,#1928,#1951)
-  - Korean (PR #1908)
-  - Lithuanian (PR #1949)
-  - Portuguese (PR #1930)
-  - Slovenian
-  - Turkish (#1931)
-
-## What Is New in 2.16.31 Beta
-
-### General
+### Folder compare
 
-- BugFix: Some Substitution filter doesn't work (#1861)
-- Add tasks to Jump List (PR #1828)
-- Update DirCmpReport.cpp (PR #1892)
+- BugFix: Fixed an issue where Differences, Left/Right EOL columns, etc. were
+    displayed as undefined values when the file comparison method was
+    Full Contents or Quick Contents and the file size exceeded 64MB.
+- BugFix: Fix the problem that when comparing with the BinaryContents compare
+    method, the contents of the files are identical, but if one side is a
+    symbolic link, it is judged to be different. (#1976)
+- Add Expand Different Subfolders menu item (#1382) (PR #1964)
+- Allow Diff algorithms (patience, histogram) other than default to be applied
+    to folder comparisons (PR #2015) (#2002)
+- Show confirmation message when closing a window that took a long time
+    to compare folders
 
-### File compare
+### Substitution filters
 
-- BugFix: Fix input range check processing in "Go to" dialog. (PR #1826)
-- BugFix: End of line diff is a bit wanky (#1838, PR #1849)
-- Confirm copy all in file merge (PR #1827)
-- Modify the "Go to" dialog. (PR #1896)
+- Avoid infinite loops in the RegularExpression::subst() function when 
+    the length of the string matching the pattern is 0
 
-### Folder compare
+### Options dialog
 
-- BugFix: Display problem with Item totals : (#1840)
-- BugFix: Bug in ignore whitespace ? (#1882)
+-  Execute the "pause" command to prevent the error message from disappearing
+     if the registration of the ShellExtension for Windows 11 fails
 
 ### Plugins
 
-- PrettifyJSON: Update jq to version 1.6 (#1871)
-- Translate some plugin error messages (PR #1873)
-- ApplyPatch: Update GNU patch to 2.7.6-1 (PR #1897)(#1871)
+- BugFix: WinMerge cannot successfully disable some of its Plugins (#2012)
+- Update jq to version 1.7
 
-### Installer
+### Manual
 
-- Silent install blocked (#1852)
+- Manual: Use po4a for manual translation (PR #1994) (#499)
 
 ### Translations
 
 - Translation updates:
-  - Brazilian (PR #1829,#1837,#1876,#1903)
-  - Bulgarian (PR #1822)
-  - Chinese Simplified (PR #1835,#1846,#1885,#1906)
-  - Dutch (PR #1831)
-  - French (PR #1841,#1842,#1894)
-  - Galician (PR #1833)
-  - German (PR #1850,#1875,#1907)
-  - Hungarian (PR #1832,#1839,#1845,#1878,#1905)
+  - Brazilian (PR #1969,#2001,#2025)
+  - Chinese Traditional (PR #1953,#1971,#2017,#2026)
+  - Corsican (PR #2022)
+  - German (PR #1952,#1977,#1989)
+  - Hungarian (PR #1968,#1999)
   - Japanese
-  - Korean (PR #1820,#1821,#1877)
-  - Lithuanian (PR #1847,#1889,#1904)
-  - Polish (PR #1869,#1870,#1884)
-  - Portuguese (PR #1843,#1895)
-  - Spanish (PR #1834)
-  - Russian (PR #1824,#1825,#1862)
+  - Korean (PR #1979,#2030)
+  - Lithuanian (PR #1974,#2018,#2027)
+  - Polish (PR #1990)
+  - Portuguese (PR #1973,#2014)
+  - Slovenian
+  - Ukrainian (PR #1955)
+
+### Internals
+
+- Optimize inserts in std containers using reserve (PR #2000)
+
 
 ## Known issues
 

DownloadDeps.cmd

@@ -29,8 +29,8 @@ https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7
 https://github.com/WinMerge/winwebdiff/releases/download/v1.0.7/winwebdiff-1.0.7.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^
 https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^
-https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win32.exe!Build\jq ^
-https://github.com/stedolan/jq/archive/refs/tags/jq-1.6.zip!Build\jq ^
+https://github.com/jqlang/jq/releases/download/jq-1.7/jq-win32.exe!Build\jq ^
+https://github.com/jqlang/jq/archive/refs/tags/jq-1.7.zip!Build\jq ^
 https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-v1.5.2-win64.zip!Build\zstd ^
 https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-md4c-0.4.8-2-any.pkg.tar.zst!Build\md4c ^
 https://mirror.msys2.org/msys/i686/gcc-libs-10.2.0-1-i686.pkg.tar.zst!Build\msys2_tmp ^

Externals/versions.txt

@@ -18,6 +18,6 @@ This file lists versions of the external components we are using.
 - 7-zip: 23.01
 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - html-tidy5: 5.4.0
-- jq: 1.6
+- jq: 1.7
 - wil: 209ff9c7e30e71bf6d1405557bf78544920f8157 on Sep 9, 2021
 - md4c: 0.4.8

Installer/InnoSetup/WinMergeARM64.is6.iss

@@ -619,7 +619,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag
 Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins
 ; jq
 Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins
-Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
+Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
 ; md4c
 Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins
 Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins

Installer/InnoSetup/WinMergeX64.is6.iss

@@ -618,7 +618,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag
 Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins
 ; jq
 Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins
-Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
+Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
 ; md4c
 Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins
 Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins

Installer/InnoSetup/WinMergeX64.iss

@@ -610,7 +610,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag
 Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins
 ; jq
 Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins
-Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
+Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
 ; md4c
 Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins
 Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins

Installer/InnoSetup/WinMergeX64NonAdmin.iss

@@ -609,7 +609,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag
 Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins
 ; jq
 Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins
-Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
+Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
 ; md4c
 Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins
 Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins

Installer/InnoSetup/WinMergeX86.iss

@@ -632,7 +632,7 @@ Source: ..\..\Build\tidy-html5\bin\*.*; DestDir: {app}\Commands\tidy-html5; Flag
 Source: ..\..\Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md; DestDir: {app}\Commands\tidy-html5; Flags: recursesubdirs; Components: Plugins
 ; jq
 Source: ..\..\Build\jq\jq-win32.exe; DestDir: {app}\Commands\jq; DestName: jq.exe; Flags: recursesubdirs; Components: Plugins
-Source: ..\..\Build\jq\jq-jq-1.6\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
+Source: ..\..\Build\jq\jq-jq-1.7\COPYING; DestDir: {app}\Commands\jq; Flags: recursesubdirs; Components: Plugins
 ; md4c
 Source: ..\..\Build\md4c\mingw32\bin\*.*; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins
 Source: ..\..\Build\md4c\mingw32\share\licenses\md4c\LICENSE.md; DestDir: {app}\Commands\md4c; Flags: recursesubdirs; Components: Plugins

Translations/WinMerge/Japanese.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
 "POT-Creation-Date: 2020-12-05 22:07+0000\n"
-"PO-Revision-Date: 2023-08-05 10:36+0900\n"
+"PO-Revision-Date: 2023-09-15 09:18+0900\n"
 "Last-Translator: Takashi Sawanaka <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
 "Language: ja\n"
@@ -481,7 +481,7 @@ msgid "&All Subfolders"
 msgstr "すべてのサブフォルダー(&A)"
 
 msgid "&Different Subfolders"
-msgstr "差異があるサブフォルダー(&A)"
+msgstr "差異があるサブフォルダー(&D)"
 
 msgid "&Identical Subfolders"
 msgstr "同一のサブフォルダー(&I)"