OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoUpdate Installer/InnoSetup/README.md
Takashi Sawanaka [Sat, 18 Dec 2021 23:50:07 +0000 (08:50 +0900)]
Update Installer/InnoSetup/README.md

2 years agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sat, 18 Dec 2021 23:48:54 +0000 (08:48 +0900)]
Update ChangeLog&ReleaseNotes (2)

2 years agoGalician translation update (#1089)
LMS [Sat, 18 Dec 2021 22:50:13 +0000 (23:50 +0100)]
Galician translation update (#1089)

2 years agoBump revision to 2.16.17
Takashi Sawanaka [Sat, 18 Dec 2021 13:20:12 +0000 (22:20 +0900)]
Bump revision to 2.16.17

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 18 Dec 2021 13:19:56 +0000 (22:19 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoFix the problem that the "Plugins" -> "Reload Plugins" menu does not work.
Takashi Sawanaka [Fri, 17 Dec 2021 23:56:04 +0000 (08:56 +0900)]
Fix the problem that the "Plugins" -> "Reload Plugins" menu does not work.

2 years agoInnoSetup/German.isl: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Fri, 17 Dec 2021 22:23:51 +0000 (07:23 +0900)]
InnoSetup/German.isl: Change the file encoding from UTF-8 to CP1252

2 years agoUpdate German.isl (#1088)
Mr-Update [Fri, 17 Dec 2021 22:18:57 +0000 (23:18 +0100)]
Update German.isl (#1088)

Translation completed.
Please keep using ISO-8859-1.

2 years agoUpdate of Lithuanian translations (#1087)
Tichij [Fri, 17 Dec 2021 11:02:11 +0000 (13:02 +0200)]
Update of Lithuanian translations (#1087)

2 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Fri, 17 Dec 2021 00:25:31 +0000 (09:25 +0900)]
Update Slovenian translation. Submitted by JadranR

2 years agoUpdate German.po (#1086)
Mr-Update [Fri, 17 Dec 2021 00:17:31 +0000 (01:17 +0100)]
Update German.po (#1086)

Translation completed

2 years agoUpdate Corsican translation for commit 353ea9c (#1085)
Patriccollu [Fri, 17 Dec 2021 00:14:06 +0000 (01:14 +0100)]
Update Corsican translation for commit 353ea9c (#1085)

2 years agoInstaller:
Takashi Sawanaka [Thu, 16 Dec 2021 11:59:38 +0000 (20:59 +0900)]
Installer:
- Reduce compiler warnings
- Update translations

2 years agoInstaller: rename WinMerge.iss to WinMergeX86.iss (2)
Takashi Sawanaka [Wed, 15 Dec 2021 12:16:18 +0000 (21:16 +0900)]
Installer: rename WinMerge.iss to WinMergeX86.iss (2)

2 years agoInstaller: rename WinMerge.iss to WinMergeX86.iss
Takashi Sawanaka [Wed, 15 Dec 2021 12:03:41 +0000 (21:03 +0900)]
Installer: rename WinMerge.iss to WinMergeX86.iss

2 years agoUpdate README.md
Takashi Sawanaka [Wed, 15 Dec 2021 11:52:43 +0000 (20:52 +0900)]
Update README.md

2 years agoUpdate of Lithuanian translation (#1082)
Tichij [Wed, 15 Dec 2021 10:47:06 +0000 (12:47 +0200)]
Update of Lithuanian translation (#1082)

2 years agoFix issue osdn.net #43374: Cannot create a report for all pages at once when comparin...
Takashi Sawanaka [Tue, 14 Dec 2021 13:35:05 +0000 (22:35 +0900)]
Fix issue osdn.net #43374: Cannot create a report for all pages at once when comparing images from multiple pages,

2 years agoUpdate Externals
Takashi Sawanaka [Sun, 12 Dec 2021 13:24:22 +0000 (22:24 +0900)]
Update Externals

2 years agoUpdate DownloadDeps.cmd
Takashi Sawanaka [Sun, 12 Dec 2021 10:13:18 +0000 (19:13 +0900)]
Update DownloadDeps.cmd

2 years agoUpdate DownloadDeps.cmd
Takashi Sawanaka [Sun, 12 Dec 2021 10:04:12 +0000 (19:04 +0900)]
Update DownloadDeps.cmd

2 years agoRename solution platform name Win32 to x86 and clean up .vcxproj file
Takashi Sawanaka [Sun, 12 Dec 2021 09:59:48 +0000 (18:59 +0900)]
Rename solution platform name Win32 to x86 and clean up .vcxproj file

2 years agoUpdate ShellExtension to 1.8.4.0
Takashi Sawanaka [Sat, 11 Dec 2021 14:24:11 +0000 (23:24 +0900)]
Update ShellExtension to 1.8.4.0

2 years agoAdd ARM platform (8)
Takashi Sawanaka [Sat, 11 Dec 2021 14:11:26 +0000 (23:11 +0900)]
Add ARM platform (8)

2 years agoShellExtension: Bump revision to 1.18.4.0
Takashi Sawanaka [Sat, 11 Dec 2021 14:06:27 +0000 (23:06 +0900)]
ShellExtension: Bump revision to 1.18.4.0

2 years agoAdd ARM platform (7)
Takashi Sawanaka [Sat, 11 Dec 2021 13:34:33 +0000 (22:34 +0900)]
Add ARM platform (7)

2 years agoUpdate ChineseTraditional.po
Takashi Sawanaka [Sat, 11 Dec 2021 13:34:10 +0000 (22:34 +0900)]
Update ChineseTraditional.po

2 years agoUpdate ShellExtension to 1.8.3.0
Takashi Sawanaka [Sat, 11 Dec 2021 09:56:06 +0000 (18:56 +0900)]
Update ShellExtension to 1.8.3.0

2 years agoShellExtension:
Takashi Sawanaka [Sat, 11 Dec 2021 09:48:19 +0000 (18:48 +0900)]
ShellExtension:
- Re-enable the extended menu, as Windows 11 Build 22499 appears to have resolved the stability issue with WinMerge's extended menu behavior.
- Bump revision to 1.8.3.0

2 years agoInnoSetup/Chinese_Traditional.isl: Change the file encoding from UTF-8 to CP950(Big-5)
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)

2 years agoupdate traditional chinese translation (#1079)
SiderealArt [Sat, 11 Dec 2021 08:59:47 +0000 (16:59 +0800)]
update traditional chinese translation (#1079)

2 years agoAdd ARM platform (6)
Takashi Sawanaka [Sat, 11 Dec 2021 03:49:30 +0000 (12:49 +0900)]
Add ARM platform (6)

2 years agoAdd ARM platform (5)
Takashi Sawanaka [Sat, 11 Dec 2021 03:47:16 +0000 (12:47 +0900)]
Add ARM platform (5)

2 years agoAdd ARM platform (4)
Takashi Sawanaka [Sat, 11 Dec 2021 03:45:32 +0000 (12:45 +0900)]
Add ARM platform (4)

2 years agoAdd ARM platform (3)
Takashi Sawanaka [Sat, 11 Dec 2021 03:38:36 +0000 (12:38 +0900)]
Add ARM platform (3)

2 years agoAdd Plugins/BuildBin.*.cmd
Takashi Sawanaka [Sat, 11 Dec 2021 02:51:42 +0000 (11:51 +0900)]
Add Plugins/BuildBin.*.cmd

2 years agoAdd ARM platform (2)
Takashi Sawanaka [Fri, 10 Dec 2021 15:47:44 +0000 (00:47 +0900)]
Add ARM platform (2)

2 years agoAdd ARM platform
Takashi Sawanaka [Fri, 10 Dec 2021 15:47:11 +0000 (00:47 +0900)]
Add ARM platform

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 9 Dec 2021 22:44:06 +0000 (07:44 +0900)]
Update TranslationsStatus

2 years agoUpdate Korean.po (#1078)
cynilyn [Thu, 9 Dec 2021 22:39:09 +0000 (07:39 +0900)]
Update Korean.po (#1078)

Correct typos in Korean translation

2 years agoReturn better HRESULTs (#1077)
Anders [Thu, 9 Dec 2021 12:52:25 +0000 (13:52 +0100)]
Return better HRESULTs (#1077)

2 years agoTranslations/InnoSetup/Corsican.isl: Change the file encoding from UTF-8 to CP-1252
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

2 years agoReadMe-Corsican.txt: 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

2 years agoAdding Corsican translation to WinMerge (#1072) (3)
Takashi Sawanaka [Tue, 7 Dec 2021 00:04:44 +0000 (09:04 +0900)]
Adding Corsican translation to WinMerge (#1072) (3)

2 years agoAdding Corsican translation to WinMerge (#1072) (2)
Takashi Sawanaka [Mon, 6 Dec 2021 23:46:22 +0000 (08:46 +0900)]
Adding Corsican translation to WinMerge (#1072) (2)

2 years agoAdding Corsican translation to WinMerge (#1072)
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

2 years agoDdd an "Defaults" section to the ini file (#1071)
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.

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Sun, 5 Dec 2021 11:20:40 +0000 (20:20 +0900)]
Update TranslationsStatus.*

2 years agoFolderCompare: Improve performance when tree mode is disabled (#1069)
Takashi Sawanaka [Sun, 5 Dec 2021 11:17:18 +0000 (20:17 +0900)]
FolderCompare: Improve performance when tree mode is disabled (#1069)

2 years agoAdd a feature to save/restore the ”Ignore numbers” setting to/from a project file...
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)

2 years agoUpdate 7-zip to 21.06
Takashi Sawanaka [Tue, 30 Nov 2021 23:59:01 +0000 (08:59 +0900)]
Update 7-zip to 21.06

2 years agoUpdate Portuguese translation (#1065)
Hugo Carvalho [Tue, 30 Nov 2021 13:33:26 +0000 (13:33 +0000)]
Update Portuguese translation (#1065)

Some grammar correction.

2 years agoUpdate German.po (#1062)
Mr-Update [Mon, 29 Nov 2021 22:26:11 +0000 (23:26 +0100)]
Update German.po (#1062)

Translation completed

2 years agoUpdate of Lithuanian translation (#1061)
Tichij [Mon, 29 Nov 2021 11:46:01 +0000 (13:46 +0200)]
Update of Lithuanian translation (#1061)

2 years agoUpdate Portuguese translation (#1060)
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

2 years agoFix issue #1052: Issue with closing WinMerge with Esc keyboard key
Takashi Sawanaka [Sun, 28 Nov 2021 12:56:47 +0000 (21:56 +0900)]
Fix issue #1052:  Issue with closing WinMerge with Esc keyboard key

2 years agoAdded VS2022 support (5)
Takashi Sawanaka [Sat, 27 Nov 2021 13:28:48 +0000 (22:28 +0900)]
Added VS2022 support (5)

2 years agoMake the 'Match similar lines' option work for 3-way comparisons (#1051) (2)
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)

2 years agoFix issue #1057: Source Files Comparison doesn't seem to Work properly
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

2 years agoFix #1056: Please add a huge icon for "Filter is active"
Takashi Sawanaka [Thu, 25 Nov 2021 14:30:09 +0000 (23:30 +0900)]
Fix #1056: Please add a huge icon for "Filter is active"

2 years agoAdded VS2022 support (4)
Takashi Sawanaka [Thu, 25 Nov 2021 14:06:49 +0000 (23:06 +0900)]
Added VS2022 support (4)

2 years agoAdded option "Ignore numbers" (#1025) (5)
Takashi Sawanaka [Wed, 24 Nov 2021 14:09:30 +0000 (23:09 +0900)]
Added option "Ignore numbers" (#1025) (5)

2 years agodiffutils: Make the definitions of __NT__ and PR_FILE_NAME unnecessary.
Takashi Sawanaka [Wed, 24 Nov 2021 14:08:47 +0000 (23:08 +0900)]
diffutils: Make the definitions of __NT__ and PR_FILE_NAME unnecessary.

2 years agoFix PHP syntax highlighting. (#1055)
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 "?>".

2 years agocrystaledit/Sample: Add Select Font menu item
Takashi Sawanaka [Tue, 23 Nov 2021 11:56:07 +0000 (20:56 +0900)]
crystaledit/Sample: Add Select Font menu item

2 years agoAdded VS2022 support (3)
Takashi Sawanaka [Tue, 23 Nov 2021 11:55:33 +0000 (20:55 +0900)]
Added VS2022 support (3)

2 years agoFix code scanning alerts: Comparison of narrow type with wide type in loop condition
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

2 years agoFix code scanning alerts: Array offset used before range check
Takashi Sawanaka [Tue, 23 Nov 2021 01:30:30 +0000 (10:30 +0900)]
Fix code scanning alerts: Array offset used before range check

2 years agoFix code scanning alerts: Potentially uninitialized local variable
Takashi Sawanaka [Tue, 23 Nov 2021 01:21:11 +0000 (10:21 +0900)]
Fix code scanning alerts: Potentially uninitialized local variable

2 years agoFix code scanning alerts: Unused local variable
Takashi Sawanaka [Tue, 23 Nov 2021 01:14:26 +0000 (10:14 +0900)]
Fix code scanning alerts: Unused local variable

2 years agoAdded VS2022 support (2)
Takashi Sawanaka [Tue, 23 Nov 2021 01:13:50 +0000 (10:13 +0900)]
Added VS2022 support (2)

2 years agorename BuildAll.vs2019x64_vs2017Win32.cmd to BuildAll.vs2022x64_vs2017Win32.cmd
Takashi Sawanaka [Mon, 22 Nov 2021 13:07:50 +0000 (22:07 +0900)]
rename BuildAll.vs2019x64_vs2017Win32.cmd to BuildAll.vs2022x64_vs2017Win32.cmd

2 years agoAdded option "Ignore numbers" (#1025) (4)
Takashi Sawanaka [Mon, 22 Nov 2021 13:06:49 +0000 (22:06 +0900)]
Added option "Ignore numbers" (#1025) (4)

2 years agoAdded option "Ignore numbers" (#1025) (3)
Takashi Sawanaka [Mon, 22 Nov 2021 12:58:01 +0000 (21:58 +0900)]
Added option "Ignore numbers" (#1025) (3)

2 years agoFix issus #923: Put the diff patch to the clipboard rather than to files
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

2 years agoFix code scanning alerts: Inconsistent definition of copy constructor and assignment...
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')

2 years agoFix code scanning alerts: Incorrect allocation-error handling
Takashi Sawanaka [Sun, 21 Nov 2021 05:51:44 +0000 (14:51 +0900)]
Fix code scanning alerts: Incorrect allocation-error handling

2 years agoMake the 'Match similar lines' option work for 3-way comparisons (#1051)
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)

2 years agoFix typo in BCMenu.cpp (#1054)
Ikko Ashimine [Fri, 19 Nov 2021 22:39:29 +0000 (07:39 +0900)]
Fix typo in BCMenu.cpp (#1054)

overide -> override

2 years agoMergeEditView.cpp: Fix assertion failure when Merge Mode is enabled
Takashi Sawanaka [Fri, 19 Nov 2021 13:33:26 +0000 (22:33 +0900)]
MergeEditView.cpp: Fix assertion failure when Merge Mode is enabled

2 years agoFix codescaning alerts: Inconsistent nullness check
Takashi Sawanaka [Mon, 15 Nov 2021 13:29:48 +0000 (22:29 +0900)]
Fix codescaning alerts: Inconsistent nullness check

2 years agoFix issue #1050: The current pane switches without me asking it to.
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.

2 years agoUpdate Polish.po (#1049)
Mirosław Żylewicz [Sat, 13 Nov 2021 23:42:08 +0000 (00:42 +0100)]
Update Polish.po (#1049)

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 10 Nov 2021 15:21:52 +0000 (00:21 +0900)]
Update Contributors.txt

2 years agoUpdate of Lithuanian translation (#1043)
Tichij [Wed, 10 Nov 2021 14:36:30 +0000 (16:36 +0200)]
Update of Lithuanian translation (#1043)

2 years agoAdd D syntax highlighting. (#1042) (2)
Takashi Sawanaka [Wed, 10 Nov 2021 14:11:32 +0000 (23:11 +0900)]
Add D syntax highlighting. (#1042) (2)

2 years agoAdd D syntax highlighting. (#1042)
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.

2 years agoAdded VS2022 support
Takashi Sawanaka [Tue, 9 Nov 2021 14:14:27 +0000 (23:14 +0900)]
Added VS2022 support

2 years agoFix crash when comparing 3 folders if additional properties were added
Takashi Sawanaka [Sun, 7 Nov 2021 04:25:59 +0000 (13:25 +0900)]
Fix crash when comparing 3 folders if additional properties were added

2 years agoSmall Fix. (#1040)
devmynote [Sat, 6 Nov 2021 09:21:45 +0000 (18:21 +0900)]
Small Fix. (#1040)

Fixed C#(Java, JavaScript) keyword highlighting.

2 years agoImprove 'Match similar lines' (related to the issue #1013 Vertical shifting needed...
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

2 years agoImprove 'Match similar lines' (related to the issue #1013 Vertical shifting needed...
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

2 years agoImprove 'Match similar lines' (related to the issue #1013 Vertical shifting needed...
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

2 years agoUpdate Portuguese translation (#1039)
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.

2 years agoFix a problem where Duplicate Group Numbers were not assigned to files with the same...
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)

2 years agoAdd the feature to display tooltips on the MDI tab. (#1038)
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.

2 years agoFix issue #1036: Release 2.16.16 crashes when comparing large files - likely a regre...
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

2 years agoUpdate Portuguese translation (#1034)
Hugo Carvalho [Sat, 30 Oct 2021 01:19:44 +0000 (02:19 +0100)]
Update Portuguese translation (#1034)

2 years agoFix a problem where Duplicate Group Numbers were not assigned to files with the same...
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)

2 years agoFix a problem where Duplicate Group Numbers were not assigned to files with the same...
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.