OSDN Git Service

winmerge-jp/winmerge-jp.git
16 months agoupdate crystaledit/test
Takashi Sawanaka [Wed, 8 Mar 2023 14:18:56 +0000 (23:18 +0900)]
update crystaledit/test

16 months agocrystaledit/Sample: Add keyboard shortcuts
Takashi Sawanaka [Wed, 8 Mar 2023 14:01:43 +0000 (23:01 +0900)]
crystaledit/Sample: Add keyboard shortcuts

16 months agoFix crash that occurs when /t is specified as a command line option and only one...
Takashi Sawanaka [Tue, 7 Mar 2023 15:53:04 +0000 (00:53 +0900)]
Fix crash that occurs when /t is specified as a command line option and only one path is specified.

16 months agoReplac CArray with std::vector
Takashi Sawanaka [Tue, 7 Mar 2023 13:37:16 +0000 (22:37 +0900)]
Replac CArray with std::vector

17 months agoReduce tchar.h depencencies
Takashi Sawanaka [Sun, 5 Mar 2023 14:29:26 +0000 (23:29 +0900)]
Reduce tchar.h depencencies

(cherry picked from commit 318d992ee319a5347db6874f437ea75bd35b3b16)

17 months agorefactor
Takashi Sawanaka [Sat, 4 Mar 2023 14:41:27 +0000 (23:41 +0900)]
refactor

17 months agorefactor
Takashi Sawanaka [Sat, 4 Mar 2023 05:19:51 +0000 (14:19 +0900)]
refactor

17 months agoFix crash when comparing Alternate Data Streams like file.zip:Zone.Identifier:$DATA...
Takashi Sawanaka [Sat, 4 Mar 2023 00:26:34 +0000 (09:26 +0900)]
Fix crash when comparing Alternate Data Streams like file.zip:Zone.Identifier:$DATA with /self-compare command line option.

17 months agoFix issue #1740: Failure to indent lines properly
Takashi Sawanaka [Sat, 4 Mar 2023 00:16:39 +0000 (09:16 +0900)]
Fix issue #1740: Failure to indent lines properly

