OSDN Git Service
Takashi Sawanaka [Sun, 1 Oct 2023 06:31:20 +0000 (15:31 +0900)]
Improve line filters and substitution filters (#2032) (4)
Takashi Sawanaka [Sun, 1 Oct 2023 04:14:11 +0000 (13:14 +0900)]
Improve line filters and substitution filters (#2032) (3)
sdottaka [Sun, 1 Oct 2023 02:47:10 +0000 (11:47 +0900)]
Improve line filters and substitution filters (#2032) (2)
sdottaka [Sun, 1 Oct 2023 02:26:05 +0000 (11:26 +0900)]
Update
sdottaka [Sat, 30 Sep 2023 11:02:13 +0000 (20:02 +0900)]
refactor
Jun Tajima [Sat, 30 Sep 2023 09:39:49 +0000 (18:39 +0900)]
Modify the "Line Filters" dialog. (#2047)
- Disable the "Edit" and "Remove" buttons when no filter is selected.
Takashi Sawanaka [Fri, 29 Sep 2023 13:33:52 +0000 (22:33 +0900)]
Fix issue #2046: Folder compare omits unique folders from results if they contain any files and/or subfolders
Revert commit "Fix issue #1588: File Duplication Bug In Outputted Zips" and redo the fix.
Takashi Sawanaka [Wed, 27 Sep 2023 15:16:37 +0000 (00:16 +0900)]
refactor
Takashi Sawanaka [Wed, 27 Sep 2023 14:25:00 +0000 (23:25 +0900)]
Fix sf.net ticket #2163: Save As: default directory should be file's original directory (2)
Takashi Sawanaka [Wed, 27 Sep 2023 14:01:33 +0000 (23:01 +0900)]
Fix issue #2045: WinMerge Crashed for Comparing Clipboard Texts
Takashi Sawanaka [Tue, 26 Sep 2023 23:30:38 +0000 (08:30 +0900)]
Update winimerge to 1.0.41
Flaviu_ [Mon, 25 Sep 2023 14:10:52 +0000 (17:10 +0300)]
Small code changes for CMDIChildWnd handling (#2043)
Takashi Sawanaka [Sun, 24 Sep 2023 23:36:02 +0000 (08:36 +0900)]
refactor
Takashi Sawanaka [Sun, 24 Sep 2023 13:45:05 +0000 (22:45 +0900)]
Introduce IDirDoc interface
Takashi Sawanaka [Sun, 24 Sep 2023 07:23:54 +0000 (16:23 +0900)]
MergeDoc.cpp: Change it to get the Prediffer plugin without depending on CDirDoc.
Takashi Sawanaka [Thu, 21 Sep 2023 10:16:44 +0000 (19:16 +0900)]
Korean.isl: Change the file encoding from UTF-8 to CP-949
VenusGirl❤ [Thu, 21 Sep 2023 10:10:59 +0000 (19:10 +0900)]
Update Korean.isl (#2041)
Takashi Sawanaka [Wed, 20 Sep 2023 14:30:30 +0000 (23:30 +0900)]
Update jq to version 1.7 (2)
Takashi Sawanaka [Wed, 20 Sep 2023 13:18:37 +0000 (22:18 +0900)]
Fix build error
Takashi Sawanaka [Wed, 20 Sep 2023 12:31:01 +0000 (21:31 +0900)]
Bump revision to 2.16.33
Takashi Sawanaka [Wed, 20 Sep 2023 12:30:41 +0000 (21:30 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Wed, 20 Sep 2023 12:20:35 +0000 (21:20 +0900)]
Substituion filters page: Fix the garbled message that is displayed when you enter an invalid regular expression and press the OK button.
Takashi Sawanaka [Wed, 20 Sep 2023 11:48:28 +0000 (20:48 +0900)]
Improve line filters and substitution filters (#2032)
sdottaka [Sun, 17 Sep 2023 08:08:11 +0000 (17:08 +0900)]
Remove unused function
sdottaka [Sun, 17 Sep 2023 07:11:06 +0000 (16:11 +0900)]
Fix an issue where values in the Left/Right EOL column may not display correctly when using the Quick contents compare method.
sdottaka [Sun, 17 Sep 2023 04:23:32 +0000 (13:23 +0900)]
refactor
sdottaka [Sat, 16 Sep 2023 02:26:40 +0000 (11:26 +0900)]
Update ChangeLog&ReleaseNotes
sdottaka [Fri, 15 Sep 2023 00:20:06 +0000 (09:20 +0900)]
Update Japanese.po
Takashi Sawanaka [Thu, 14 Sep 2023 23:59:45 +0000 (08:59 +0900)]
Update jq to version 1.7
Takashi Sawanaka [Mon, 11 Sep 2023 23:16:03 +0000 (08:16 +0900)]
Add diff_2_buffers_xdiff() function
Takashi Sawanaka [Mon, 11 Sep 2023 22:14:51 +0000 (07:14 +0900)]
Remove unused function
VenusGirl❤ [Mon, 11 Sep 2023 21:35:27 +0000 (06:35 +0900)]
Update Korean.po (#2030)
Takashi Sawanaka [Mon, 11 Sep 2023 11:57:31 +0000 (20:57 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 11 Sep 2023 11:56:56 +0000 (20:56 +0900)]
Update Merge.vcxproj
Tichij [Mon, 11 Sep 2023 11:17:47 +0000 (14:17 +0300)]
Update of Lithuanian translation (#2027)
Gang Yin [Mon, 11 Sep 2023 11:16:45 +0000 (19:16 +0800)]
update zh-cn translations (#2026)
Marcellomco [Sun, 10 Sep 2023 22:48:23 +0000 (19:48 -0300)]
[XML] Update Brazilian.po (#2025)
Translation for "Folder compare: Add Both Shell Menu"
Patriccollu [Sun, 10 Sep 2023 22:47:15 +0000 (00:47 +0200)]
Update Corsican translation for 2.16.33 (#2022)
Takashi Sawanaka [Sun, 10 Sep 2023 09:23:47 +0000 (18:23 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sun, 10 Sep 2023 09:14:02 +0000 (18:14 +0900)]
Folder compare: Add Both Shell Menu (refs #1986) (#2021)
Takashi Sawanaka [Sun, 10 Sep 2023 07:32:15 +0000 (16:32 +0900)]
Revert "Fix an issue where clicking the Left/Right Shell Menu menu item would sometimes not show the shell menu"
This reverts commit
c0a92868ce653cfdc4622d58219cb573f1c2b7d3.
Tichij [Thu, 7 Sep 2023 12:51:07 +0000 (15:51 +0300)]
Update of Lithuanian translation (#2018)
Takashi Sawanaka [Thu, 7 Sep 2023 12:50:36 +0000 (21:50 +0900)]
Fix an issue where clicking the Left/Right Shell Menu menu item would sometimes not show the shell menu
Gang Yin [Thu, 7 Sep 2023 11:00:26 +0000 (19:00 +0800)]
update zh-cn translations (#2017)
* update zh-cn translations
* fix last commit
Takashi Sawanaka [Thu, 7 Sep 2023 00:07:50 +0000 (09:07 +0900)]
Allow Diff algorithms (patience, histogram) other than default to be … (#2015)
Takashi Sawanaka [Wed, 6 Sep 2023 23:27:43 +0000 (08:27 +0900)]
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.
Takashi Sawanaka [Wed, 6 Sep 2023 12:54:05 +0000 (21:54 +0900)]
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.
Hugo Carvalho [Sun, 3 Sep 2023 22:09:12 +0000 (23:09 +0100)]
Update Portuguese.po (#2014)
Takashi Sawanaka [Sun, 3 Sep 2023 01:35:26 +0000 (10:35 +0900)]
Fix issue #2008: "Ignore comment differences" still compares inline comments
Takashi Sawanaka [Tue, 29 Aug 2023 14:24:15 +0000 (23:24 +0900)]
Optimize inserts in std containers using reserve (#2000) (2)
Marcellomco [Tue, 29 Aug 2023 13:19:57 +0000 (10:19 -0300)]
Update Brazilian.po (#2001)
Added translation for "Show confirmation message when closing a window that took a long time…"
Herman Semenov [Mon, 28 Aug 2023 23:30:36 +0000 (23:30 +0000)]
Optimize inserts in std containers using reserve (#2000)
efi99 [Mon, 28 Aug 2023 22:53:28 +0000 (00:53 +0200)]
Update Hungarian.po (#1999)
Takashi Sawanaka [Sun, 27 Aug 2023 12:40:58 +0000 (21:40 +0900)]
Manual: Use po4a for manual translation (#1994) (5)
Takashi Sawanaka [Sun, 27 Aug 2023 12:32:50 +0000 (21:32 +0900)]
update freeimage
Takashi Sawanaka [Sun, 27 Aug 2023 12:16:57 +0000 (21:16 +0900)]
Show confirmation message when closing a window that took a long time to compare folders
Takashi Sawanaka [Sun, 27 Aug 2023 12:06:55 +0000 (21:06 +0900)]
Avoid infinite loops in the RegularExpression::subst() function when the length of the string matching the pattern is 0. ref #1997
Jun Tajima [Sun, 27 Aug 2023 10:51:58 +0000 (19:51 +0900)]
Update Rust syntax highlighting keyword list. (#1998)
- Added some keywords defined in version 1.72.0.
- https://doc.rust-lang.org/book/appendix-01-keywords.html
- https://doc.rust-lang.org/std/index.html
sdottaka [Sat, 26 Aug 2023 12:29:50 +0000 (21:29 +0900)]
Update German.po
sdottaka [Sat, 26 Aug 2023 12:29:36 +0000 (21:29 +0900)]
Manual: Use po4a for manual translation (#1994) (4)
sdottaka [Sat, 26 Aug 2023 12:21:29 +0000 (21:21 +0900)]
Manual: Use po4a for manual translation (#1994) (3)
sdottaka [Sat, 26 Aug 2023 11:16:57 +0000 (20:16 +0900)]
Manual: Use po4a for manual translation (#1994) (2)
Takashi Sawanaka [Sat, 26 Aug 2023 07:12:43 +0000 (16:12 +0900)]
Manual: Use po4a for manual translation (#1994)
sdottaka [Sat, 26 Aug 2023 06:08:22 +0000 (15:08 +0900)]
Manual: Fix typos
Takashi Sawanaka [Thu, 24 Aug 2023 11:48:08 +0000 (20:48 +0900)]
Change the folder name from Docs/Manual/EN to Docs/Manual/English, and from Docs/Manual/JP to Docs/Manual/Japanese.
Takashi Sawanaka [Wed, 23 Aug 2023 14:39:17 +0000 (23:39 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 23 Aug 2023 14:38:33 +0000 (23:38 +0900)]
refactor
Mirosław Żylewicz [Sun, 20 Aug 2023 23:02:56 +0000 (01:02 +0200)]
Update Polish.po (#1990)
Justman10000 [Sun, 20 Aug 2023 23:02:24 +0000 (01:02 +0200)]
Update (#1989)
* Update TranslationsStatus
* Fixed syntax errors and improved Language
Takashi Sawanaka [Sun, 20 Aug 2023 04:25:03 +0000 (13:25 +0900)]
Remove far modifier and _MFC_VER
sdottaka [Sat, 19 Aug 2023 12:09:44 +0000 (21:09 +0900)]
Reduce startup time and decrease the usage of Win32 user objects.
Takashi Sawanaka [Sat, 19 Aug 2023 04:58:02 +0000 (13:58 +0900)]
Fix issue #1985: Wimerge saves changes to the wrong file (#1988)
Takashi Sawanaka [Fri, 18 Aug 2023 06:13:34 +0000 (15:13 +0900)]
Generate reports in tabular format for table comparisons. (#1983)
Generate reports in tabular format for table comparisons
sdottaka [Thu, 17 Aug 2023 01:11:45 +0000 (10:11 +0900)]
Execute the "pause" command to prevent the error message from disappearing if the registration of the ShellExtension for Windows 11 fails
sdottaka [Sun, 13 Aug 2023 00:04:41 +0000 (09:04 +0900)]
Fix issue #1980: Current Difference" specified by double-clicking cannot merge using the "Copy to Right (or Left)" menu.
- When double-clicking on a line, only select text word-by-word if the line is the current difference or non-difference line
sdottaka [Sat, 12 Aug 2023 05:34:59 +0000 (14:34 +0900)]
Add Convert to HTML and View Line Numbers menu item
sdottaka [Fri, 11 Aug 2023 23:53:43 +0000 (08:53 +0900)]
An attempt to reduce build time
VenusGirl❤ [Fri, 11 Aug 2023 23:10:48 +0000 (08:10 +0900)]
Update Korean.po (#1979)
sdottaka [Fri, 11 Aug 2023 23:09:13 +0000 (08:09 +0900)]
Update Slovenian.po. Submitted By JadranR
sdottaka [Fri, 11 Aug 2023 08:32:00 +0000 (17:32 +0900)]
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. refs #1976
Takashi Sawanaka [Wed, 9 Aug 2023 12:49:22 +0000 (21:49 +0900)]
Fix the issue where the Apache Tika plugin becomes enabled again when reopening the Plugins window, despite having unchecked the Apache Tika plugin in the Plugins window
Takashi Sawanaka [Wed, 9 Aug 2023 12:23:07 +0000 (21:23 +0900)]
Fix issue #1972: Cannot compare one-line file
Mr-Update [Tue, 8 Aug 2023 22:09:51 +0000 (00:09 +0200)]
Update German.po (#1977)
Tichij [Tue, 8 Aug 2023 12:59:41 +0000 (15:59 +0300)]
Update of Lithuanian translation (#1974)
Takashi Sawanaka [Mon, 7 Aug 2023 23:03:00 +0000 (08:03 +0900)]
Reduce memory usage after startup (-200KB)
Takashi Sawanaka [Mon, 7 Aug 2023 22:59:39 +0000 (07:59 +0900)]
Update TranslationsStatus
Hugo Carvalho [Mon, 7 Aug 2023 12:09:26 +0000 (13:09 +0100)]
Gang Yin [Mon, 7 Aug 2023 12:09:01 +0000 (20:09 +0800)]
update zh-cn translation (#1971)
Takashi Sawanaka [Sun, 6 Aug 2023 10:18:50 +0000 (19:18 +0900)]
Reduce IntelliSense warnings
Takashi Sawanaka [Sun, 6 Aug 2023 08:01:06 +0000 (17:01 +0900)]
Make it work in environments like Windows Sandbox where Short Name Creations is disabled
Marcellomco [Sat, 5 Aug 2023 23:07:50 +0000 (20:07 -0300)]
Update Brazilian.po (#1969)
Added translation for "Add Expand Different Subfolders menu item (#1964) "
efi99 [Sat, 5 Aug 2023 12:30:00 +0000 (14:30 +0200)]
Update Hungarian.po (#1968)
Takashi Sawanaka [Sat, 5 Aug 2023 10:27:53 +0000 (19:27 +0900)]
Add Expand Different Subfolders menu item (#1964)
* Add Expand Different Subfolders menu item
* (2)
* Add Expand Different Subfolders menu item (3)
* Add Expand Different Subfolders menu item (4)
Takashi Sawanaka [Fri, 28 Jul 2023 12:56:37 +0000 (21:56 +0900)]
Update ShellExtension/Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Fri, 28 Jul 2023 11:52:35 +0000 (20:52 +0900)]
Update Contributors.txt and TranslationsStatus
sergey-astral [Fri, 28 Jul 2023 11:38:29 +0000 (14:38 +0300)]
Update Ukrainian.po (#1955)
Translation up to 500 lines
YIN, Gang [Fri, 28 Jul 2023 11:36:38 +0000 (19:36 +0800)]
udpate zh-cn translation (#1953)
Mr-Update [Thu, 27 Jul 2023 21:13:38 +0000 (23:13 +0200)]
Update German.po (#1952)
Takashi Sawanaka [Thu, 27 Jul 2023 11:08:40 +0000 (20:08 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Thu, 27 Jul 2023 10:46:05 +0000 (19:46 +0900)]
Update TranslationsStatus