OSDN Git Service
Takashi Sawanaka [Sat, 11 Dec 2021 09:12:03 +0000 (18:12 +0900)]
InnoSetup/Chinese_Traditional.isl: Change the file encoding from UTF-8 to CP950(Big-5)
SiderealArt [Sat, 11 Dec 2021 08:59:47 +0000 (16:59 +0800)]
update traditional chinese translation (#1079)
Takashi Sawanaka [Sat, 11 Dec 2021 03:49:30 +0000 (12:49 +0900)]
Add ARM platform (6)
Takashi Sawanaka [Sat, 11 Dec 2021 03:47:16 +0000 (12:47 +0900)]
Add ARM platform (5)
Takashi Sawanaka [Sat, 11 Dec 2021 03:45:32 +0000 (12:45 +0900)]
Add ARM platform (4)
Takashi Sawanaka [Sat, 11 Dec 2021 03:38:36 +0000 (12:38 +0900)]
Add ARM platform (3)
Takashi Sawanaka [Sat, 11 Dec 2021 02:51:42 +0000 (11:51 +0900)]
Add Plugins/BuildBin.*.cmd
Takashi Sawanaka [Fri, 10 Dec 2021 15:47:44 +0000 (00:47 +0900)]
Add ARM platform (2)
Takashi Sawanaka [Fri, 10 Dec 2021 15:47:11 +0000 (00:47 +0900)]
Add ARM platform
Takashi Sawanaka [Thu, 9 Dec 2021 22:44:06 +0000 (07:44 +0900)]
Update TranslationsStatus
cynilyn [Thu, 9 Dec 2021 22:39:09 +0000 (07:39 +0900)]
Update Korean.po (#1078)
Correct typos in Korean translation
Anders [Thu, 9 Dec 2021 12:52:25 +0000 (13:52 +0100)]
Return better HRESULTs (#1077)
Takashi Sawanaka [Wed, 8 Dec 2021 13:20:54 +0000 (22:20 +0900)]
Translations/InnoSetup/Corsican.isl: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Wed, 8 Dec 2021 13:02:01 +0000 (22:02 +0900)]
ReadMe-Corsican.txt: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Tue, 7 Dec 2021 00:04:44 +0000 (09:04 +0900)]
Adding Corsican translation to WinMerge (#1072) (3)
Takashi Sawanaka [Mon, 6 Dec 2021 23:46:22 +0000 (08:46 +0900)]
Adding Corsican translation to WinMerge (#1072) (2)
Patriccollu [Mon, 6 Dec 2021 22:27:35 +0000 (23:27 +0100)]
Adding Corsican translation to WinMerge (#1072)
* Adding Corsican translation to WinMerge
* Adding Corsican translation to ShellExtension
* Adding Corsican translation to InnoSetup
* Adding Corsican translation to Docs/Readme
SamuelPlentz [Mon, 6 Dec 2021 13:06:55 +0000 (14:06 +0100)]
Ddd an "Defaults" section to the ini file (#1071)
After reading the "WinMerge" section try to read the "Defaults" section.
Overwrite existing entries in "iniFileKeyValues" with the ones from the "Defaults" section.
This section is not written to, as it should contain default entries, that are reverted at each restart of WinMerge.
More informations see #460.
Takashi Sawanaka [Sun, 5 Dec 2021 11:20:40 +0000 (20:20 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Sun, 5 Dec 2021 11:17:18 +0000 (20:17 +0900)]
FolderCompare: Improve performance when tree mode is disabled (#1069)
Jun Tajima [Sun, 5 Dec 2021 03:12:28 +0000 (12:12 +0900)]
Add a feature to save/restore the ”Ignore numbers” setting to/from a project file. (#1068)
Takashi Sawanaka [Tue, 30 Nov 2021 23:59:01 +0000 (08:59 +0900)]
Update 7-zip to 21.06
Hugo Carvalho [Tue, 30 Nov 2021 13:33:26 +0000 (13:33 +0000)]
Update Portuguese translation (#1065)
Some grammar correction.
Mr-Update [Mon, 29 Nov 2021 22:26:11 +0000 (23:26 +0100)]
Update German.po (#1062)
Translation completed
Tichij [Mon, 29 Nov 2021 11:46:01 +0000 (13:46 +0200)]
Update of Lithuanian translation (#1061)
Hugo Carvalho [Sun, 28 Nov 2021 23:56:36 +0000 (23:56 +0000)]
Update Portuguese translation (#1060)
For commit:
https://github.com/hugok79/winmerge/commit/
88e8c0798094f7baf8dbb80834dfca677971bf5f
Takashi Sawanaka [Sun, 28 Nov 2021 12:56:47 +0000 (21:56 +0900)]
Fix issue #1052: Issue with closing WinMerge with Esc keyboard key
Takashi Sawanaka [Sat, 27 Nov 2021 13:28:48 +0000 (22:28 +0900)]
Added VS2022 support (5)
Takashi Sawanaka [Fri, 26 Nov 2021 23:45:00 +0000 (08:45 +0900)]
Make the 'Match similar lines' option work for 3-way comparisons (#1051) (2)
Takashi Sawanaka [Fri, 26 Nov 2021 14:47:42 +0000 (23:47 +0900)]
Fix issue #1057: Source Files Comparison doesn't seem to Work properly
Takashi Sawanaka [Thu, 25 Nov 2021 14:30:09 +0000 (23:30 +0900)]
Fix #1056: Please add a huge icon for "Filter is active"
Takashi Sawanaka [Thu, 25 Nov 2021 14:06:49 +0000 (23:06 +0900)]
Added VS2022 support (4)
Takashi Sawanaka [Wed, 24 Nov 2021 14:09:30 +0000 (23:09 +0900)]
Added option "Ignore numbers" (#1025) (5)
Takashi Sawanaka [Wed, 24 Nov 2021 14:08:47 +0000 (23:08 +0900)]
diffutils: Make the definitions of __NT__ and PR_FILE_NAME unnecessary.
Jun Tajima [Tue, 23 Nov 2021 22:32:05 +0000 (07:32 +0900)]
Fix PHP syntax highlighting. (#1055)
- Fix an issue where text is not highlighted correctly if there is no space or symbol between a single line comment or variable and the end tag "?>".
Takashi Sawanaka [Tue, 23 Nov 2021 11:56:07 +0000 (20:56 +0900)]
crystaledit/Sample: Add Select Font menu item
Takashi Sawanaka [Tue, 23 Nov 2021 11:55:33 +0000 (20:55 +0900)]
Added VS2022 support (3)
Takashi Sawanaka [Tue, 23 Nov 2021 01:33:23 +0000 (10:33 +0900)]
Fix code scanning alerts: Comparison of narrow type with wide type in loop condition
Takashi Sawanaka [Tue, 23 Nov 2021 01:30:30 +0000 (10:30 +0900)]
Fix code scanning alerts: Array offset used before range check
Takashi Sawanaka [Tue, 23 Nov 2021 01:21:11 +0000 (10:21 +0900)]
Fix code scanning alerts: Potentially uninitialized local variable
Takashi Sawanaka [Tue, 23 Nov 2021 01:14:26 +0000 (10:14 +0900)]
Fix code scanning alerts: Unused local variable
Takashi Sawanaka [Tue, 23 Nov 2021 01:13:50 +0000 (10:13 +0900)]
Added VS2022 support (2)
Takashi Sawanaka [Mon, 22 Nov 2021 13:07:50 +0000 (22:07 +0900)]
rename BuildAll.vs2019x64_vs2017Win32.cmd to BuildAll.vs2022x64_vs2017Win32.cmd
Takashi Sawanaka [Mon, 22 Nov 2021 13:06:49 +0000 (22:06 +0900)]
Added option "Ignore numbers" (#1025) (4)
Takashi Sawanaka [Mon, 22 Nov 2021 12:58:01 +0000 (21:58 +0900)]
Added option "Ignore numbers" (#1025) (3)
Takashi Sawanaka [Sun, 21 Nov 2021 12:45:33 +0000 (21:45 +0900)]
Fix issus #923: Put the diff patch to the clipboard rather than to files
Takashi Sawanaka [Sun, 21 Nov 2021 06:48:12 +0000 (15:48 +0900)]
Fix code scanning alerts: Inconsistent definition of copy constructor and assignment ('Rule of Two')
Takashi Sawanaka [Sun, 21 Nov 2021 05:51:44 +0000 (14:51 +0900)]
Fix code scanning alerts: Incorrect allocation-error handling
Takashi Sawanaka [Sun, 21 Nov 2021 04:02:04 +0000 (13:02 +0900)]
Make the 'Match similar lines' option work for 3-way comparisons (#1051)
Ikko Ashimine [Fri, 19 Nov 2021 22:39:29 +0000 (07:39 +0900)]
Fix typo in BCMenu.cpp (#1054)
overide -> override
Takashi Sawanaka [Fri, 19 Nov 2021 13:33:26 +0000 (22:33 +0900)]
MergeEditView.cpp: Fix assertion failure when Merge Mode is enabled
Takashi Sawanaka [Mon, 15 Nov 2021 13:29:48 +0000 (22:29 +0900)]
Fix codescaning alerts: Inconsistent nullness check
Takashi Sawanaka [Sun, 14 Nov 2021 11:54:01 +0000 (20:54 +0900)]
Fix issue #1050: The current pane switches without me asking it to.
Mirosław Żylewicz [Sat, 13 Nov 2021 23:42:08 +0000 (00:42 +0100)]
Update Polish.po (#1049)
Takashi Sawanaka [Wed, 10 Nov 2021 15:21:52 +0000 (00:21 +0900)]
Update Contributors.txt
Tichij [Wed, 10 Nov 2021 14:36:30 +0000 (16:36 +0200)]
Update of Lithuanian translation (#1043)
Takashi Sawanaka [Wed, 10 Nov 2021 14:11:32 +0000 (23:11 +0900)]
Add D syntax highlighting. (#1042) (2)
devmynote [Wed, 10 Nov 2021 14:10:18 +0000 (23:10 +0900)]
Add D syntax highlighting. (#1042)
* Small Fix.
Fixed C#(Java, JavaScript) keyword highlighting.
* Add D syntax highlighting.
* Improved D syntax highlighting.
(Supports nested comments)
* Improved D syntax highlighting.
(Supports string literals)
* Fixed blank line handling.
Takashi Sawanaka [Tue, 9 Nov 2021 14:14:27 +0000 (23:14 +0900)]
Added VS2022 support
Takashi Sawanaka [Sun, 7 Nov 2021 04:25:59 +0000 (13:25 +0900)]
Fix crash when comparing 3 folders if additional properties were added
devmynote [Sat, 6 Nov 2021 09:21:45 +0000 (18:21 +0900)]
Small Fix. (#1040)
Fixed C#(Java, JavaScript) keyword highlighting.
Takashi Sawanaka [Sat, 6 Nov 2021 01:26:35 +0000 (10:26 +0900)]
Improve 'Match similar lines' (related to the issue #1013 Vertical shifting needed when some lines do not match) (3)
- Reduce the execution time of the GetMatchCost() function
- Remove the 15-line limit for a single Diff block, and instead make the limit to 4096 characters per Diff block
Takashi Sawanaka [Sat, 6 Nov 2021 01:05:18 +0000 (10:05 +0900)]
Improve 'Match similar lines' (related to the issue #1013 Vertical shifting needed when some lines do not match) (2)
- Reduce the execution time of the GetMatchCost() function
- Remove the 15-line limit for a single Diff block, and instead make the limit to 4096 characters per Diff block
Takashi Sawanaka [Sat, 6 Nov 2021 00:14:43 +0000 (09:14 +0900)]
Improve 'Match similar lines' (related to the issue #1013 Vertical shifting needed when some lines do not match)
- Reduce the execution time of the GetMatchCost() function
- Remove the 15-line limit for a single Diff block, and instead make the limit to 4096 characters per Diff block
Hugo Carvalho [Fri, 5 Nov 2021 22:30:15 +0000 (22:30 +0000)]
Update Portuguese translation (#1039)
I took some time to proofread the translation.
Some grammar correction and other minor fixes.
Takashi Sawanaka [Wed, 3 Nov 2021 14:06:55 +0000 (23:06 +0900)]
Fix a problem where Duplicate Group Numbers were not assigned to files with the same content but different file names. (3)
Jun Tajima [Wed, 3 Nov 2021 10:38:56 +0000 (19:38 +0900)]
Add the feature to display tooltips on the MDI tab. (#1038)
- Show tooltips when the title is too long to display the entire title.
Takashi Sawanaka [Tue, 2 Nov 2021 13:27:51 +0000 (22:27 +0900)]
Fix issue #1036: Release 2.16.16 crashes when comparing large files - likely a regression
Hugo Carvalho [Sat, 30 Oct 2021 01:19:44 +0000 (02:19 +0100)]
Update Portuguese translation (#1034)
Takashi Sawanaka [Thu, 28 Oct 2021 23:08:05 +0000 (08:08 +0900)]
Fix a problem where Duplicate Group Numbers were not assigned to files with the same content but different file names. (2)
Takashi Sawanaka [Thu, 28 Oct 2021 22:56:24 +0000 (07:56 +0900)]
Fix a problem where Duplicate Group Numbers were not assigned to files with the same content but different file names.
Takashi Sawanaka [Thu, 28 Oct 2021 22:51:41 +0000 (07:51 +0900)]
Update Russian.po
efi99 [Thu, 28 Oct 2021 13:49:00 +0000 (15:49 +0200)]
Update Hungarian.po (#1032)
Takashi Sawanaka [Thu, 28 Oct 2021 12:50:49 +0000 (21:50 +0900)]
Added option "Ignore numbers" (#1025) (2)
wvxwxvw [Thu, 28 Oct 2021 12:38:26 +0000 (15:38 +0300)]
Update Russian.po (#1031)
evoc [Thu, 28 Oct 2021 00:47:28 +0000 (02:47 +0200)]
Added option "Ignore numbers" (#1025)
* added ignore numbers option
* updated .po files
* fixed Merge.rc
* actually using options flag for numbers
* added ignore numbers to toolbar menu
* added unit test IgnoreNumbers
* re-added some german translations
* added ignore numbers option
updated .po files
* actually using options flag for numbers
* added ignore numbers to toolbar menu
* added unit test IgnoreNumbers
* prepare for merge
* setting private build stringdiffs.cpp.orig
* skip building ARM64 in BuildAll.vs2019x64_vs2017Win32.cmd
* disabled UploadToVirusTotal.cmd
* updated ChangeLog to include option "ignore numbers"
* cleanung build scripts
Co-authored-by: wittenburg <wittenburg@optimal-systems.de>
Takashi Sawanaka [Tue, 26 Oct 2021 23:14:58 +0000 (08:14 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Tue, 26 Oct 2021 23:14:00 +0000 (08:14 +0900)]
Update ChangeLog&ReleaseNotes (4)
Mr-Update [Tue, 26 Oct 2021 23:03:19 +0000 (01:03 +0200)]
Update German.po (#1027)
Translation completed
Takashi Sawanaka [Tue, 26 Oct 2021 13:08:29 +0000 (22:08 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Tue, 26 Oct 2021 12:59:29 +0000 (21:59 +0900)]
Update Slovenian translation. Submited by JadranR
Takashi Sawanaka [Tue, 26 Oct 2021 12:47:49 +0000 (21:47 +0900)]
CompareMSExcelFiles.sct: Make the number before the sheet name zero-padded. Submitted by Shirai
Takashi Sawanaka [Tue, 26 Oct 2021 00:24:51 +0000 (09:24 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Tue, 26 Oct 2021 00:21:37 +0000 (09:21 +0900)]
Bump revision to 2.16.16
Takashi Sawanaka [Sun, 24 Oct 2021 12:30:51 +0000 (21:30 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 24 Oct 2021 11:31:49 +0000 (20:31 +0900)]
Fix issue #1007: Comparing broken lnk-files (windows shortcuts) freezes WinMerge
efi99 [Sun, 24 Oct 2021 10:21:45 +0000 (12:21 +0200)]
Update Hungarian.po (#1023)
Takashi Sawanaka [Sun, 24 Oct 2021 06:34:31 +0000 (15:34 +0900)]
FolderCompare: Additional Properties (Windows Property System+Hash(MD5, SHA-1, SHA-256)) (#996)
Hugo Carvalho [Thu, 21 Oct 2021 13:52:57 +0000 (14:52 +0100)]
Add Portuguese.isl (#1017)
LMS [Tue, 12 Oct 2021 11:09:05 +0000 (13:09 +0200)]
Galician translation update (#1005)
Takashi Sawanaka [Tue, 12 Oct 2021 00:29:24 +0000 (09:29 +0900)]
Fix issue #1004: Where to report documentation/help errors?
Takashi Sawanaka [Mon, 11 Oct 2021 12:52:43 +0000 (21:52 +0900)]
Fix a problem where the string in the Windows common dialog would not change to the language when switching languages.
Takashi Sawanaka [Mon, 11 Oct 2021 11:31:37 +0000 (20:31 +0900)]
Update Apache tika to 2.1.0 and change the download URL to the URL suggested by JohnF-tfa (https://github.com/WinMerge/winmerge/issues/715#issuecomment-
939630493)
Ikko Ashimine [Sun, 10 Oct 2021 22:56:08 +0000 (07:56 +0900)]
Fix typo in OpenView.cpp (#1000)
Callled -> Called
Takashi Sawanaka [Sat, 9 Oct 2021 23:54:53 +0000 (08:54 +0900)]
Fix issue #998: Cannot resize last column with UI
Takashi Sawanaka [Fri, 8 Oct 2021 11:40:13 +0000 (20:40 +0900)]
PropShell.cpp: Fix the problem that the "Register Shell Extension for Windows 11 or later" button is not enabled when another user has registered ShellExtension for Windows 11.
Takashi Sawanaka [Wed, 6 Oct 2021 12:56:27 +0000 (21:56 +0900)]
ShellFileOperations_test.cpp: Fix failed test
Takashi Sawanaka [Sun, 3 Oct 2021 11:32:01 +0000 (20:32 +0900)]
Resource.h: Increase the maximum number of unpacker plugins from 40 to 200.
Jun Tajima [Sun, 3 Oct 2021 10:02:37 +0000 (19:02 +0900)]
Fix an issue where filters are not applied correctly when opening a project file containing multiple items with different filters. (#995)
- Duplicate the global file filter and set it into the diff context of the CDirDoc class.
Takashi Sawanaka [Sat, 2 Oct 2021 01:11:55 +0000 (10:11 +0900)]
ImgMergeFrm.cpp: Fix an issue where drag-and-drop of file would only work once.