OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoWinMergeContextMenu: Fix the problem that the WinMerge icon is not correctly displaye...
Takashi Sawanaka [Mon, 23 May 2022 12:52:31 +0000 (21:52 +0900)]
WinMergeContextMenu: Fix the problem that the WinMerge icon is not correctly displayed on the taskbar when WinMerge is started from the Windows 11 context menu.

I referred to the following URL

- https://gitlab.com/tortoisegit/tortoisegit/-/merge_requests/187
- https://devblogs.microsoft.com/oldnewthing/20131118-00/?p=2643
- https://devblogs.microsoft.com/oldnewthing/20130318-00/?p=4933

2 years agoWinMergeContextMenu: Fix an issue where the WinMerge menu displayed in the "Show...
Takashi Sawanaka [Mon, 23 May 2022 12:45:54 +0000 (21:45 +0900)]
WinMergeContextMenu: Fix an issue where the WinMerge menu displayed in the "Show more options" menu of the Windows 11 Explorer context menu is not an advanced menu, even though the advanced menu is enabled.

2 years agoCall Windows 7 or later API functions directly since WinMerge 64-bit version only...
Takashi Sawanaka [Sun, 22 May 2022 12:30:16 +0000 (21:30 +0900)]
Call Windows 7 or later API functions directly since WinMerge 64-bit version only works with Windows 7 or later,

2 years agoUndo accidentally committed file
Takashi Sawanaka [Sun, 22 May 2022 12:24:55 +0000 (21:24 +0900)]
Undo accidentally committed file

2 years agoIssue #1340: Request for updating code: a new language(ABAP) in "syntax highlighting...
Takashi Sawanaka [Sun, 22 May 2022 12:10:59 +0000 (21:10 +0900)]
Issue #1340: Request for updating code: a new language(ABAP) in "syntax highlighting"   Submitted by yuanshouyan1823

2 years agoUpdate .gitignore
Takashi Sawanaka [Sun, 22 May 2022 01:53:31 +0000 (10:53 +0900)]
Update .gitignore

2 years agoUpdate winimerge to 1.0.34 (2)
Takashi Sawanaka [Sun, 22 May 2022 01:43:22 +0000 (10:43 +0900)]
Update winimerge to 1.0.34 (2)

2 years agoUpdate winwebdiff to 1.0.3
Takashi Sawanaka [Sun, 22 May 2022 01:42:57 +0000 (10:42 +0900)]
Update winwebdiff to 1.0.3

2 years agoFix issue #1312: In windows 11 i have error 78 sidebyside with the winmerge manifest
Takashi Sawanaka [Sat, 21 May 2022 15:16:07 +0000 (00:16 +0900)]
Fix issue #1312: In windows 11 i have error 78 sidebyside with the winmerge manifest

