OSDN Git Service
Takashi Sawanaka [Mon, 9 Oct 2023 12:01:56 +0000 (21:01 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Mon, 9 Oct 2023 11:50:08 +0000 (20:50 +0900)]
Update Contributors.txt
Takashi Sawanaka [Mon, 9 Oct 2023 11:45:52 +0000 (20:45 +0900)]
crystaledit: Reduce MFC dependency
Takashi Sawanaka [Sun, 8 Oct 2023 10:54:40 +0000 (19:54 +0900)]
DiffWrapper_test.cpp: Add RunFileDiff_LineFilters and RunFileDiff_SubstitutionFilters
Takashi Sawanaka [Sun, 8 Oct 2023 04:03:04 +0000 (13:03 +0900)]
DiffWrapper_test.cpp: Add RunFileDiff_IgnoreComments
Takashi Sawanaka [Sun, 8 Oct 2023 02:28:57 +0000 (11:28 +0900)]
Update UnitTests.vcxproj
Takashi Sawanaka [Sun, 8 Oct 2023 00:57:04 +0000 (09:57 +0900)]
UniTests: Add DiffWrapper_test.cpp
Takashi Sawanaka [Sat, 7 Oct 2023 23:53:30 +0000 (08:53 +0900)]
TempFile.h: Add move constructor
Takashi Sawanaka [Sat, 7 Oct 2023 09:44:16 +0000 (18:44 +0900)]
Fix a crash problem when the Diff algorithm is set to something other than default and one file does not have an EOL of the last line and the other file has an EOL of the last line.
Takashi Sawanaka [Sat, 7 Oct 2023 08:41:36 +0000 (17:41 +0900)]
Add file*_nolasteol.txt
Takashi Sawanaka [Sat, 7 Oct 2023 05:17:41 +0000 (14:17 +0900)]
FolderCompare.vcxproj: Remove MFC dependencies
Takashi Sawanaka [Sat, 7 Oct 2023 04:14:02 +0000 (13:14 +0900)]
Fix build error on VS2017
Takashi Sawanaka [Sat, 7 Oct 2023 04:00:49 +0000 (13:00 +0900)]
Move the parser source files in editlib.vcxitems to editlibparsers.vcxitems.
Takashi Sawanaka [Sat, 7 Oct 2023 01:02:59 +0000 (10:02 +0900)]
Update French.po
Takashi Sawanaka [Sat, 7 Oct 2023 01:02:30 +0000 (10:02 +0900)]
Update French.po
Takashi Sawanaka [Sat, 7 Oct 2023 00:39:09 +0000 (09:39 +0900)]
DiffWrapper.cpp: Remove unnecessary #include
Need74 [Sat, 7 Oct 2023 00:23:43 +0000 (02:23 +0200)]
Update French.po 16.30 => 16.32 (#2058)
* Update French.po 16.30 => 16.32
Hi
I have just made this update (16.32) including the few latest new features since version 16.30 and also by tweaking the slightly French formulations (clumsy word-for-word translation) or sometimes errors in the meaning of the text in English compared to what is actually happens by activating the command (2 or 3 cases at most).
Aware that I have still made many small modifications which require verification, I remain attentive and in no way claim to have the absolute truth.
My pleasure is still great to work with WinMerge in parallel with Notepad++ and translating it is a real pleasure for me to share my passion for this program.
* Update French.po on spell error "caractères"
The error is corrected
Now I wait for 16.33 version
Takashi Sawanaka [Fri, 6 Oct 2023 14:25:43 +0000 (23:25 +0900)]
Korean.isl: Change the file encoding from UTF-8 to CP-949
VenusGirl❤ [Fri, 6 Oct 2023 14:20:00 +0000 (23:20 +0900)]
Update Korean.isl (#2060)
VenusGirl❤ [Fri, 6 Oct 2023 14:19:16 +0000 (23:19 +0900)]
Update Korean.isl (#2059)
Takashi Sawanaka [Thu, 5 Oct 2023 11:47:18 +0000 (20:47 +0900)]
Add excel.xlsx, excel.xlsm
Takashi Sawanaka [Thu, 5 Oct 2023 11:15:18 +0000 (20:15 +0900)]
Update Testing/Data/Compare/Dir*/ignore_comments.cpp
Takashi Sawanaka [Thu, 5 Oct 2023 00:28:33 +0000 (09:28 +0900)]
Bump revision to 2.16.32+-jp-4
Takashi Sawanaka [Thu, 5 Oct 2023 00:24:20 +0000 (09:24 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Thu, 5 Oct 2023 00:04:43 +0000 (09:04 +0900)]
Improve line filters and substitution filters (#2032) (5)
Takashi Sawanaka [Wed, 4 Oct 2023 23:27:53 +0000 (08:27 +0900)]
Allow NUL and \\.\NUL in paths specified as command line arguments (#2056)
VenusGirl❤ [Wed, 4 Oct 2023 21:12:40 +0000 (06:12 +0900)]
Update Korean.po (#2057)
slolo2000 [Wed, 4 Oct 2023 11:02:00 +0000 (13:02 +0200)]
Update French.po (#2055)
Takashi Sawanaka [Wed, 4 Oct 2023 10:58:31 +0000 (19:58 +0900)]
Add "(F4)" to the description of the toolbar icon "Difference in the Current Line". refs #2050 (2)
Takashi Sawanaka [Mon, 2 Oct 2023 12:40:38 +0000 (21:40 +0900)]
Add "(F4)" to the description of the toolbar icon "Difference in the Current Line". refs #2050
Takashi Sawanaka [Sun, 1 Oct 2023 06:42:47 +0000 (15:42 +0900)]
Update ignore_comments.cpp
Takashi Sawanaka [Sun, 1 Oct 2023 06:32:59 +0000 (15:32 +0900)]
Fix typo
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 22:37:26 +0000 (07:37 +0900)]
update patch
Takashi Sawanaka [Wed, 27 Sep 2023 15:41:17 +0000 (00:41 +0900)]
Update ChangeLogJapanese (2)
Takashi Sawanaka [Wed, 27 Sep 2023 15:31:14 +0000 (00:31 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
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 [Sat, 23 Sep 2023 23:14:43 +0000 (08:14 +0900)]
Update ChangeLogJapanese
Takashi Sawanaka [Sat, 23 Sep 2023 23:01:20 +0000 (08:01 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
# Conflicts:
# SetVersion.cmd
# Version.h
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 [Mon, 28 Aug 2023 12:03:56 +0000 (21:03 +0900)]
Bump revision to 2.16.32+-jp-2
Takashi Sawanaka [Sun, 27 Aug 2023 22:14:05 +0000 (07:14 +0900)]
Update ChangeLogJapanese (2)
Takashi Sawanaka [Sun, 27 Aug 2023 22:06:17 +0000 (07:06 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
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)