OSDN Git Service
Takashi Sawanaka [Fri, 17 Sep 2021 09:38:32 +0000 (18:38 +0900)]
Bump revision to 2.16.14+-jp-4
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
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.
Hugo Carvalho [Thu, 16 Sep 2021 14:11:15 +0000 (15:11 +0100)]
Update Portuguese translation (#976)
Takashi Sawanaka [Thu, 16 Sep 2021 12:13:31 +0000 (21:13 +0900)]
Shell Extension for Windows 11 or later (6)
Takashi Sawanaka [Thu, 16 Sep 2021 12:04:28 +0000 (21:04 +0900)]
Shell Extension for Windows 11 or later (5)
Takashi Sawanaka [Wed, 15 Sep 2021 12:05:09 +0000 (21:05 +0900)]
Shell Extension for Windows 11 or later (4)
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
Takashi Sawanaka [Tue, 14 Sep 2021 23:16:21 +0000 (08:16 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Tue, 14 Sep 2021 23:15:26 +0000 (08:15 +0900)]
Update Contributors.txt
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
Takashi Sawanaka [Mon, 13 Sep 2021 15:21:44 +0000 (00:21 +0900)]
Update winimerge to v1.0.31
Takashi Sawanaka [Mon, 13 Sep 2021 12:59:37 +0000 (21:59 +0900)]
Fix MergeLang.vcxproj
Thomas De Rocker [Mon, 13 Sep 2021 12:42:32 +0000 (14:42 +0200)]
Update Dutch.po (#969)
Takashi Sawanaka [Mon, 13 Sep 2021 12:30:30 +0000 (21:30 +0900)]
Shell Extension for Windows 11 or later (3)
Takashi Sawanaka [Mon, 13 Sep 2021 11:25:21 +0000 (20:25 +0900)]
Shell Extension for Windows 11 or later (2)
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
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
Takashi Sawanaka [Mon, 13 Sep 2021 00:06:22 +0000 (09:06 +0900)]
Shell Extension for Windows 11 or later (#954)
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.
Takashi Sawanaka [Sun, 12 Sep 2021 12:38:09 +0000 (21:38 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Sun, 12 Sep 2021 12:36:16 +0000 (21:36 +0900)]
Installer: sign installer if the SIGNBAT_PATH environment variable is defined
Mr-Update [Sun, 12 Sep 2021 01:46:34 +0000 (03:46 +0200)]
Update German.po (#965)
Translation completed
Hugo Carvalho [Sun, 12 Sep 2021 01:46:05 +0000 (02:46 +0100)]
Update Portuguese.po (#964)
wvxwxvw [Sat, 11 Sep 2021 03:13:50 +0000 (06:13 +0300)]
Update Russian.po (#963)
Takashi Sawanaka [Thu, 9 Sep 2021 00:07:16 +0000 (09:07 +0900)]
Update TranslationsStatus.*
Hugo Carvalho [Wed, 8 Sep 2021 22:35:37 +0000 (23:35 +0100)]
Update Portuguese translation (#956)
Takashi Sawanaka [Wed, 8 Sep 2021 15:03:55 +0000 (00:03 +0900)]
ShellExtension: Bump revision to 1.17.17.0
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.
Takashi Sawanaka [Wed, 8 Sep 2021 14:58:39 +0000 (23:58 +0900)]
ShellExtension.vcxproj: Add /Zc:threadSafeInit- compiler option
Takashi Sawanaka [Wed, 8 Sep 2021 14:56:37 +0000 (23:56 +0900)]
ShellExtension: refactor
efi99 [Sun, 5 Sep 2021 11:08:11 +0000 (13:08 +0200)]
Update Hungarian.po (#955)
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)
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
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)
Takashi Sawanaka [Tue, 31 Aug 2021 12:58:18 +0000 (21:58 +0900)]
BCMenu.cpp: Improve menu item drawing on Windows 11
Takashi Sawanaka [Sun, 29 Aug 2021 14:13:47 +0000 (23:13 +0900)]
Update README.md
Takashi Sawanaka [Sun, 29 Aug 2021 13:59:47 +0000 (22:59 +0900)]
Update README.md
Takashi Sawanaka [Sun, 29 Aug 2021 13:58:19 +0000 (22:58 +0900)]
Update README.md
Takashi Sawanaka [Sat, 28 Aug 2021 14:18:17 +0000 (23:18 +0900)]
Fix issue #940: Replace slow (4)
Takashi Sawanaka [Sat, 28 Aug 2021 14:18:06 +0000 (23:18 +0900)]
Fix issue #940: Replace slow (3)
Takashi Sawanaka [Sat, 28 Aug 2021 09:10:12 +0000 (18:10 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 28 Aug 2021 09:09:54 +0000 (18:09 +0900)]
Fix issue #940: Replace slow (2)
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)
Takashi Sawanaka [Fri, 27 Aug 2021 13:21:12 +0000 (22:21 +0900)]
Fix issue #940: Replace slow (1)
Takashi Sawanaka [Fri, 27 Aug 2021 11:48:16 +0000 (20:48 +0900)]
crystaledit/Sample: Fix crash when displaying Replace dialog
Takashi Sawanaka [Thu, 26 Aug 2021 13:03:55 +0000 (22:03 +0900)]
UploadToVirusTotal.cmd: Do not upload the *-pdb.7z file to virustotal.com.
Takashi Sawanaka [Thu, 26 Aug 2021 12:44:17 +0000 (21:44 +0900)]
UpdateToGithub.cmd: Use gh command instead of github-release command
Takashi Sawanaka [Thu, 26 Aug 2021 12:11:11 +0000 (21:11 +0900)]
Bump revision to 2.16.14+-jp-3
Takashi Sawanaka [Thu, 26 Aug 2021 11:51:44 +0000 (20:51 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Thu, 26 Aug 2021 10:37:44 +0000 (19:37 +0900)]
Update translations
efi99 [Wed, 25 Aug 2021 23:55:20 +0000 (01:55 +0200)]
Update Hungarian.po (#937)
Takashi Sawanaka [Wed, 25 Aug 2021 15:15:44 +0000 (00:15 +0900)]
Attempt to fix crash #808, #908 and #913
Takashi Sawanaka [Wed, 25 Aug 2021 13:25:32 +0000 (22:25 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
Takashi Sawanaka [Wed, 25 Aug 2021 12:46:27 +0000 (21:46 +0900)]
Plugins: Add DisassembleJVM, DisassembleIL and DisassembleNative plugin (3)
Takashi Sawanaka [Tue, 24 Aug 2021 13:35:47 +0000 (22:35 +0900)]
Fix crash on ImageList_Destroy() call in CMainFrame::~CMainFrame() (found by Application Verfier(appverif.exe))
Takashi Sawanaka [Mon, 23 Aug 2021 00:13:00 +0000 (09:13 +0900)]
Plugins: Add DisassembleJVM, DisassembleIL and DisassembleNative plugin (2)
Takashi Sawanaka [Sun, 22 Aug 2021 22:55:41 +0000 (07:55 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sun, 22 Aug 2021 22:50:14 +0000 (07:50 +0900)]
Update Contributors.txt
Apparatus_Zero [Sun, 22 Aug 2021 22:47:01 +0000 (07:47 +0900)]
Update Korean Translation (#932)
Minor fixes regarding
1. missing translations
2. inconsistencies
3. typos
Takashi Sawanaka [Sun, 22 Aug 2021 14:38:49 +0000 (23:38 +0900)]
Plugins: Add DecompileJVM, DecompileIL and DisassembleNative plugin
Takashi Sawanaka [Sun, 22 Aug 2021 01:52:49 +0000 (10:52 +0900)]
Bump revision to 2.16.14+-jp-2
Takashi Sawanaka [Sun, 22 Aug 2021 01:52:07 +0000 (10:52 +0900)]
Update translations
Takashi Sawanaka [Sun, 22 Aug 2021 00:51:32 +0000 (09:51 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
# Conflicts:
# BuildArc.cmd
# Src/MainFrm.cpp
# Src/OptionsInit.cpp
# Translations/WinMerge/Brazilian.po
# Translations/WinMerge/Turkish.po
Takashi Sawanaka [Sat, 21 Aug 2021 09:55:39 +0000 (18:55 +0900)]
OptionsDef: use std::string_literals
Takashi Sawanaka [Sat, 21 Aug 2021 02:02:54 +0000 (11:02 +0900)]
Fix Code scanning alerts #4: Upcast array used in pointer arithmetic
Takashi Sawanaka [Fri, 20 Aug 2021 23:52:46 +0000 (08:52 +0900)]
MergeDocLineDiff.cpp: Fix crash when pressing Shift+F4 key
Takashi Sawanaka [Fri, 20 Aug 2021 12:40:13 +0000 (21:40 +0900)]
Fix UploadToVirusTotal.cmd
Takashi Sawanaka [Fri, 20 Aug 2021 12:37:21 +0000 (21:37 +0900)]
Plugins/Commands/*/*.bat: Verify SHA256 hash of downloaded file.
wvxwxvw [Wed, 18 Aug 2021 23:31:32 +0000 (02:31 +0300)]
Update Russian.po (#927)
Takashi Sawanaka [Wed, 18 Aug 2021 11:34:35 +0000 (20:34 +0900)]
DownloadDeps.cmd: Update ShellExtension to 1.17.16.0
Takashi Sawanaka [Wed, 18 Aug 2021 11:25:02 +0000 (20:25 +0900)]
CreateMasterPotFile.vbs: ShellExtensionTemplate.rc → ShellExtension.rc
Takashi Sawanaka [Wed, 18 Aug 2021 11:24:26 +0000 (20:24 +0900)]
MergeLang.vcxproj*: Add *.po files for ShellExtension
Takashi Sawanaka [Wed, 18 Aug 2021 11:14:07 +0000 (20:14 +0900)]
ShellExtension: Bump revision to 1.17.16.0
Takashi Sawanaka [Wed, 18 Aug 2021 11:13:45 +0000 (20:13 +0900)]
ShellExtension: Fix an issue where the Shell Extension menu string did not switch when changing the language from Non-English to English in WinMerge's Options dialog.
Takashi Sawanaka [Wed, 18 Aug 2021 11:04:45 +0000 (20:04 +0900)]
Translations/ShellExtension: Add UpdatePoFilesFromPotFile.ps1
Takashi Sawanaka [Wed, 18 Aug 2021 11:02:58 +0000 (20:02 +0900)]
Translation/ShellExtension/*.po: Remove BOM
Takashi Sawanaka [Wed, 18 Aug 2021 00:19:22 +0000 (09:19 +0900)]
ShellExtension: As with WinMergeU.exe, do not embed translation strings in ShellExtension*.dll, but get it from the *.po file.
Thomas De Rocker [Tue, 17 Aug 2021 23:22:48 +0000 (01:22 +0200)]
Update Dutch.po (#921)
Takashi Sawanaka [Tue, 17 Aug 2021 11:49:39 +0000 (20:49 +0900)]
Fix issue #249: Right click - compare - is unclear
Takashi Sawanaka [Sun, 15 Aug 2021 23:56:37 +0000 (08:56 +0900)]
Add /EnableExitCode command line switch
Takashi Sawanaka [Sun, 15 Aug 2021 12:26:57 +0000 (21:26 +0900)]
Update Merge.vcxproj.*
Takashi Sawanaka [Sun, 15 Aug 2021 12:13:35 +0000 (21:13 +0900)]
DirView.cpp: Sort MESSAGE_MAP in menu order
Takashi Sawanaka [Sat, 14 Aug 2021 13:58:45 +0000 (22:58 +0900)]
Set the comparison options read from the project file to memory temporarily instead of saving them in the registry.
Takashi Sawanaka [Sat, 14 Aug 2021 13:55:29 +0000 (22:55 +0900)]
Set the exit status of the process to 0 if the comparison result is identical, 1 if different, and 2 if there is an error.
(For now, set the exit status to 2 for single instance mode)
Jun Tajima [Sat, 14 Aug 2021 00:03:56 +0000 (09:03 +0900)]
Add a feature to save/restore compare options to/from a project file. (#915)
Also, change the behavior of the "Options..." popup menu in the Select Files or Folders dialog.
- Even if the values in the popup menu are changed, it is not saved in the WinMerge option at that time.
- The values in the popup menu are saved in the WinMerge options when the "Compare" button is clicked.
- The "Include Subfolders" item in the popup menu is deleted.
Takashi Sawanaka [Fri, 13 Aug 2021 11:43:03 +0000 (20:43 +0900)]
Fix issue #914: Unicode SMP chars misrendered after performing a find
Takashi Sawanaka [Fri, 13 Aug 2021 06:53:22 +0000 (15:53 +0900)]
ConfigLog.cpp: Add Current Directory
Takashi Sawanaka [Fri, 13 Aug 2021 06:28:06 +0000 (15:28 +0900)]
Don't load file filters until they are used (2)
Takashi Sawanaka [Thu, 12 Aug 2021 15:43:15 +0000 (00:43 +0900)]
Don't load file filters until they are used
Takashi Sawanaka [Thu, 12 Aug 2021 13:43:06 +0000 (22:43 +0900)]
PerfTest.cmd: Add the measurement result to the CSV file
Takashi Sawanaka [Thu, 12 Aug 2021 12:09:54 +0000 (21:09 +0900)]
UnitTests: Add DiffItemListTest
Takashi Sawanaka [Thu, 12 Aug 2021 01:58:21 +0000 (10:58 +0900)]
- Fix an issue where the horizontal scrollbar was not disabled when comparing files while Word wrap was enabled. (2)
- Attempts to reduce the number of calls to the SetScrollInfo () function (2)
Takashi Sawanaka [Thu, 12 Aug 2021 00:34:49 +0000 (09:34 +0900)]
- Fix an issue where the horizontal scrollbar was not disabled when comparing files while Word wrap was enabled.
- Attempts to reduce the number of calls to the SetScrollInfo () function
Takashi Sawanaka [Wed, 11 Aug 2021 00:02:44 +0000 (09:02 +0900)]
Remove USES_CONVERSION
Takashi Sawanaka [Tue, 10 Aug 2021 23:26:42 +0000 (08:26 +0900)]
Code scanning alerts 744: Cast between HRESULT and a Boolean type
Takashi Sawanaka [Tue, 10 Aug 2021 13:41:26 +0000 (22:41 +0900)]
ShellExtension: Fix osdn.net ticket #42702: WinMerge's extended menu item was double-inserted in the Explorer's navigation pane.
Takashi Sawanaka [Mon, 9 Aug 2021 23:33:54 +0000 (08:33 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 9 Aug 2021 23:33:35 +0000 (08:33 +0900)]
Update Contributors.txt
Massimiliano Caniparoli [Mon, 9 Aug 2021 23:28:29 +0000 (01:28 +0200)]
Updated Italian Translation (#911)
Added some translations, not all of them.
I need to re-check the shortcuts, when a new release will be available :) Forgive me, I have no time for building WinMerge ;)