17 months agoUpdate Portuguese translations (#1737)
Hugo Carvalho [Tue, 28 Feb 2023 15:20:24 +0000 (15:20 +0000)]
Update Portuguese translations (#1737)

* Update Portuguese.isl

* Update Portuguese.isl

Corrections

* Update Portuguese translation

* Update Portuguese translation

17 months agoDisable output of assembly code to reduce build time.
Takashi Sawanaka [Mon, 27 Feb 2023 11:50:39 +0000 (20:50 +0900)]
Disable output of assembly code to reduce build time.

17 months agoUpdate ShellExtension to 1.18.7.0
Takashi Sawanaka [Mon, 27 Feb 2023 11:43:43 +0000 (20:43 +0900)]
Update ShellExtension to 1.18.7.0

17 months agoFix issue #1661: Context menu does nothing after pushing "Compare..." on the second...
Takashi Sawanaka [Mon, 27 Feb 2023 00:11:30 +0000 (09:11 +0900)]
Fix issue #1661: Context menu does nothing after pushing "Compare..." on the second file
(https://stackoverflow.com/questions/74226129/why-is-iexplorercommandinvoke-no-longer-being-called)

17 months agoRemove the ability to import line filters for versions prior to version 2.6.x
Takashi Sawanaka [Sun, 26 Feb 2023 05:08:06 +0000 (14:08 +0900)]
Remove the ability to import line filters for versions prior to version 2.6.x

17 months agoUpdate Japanese.isl
Takashi Sawanaka [Fri, 24 Feb 2023 23:45:14 +0000 (08:45 +0900)]
Update Japanese.isl

17 months agoShellExtension (2):
Takashi Sawanaka [Thu, 23 Feb 2023 06:57:02 +0000 (15:57 +0900)]
ShellExtension (2):
- Add Compare As menu item
- Change the &WinMerge menu item to Win&Merge to avoid conflicting with Explorer's Ne&w menu item accelerator key

17 months agoRename *_to_*.bmp to copy_*_to_*.bmp
Takashi Sawanaka [Thu, 23 Feb 2023 04:56:08 +0000 (13:56 +0900)]
Rename *_to_*.bmp to copy_*_to_*.bmp

17 months agoAdd res\move_*_to_*.bmp to Merge.vcxproj
Takashi Sawanaka [Thu, 23 Feb 2023 04:25:43 +0000 (13:25 +0900)]
Add res\move_*_to_*.bmp to Merge.vcxproj

17 months agoUpdate .github/workflows/*.yml (4)
Takashi Sawanaka [Thu, 23 Feb 2023 02:51:18 +0000 (11:51 +0900)]
Update .github/workflows/*.yml (4)

17 months agoUpdate .github/workflows/*.yml (3)
Takashi Sawanaka [Thu, 23 Feb 2023 02:30:22 +0000 (11:30 +0900)]
Update .github/workflows/*.yml (3)

17 months agoUpdate .github/workflows/*.yml (2)
Takashi Sawanaka [Thu, 23 Feb 2023 02:21:35 +0000 (11:21 +0900)]
Update .github/workflows/*.yml (2)

17 months agoUpdate .github/workflows/*.yml
Takashi Sawanaka [Thu, 23 Feb 2023 02:09:21 +0000 (11:09 +0900)]
Update .github/workflows/*.yml

17 months agoImplement issue #1413: "Move" needs options "Left to Right" or "Right… (#1732)
Takashi Sawanaka [Thu, 23 Feb 2023 01:07:12 +0000 (10:07 +0900)]
Implement issue #1413: "Move" needs options "Left to Right" or "Right… (#1732)

17 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 21 Feb 2023 13:42:35 +0000 (22:42 +0900)]
Update TranslationsStatus

(cherry picked from commit ff528c9f9ac55bb754acaf4ce7c0b5cc75a9f635)

17 months agoDirActions.cpp: Fix Left/Right Date and Left/Right Size columns not updating when...
Takashi Sawanaka [Tue, 21 Feb 2023 13:23:29 +0000 (22:23 +0900)]
DirActions.cpp: Fix Left/Right Date and Left/Right Size columns not updating when deleting files one-sided

17 months agoAdd -show-dialog and -show-compare-as-menu command line options (5)
Takashi Sawanaka [Tue, 21 Feb 2023 13:06:38 +0000 (22:06 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (5)

17 months agoBCMenu.cpp: Show "Debug Assertion Failed" message box when the debug version fails...
Takashi Sawanaka [Tue, 21 Feb 2023 12:10:19 +0000 (21:10 +0900)]
BCMenu.cpp: Show "Debug Assertion Failed" message box when the debug version fails to load an image.
(Bitmap images saved with GIMP fail to load)

17 months agoupdate zh-cn translations (#1731)
YIN, Gang [Tue, 21 Feb 2023 11:41:40 +0000 (19:41 +0800)]
update zh-cn translations (#1731)

17 months agoPatch 1 (#1730)
Mr-Update [Mon, 20 Feb 2023 22:52:01 +0000 (23:52 +0100)]
Patch 1 (#1730)

* Update German.po

* Update German.po

17 months agoUpdate of Lithuanian translation (#1729)
Tichij [Mon, 20 Feb 2023 11:42:29 +0000 (13:42 +0200)]
Update of Lithuanian translation (#1729)

17 months agoUpdate Brazilian.po (#1728)
Marcellomco [Mon, 20 Feb 2023 11:42:04 +0000 (08:42 -0300)]
Update Brazilian.po (#1728)

Add translation for "Enable Compare As menu"

17 months agoUpdate Brazilian.po (#1727)
Marcellomco [Mon, 20 Feb 2023 11:41:37 +0000 (08:41 -0300)]
Update Brazilian.po (#1727)

Add translation for "Compare As"

17 months agoAdd -show-dialog and -show-compare-as-menu command line options (4)
Takashi Sawanaka [Sun, 19 Feb 2023 22:28:48 +0000 (07:28 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (4)

17 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 19 Feb 2023 14:16:05 +0000 (23:16 +0900)]
Update TranslationsStatus

17 months agoUpdate Hungarian.po (#1726)
efi99 [Sun, 19 Feb 2023 14:09:43 +0000 (15:09 +0100)]
Update Hungarian.po (#1726)

17 months agoUpdate Hungarian.po (#1725)
efi99 [Sun, 19 Feb 2023 14:09:17 +0000 (15:09 +0100)]
Update Hungarian.po (#1725)

17 months agoFix issue #1715: Plugin IgnoreLeadingLineNumbers hangs
Takashi Sawanaka [Sun, 19 Feb 2023 13:38:21 +0000 (22:38 +0900)]
Fix issue #1715: Plugin IgnoreLeadingLineNumbers hangs

17 months agoAdd -show-dialog and -show-compare-as-menu command line options (3)
Takashi Sawanaka [Sun, 19 Feb 2023 13:03:44 +0000 (22:03 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (3)

17 months agorefactor
Takashi Sawanaka [Sun, 19 Feb 2023 12:11:26 +0000 (21:11 +0900)]
refactor

17 months agoFix Code scanning alert: Unused local variable (2)
Takashi Sawanaka [Sun, 19 Feb 2023 07:36:44 +0000 (16:36 +0900)]
Fix Code scanning alert: Unused local variable (2)

17 months agoFix Code scanning alert: Multiplication result converted to larger type
Takashi Sawanaka [Sun, 19 Feb 2023 07:28:05 +0000 (16:28 +0900)]
Fix Code scanning alert: Multiplication result converted to larger type

17 months agoFix Code scanning alert: Unsigned comparison to zero
Takashi Sawanaka [Sun, 19 Feb 2023 07:27:41 +0000 (16:27 +0900)]
Fix Code scanning alert: Unsigned comparison to zero

17 months agoFix Code scanning alert: Unused local variable
Takashi Sawanaka [Sun, 19 Feb 2023 07:27:24 +0000 (16:27 +0900)]
Fix Code scanning alert: Unused local variable

17 months agoUpdate ShellExtension to 1.18.6.0
Takashi Sawanaka [Sun, 19 Feb 2023 04:08:18 +0000 (13:08 +0900)]
Update ShellExtension to 1.18.6.0

17 months agoWinMergeContextMenu: Bump revision to 1.0.6.0
Takashi Sawanaka [Sun, 19 Feb 2023 04:02:34 +0000 (13:02 +0900)]
WinMergeContextMenu: Bump revision to 1.0.6.0

17 months agoShellExtension: Fix failure to sign ShellExtensionU.dll
Takashi Sawanaka [Sun, 19 Feb 2023 03:57:50 +0000 (12:57 +0900)]
ShellExtension: Fix failure to sign ShellExtensionU.dll

17 months agoShellExtension:
Takashi Sawanaka [Sun, 19 Feb 2023 03:28:45 +0000 (12:28 +0900)]
ShellExtension:
- Add Compare As menu item
- Change the &WinMerge menu item to Win&Merge to avoid conflicting with Explorer's Ne&w menu item accelerator key

17 months agoAdd -show-dialog and -show-compare-as-menu command line options (2)
Takashi Sawanaka [Sun, 19 Feb 2023 01:10:31 +0000 (10:10 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (2)

17 months agoReadMe-Corsican.txt: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Sat, 18 Feb 2023 23:30:40 +0000 (08:30 +0900)]
ReadMe-Corsican.txt: Change the file encoding from UTF-8 to CP-1252

17 months agoUpdate ReadMe-Corsican.txt for 2.16.28 (#1723)
Patriccollu [Sat, 18 Feb 2023 23:18:00 +0000 (00:18 +0100)]
Update ReadMe-Corsican.txt for 2.16.28 (#1723)

17 months agoAdd -show-dialog and -show-compare-as-menu command line options
Takashi Sawanaka [Sat, 18 Feb 2023 14:49:24 +0000 (23:49 +0900)]
Add -show-dialog and -show-compare-as-menu command line options

17 months agoupdate zh-cn translation of Readme.txt (#1722)
YIN, Gang [Sat, 18 Feb 2023 13:40:36 +0000 (21:40 +0800)]
update zh-cn translation of Readme.txt (#1722)

17 months agoReadMe-ChineseSimplified.txt: Change the file encoding from UTF-8 to CP-936
Takashi Sawanaka [Sat, 18 Feb 2023 12:02:57 +0000 (21:02 +0900)]
ReadMe-ChineseSimplified.txt: Change the file encoding from UTF-8 to CP-936

17 months agoRemove unused resource IDs
Takashi Sawanaka [Sat, 18 Feb 2023 12:00:38 +0000 (21:00 +0900)]
Remove unused resource IDs

17 months agoUpdate ReadMe.txt
Takashi Sawanaka [Sat, 18 Feb 2023 11:58:53 +0000 (20:58 +0900)]
Update ReadMe.txt

17 months agoupdate zh-cn translation of Readme.txt (#1719)
YIN, Gang [Sat, 18 Feb 2023 11:54:16 +0000 (19:54 +0800)]
update zh-cn translation of Readme.txt (#1719)

17 months agoTry again to fix issue #1646, #1644: Filtering qualified files
Takashi Sawanaka [Thu, 16 Feb 2023 13:52:12 +0000 (22:52 +0900)]
Try again to fix issue #1646, #1644: Filtering qualified files

17 months agoKorean.isl: Change the file encoding from UTF-8 to CP-949
Takashi Sawanaka [Wed, 15 Feb 2023 15:37:17 +0000 (00:37 +0900)]
Korean.isl: Change the file encoding from UTF-8 to CP-949

17 months agoUpdate Korean.isl (#1718)
VenusGirl❤ [Wed, 15 Feb 2023 15:34:07 +0000 (00:34 +0900)]
Update Korean.isl (#1718)

17 months agoCorsican.isl: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Wed, 15 Feb 2023 15:30:39 +0000 (00:30 +0900)]
Corsican.isl: Change the file encoding from UTF-8 to CP-1252

17 months agoUpdate Corsican translation for 2.16.28 (#1717)
Patriccollu [Wed, 15 Feb 2023 15:27:18 +0000 (16:27 +0100)]
Update Corsican translation for 2.16.28 (#1717)

17 months agoBrazillian.isl: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Wed, 15 Feb 2023 12:22:28 +0000 (21:22 +0900)]
Brazillian.isl: Change the file encoding from UTF-8 to CP-1252

17 months agoupdate zh-cn translation of InnoSetup (#1714)
YIN, Gang [Wed, 15 Feb 2023 11:49:45 +0000 (19:49 +0800)]
update zh-cn translation of InnoSetup (#1714)

17 months agoUpdate Brazilian.isl (#1713)
Marcellomco [Wed, 15 Feb 2023 11:47:59 +0000 (08:47 -0300)]
Update Brazilian.isl (#1713)

Added translation for "Installer: Rename the ShellExtension*.dll file names before installin…"

17 months agoInstaller: Rename the ShellExtension*.dll file names before installing to avoid insta...
Takashi Sawanaka [Tue, 14 Feb 2023 16:58:49 +0000 (01:58 +0900)]
Installer: Rename the ShellExtension*.dll file names before installing to avoid installation failures when Explorer is using ShellExtension*.dll

17 months agoAdd Testing/Data/Compare/Dir*/.svn/test
Takashi Sawanaka [Tue, 14 Feb 2023 16:50:23 +0000 (01:50 +0900)]
Add Testing/Data/Compare/Dir*/.svn/test

17 months agoUpdate ChangeLog&ReaseNotes (2)
Takashi Sawanaka [Tue, 14 Feb 2023 16:38:41 +0000 (01:38 +0900)]
Update ChangeLog&ReaseNotes (2)

17 months agoMerge branch 'stable'
Takashi Sawanaka [Tue, 14 Feb 2023 16:36:02 +0000 (01:36 +0900)]
Merge branch 'stable'

17 months agoBump revision to 2.16.28
Takashi Sawanaka [Tue, 14 Feb 2023 14:40:05 +0000 (23:40 +0900)]
Bump revision to 2.16.28

17 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Tue, 14 Feb 2023 14:39:49 +0000 (23:39 +0900)]
Update ChangeLog&ReleaseNotes

17 months agoRevert "Fix issue #1646, #1644: Filtering qualified files"
Takashi Sawanaka [Tue, 14 Feb 2023 14:09:03 +0000 (23:09 +0900)]
Revert "Fix issue #1646, #1644: Filtering qualified files"

This reverts commit 96fd846ca51fc6b339ce27f89d59f547a691ca00.

17 months agoRevert "Fix issue #1646, #1644: Filtering qualified files (2)"
Takashi Sawanaka [Tue, 14 Feb 2023 14:08:48 +0000 (23:08 +0900)]
Revert "Fix issue #1646, #1644: Filtering qualified files (2)"

This reverts commit 07ddaffeeeb245c308eedfc2dffcca6f989a409e.

17 months agoFix an issue where the following messages are not translated. (#1712)
Jun Tajima [Sun, 12 Feb 2023 04:07:26 +0000 (13:07 +0900)]
Fix an issue where the following messages are not translated. (#1712)

- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters folder:\n%2."
- "Left side file version, only for some file types."
- "Right side file version, only for some file types."
- "Middle side file version, only for some file types."

17 months agoShellExtension: Fix the problem that the WinMerge menu does not appear when right...
Takashi Sawanaka [Sat, 11 Feb 2023 12:43:23 +0000 (21:43 +0900)]
ShellExtension: Fix the problem that the WinMerge menu does not appear when right-clicking on a non-item area in Explorer. (3)

17 months agoShellExtension: Fix the problem that the WinMerge menu does not appear when right...
Takashi Sawanaka [Sat, 11 Feb 2023 03:09:01 +0000 (12:09 +0900)]
ShellExtension: Fix the problem that the WinMerge menu does not appear when right-clicking on a non-item area in Explorer. (2)

17 months agoShellExtension: Fix the problem that the WinMerge menu does not appear when right...
Takashi Sawanaka [Sat, 11 Feb 2023 03:06:09 +0000 (12:06 +0900)]
ShellExtension: Fix the problem that the WinMerge menu does not appear when right-clicking on a non-item area in Explorer.

17 months agoUpdate winwebdiff to 1.0.6 (2)
Takashi Sawanaka [Sat, 11 Feb 2023 03:03:57 +0000 (12:03 +0900)]
Update winwebdiff to 1.0.6 (2)

17 months agoUpdate winwebdiff to 1.0.6
Takashi Sawanaka [Sat, 11 Feb 2023 00:47:21 +0000 (09:47 +0900)]
Update winwebdiff to 1.0.6

17 months agoImage Compare: Fix issue preventing saving image comparison reports to a network...
Takashi Sawanaka [Fri, 10 Feb 2023 13:37:56 +0000 (22:37 +0900)]
Image Compare: Fix issue preventing saving image comparison reports to a network share

17 months agoUpdate TranslationsStatus
Takashi Sawanaka [Fri, 10 Feb 2023 12:15:50 +0000 (21:15 +0900)]
Update TranslationsStatus

17 months agoBrazilian.isl: Change the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Fri, 10 Feb 2023 12:15:20 +0000 (21:15 +0900)]
Brazilian.isl: Change the file encoding from UTF-8 to CP-1252

17 months ago Installer: Update Brazilian.isl (#1711)
Marcellomco [Fri, 10 Feb 2023 12:10:59 +0000 (09:10 -0300)]
 Installer: Update Brazilian.isl (#1711)

Added translation for Corsican language option and corrected "DeletePreviousStartMenu" entry, there were two percent signs missing.

17 months agoUpdate Russian.po (#1710)
wvxwxvw [Thu, 9 Feb 2023 22:19:51 +0000 (01:19 +0300)]
Update Russian.po (#1710)

17 months agoFix issue #1706 Alarmingly bad swedish translations (#1707)
T. Almroth [Thu, 9 Feb 2023 00:12:00 +0000 (01:12 +0100)]
Fix issue #1706 Alarmingly bad swedish translations (#1707)

* Fix issue #1706 Alarmingly bad swedish translations

* Polish swedish translations

17 months agoInstaller: Change Frhed, WinIMerge, WinWebDiff and ArchiveSupport components to Core...
Takashi Sawanaka [Sun, 5 Feb 2023 04:55:33 +0000 (13:55 +0900)]
Installer: Change Frhed, WinIMerge, WinWebDiff and ArchiveSupport components to Core components.
Change Commands(GnuWin32 Patch for Windows/HTML Tidy/jq/md4c) component to Plugins component.
(#1698)

17 months agoWebpage Compare: Fix missing file path in header bar
Takashi Sawanaka [Sat, 4 Feb 2023 23:19:48 +0000 (08:19 +0900)]
Webpage Compare: Fix missing file path in header bar

17 months agoFix issue #1696: 3-way compare does not properly align identical lines when resolving...
Takashi Sawanaka [Sat, 4 Feb 2023 14:25:57 +0000 (23:25 +0900)]
Fix issue #1696: 3-way compare does not properly align identical lines when resolving conflicts, and show false highlights

17 months ago- Fix issue winmerge/frhed#13
Takashi Sawanaka [Sat, 4 Feb 2023 01:24:17 +0000 (10:24 +0900)]
- Fix issue winmerge/frhed#13
- Update frhed to 0.10904.2017.12

18 months agoChange file encoding from UTF-8 to CP-949 (#1694)
Takashi Sawanaka [Sat, 28 Jan 2023 23:58:00 +0000 (08:58 +0900)]
Change file encoding from UTF-8 to CP-949 (#1694)

18 months agoUpdate Korean.isl (#1694)
VenusGirl❤ [Sat, 28 Jan 2023 23:41:01 +0000 (08:41 +0900)]
Update Korean.isl (#1694)

* Update Korean.isl

* Update Korean.isl

18 months agoFix an issue where specifying a file and the PreviewMarkdown plugin in the Select...
Takashi Sawanaka [Fri, 27 Jan 2023 15:36:15 +0000 (00:36 +0900)]
Fix an issue where specifying a file and the PreviewMarkdown plugin in the Select Files or Folders window would not open the file in the Webpage Compare window.

18 months agoChange file encoding from UTF-8 to CP-949 due to installer limitations (#1692, #1693)
Takashi Sawanaka [Fri, 27 Jan 2023 13:09:55 +0000 (22:09 +0900)]
Change file encoding from UTF-8 to CP-949 due to installer limitations (#1692, #1693)

18 months agoUpdate Korean.isl (#1693)
VenusGirl❤ [Fri, 27 Jan 2023 12:50:18 +0000 (21:50 +0900)]
Update Korean.isl (#1693)

18 months agoUpdate ReadMe-Korean.txt (#1692)
VenusGirl❤ [Fri, 27 Jan 2023 12:49:26 +0000 (21:49 +0900)]
Update ReadMe-Korean.txt (#1692)

18 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 26 Jan 2023 22:47:30 +0000 (07:47 +0900)]
Update TranslationsStatus

18 months agoUpdate Contributors.txt
Takashi Sawanaka [Thu, 26 Jan 2023 22:46:39 +0000 (07:46 +0900)]
Update Contributors.txt

18 months agoUpdate Korean.po (#1690)
VenusGirl❤ [Thu, 26 Jan 2023 22:44:09 +0000 (07:44 +0900)]
Update Korean.po (#1690)

18 months agoUpdate Korean.po (#1689)
VenusGirl❤ [Thu, 26 Jan 2023 22:43:39 +0000 (07:43 +0900)]
Update Korean.po (#1689)

18 months agoBump revision to 2.16.26
Takashi Sawanaka [Thu, 26 Jan 2023 12:48:02 +0000 (21:48 +0900)]
Bump revision to 2.16.26

18 months agoShow/hide the directory with the following menu items in the folder compare window...
Takashi Sawanaka [Wed, 25 Jan 2023 14:42:35 +0000 (23:42 +0900)]
Show/hide the directory with the following menu items in the folder compare window. (2)
- "View" > "3-way Compare" > "Show Left Only Different Items"
- "View" > "3-way Compare" > "Show Middle Only Different Items"
- "View" > "3-way Compare" > "Show Right Only Different Items"