OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 24 Oct 2021 14:44:33 +0000 (23:44 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Translations/WinMerge/Japanese.po

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 24 Oct 2021 12:30:51 +0000 (21:30 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoFix issue #1007: Comparing broken lnk-files (windows shortcuts) freezes WinMerge
Takashi Sawanaka [Sun, 24 Oct 2021 11:31:49 +0000 (20:31 +0900)]
Fix issue #1007: Comparing broken lnk-files (windows shortcuts) freezes WinMerge

2 years agoUpdate Hungarian.po (#1023)
efi99 [Sun, 24 Oct 2021 10:21:45 +0000 (12:21 +0200)]
Update Hungarian.po (#1023)

2 years agoFolderCompare: Additional Properties (Windows Property System+Hash(MD5, SHA-1, SHA...
Takashi Sawanaka [Sun, 24 Oct 2021 06:34:31 +0000 (15:34 +0900)]
FolderCompare: Additional Properties (Windows Property System+Hash(MD5, SHA-1, SHA-256)) (#996)

2 years agoAdd Portuguese.isl (#1017)
Hugo Carvalho [Thu, 21 Oct 2021 13:52:57 +0000 (14:52 +0100)]
Add Portuguese.isl (#1017)

2 years agoGalician translation update (#1005)
LMS [Tue, 12 Oct 2021 11:09:05 +0000 (13:09 +0200)]
Galician translation update (#1005)

2 years agoFix issue #1004: Where to report documentation/help errors?
Takashi Sawanaka [Tue, 12 Oct 2021 00:29:24 +0000 (09:29 +0900)]
Fix issue #1004:  Where to report documentation/help errors?

2 years agoFix a problem where the string in the Windows common dialog would not change to the...
Takashi Sawanaka [Mon, 11 Oct 2021 12:52:43 +0000 (21:52 +0900)]
Fix a problem where the string in the Windows common dialog would not change to the language when switching languages.

2 years agoUpdate Apache tika to 2.1.0 and change the download URL to the URL suggested by JohnF...
Takashi Sawanaka [Mon, 11 Oct 2021 11:31:37 +0000 (20:31 +0900)]
Update Apache tika to 2.1.0 and change the download URL to the URL suggested by JohnF-tfa (https://github.com/WinMerge/winmerge/issues/715#issuecomment-939630493)

2 years agoFix typo in OpenView.cpp (#1000)
Ikko Ashimine [Sun, 10 Oct 2021 22:56:08 +0000 (07:56 +0900)]
Fix typo in OpenView.cpp (#1000)

Callled -> Called

2 years agoFix issue #998: Cannot resize last column with UI
Takashi Sawanaka [Sat, 9 Oct 2021 23:54:53 +0000 (08:54 +0900)]
Fix issue #998: Cannot resize last column with UI

2 years agoPropShell.cpp: Fix the problem that the "Register Shell Extension for Windows 11...
Takashi Sawanaka [Fri, 8 Oct 2021 11:40:13 +0000 (20:40 +0900)]
PropShell.cpp: Fix the problem that the "Register Shell Extension for Windows 11 or later" button is not enabled when another user has registered ShellExtension for Windows 11.

2 years agoShellFileOperations_test.cpp: Fix failed test
Takashi Sawanaka [Wed, 6 Oct 2021 12:56:27 +0000 (21:56 +0900)]
ShellFileOperations_test.cpp: Fix failed test

2 years agoResource.h: Increase the maximum number of unpacker plugins from 40 to 200.
Takashi Sawanaka [Sun, 3 Oct 2021 11:32:01 +0000 (20:32 +0900)]
Resource.h: Increase the maximum number of unpacker plugins from 40 to 200.

2 years agoFix an issue where filters are not applied correctly when opening a project file...
Jun Tajima [Sun, 3 Oct 2021 10:02:37 +0000 (19:02 +0900)]
Fix an issue where filters are not applied correctly when opening a project file containing multiple items with different filters. (#995)

- Duplicate the global file filter and set it into the diff context of the CDirDoc class.

2 years agoImgMergeFrm.cpp: Fix an issue where drag-and-drop of file would only work once.
Takashi Sawanaka [Sat, 2 Oct 2021 01:11:55 +0000 (10:11 +0900)]
ImgMergeFrm.cpp: Fix an issue where drag-and-drop of file would only work once.

2 years agoDlowloadDeps.cmd: Update ShellExtension to 1.18.2.0
Takashi Sawanaka [Fri, 1 Oct 2021 14:41:42 +0000 (23:41 +0900)]
DlowloadDeps.cmd: Update ShellExtension to 1.18.2.0

2 years agoShellExtension: Bump revision to 1.18.3.0 ShellExtension-1.18.2.0
Takashi Sawanaka [Fri, 1 Oct 2021 14:34:13 +0000 (23:34 +0900)]
ShellExtension: Bump revision to 1.18.3.0

2 years agoShellExtension for Windows11: Disable Registry Write Virtualization
Takashi Sawanaka [Fri, 1 Oct 2021 14:30:53 +0000 (23:30 +0900)]
ShellExtension for Windows11: Disable Registry Write Virtualization

2 years agoConflictFileParser: use namespace
Takashi Sawanaka [Tue, 28 Sep 2021 23:24:40 +0000 (08:24 +0900)]
ConflictFileParser: use namespace

2 years agoUpdate Hungarian.po (#991)
efi99 [Tue, 28 Sep 2021 23:19:45 +0000 (01:19 +0200)]
Update Hungarian.po (#991)

2 years agoLoop counter should be the same type as the count type. (#987)
Anders [Mon, 27 Sep 2021 23:03:29 +0000 (01:03 +0200)]
Loop counter should be the same type as the count type. (#987)

It is unlikely that somebody selects more than 0xffff files but just in case, don't loop forever.

2 years agoFix issue #983: Plugin unpacked file extension problem (get_PluginUnpackedFileExtensi...
Takashi Sawanaka [Mon, 27 Sep 2021 11:27:05 +0000 (20:27 +0900)]
Fix issue #983: Plugin unpacked file extension problem (get_PluginUnpackedFileExtension) (2)

2 years agoBump revision to 2.16.14+-jp-6 2.16.14+jp-6
Takashi Sawanaka [Sun, 26 Sep 2021 12:58:00 +0000 (21:58 +0900)]
Bump revision to 2.16.14+-jp-6

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Sun, 26 Sep 2021 12:54:18 +0000 (21:54 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoFix not getting the proper error message when saving failed
Takashi Sawanaka [Sun, 26 Sep 2021 12:53:29 +0000 (21:53 +0900)]
Fix not getting the proper error message when saving failed

2 years agoAttempt to fix issue #771: Sync (Super Slow) (2)
Takashi Sawanaka [Sun, 26 Sep 2021 12:26:46 +0000 (21:26 +0900)]
Attempt to fix issue #771: Sync (Super Slow) (2)

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp 2.16.14+jp-5
Takashi Sawanaka [Sun, 26 Sep 2021 01:11:54 +0000 (10:11 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h

2 years agoAttempt to fix issue #771: Sync (Super Slow)
Takashi Sawanaka [Sun, 26 Sep 2021 00:58:06 +0000 (09:58 +0900)]
Attempt to fix issue #771: Sync (Super Slow)

2 years agoUpdate ShellExtension to 1.18.1.0
Takashi Sawanaka [Sun, 26 Sep 2021 00:48:13 +0000 (09:48 +0900)]
Update ShellExtension to 1.18.1.0

2 years agoWInMergeContextMenu.dll: Disable advanced menu due to stability issues ShellExtension-1.18.1.0
Takashi Sawanaka [Sun, 26 Sep 2021 00:36:53 +0000 (09:36 +0900)]
WInMergeContextMenu.dll: Disable advanced menu due to stability issues

2 years agoUpdate German.po (#986)
Mr-Update [Sat, 25 Sep 2021 23:57:28 +0000 (01:57 +0200)]
Update German.po (#986)

Translation completed

2 years agoFix issue #983: Plugin unpacked file extension problem (get_PluginUnpackedFileExtension)
Takashi Sawanaka [Sat, 25 Sep 2021 11:17:30 +0000 (20:17 +0900)]
Fix issue #983: Plugin unpacked file extension problem (get_PluginUnpackedFileExtension)

2 years agoUpdate Turkish.po
Takashi Sawanaka [Fri, 24 Sep 2021 13:02:18 +0000 (22:02 +0900)]
Update Turkish.po

2 years agoFix issue #985: Missing packages.config (also outdated) and wrong NuGet packages...
Takashi Sawanaka [Fri, 24 Sep 2021 13:02:01 +0000 (22:02 +0900)]
Fix issue #985:  Missing packages.config (also outdated) and wrong NuGet packages path in the WinMergeContextMenu.vcxproj and .filters file
- Use git submodule instead of NugGet package

2 years agoShellExtension: Bump revision to 1.18.1.0
Takashi Sawanaka [Thu, 23 Sep 2021 07:10:38 +0000 (16:10 +0900)]
ShellExtension: Bump revision to 1.18.1.0

2 years agoShellExtension: ShellExtension for Windows 11 did not work on machines that did not...
Takashi Sawanaka [Thu, 23 Sep 2021 07:10:00 +0000 (16:10 +0900)]
ShellExtension: ShellExtension for Windows 11 did not work on machines that did not have MSVCP140.dll VCRUNTIME140*.dll installed.

2 years agoFix issue #951: Reloading a file that was changed by another application does not...
Takashi Sawanaka [Wed, 22 Sep 2021 23:07:47 +0000 (08:07 +0900)]
Fix issue #951: Reloading a file that was changed by another application does not preserve column widths

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 21 Sep 2021 23:21:59 +0000 (08:21 +0900)]
Update TranslationsStatus

2 years agoUpdate ShellExtension/Turkish.po
Takashi Sawanaka [Tue, 21 Sep 2021 23:21:28 +0000 (08:21 +0900)]
Update ShellExtension/Turkish.po

2 years ago2.16.15 Turkish translation update (#980)
Kaya Zeren [Tue, 21 Sep 2021 23:15:46 +0000 (02:15 +0300)]
2.16.15 Turkish translation update   (#980)

* 2.16.15 Turkish translation update

2.16.15 Turkish translation update

* 2.16.15 Turkish translation update

2.16.15 Turkish translation update

2 years agoUpdate Slovenian translation. Submited by JadranR
Takashi Sawanaka [Mon, 20 Sep 2021 23:57:01 +0000 (08:57 +0900)]
Update Slovenian translation. Submited by JadranR

2 years agoUpdate of Lithuanian translation (#979)
Tichij [Mon, 20 Sep 2021 14:15:53 +0000 (17:15 +0300)]
Update of Lithuanian translation (#979)

2 years agoUpdate ChangeLog&ReleaseNotes v2.16.15
Takashi Sawanaka [Mon, 20 Sep 2021 05:48:10 +0000 (14:48 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoManual: Update Command_line.xml
Takashi Sawanaka [Mon, 20 Sep 2021 05:47:58 +0000 (14:47 +0900)]
Manual: Update Command_line.xml

2 years agoManual: Fix an error in the description of the /o command line option. (issue #732...
Takashi Sawanaka [Sun, 19 Sep 2021 11:20:02 +0000 (20:20 +0900)]
Manual: Fix an error in the description of the /o command line option. (issue #732) (2)

2 years agoManual: Fix an error in the description of the /o command line option. (issue #732)
Takashi Sawanaka [Sun, 19 Sep 2021 11:17:58 +0000 (20:17 +0900)]
Manual: Fix an error in the description of the /o command line option. (issue #732)

2 years agoUpdated all links to poEdit (#978)
Gitoffthelawn [Sun, 19 Sep 2021 10:48:56 +0000 (03:48 -0700)]
Updated all links to poEdit (#978)

Now links use HTTPS and no longer have the deprecated host.

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 19 Sep 2021 00:18:19 +0000 (09:18 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoBump revision to 2.16.15
Takashi Sawanaka [Sun, 19 Sep 2021 00:12:35 +0000 (09:12 +0900)]
Bump revision to 2.16.15

2 years agoFix GUITests
Takashi Sawanaka [Sun, 19 Sep 2021 00:12:07 +0000 (09:12 +0900)]
Fix GUITests

2 years agoFix issue #941: Make "Do not close this box" checkbox in search window On by default
Takashi Sawanaka [Sat, 18 Sep 2021 05:50:09 +0000 (14:50 +0900)]
Fix issue #941: Make "Do not close this box" checkbox in search window On by default

2 years agoInstaller: Currently, WinMergeContextMenu.dll does not work in some environments...
Takashi Sawanaka [Sat, 18 Sep 2021 01:13:27 +0000 (10:13 +0900)]
Installer: Currently, WinMergeContextMenu.dll does not work in some environments on Windows 11 preview version, and I cannot determine at the moment whether the problem is in the OS or in WinMergeContextMenu.dll.
For now, I have decided to give up on registering WinMergeContextMenu.dll as the default.

2 years agoUpdate German.po (#977)
Mr-Update [Fri, 17 Sep 2021 22:40:28 +0000 (00:40 +0200)]
Update German.po (#977)

Translation completed

2 years agoPlugins: Add DecompileJVM, DecompileIL and DisassembleNative plugin (2)
Takashi Sawanaka [Fri, 17 Sep 2021 12:57:01 +0000 (21:57 +0900)]
Plugins: Add DecompileJVM, DecompileIL and DisassembleNative plugin (2)

2 years agoBump revision to 2.16.14+-jp-4 2.16.14+jp-4
Takashi Sawanaka [Fri, 17 Sep 2021 09:38:32 +0000 (18:38 +0900)]
Bump revision to 2.16.14+-jp-4

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Fri, 17 Sep 2021 00:22:24 +0000 (09:22 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Externals/winimerge
# Translations/WinMerge/English.pot
# Translations/WinMerge/Swedish.po

2 years agoFix osdn.net #42862: When the Diff pane was redisplayed, the scroll position of the...
Takashi Sawanaka [Fri, 17 Sep 2021 00:18:17 +0000 (09:18 +0900)]
Fix osdn.net #42862: When the Diff pane was redisplayed, the scroll position of the Diff pane was not appropriate.

2 years agoUpdate Portuguese translation (#976)
Hugo Carvalho [Thu, 16 Sep 2021 14:11:15 +0000 (15:11 +0100)]
Update Portuguese translation (#976)

2 years agoShell Extension for Windows 11 or later (6)
Takashi Sawanaka [Thu, 16 Sep 2021 12:13:31 +0000 (21:13 +0900)]
Shell Extension for Windows 11 or later (6)

2 years agoShell Extension for Windows 11 or later (5)
Takashi Sawanaka [Thu, 16 Sep 2021 12:04:28 +0000 (21:04 +0900)]
Shell Extension for Windows 11 or later (5)

2 years agoShell Extension for Windows 11 or later (4)
Takashi Sawanaka [Wed, 15 Sep 2021 12:05:09 +0000 (21:05 +0900)]
Shell Extension for Windows 11 or later (4)

2 years agoFix issue #970: When moving in the scroll pane, the selected position is incorrect
Takashi Sawanaka [Wed, 15 Sep 2021 00:05:32 +0000 (09:05 +0900)]
Fix issue #970: When moving in the scroll pane, the selected position is incorrect

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Tue, 14 Sep 2021 23:16:21 +0000 (08:16 +0900)]
Update TranslationsStatus.*

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Tue, 14 Sep 2021 23:15:26 +0000 (08:15 +0900)]
Update Contributors.txt

2 years agoUpdated Swedish translations (#974)
T. Almroth [Tue, 14 Sep 2021 22:58:38 +0000 (00:58 +0200)]
Updated Swedish translations (#974)

* Updated Swedish translations

The previous translations were absolutely terrible. I mean literally terrible.
I have redone it completely. The previous has words that were invented, weird upper- amd lowercases, words nobody uses. And sometimes just jibberish.

* Minor adjustments and polishing

* Minor adjustments

* Minor adjustments

2 years agoUpdate winimerge to v1.0.31
Takashi Sawanaka [Mon, 13 Sep 2021 15:21:44 +0000 (00:21 +0900)]
Update winimerge to v1.0.31

2 years agoFix MergeLang.vcxproj
Takashi Sawanaka [Mon, 13 Sep 2021 12:59:37 +0000 (21:59 +0900)]
Fix MergeLang.vcxproj

2 years agoUpdate Dutch.po (#969)
Thomas De Rocker [Mon, 13 Sep 2021 12:42:32 +0000 (14:42 +0200)]
Update Dutch.po (#969)

2 years agoShell Extension for Windows 11 or later (3) ShellExtension-1.18.0.0
Takashi Sawanaka [Mon, 13 Sep 2021 12:30:30 +0000 (21:30 +0900)]
Shell Extension for Windows 11 or later (3)

2 years agoShell Extension for Windows 11 or later (2)
Takashi Sawanaka [Mon, 13 Sep 2021 11:25:21 +0000 (20:25 +0900)]
Shell Extension for Windows 11 or later (2)

2 years agoFix issue #903: 50% cpu use by winmergeu.exe after program closed
Takashi Sawanaka [Mon, 13 Sep 2021 10:42:33 +0000 (19:42 +0900)]
Fix issue #903: 50% cpu use by winmergeu.exe after program closed

2 years agocompiler-calculated maximum value for `m_SourceDefs` (#966)
Simon Sobisch [Mon, 13 Sep 2021 10:08:18 +0000 (12:08 +0200)]
compiler-calculated maximum value for `m_SourceDefs` (#966)

removing the need to manually adjust the size when `TextType` is adjusted

2 years agoShell Extension for Windows 11 or later (#954)
Takashi Sawanaka [Mon, 13 Sep 2021 00:06:22 +0000 (09:06 +0900)]
Shell Extension for Windows 11 or later (#954)

2 years agoFix the problem that registration/unregistration of ShellExtension from the Options... ShellExtension-1.17.17.0
Takashi Sawanaka [Sun, 12 Sep 2021 14:43:24 +0000 (23:43 +0900)]
Fix the problem that registration/unregistration of ShellExtension from the Options dialog does not work on ARM64 version.

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Sun, 12 Sep 2021 12:38:09 +0000 (21:38 +0900)]
Update TranslationsStatus.*

2 years agoInstaller: sign installer if the SIGNBAT_PATH environment variable is defined
Takashi Sawanaka [Sun, 12 Sep 2021 12:36:16 +0000 (21:36 +0900)]
Installer: sign installer if the SIGNBAT_PATH environment variable is defined

2 years agoUpdate German.po (#965)
Mr-Update [Sun, 12 Sep 2021 01:46:34 +0000 (03:46 +0200)]
Update German.po (#965)

Translation completed

2 years agoUpdate Portuguese.po (#964)
Hugo Carvalho [Sun, 12 Sep 2021 01:46:05 +0000 (02:46 +0100)]
Update Portuguese.po (#964)

2 years agoUpdate Russian.po (#963)
wvxwxvw [Sat, 11 Sep 2021 03:13:50 +0000 (06:13 +0300)]
Update Russian.po (#963)

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Thu, 9 Sep 2021 00:07:16 +0000 (09:07 +0900)]
Update TranslationsStatus.*

2 years agoUpdate Portuguese translation (#956)
Hugo Carvalho [Wed, 8 Sep 2021 22:35:37 +0000 (23:35 +0100)]
Update Portuguese translation (#956)

2 years agoShellExtension: Bump revision to 1.17.17.0
Takashi Sawanaka [Wed, 8 Sep 2021 15:03:55 +0000 (00:03 +0900)]
ShellExtension: Bump revision to 1.17.17.0

2 years agoShellExtension: Remove resource strings for status bar, which is no longer displayed...
Takashi Sawanaka [Wed, 8 Sep 2021 15:02:01 +0000 (00:02 +0900)]
ShellExtension: Remove resource strings for status bar, which is no longer displayed in recent versions of Explorer.

2 years agoShellExtension.vcxproj: Add /Zc:threadSafeInit- compiler option
Takashi Sawanaka [Wed, 8 Sep 2021 14:58:39 +0000 (23:58 +0900)]
ShellExtension.vcxproj: Add /Zc:threadSafeInit- compiler option

2 years agoShellExtension: refactor
Takashi Sawanaka [Wed, 8 Sep 2021 14:56:37 +0000 (23:56 +0900)]
ShellExtension: refactor

2 years agoUpdate Hungarian.po (#955)
efi99 [Sun, 5 Sep 2021 11:08:11 +0000 (13:08 +0200)]
Update Hungarian.po (#955)

2 years agoAdd a feature to set items saved to or restored from the project file. (#953)
Jun Tajima [Sun, 5 Sep 2021 09:31:15 +0000 (18:31 +0900)]
Add a feature to set items saved to or restored from the project file. (#953)

2 years agoShellExtension: Move *.cpp, *.h, *.vcxproj files to src folderShellExtension: Move...
Takashi Sawanaka [Sun, 5 Sep 2021 03:56:18 +0000 (12:56 +0900)]
ShellExtension: Move *.cpp, *.h, *.vcxproj files to src folderShellExtension: Move *.cpp, *.h, *.vcxproj files to ShellExtension folder

2 years agoShellExtension: Move *.cpp, *.h, *.vcxproj files to src folder
Takashi Sawanaka [Sun, 5 Sep 2021 00:49:49 +0000 (09:49 +0900)]
ShellExtension: Move *.cpp, *.h, *.vcxproj files to src folder

(cherry picked from commit 1aef1745ce455e832103f52f1a387df5e50b40c6)

2 years agoBCMenu.cpp: Improve menu item drawing on Windows 11
Takashi Sawanaka [Tue, 31 Aug 2021 12:58:18 +0000 (21:58 +0900)]
BCMenu.cpp: Improve menu item drawing on Windows 11

2 years agoUpdate README.md
Takashi Sawanaka [Sun, 29 Aug 2021 14:13:47 +0000 (23:13 +0900)]
Update README.md

2 years agoUpdate README.md
Takashi Sawanaka [Sun, 29 Aug 2021 13:59:47 +0000 (22:59 +0900)]
Update README.md

2 years agoUpdate README.md
Takashi Sawanaka [Sun, 29 Aug 2021 13:58:19 +0000 (22:58 +0900)]
Update README.md

2 years agoFix issue #940: Replace slow (4)
Takashi Sawanaka [Sat, 28 Aug 2021 14:18:17 +0000 (23:18 +0900)]
Fix issue #940: Replace slow (4)

2 years agoFix issue #940: Replace slow (3)
Takashi Sawanaka [Sat, 28 Aug 2021 14:18:06 +0000 (23:18 +0900)]
Fix issue #940: Replace slow (3)

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 28 Aug 2021 09:10:12 +0000 (18:10 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoFix issue #940: Replace slow (2)
Takashi Sawanaka [Sat, 28 Aug 2021 09:09:54 +0000 (18:09 +0900)]
Fix issue #940: Replace slow (2)

2 years agoMake it clear that requirements are to build, not use the application (#942)
Gitoffthelawn [Sat, 28 Aug 2021 05:27:43 +0000 (22:27 -0700)]
Make it clear that requirements are to build, not use the application (#942)