OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoUpdate of Lithuanian translation
Tichij [Mon, 12 Oct 2020 06:55:40 +0000 (09:55 +0300)]
Update of Lithuanian translation

3 years agoUpdate translations
Takashi Sawanaka [Mon, 12 Oct 2020 00:21:16 +0000 (09:21 +0900)]
Update translations

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 11 Oct 2020 22:10:09 +0000 (07:10 +0900)]
Update Contributors.txt

3 years agoMerge pull request #448 from Mr-Update/patch-5
Takashi Sawanaka [Sun, 11 Oct 2020 22:01:39 +0000 (07:01 +0900)]
Merge pull request #448 from Mr-Update/patch-5

Update German.po

3 years agoMerge pull request #447 from mlipok/patch-1
Takashi Sawanaka [Sun, 11 Oct 2020 22:01:08 +0000 (07:01 +0900)]
Merge pull request #447 from mlipok/patch-1

Update Polish.po

3 years agoUpdate German.po
Mr-Update [Sun, 11 Oct 2020 21:49:18 +0000 (23:49 +0200)]
Update German.po

Translation improved.

3 years agoUpdate Polish.po
Michał Lipok [Sun, 11 Oct 2020 21:07:49 +0000 (23:07 +0200)]
Update Polish.po

3 years agoUpdate translations
Takashi Sawanaka [Sun, 11 Oct 2020 10:39:46 +0000 (19:39 +0900)]
Update translations

3 years agoUpdate translations
Takashi Sawanaka [Sun, 11 Oct 2020 10:38:10 +0000 (19:38 +0900)]
Update translations

3 years agoUpdate translations
Takashi Sawanaka [Sat, 10 Oct 2020 21:56:42 +0000 (06:56 +0900)]
Update translations

3 years agoUpdate translations
Takashi Sawanaka [Sat, 10 Oct 2020 21:56:18 +0000 (06:56 +0900)]
Update translations

3 years agoMerge.rc: Reduce the strings that need to be translated
Takashi Sawanaka [Sat, 10 Oct 2020 21:43:18 +0000 (06:43 +0900)]
Merge.rc: Reduce the strings that need to be translated

3 years agoMerge.cpp: Avoid unnecessary drawing at startup
Takashi Sawanaka [Sat, 10 Oct 2020 16:48:00 +0000 (01:48 +0900)]
Merge.cpp: Avoid unnecessary drawing at startup

3 years agoUpdate translations
Takashi Sawanaka [Sat, 10 Oct 2020 14:48:06 +0000 (23:48 +0900)]
Update translations

3 years agoUpdate translation
Takashi Sawanaka [Fri, 9 Oct 2020 21:52:34 +0000 (06:52 +0900)]
Update translation

3 years agoMerge pull request #445 from tchesftw/fld_copy_dlg_dontaskagain
Takashi Sawanaka [Fri, 9 Oct 2020 21:22:43 +0000 (06:22 +0900)]
Merge pull request #445 from tchesftw/fld_copy_dlg_dontaskagain

"Don't ask again" checkbox for the Confirm Copy dialog

3 years agoFix GitHub issue #444: "Don't ask again" checkbox for the Confirm Copy dialog
Matheus Michels [Fri, 9 Oct 2020 17:42:00 +0000 (14:42 -0300)]
Fix GitHub issue #444: "Don't ask again" checkbox for the Confirm Copy dialog

3 years agoUpdate translations
Takashi Sawanaka [Fri, 9 Oct 2020 00:13:35 +0000 (09:13 +0900)]
Update translations

3 years agoUpdate translations
Takashi Sawanaka [Wed, 7 Oct 2020 23:08:24 +0000 (08:08 +0900)]
Update translations

3 years agoUpdate translations
Takashi Sawanaka [Wed, 7 Oct 2020 13:27:13 +0000 (22:27 +0900)]
Update translations

3 years agoMerge pull request #443 from Tichij/master
Takashi Sawanaka [Wed, 7 Oct 2020 11:36:56 +0000 (20:36 +0900)]
Merge pull request #443 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Wed, 7 Oct 2020 04:41:27 +0000 (07:41 +0300)]
Update of Lithuanian translation

3 years agoUpdate translations
Takashi Sawanaka [Mon, 5 Oct 2020 23:22:38 +0000 (08:22 +0900)]
Update translations

3 years agoUpdate English.pot #440
Takashi Sawanaka [Mon, 5 Oct 2020 23:14:23 +0000 (08:14 +0900)]
Update English.pot #440