2 years agoUpdate TranslationsStatus format for Corsican (#1347) (2)
Takashi Sawanaka [Sat, 21 May 2022 14:28:14 +0000 (23:28 +0900)]
Update TranslationsStatus format for Corsican (#1347) (2)

2 years agoUpdate TranslationsStatus format for Corsican (#1347)
Patriccollu [Sat, 21 May 2022 14:21:10 +0000 (16:21 +0200)]
Update TranslationsStatus format for Corsican (#1347)

2 years agoFix issue #1326: Backup files: Misleading error message when file cannot be written
Takashi Sawanaka [Sat, 21 May 2022 13:37:26 +0000 (22:37 +0900)]
Fix issue  #1326: Backup files: Misleading error message when file cannot be written

2 years ago- Image compare: Make patience and histogram diff algorithm selectable.
Takashi Sawanaka [Sat, 21 May 2022 06:19:41 +0000 (15:19 +0900)]
- Image compare: Make patience and histogram diff algorithm selectable.
- Update winimerge to 1.0.34

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 21 May 2022 06:16:42 +0000 (15:16 +0900)]
Update TranslationsStatus

2 years agoUpdate Portuguese translation (#1345)
Hugo Carvalho [Fri, 20 May 2022 22:32:40 +0000 (23:32 +0100)]
Update Portuguese translation (#1345)

2 years agoFix report generation process. (#1344)
Jun Tajima [Fri, 20 May 2022 15:34:31 +0000 (00:34 +0900)]
Fix report generation process. (#1344)

- The string with the hyperlink to the file comparie report is now replaced with the HTML entity, when generating an HTML-style folder compare report with the "Include File Compare Report" option enabled.

2 years agoFix typo: GPL (#1342)
stonee-K [Fri, 20 May 2022 00:10:18 +0000 (09:10 +0900)]
Fix typo: GPL (#1342)

* Fix typo: GPL

Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".

* Fix typo: GPL

Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".

2 years agoUpdate Japanese.po (Codepage dialog) (#1338)
stonee-K [Mon, 16 May 2022 11:19:23 +0000 (20:19 +0900)]
Update Japanese.po (Codepage dialog) (#1338)

"both" means loading and saving, not left pane and right pane.

2 years agoFix issue #1335: Alt/Shift key highlighting issue not resetting start point from...
Takashi Sawanaka [Mon, 16 May 2022 00:11:19 +0000 (09:11 +0900)]
Fix issue  #1335: Alt/Shift key highlighting issue not resetting start point from move.

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Sat, 14 May 2022 14:18:44 +0000 (23:18 +0900)]
Update Contributors.txt

2 years agoFix issue #1334: Copy left/right different behavior
Takashi Sawanaka [Sat, 14 May 2022 14:10:58 +0000 (23:10 +0900)]
Fix issue #1334: Copy left/right different behavior

2 years agoModify "Tools - Generate Report" (Add column width definition to html output) (#1333...
Takashi Sawanaka [Sat, 14 May 2022 01:33:54 +0000 (10:33 +0900)]
Modify "Tools - Generate Report" (Add column width definition to html output) (#1333) (2)

2 years agoFolderCompare: Make the sort order of file names including numbers the same as Explor...
Takashi Sawanaka [Sat, 14 May 2022 01:04:25 +0000 (10:04 +0900)]
FolderCompare: Make the sort order of file names including numbers the same as Explorer. (osdn.net #44557) (2)

2 years agoModify "Tools - Generate Report" (Add column width definition to html output) (#1333)
stonee-K [Fri, 13 May 2022 12:07:26 +0000 (21:07 +0900)]
Modify "Tools - Generate Report" (Add column width definition to html output) (#1333)

* Modify column width definition at "GenerateReport"

* Modify column width definition at "GenerateReport"

2 years agoFolderCompare: Make the sort order of file names including numbers the same as Explor...
Takashi Sawanaka [Wed, 11 May 2022 11:40:13 +0000 (20:40 +0900)]
FolderCompare: Make the sort order of file names including numbers the same as Explorer. (osdn.net #44557)

e.g.)
befere:
     file1.txt
     file100.txt
     file2.txt
after: ↓
     file1.txt
     file2.txt
     file100.txt

2 years agoUpdate TrnaslationsStatus
Takashi Sawanaka [Wed, 11 May 2022 11:36:29 +0000 (20:36 +0900)]
Update TrnaslationsStatus

2 years agoUpdate Turkish.po
Takashi Sawanaka [Wed, 11 May 2022 11:36:05 +0000 (20:36 +0900)]
Update Turkish.po

2 years agoTurkish translation update (#1332)
Kaya Zeren [Wed, 11 May 2022 03:18:19 +0000 (06:18 +0300)]
Turkish translation update (#1332)

* Turkish language update 2.16.19 Beta

Turkish language update 2.16.19 Beta

* Turkish translation update

Turkish translation update

2 years agoUpdate Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Mon, 9 May 2022 22:07:47 +0000 (07:07 +0900)]
Update Slovenian.po. Submitted by JadranR

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 9 May 2022 13:45:33 +0000 (22:45 +0900)]
Update TranslationsStatus

2 years agoLocationView: Enable mouse wheel scrolling on the location pane.
Takashi Sawanaka [Mon, 9 May 2022 13:38:13 +0000 (22:38 +0900)]
LocationView: Enable mouse wheel scrolling on the location pane.

2 years agoSelect Plugin dialog: Fix a problem where the "Open files in the same window type...
Takashi Sawanaka [Mon, 9 May 2022 13:31:54 +0000 (22:31 +0900)]
Select Plugin dialog: Fix a problem where the "Open files in the same window type after unpacking" checkbox was checked, but the checkbox was not checked the next time the dialog was opened.

2 years agoFix osdn.net ticket #44522: CompareMSExcelFiles Plugins do not compare folders when...
Takashi Sawanaka [Mon, 9 May 2022 13:25:20 +0000 (22:25 +0900)]
Fix osdn.net ticket #44522: CompareMSExcelFiles Plugins do not compare folders when opening .xlsx files from Plugins-> Edit with Unpacker menu item even though the "Extract workbook data to multiple files" option is enabled in the plugin settings

2 years agoUpdate Corsican translation for first 2 commits in May (#1331)
Patriccollu [Sun, 8 May 2022 14:37:39 +0000 (16:37 +0200)]
Update Corsican translation for first 2 commits in May (#1331)

2 years agoupdate ChineseSimplified.po (#1330)
CharlesMengCA [Sat, 7 May 2022 23:56:58 +0000 (19:56 -0400)]
update ChineseSimplified.po (#1330)

2 years agoUpdate German.po (#1329)
Mr-Update [Sat, 7 May 2022 14:05:11 +0000 (16:05 +0200)]
Update German.po (#1329)

2 years agoUpdate of Lithuanian translation (#1327)
Tichij [Fri, 6 May 2022 08:53:58 +0000 (11:53 +0300)]
Update of Lithuanian translation (#1327)

2 years agoDirActions.cpp: Fix Code scanning alerts: Complex condition
Takashi Sawanaka [Thu, 5 May 2022 14:48:59 +0000 (23:48 +0900)]
DirActions.cpp: Fix Code scanning alerts: Complex condition

2 years agoUpdate Hungarian.po (#1325)
efi99 [Thu, 5 May 2022 14:34:13 +0000 (16:34 +0200)]
Update Hungarian.po (#1325)

2 years agoFix report generation process. (#1324)
Jun Tajima [Thu, 5 May 2022 09:48:53 +0000 (18:48 +0900)]
Fix report generation process. (#1324)

- Fix an issue where the middle directory is not output in the title of the directory compare report for three directories.

2 years agoAdd "none" diff algorithm
Takashi Sawanaka [Wed, 4 May 2022 23:13:37 +0000 (08:13 +0900)]
Add "none" diff algorithm

2 years agoUpdate Polish.po (#1323)
Mirosław Żylewicz [Tue, 3 May 2022 14:22:56 +0000 (16:22 +0200)]
Update Polish.po (#1323)

2 years agoFix an issue where WinMerge crashes depending on the filename when generating a file...
Jun Tajima [Mon, 2 May 2022 10:57:21 +0000 (19:57 +0900)]
Fix an issue where WinMerge crashes depending on the filename when generating a file compare report. (#1319)

- Fix to properly resize the buffer of the replaced character string in the process of replacing the special characters contained in the file name with the HTML entities.

2 years agoUpdate of Lithuanian translation (#1318)
Tichij [Sun, 1 May 2022 08:00:13 +0000 (11:00 +0300)]
Update of Lithuanian translation (#1318)

2 years agoUpdate Portuguese.po (#1317)
Hugo Carvalho [Sat, 30 Apr 2022 22:55:05 +0000 (23:55 +0100)]
Update Portuguese.po (#1317)

2 years agoUpdate Japanese.po, Readme nad Manual. Submitted by Rukoto Luther
Rukoto Luther [Fri, 29 Apr 2022 08:37:13 +0000 (17:37 +0900)]
Update Japanese.po, Readme nad Manual. Submitted by Rukoto Luther

2 years agoFix issue #1308: Sugg: Increase the dialogue for Pluginns
Takashi Sawanaka [Fri, 29 Apr 2022 08:11:44 +0000 (17:11 +0900)]
Fix issue #1308: Sugg: Increase the dialogue for Pluginns

2 years agoFix typo in BCMenu.cpp (#1313)
Ikko Ashimine [Thu, 28 Apr 2022 22:53:16 +0000 (07:53 +0900)]
Fix typo in BCMenu.cpp (#1313)

adress -> address

2 years agoUpdate German.po (#1311)
Mr-Update [Wed, 27 Apr 2022 23:16:43 +0000 (01:16 +0200)]
Update German.po (#1311)

2 years agoUpdate Russian.po (2)
Takashi Sawanaka [Wed, 27 Apr 2022 14:03:32 +0000 (23:03 +0900)]
Update Russian.po (2)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 27 Apr 2022 14:00:43 +0000 (23:00 +0900)]
Update TranslationsStatus

2 years agoUpdate Russian.po
Takashi Sawanaka [Wed, 27 Apr 2022 13:59:30 +0000 (22:59 +0900)]
Update Russian.po

2 years agoUpdate Russian.po (#1310)
wvxwxvw [Wed, 27 Apr 2022 13:46:23 +0000 (16:46 +0300)]
Update Russian.po (#1310)

2 years agoUpdate ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Tue, 26 Apr 2022 23:59:37 +0000 (08:59 +0900)]
Update ChangeLog&ReleaseNotes (4)

2 years agoWebPageDiffFrm.cpp: Define BCN_DROPDOWN if BCN_DROPDOWN is not defined
Takashi Sawanaka [Tue, 26 Apr 2022 22:57:29 +0000 (07:57 +0900)]
WebPageDiffFrm.cpp: Define BCN_DROPDOWN if BCN_DROPDOWN is not defined

2 years agoDelete the WinWebDiff* project in ALL.vs2017.sln, as WinWebDiff* cannot be built...
Takashi Sawanaka [Tue, 26 Apr 2022 22:54:41 +0000 (07:54 +0900)]
Delete the WinWebDiff* project in ALL.vs2017.sln, as WinWebDiff* cannot be built in VS2017.

2 years agoUpdate Hungarian.po
Takashi Sawanaka [Tue, 26 Apr 2022 15:27:42 +0000 (00:27 +0900)]
Update Hungarian.po

2 years agoBump revsion to 2.16.20
Takashi Sawanaka [Tue, 26 Apr 2022 15:08:09 +0000 (00:08 +0900)]
Bump revsion to 2.16.20

2 years agoUpdate winimerge
Takashi Sawanaka [Tue, 26 Apr 2022 15:06:21 +0000 (00:06 +0900)]
Update winimerge

2 years agoUpdate winwebdiff to 1.0.2
Takashi Sawanaka [Tue, 26 Apr 2022 14:44:31 +0000 (23:44 +0900)]
Update winwebdiff to 1.0.2

2 years agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Tue, 26 Apr 2022 13:45:56 +0000 (22:45 +0900)]
Update ChangeLog&ReleaseNotes (3)

2 years agoManual: Bump revision to 1.7.4
Takashi Sawanaka [Tue, 26 Apr 2022 13:36:09 +0000 (22:36 +0900)]
Manual: Bump revision to 1.7.4

2 years agoFix issue #1309: Help file: Small issue for plugins
Takashi Sawanaka [Tue, 26 Apr 2022 13:32:50 +0000 (22:32 +0900)]
Fix issue #1309: Help file: Small issue for plugins

2 years agoUpdate Corsican translation (2nd) for 2.16.20 (#1307)
Patriccollu [Tue, 26 Apr 2022 12:46:48 +0000 (14:46 +0200)]
Update Corsican translation (2nd) for 2.16.20 (#1307)

2 years agoUpdate Tests
Takashi Sawanaka [Tue, 26 Apr 2022 12:45:45 +0000 (21:45 +0900)]
Update Tests

2 years agoWebPageDiffFrm.cpp: Fix WebPageDiffBar not updating after checking Webpage -> Size...
Takashi Sawanaka [Tue, 26 Apr 2022 12:09:35 +0000 (21:09 +0900)]
WebPageDiffFrm.cpp: Fix WebPageDiffBar not updating after checking Webpage -> Size -> Fit to Window menu item, etc.

2 years agoManual: Add "/t Webpage" option
Takashi Sawanaka [Tue, 26 Apr 2022 12:01:51 +0000 (21:01 +0900)]
Manual: Add "/t Webpage" option

2 years agoAdd Testing/Data/Compare/Dir*/Case*.txt files
Takashi Sawanaka [Tue, 26 Apr 2022 11:56:34 +0000 (20:56 +0900)]
Add Testing/Data/Compare/Dir*/Case*.txt files

2 years agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Mon, 25 Apr 2022 23:32:29 +0000 (08:32 +0900)]
Update ChangeLog&ReleaseNotes (2)

2 years agoUpdate frhed to 0.10904.2017.10
Takashi Sawanaka [Mon, 25 Apr 2022 23:29:13 +0000 (08:29 +0900)]
Update frhed to 0.10904.2017.10

2 years agoUpdate Hungarian.po (#1306)
efi99 [Mon, 25 Apr 2022 23:01:09 +0000 (01:01 +0200)]
Update Hungarian.po (#1306)

2 years agoUpdate Corsican translation for 2.16.20 (#1305)
Patriccollu [Mon, 25 Apr 2022 22:59:28 +0000 (00:59 +0200)]
Update Corsican translation for 2.16.20 (#1305)

* Update Corsican translation for 2.16.20

* Update Corsican.isl translation for 2.16.20

2 years agoUpdate winwebdiff to 1.0.1
Takashi Sawanaka [Mon, 25 Apr 2022 15:16:31 +0000 (00:16 +0900)]
Update winwebdiff to 1.0.1

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Mon, 25 Apr 2022 14:57:26 +0000 (23:57 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoCode refactor with C++17 features replace optimize create smart pointers (#1304)
Herman Semenov [Mon, 25 Apr 2022 13:19:38 +0000 (16:19 +0300)]
Code refactor with C++17 features replace optimize create smart pointers (#1304)

2 years agoTranslations/InnoSetup: Fix broken *.isl files
Takashi Sawanaka [Sun, 24 Apr 2022 16:05:36 +0000 (01:05 +0900)]
Translations/InnoSetup: Fix broken *.isl files

2 years agoWebpage Compare [EXPERIMENTAL] (#1182)
Takashi Sawanaka [Sun, 24 Apr 2022 14:28:57 +0000 (23:28 +0900)]
Webpage Compare [EXPERIMENTAL] (#1182)

2 years agoFix an issue where items with different case are not displayed correctly in the folde...
Jun Tajima [Sat, 23 Apr 2022 23:06:17 +0000 (08:06 +0900)]
Fix an issue where items with different case are not displayed correctly in the folder compare window when comparing three directories. (#1299)

2 years agoFix issue #1281 a): New filter (F) display
Takashi Sawanaka [Sat, 23 Apr 2022 02:50:18 +0000 (11:50 +0900)]
Fix issue #1281 a): New filter (F) display

2 years agoPrettifyHTML plugin: Add "--tidy-mark no" option
Takashi Sawanaka [Sat, 23 Apr 2022 01:59:12 +0000 (10:59 +0900)]
PrettifyHTML plugin: Add "--tidy-mark no" option

2 years agoImage Compare: Fix the problem that the next pane is not activated by pressing F6...
Takashi Sawanaka [Fri, 22 Apr 2022 12:43:03 +0000 (21:43 +0900)]
Image Compare: Fix the problem that the next pane is not activated by pressing F6 key.

2 years agoReduce unnecessary copying
Takashi Sawanaka [Fri, 22 Apr 2022 12:36:45 +0000 (21:36 +0900)]
Reduce unnecessary copying

2 years agoosdn.net ticket #44417: Fix an issue where the caret would not display in the correct...
Takashi Sawanaka [Mon, 18 Apr 2022 14:41:42 +0000 (23:41 +0900)]
osdn.net ticket #44417: Fix an issue where the caret would not display in the correct position on lines containing tab characters under the following conditions:
- The "View Whitespace" menu is checked.
- HackGen font is used.

2 years agoMDITabBar.cpp: Avoid displaying the "Encountered an improper argument" message if...
Takashi Sawanaka [Sat, 16 Apr 2022 14:00:20 +0000 (23:00 +0900)]
MDITabBar.cpp: Avoid displaying the "Encountered an improper argument" message if the tooltip string length is too long

2 years agoLimit Recent Files or Folders menu string length to 128 characters or less
Takashi Sawanaka [Sat, 16 Apr 2022 01:45:33 +0000 (10:45 +0900)]
Limit Recent Files or Folders menu string length to 128 characters or less

2 years agoFix link errors occurring in Windows 10 SDK version 10.0.19041.0 and lower
Takashi Sawanaka [Sat, 16 Apr 2022 00:45:18 +0000 (09:45 +0900)]
Fix link errors occurring in Windows 10 SDK version 10.0.19041.0 and lower

2 years agoFrench translation update (#1294)
slolo2000 [Wed, 13 Apr 2022 11:34:46 +0000 (13:34 +0200)]
French translation update (#1294)

2 years agoGalician translation update (#1292)
LMS [Sun, 10 Apr 2022 16:13:45 +0000 (18:13 +0200)]
Galician translation update (#1292)

2 years agoUpdate Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Thu, 7 Apr 2022 22:27:31 +0000 (07:27 +0900)]
Update Slovenian.po. Submitted by JadranR

2 years agoUpdate Polish.po (#1288)
Mirosław Żylewicz [Thu, 7 Apr 2022 00:13:43 +0000 (02:13 +0200)]
Update Polish.po (#1288)

2 years agoUpdate Polish.po (#1287)
Mirosław Żylewicz [Thu, 7 Apr 2022 00:12:47 +0000 (02:12 +0200)]
Update Polish.po (#1287)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 3 Apr 2022 01:29:02 +0000 (10:29 +0900)]
Update TranslationsStatus

2 years agoUpdate Merge.rc
Takashi Sawanaka [Sun, 3 Apr 2022 01:28:41 +0000 (10:28 +0900)]
Update Merge.rc

2 years agoCompareMSExcelFiles.sct: Fix #1279: Date formats interpreted inconsistently
Takashi Sawanaka [Fri, 1 Apr 2022 13:22:02 +0000 (22:22 +0900)]
CompareMSExcelFiles.sct: Fix #1279: Date formats interpreted inconsistently

2 years agoFix issue #1265: Allow resizing Options dialog box in both directions (2)
Takashi Sawanaka [Thu, 31 Mar 2022 12:18:59 +0000 (21:18 +0900)]
Fix issue #1265: Allow resizing Options dialog box in both directions (2)

2 years agoImprovements Japanese (#10)
Rukoto Luther [Thu, 31 Mar 2022 11:48:32 +0000 (20:48 +0900)]
Improvements Japanese (#10)

* Update Japanese.po

* Update Shortcut_keys.xml

(cherry picked from commit 22fb60800b3ade15878a1cf114dbf7959c5c2fa0)

2 years agoFix issue #1265: Allow resizing Options dialog box in both directions
Takashi Sawanaka [Wed, 30 Mar 2022 13:37:33 +0000 (22:37 +0900)]
Fix issue #1265: Allow resizing Options dialog box in both directions

2 years agoReplace plugin: When regular expression substitution is performed with the -e option...
Takashi Sawanaka [Wed, 30 Mar 2022 12:07:15 +0000 (21:07 +0900)]
Replace plugin: When regular expression substitution is performed with the -e option, \r and \n in the second argument are now treated as control characters CR and LF.
(Change $ r, $ n in the previous commit to \ r, \ n)

2 years agoMerge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Tue, 29 Mar 2022 14:17:41 +0000 (23:17 +0900)]
Merge branch 'master' of https://github.com/WinMerge/winmerge

2 years agoReplace unpacker plugin: When regular expression substitution is performed with the...
Takashi Sawanaka [Tue, 29 Mar 2022 14:17:18 +0000 (23:17 +0900)]
Replace unpacker plugin: When regular expression substitution is performed with the -e option, $r and $n in the second argument are now treated as control characters CR and LF.