OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoFix issue #1111: Winmerge hangs when i try to compare files. (2)
Takashi Sawanaka [Sat, 8 Jan 2022 08:29:08 +0000 (17:29 +0900)]
Fix issue #1111: Winmerge hangs when i try to compare files. (2)

2 years agoInstaller: Add replacesameversion flag to 7z.dll
Takashi Sawanaka [Fri, 7 Jan 2022 13:07:58 +0000 (22:07 +0900)]
Installer: Add replacesameversion flag to 7z.dll

2 years agoInstaller: Re-enabled the process of installing ShellExtension for Windows 11.
Takashi Sawanaka [Fri, 7 Jan 2022 12:42:26 +0000 (21:42 +0900)]
Installer: Re-enabled the process of installing ShellExtension for Windows 11.

2 years agoUpdate Corsican translation for plugin descriptions (#1119)
Patriccollu [Thu, 6 Jan 2022 22:53:19 +0000 (23:53 +0100)]
Update Corsican translation for plugin descriptions (#1119)

2 years agoFix DownloadDeps.cmd
Takashi Sawanaka [Thu, 6 Jan 2022 14:49:04 +0000 (23:49 +0900)]
Fix DownloadDeps.cmd

2 years agoFix typo in DirScan.cpp (#1118)
Ikko Ashimine [Thu, 6 Jan 2022 14:44:59 +0000 (23:44 +0900)]
Fix typo in DirScan.cpp (#1118)

Propogate -> Propagate

2 years agoUpdate 7-Zip to 21.07
Takashi Sawanaka [Thu, 6 Jan 2022 13:11:21 +0000 (22:11 +0900)]
Update 7-Zip to 21.07

2 years agoFIx issue #1116: Colors -> Differences -> Word Difference : Text color ignored
Takashi Sawanaka [Thu, 6 Jan 2022 12:40:33 +0000 (21:40 +0900)]
FIx issue #1116: Colors -> Differences -> Word Difference : Text color ignored

2 years agoSubeditList.cpp: Fix comments
Takashi Sawanaka [Thu, 6 Jan 2022 12:38:58 +0000 (21:38 +0900)]
SubeditList.cpp: Fix comments

2 years agoMessage Boxes category in the Options dialog: prevent the text displayed in the combo...
Takashi Sawanaka [Thu, 6 Jan 2022 11:50:09 +0000 (20:50 +0900)]
Message Boxes category in the Options dialog: prevent the text displayed in the combo box from overlapping with the text in the background list view.

2 years agoFix issue #483: Sorting on Comparison Result being done incorectly (2)
Takashi Sawanaka [Wed, 5 Jan 2022 23:39:21 +0000 (08:39 +0900)]
Fix issue #483: Sorting on Comparison Result being done incorectly (2)

2 years agoUpdate German.po (#1117)
Mr-Update [Wed, 5 Jan 2022 22:57:38 +0000 (23:57 +0100)]
Update German.po (#1117)

Translation completed

2 years agoUpdate Hungarian.po (#1115)
efi99 [Wed, 5 Jan 2022 22:56:33 +0000 (23:56 +0100)]
Update Hungarian.po (#1115)

2 years agoMake plugin descriptions translatable
Takashi Sawanaka [Wed, 5 Jan 2022 12:32:38 +0000 (21:32 +0900)]
Make plugin descriptions translatable

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 4 Jan 2022 11:07:58 +0000 (20:07 +0900)]
Update TranslationsStatus

2 years agoUpdate copyright year
Takashi Sawanaka [Tue, 4 Jan 2022 11:07:15 +0000 (20:07 +0900)]
Update copyright year

2 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Mon, 3 Jan 2022 12:43:30 +0000 (21:43 +0900)]
Update Slovenian translation. Submitted by JadranR

2 years agoFix issue #1111: Winmerge hangs when i try to compare files.
Takashi Sawanaka [Sat, 1 Jan 2022 02:06:03 +0000 (11:06 +0900)]
Fix issue #1111: Winmerge hangs when i try to compare files.

2 years agoUpdate ChineseSimplified.po for better wording and consistency (#1112)
CharlesMengCA [Sat, 1 Jan 2022 00:18:45 +0000 (19:18 -0500)]
Update ChineseSimplified.po for better wording and consistency (#1112)

2 years agoUpdate German.po (#1110)
Mr-Update [Sat, 1 Jan 2022 00:01:51 +0000 (01:01 +0100)]
Update German.po (#1110)

Translation completed

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Fri, 31 Dec 2021 09:39:38 +0000 (18:39 +0900)]
Update TranslationsStatus

2 years agoUpdate ChineseSimplified.po. Submitted by CharlesMengCA (#1109)
Takashi Sawanaka [Fri, 31 Dec 2021 09:35:14 +0000 (18:35 +0900)]
Update ChineseSimplified.po. Submitted by CharlesMengCA (#1109)

2 years agoUpdate portuguese translation (#1106)
Hugo Carvalho [Thu, 30 Dec 2021 23:18:54 +0000 (23:18 +0000)]
Update portuguese translation (#1106)

2 years agoFix code scanning alerts: Inconsistent nullness check
Takashi Sawanaka [Mon, 27 Dec 2021 12:23:50 +0000 (21:23 +0900)]
Fix code scanning alerts: Inconsistent nullness check

2 years agoFix code scanning alerts: Inconsistent nullness check
Takashi Sawanaka [Sun, 26 Dec 2021 00:58:21 +0000 (09:58 +0900)]
Fix code scanning alerts: Inconsistent nullness check

2 years agoUpdate Corsican translation for 2 commits on Dec. 23rd (#1103)
Patriccollu [Fri, 24 Dec 2021 23:14:08 +0000 (00:14 +0100)]
Update Corsican translation for 2 commits on Dec. 23rd (#1103)

2 years agoPatch 15 hungarian lang (#1102)
efi99 [Fri, 24 Dec 2021 15:23:03 +0000 (16:23 +0100)]
Patch 15 hungarian lang (#1102)

* Update Hungarian.po

* Update Hungarian.po

2 years agoFix a problem that 'Encountered an improper argument' error occurs when a pane split...
Takashi Sawanaka [Fri, 24 Dec 2021 13:04:37 +0000 (22:04 +0900)]
Fix a problem that 'Encountered an improper argument' error occurs when a pane split by Window→Split menu item is unsplit by drag operation.

2 years agoMerge.rc:
Takashi Sawanaka [Thu, 23 Dec 2021 13:13:33 +0000 (22:13 +0900)]
Merge.rc:
- Rename "Quick compare limit (MB)" to "Threshold for switching to quick compare (MB)"
- Rename "Binary compare limit (MB)" to "Threshold for switching to binary compare (MB)"
related to #318, #1092 and #1100

2 years ago3-pane compare window: Allow copying from left to right or vice versa, not just to...
Takashi Sawanaka [Thu, 23 Dec 2021 12:50:27 +0000 (21:50 +0900)]
3-pane compare window: Allow copying from left to right or vice versa, not just to adjacent panes

2 years agoFix issse #1100: "Quick compare limit" and "Binary compare limit" settings don't...
Takashi Sawanaka [Thu, 23 Dec 2021 00:07:19 +0000 (09:07 +0900)]
Fix issse #1100:  "Quick compare limit" and "Binary compare limit" settings don't have the expected (and documented) purpose

2 years agoFix issse #1101: wm 2.16.16.0 crashes with file attached
Takashi Sawanaka [Wed, 22 Dec 2021 23:13:41 +0000 (08:13 +0900)]
Fix issse #1101:  wm 2.16.16.0 crashes with file attached

2 years agoTurkish translation update (#1099)
Kaya Zeren [Tue, 21 Dec 2021 23:01:37 +0000 (02:01 +0300)]
Turkish translation update (#1099)

Turkish translation update 2.16.17

2 years agoPortuguese translation update (#1098)
Hugo Carvalho [Mon, 20 Dec 2021 23:21:37 +0000 (23:21 +0000)]
Portuguese translation update (#1098)

* Portuguese translation update

* Add files via upload

2 years agoUpdate Portuguese translation (#1097)
Hugo Carvalho [Mon, 20 Dec 2021 23:20:39 +0000 (23:20 +0000)]
Update Portuguese translation (#1097)

2 years agoMergeEditView.cpp: Use MF_MENUBREAK for View->Syntax Highlight menu item
Takashi Sawanaka [Mon, 20 Dec 2021 14:15:45 +0000 (23:15 +0900)]
MergeEditView.cpp: Use MF_MENUBREAK for View->Syntax Highlight menu item

2 years agoFix Generate Report menu item icon not being displayed in image comparison and binary...
Takashi Sawanaka [Mon, 20 Dec 2021 13:35:49 +0000 (22:35 +0900)]
Fix Generate Report menu item icon not being displayed in image comparison and binary comparison windows.

2 years agoadded me to contributor list (#1094)
SamuelPlentz [Mon, 20 Dec 2021 11:29:49 +0000 (12:29 +0100)]
added me to contributor list (#1094)

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)