3 years agoMerge pull request #440 from Mr-Update/patch-4
Takashi Sawanaka [Mon, 5 Oct 2020 22:27:37 +0000 (07:27 +0900)]
Merge pull request #440 from Mr-Update/patch-4

Update English.pot

3 years agoUpdate English.pot
Mr-Update [Mon, 5 Oct 2020 21:02:56 +0000 (23:02 +0200)]
Update English.pot

- English template improved.
- I have included the open parts of Issue #411. It can be closed.

3 years agoDirView.*: Fix default column width being too small for High-DPI
Takashi Sawanaka [Sun, 4 Oct 2020 11:58:58 +0000 (20:58 +0900)]
DirView.*: Fix default column width being too small for High-DPI

3 years agoUpdate PerfTest.cmd [ci skip]
Takashi Sawanaka [Sun, 4 Oct 2020 01:14:21 +0000 (10:14 +0900)]
Update PerfTest.cmd [ci skip]

3 years agoUpdate ReportTest.cmd [ci skip]
Takashi Sawanaka [Sun, 4 Oct 2020 01:14:03 +0000 (10:14 +0900)]
Update ReportTest.cmd [ci skip]

3 years agoTempFile.cpp: Make CleanupWMtemp() function simple
Takashi Sawanaka [Sat, 3 Oct 2020 14:54:09 +0000 (23:54 +0900)]
TempFile.cpp: Make CleanupWMtemp() function simple

3 years agocrystaledit: Use ubrk_openBinaryRules() instead of ubrk_openRules() if icu.dll is...
Takashi Sawanaka [Sat, 3 Oct 2020 13:31:37 +0000 (22:31 +0900)]
crystaledit: Use ubrk_openBinaryRules() instead of ubrk_openRules() if icu.dll is the expected version

3 years agocrystaledit/Sample: fix compilation error
Takashi Sawanaka [Sat, 3 Oct 2020 11:41:00 +0000 (20:41 +0900)]
crystaledit/Sample: fix compilation error

3 years agoMainFrm.h: Do not call SetRedraw() when MDI child window is not maximizedAnother...
Takashi Sawanaka [Sat, 3 Oct 2020 10:36:03 +0000 (19:36 +0900)]
MainFrm.h: Do not call SetRedraw() when MDI child window is not maximizedAnother approach to the fix below (2):

Revision: 080ff2f30c323d2a1b5d7ba4fbe9c3f9bbda473d
Author: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: 2019/01/14 10:38:39
Message:
MainFrm.h: Fix a problem which the size of header paths is not updated when opening identical files from OpenDlg.

----
Modified: Src/MainFrm.h
Modified: Src/MergeDoc.cpp

Revision: 2550fd98a90c7eac755e38b92546693b2f664c54
Author: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: 2019/01/13 21:24:02
Message:
MainFrm.h: Fix a problem which title is not updated when opening files from DirView.

----
Modified: Src/MainFrm.h

3 years agoMainFrm.h: Do not call SetRedraw() when MDI child window is not maximized
Takashi Sawanaka [Sat, 3 Oct 2020 07:19:03 +0000 (16:19 +0900)]
MainFrm.h: Do not call SetRedraw() when MDI child window is not maximized

3 years agoImgMergeFrm.cpp: Fix crash when comparing images from DirView when WinIMergeLib.dll...
Takashi Sawanaka [Sat, 3 Oct 2020 07:16:11 +0000 (16:16 +0900)]
ImgMergeFrm.cpp: Fix crash when comparing images from DirView when WinIMergeLib.dll is not installed

3 years agoAnother approach to the fix below:
Takashi Sawanaka [Sat, 3 Oct 2020 07:13:39 +0000 (16:13 +0900)]
Another approach to the fix below:

Revision: 080ff2f30c323d2a1b5d7ba4fbe9c3f9bbda473d
Author: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: 2019/01/14 10:38:39
Message:
MainFrm.h: Fix a problem which the size of header paths is not updated when opening identical files from OpenDlg.

----
Modified: Src/MainFrm.h
Modified: Src/MergeDoc.cpp

Revision: 2550fd98a90c7eac755e38b92546693b2f664c54
Author: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: 2019/01/13 21:24:02
Message:
MainFrm.h: Fix a problem which title is not updated when opening files from DirView.

----
Modified: Src/MainFrm.h

3 years agoWildcardDropList.cpp: Fix an issue where the list item height was too small at high...
Takashi Sawanaka [Sat, 3 Oct 2020 03:17:28 +0000 (12:17 +0900)]
WildcardDropList.cpp: Fix an issue where the list item height was too small at high DPI (250%).

3 years agoReduce the number of window resizing
Takashi Sawanaka [Fri, 2 Oct 2020 14:12:45 +0000 (23:12 +0900)]
Reduce the number of window resizing

3 years agoMerge pull request #439 from Tichij/master
Takashi Sawanaka [Thu, 1 Oct 2020 13:26:23 +0000 (22:26 +0900)]
Merge pull request #439 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Thu, 1 Oct 2020 12:33:09 +0000 (15:33 +0300)]
Update of Lithuanian translation

3 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 29 Sep 2020 21:49:29 +0000 (06:49 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

3 years agoBCMenu.cpp: Don't load images until needed (3)
Takashi Sawanaka [Tue, 29 Sep 2020 21:48:08 +0000 (06:48 +0900)]
BCMenu.cpp: Don't load images until needed (3)

3 years agoMerge pull request #438 from Mr-Update/patch-3
Takashi Sawanaka [Mon, 28 Sep 2020 23:55:17 +0000 (08:55 +0900)]
Merge pull request #438 from Mr-Update/patch-3

Update German.po

3 years agoUpdate PerTest.cmd
Takashi Sawanaka [Mon, 28 Sep 2020 23:50:54 +0000 (08:50 +0900)]
Update PerTest.cmd

3 years agoUpdate PerTest.cmd
Takashi Sawanaka [Mon, 28 Sep 2020 23:35:38 +0000 (08:35 +0900)]
Update PerTest.cmd

3 years agoUpdate German.po
Mr-Update [Mon, 28 Sep 2020 20:50:01 +0000 (22:50 +0200)]
Update German.po

Translation improved

3 years agoAdd PerfTest.cmd
Takashi Sawanaka [Mon, 28 Sep 2020 00:18:19 +0000 (09:18 +0900)]
Add PerfTest.cmd

3 years agoUpdate Manual/JP
Takashi Sawanaka [Sun, 27 Sep 2020 15:32:54 +0000 (00:32 +0900)]
Update Manual/JP

3 years agoBCMenu.cpp: Don't load images until needed (2)
Takashi Sawanaka [Sun, 27 Sep 2020 15:32:39 +0000 (00:32 +0900)]
BCMenu.cpp: Don't load images until needed (2)

3 years agoFix GitHub issue #265: how to show white space with linebreak hidden?
Takashi Sawanaka [Sun, 27 Sep 2020 14:52:51 +0000 (23:52 +0900)]
Fix GitHub issue #265: how to show white space with linebreak hidden?

3 years agosome random refactoring
Takashi Sawanaka [Sun, 27 Sep 2020 13:58:29 +0000 (22:58 +0900)]
some random refactoring

3 years agoenv::GetMyDocuments() is too slow
Takashi Sawanaka [Sun, 27 Sep 2020 01:01:31 +0000 (10:01 +0900)]
env::GetMyDocuments() is too slow

3 years agoBCMenu.*:
Takashi Sawanaka [Sat, 26 Sep 2020 16:20:40 +0000 (01:20 +0900)]
BCMenu.*:
- Remove unused functions
- Don't load images until needed

3 years agoBCMenu.h: refactor
Takashi Sawanaka [Sat, 26 Sep 2020 07:03:48 +0000 (16:03 +0900)]
BCMenu.h: refactor

3 years agoUpdate Portuguese.po
Takashi Sawanaka [Sat, 26 Sep 2020 06:37:03 +0000 (15:37 +0900)]
Update Portuguese.po

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276 (5)
Takashi Sawanaka [Fri, 25 Sep 2020 14:51:00 +0000 (23:51 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276 (5)

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276 (4)
Takashi Sawanaka [Thu, 24 Sep 2020 12:43:55 +0000 (21:43 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276 (4)

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276 (3)
Takashi Sawanaka [Thu, 24 Sep 2020 12:09:30 +0000 (21:09 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276 (3)

3 years agoMerge pull request #435 from tjmprm77/feature/sync_point_at_first_line
Takashi Sawanaka [Tue, 22 Sep 2020 09:18:28 +0000 (18:18 +0900)]
Merge pull request #435 from tjmprm77/feature/sync_point_at_first_line

Fix the problem that the comparison result is displayed one line off in the file compare window if a sync point is added with the first line selected.

3 years agoFix the problem that the comparison result is displayed one line off in the file...
Jun Tajima [Tue, 22 Sep 2020 08:33:28 +0000 (17:33 +0900)]
Fix the problem that the comparison result is displayed one line off in the file compare window if a sync point is added with the first line selected.

- Correct the comparison results made by diffutils if the first file separated by the sync point is an empty file.

3 years agoFix GitHub issue #434: unused variable
Takashi Sawanaka [Mon, 21 Sep 2020 14:12:45 +0000 (23:12 +0900)]
Fix GitHub issue #434: unused variable

3 years agoMerge pull request #432 from datadiode/toolbar_leaks_imagelists
Takashi Sawanaka [Sat, 19 Sep 2020 09:54:54 +0000 (18:54 +0900)]
Merge pull request #432 from datadiode/toolbar_leaks_imagelists

MainFrm.cpp: Toolbar was leaking image lists

3 years agoMainFrm.cpp: Toolbar was leaking image lists
datadiode [Sat, 19 Sep 2020 09:33:08 +0000 (11:33 +0200)]
MainFrm.cpp: Toolbar was leaking image lists

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276 (2)
Takashi Sawanaka [Wed, 16 Sep 2020 22:36:39 +0000 (07:36 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276 (2)

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276
Takashi Sawanaka [Wed, 16 Sep 2020 14:56:13 +0000 (23:56 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276

3 years agoMerge pull request #430 from Mr-Update/patch-2
Takashi Sawanaka [Sun, 13 Sep 2020 23:14:51 +0000 (08:14 +0900)]
Merge pull request #430 from Mr-Update/patch-2

Update Shortcut_keys.xml

3 years agoUpdate Shortcut_keys.xml
Mr-Update [Sun, 13 Sep 2020 20:12:54 +0000 (22:12 +0200)]
Update Shortcut_keys.xml

Shift+F6 added

3 years agoMerge pull request #429 from hugok79/master
Takashi Sawanaka [Sat, 12 Sep 2020 15:44:34 +0000 (00:44 +0900)]
Merge pull request #429 from hugok79/master

Update Portuguese translation

3 years agoAdd files via upload
Hugo Carvalho [Sat, 12 Sep 2020 15:24:29 +0000 (16:24 +0100)]
Add files via upload

3 years agomemcombo.cpp: The text width was calculated using the wrong font.
Takashi Sawanaka [Thu, 10 Sep 2020 22:19:53 +0000 (07:19 +0900)]
memcombo.cpp: The text width was calculated using the wrong font.

3 years agoFix wrong base class names in the BEGIN_MESSAGE_MAP macro
Takashi Sawanaka [Wed, 9 Sep 2020 12:09:07 +0000 (21:09 +0900)]
Fix wrong base class names in the BEGIN_MESSAGE_MAP macro

3 years agoTrDialogs.h: Use using
Takashi Sawanaka [Tue, 8 Sep 2020 12:16:39 +0000 (21:16 +0900)]
TrDialogs.h: Use using

3 years agoUpdate Turkish.po
Takashi Sawanaka [Tue, 8 Sep 2020 12:16:19 +0000 (21:16 +0900)]
Update Turkish.po

3 years agoMerge pull request #425 from kayazeren/master
Takashi Sawanaka [Tue, 8 Sep 2020 10:08:06 +0000 (19:08 +0900)]
Merge pull request #425 from kayazeren/master

2.16.8 Turkish translation update

3 years agoMerge branch 'master' into master
Takashi Sawanaka [Tue, 8 Sep 2020 10:07:52 +0000 (19:07 +0900)]
Merge branch 'master' into master

3 years ago2.16.8 Turkish translation update
Kaya Zeren [Tue, 8 Sep 2020 07:25:12 +0000 (10:25 +0300)]
2.16.8 Turkish translation update

2.16.8 Turkish translation update

3 years agoMerge pull request #424 from gerundt/master
Takashi Sawanaka [Sun, 6 Sep 2020 00:22:35 +0000 (09:22 +0900)]
Merge pull request #424 from gerundt/master

Tweak output from BuildInstaller.cmd and BuildArc.cmd

3 years agoHide setup copy in BuildArc.cmd output
Tim Gerundt [Sat, 5 Sep 2020 22:05:48 +0000 (00:05 +0200)]
Hide setup copy in BuildArc.cmd output

3 years agoAdd echo output to BuildInstaller.cmd
Tim Gerundt [Sat, 5 Sep 2020 22:05:02 +0000 (00:05 +0200)]
Add echo output to BuildInstaller.cmd

3 years agoUpdate README.md
Takashi Sawanaka [Thu, 3 Sep 2020 12:15:41 +0000 (21:15 +0900)]
Update README.md

3 years agoFix GitHub issue #418: Commandline to display versions in the output report
Takashi Sawanaka [Sun, 30 Aug 2020 13:49:53 +0000 (22:49 +0900)]
Fix GitHub issue #418: Commandline to display versions in the output report

3 years agoUpdate ChangeLog.*
Takashi Sawanaka [Sun, 30 Aug 2020 07:36:18 +0000 (16:36 +0900)]
Update ChangeLog.*

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 30 Aug 2020 07:34:43 +0000 (16:34 +0900)]
Update Contributors.txt

3 years agoEven in VS2019, setting the Linker/System/Minimum Required Version to 5.01 seems...
Takashi Sawanaka [Sun, 30 Aug 2020 07:23:27 +0000 (16:23 +0900)]
Even in VS2019, setting the Linker/System/Minimum Required Version to 5.01 seems to create an executable that works on Windows XP.

3 years ago CreateRelease.cmd: PDB files could not be copied properly (2)
Takashi Sawanaka [Sun, 30 Aug 2020 06:24:58 +0000 (15:24 +0900)]
 CreateRelease.cmd: PDB files could not be copied properly (2)

3 years agoMerge pull request #421 from tjmprm77/feature/generate_patch_by_selecting_multiple_files
Takashi Sawanaka [Sun, 30 Aug 2020 06:21:30 +0000 (15:21 +0900)]
Merge pull request #421 from tjmprm77/feature/generate_patch_by_selecting_multiple_files

Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files.

3 years agoFixed the problem that the input to File1 or File2 comboboxes of the Patch Generator...
Jun Tajima [Sun, 30 Aug 2020 05:57:50 +0000 (14:57 +0900)]
Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files.

- When multiple items are registered in the internal item list of the CPatchDlg class, and the File1 or File2 comboboxes of the Patch Generator dialog is changed, do the following:
  - Clear the internal item list of the CPatchDlg class.
  - Clear the contents of the other combobox.

3 years agoCreateRelase.cmd: The PDB file could not be copied propery
Takashi Sawanaka [Sat, 29 Aug 2020 21:02:48 +0000 (06:02 +0900)]
CreateRelase.cmd: The PDB file could not be copied propery

4 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Fri, 28 Aug 2020 22:46:41 +0000 (07:46 +0900)]
Update Slovenian translation. Submitted by JadranR

4 years agoUpdate Galician.po
Takashi Sawanaka [Fri, 28 Aug 2020 22:07:56 +0000 (07:07 +0900)]
Update Galician.po

4 years agoBump revision to 2.16.9
Takashi Sawanaka [Fri, 28 Aug 2020 22:00:03 +0000 (07:00 +0900)]
Bump revision to 2.16.9

4 years agoBump revision to 2.16.8 2.16.8
Takashi Sawanaka [Fri, 28 Aug 2020 14:13:42 +0000 (23:13 +0900)]
Bump revision to 2.16.8

4 years agoUpdUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 14:10:29 +0000 (23:10 +0900)]
UpdUpdate ChangeLog and ReleaseNotes

4 years agoFix GitHub issue #420: Wrong merging (minimal/patience/histogram Diff algorithm does...
Takashi Sawanaka [Fri, 28 Aug 2020 14:04:05 +0000 (23:04 +0900)]
Fix GitHub issue #420: Wrong merging (minimal/patience/histogram Diff algorithm does not work on Windows XP)

4 years agoUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 11:40:57 +0000 (20:40 +0900)]
Update ChangeLog and ReleaseNotes

4 years agoUpdate Manual
Takashi Sawanaka [Fri, 28 Aug 2020 11:39:33 +0000 (20:39 +0900)]
Update Manual

4 years agoUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 10:50:24 +0000 (19:50 +0900)]
Update ChangeLog and ReleaseNotes

4 years agoFix osdn.net ticket #40672: 'Show Middle/Right Unique items' menu item does not work...
Takashi Sawanaka [Fri, 28 Aug 2020 10:45:00 +0000 (19:45 +0900)]
Fix osdn.net ticket #40672: 'Show Middle/Right Unique items' menu item does not work properly in 3-way folder compare.

4 years agoUpdate BuildArc.cmd
Takashi Sawanaka [Fri, 28 Aug 2020 00:02:05 +0000 (09:02 +0900)]
Update BuildArc.cmd

4 years agoMergeEditView.*: When scrolling with the horizontal mouse wheel, the scroll positions...
Takashi Sawanaka [Thu, 27 Aug 2020 23:44:37 +0000 (08:44 +0900)]
MergeEditView.*: When scrolling with the horizontal mouse wheel, the scroll positions of the left and right panes were not synchronized.