OSDN Git Service
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 ;)
Felipe [Mon, 9 Aug 2021 23:27:45 +0000 (20:27 -0300)]
Updated translations (#910)
* Add files via upload
* Add files via upload
Takashi Sawanaka [Mon, 9 Aug 2021 06:28:53 +0000 (15:28 +0900)]
Add /c command line option
Takashi Sawanaka [Mon, 9 Aug 2021 01:46:01 +0000 (10:46 +0900)]
Rename SetDefaults() to Init()
Takashi Sawanaka [Sun, 8 Aug 2021 14:09:56 +0000 (23:09 +0900)]
Fix crash when registry is set to an unexpected value (3)
Takashi Sawanaka [Sun, 8 Aug 2021 14:04:48 +0000 (23:04 +0900)]
Update googletest to v1.11.0
Takashi Sawanaka [Sun, 8 Aug 2021 05:48:43 +0000 (14:48 +0900)]
Fix crash when registry is set to an unexpected value (2)
Takashi Sawanaka [Sun, 8 Aug 2021 05:32:00 +0000 (14:32 +0900)]
Fix crash when registry is set to an unexpected value
Takashi Sawanaka [Fri, 6 Aug 2021 00:28:50 +0000 (09:28 +0900)]
SplitterWndEx.cpp: Fix wrong row height calculation
Takashi Sawanaka [Wed, 4 Aug 2021 12:34:46 +0000 (21:34 +0900)]
IniOptionsMgr.cpp: Fix crash when an integer parameter in the INI file contains an invalid value
Takashi Sawanaka [Wed, 4 Aug 2021 11:09:52 +0000 (20:09 +0900)]
Fix the problem that "CoInitialize has not been called." is displayed in the output pane when the network path is specified in the "Select Files or Folders" window.
Takashi Sawanaka [Sun, 1 Aug 2021 04:32:17 +0000 (13:32 +0900)]
Make CreateOptionsManager() function static function
Takashi Sawanaka [Sat, 31 Jul 2021 14:12:28 +0000 (23:12 +0900)]
MainFrm.cpp: Fix an issue where a two-pane window was displayed even though New (3panes) → Table menu item was selected.
Takashi Sawanaka [Sat, 31 Jul 2021 08:09:38 +0000 (17:09 +0900)]
BInary Compare: Fix "Save Middle" and "Save Middle As" menu items not being enabled
Takashi Sawanaka [Sat, 31 Jul 2021 07:57:05 +0000 (16:57 +0900)]
- Move some CMergeEditVew::On* functions to CMergeDoc class
- Sort the order of message handlers in menu order
Takashi Sawanaka [Sat, 31 Jul 2021 02:00:43 +0000 (11:00 +0900)]
Fix mouse cursor not being in Wait state when loading files and plugins take a long time
Takashi Sawanaka [Fri, 30 Jul 2021 13:04:32 +0000 (22:04 +0900)]
Fix issue #905: Duplicate menu shortcut in translations (2)
Takashi Sawanaka [Fri, 30 Jul 2021 11:46:48 +0000 (20:46 +0900)]
Fix issue #905: Duplicate menu shortcut in translations
Takashi Sawanaka [Tue, 27 Jul 2021 23:47:01 +0000 (08:47 +0900)]
Add Tools/Scripts/URLFileSizeSHA256.*
wvxwxvw [Mon, 26 Jul 2021 14:56:55 +0000 (17:56 +0300)]
Update Russian.po (#901)
Takashi Sawanaka [Sun, 25 Jul 2021 23:28:48 +0000 (08:28 +0900)]
Add CMergeApp::GetLangName() function
Takashi Sawanaka [Sun, 25 Jul 2021 23:21:39 +0000 (08:21 +0900)]
Update Slovenian translation. Submited by JadranR
Kaya Zeren [Sun, 25 Jul 2021 23:18:47 +0000 (02:18 +0300)]
Turkish translation update 2.16.14 (#899)
Turkish translation update 2.16.14
Takashi Sawanaka [Sun, 25 Jul 2021 07:00:50 +0000 (16:00 +0900)]
Plugins/Commands/q/q.bat: Allow the 64-bit version of the q command to be executed when running the 32-bit version of WinMerge on 64-bit Windows,
Takashi Sawanaka [Sun, 25 Jul 2021 06:35:29 +0000 (15:35 +0900)]
Plugins/Commands: Fix an issue where file download would fail if the% APPDATA%\WinMerge folder did not exist
Takashi Sawanaka [Sun, 25 Jul 2021 04:03:50 +0000 (13:03 +0900)]
Plugins.xml: Remove unnecessary double quotation marks
Takashi Sawanaka [Sun, 25 Jul 2021 02:34:08 +0000 (11:34 +0900)]
Allow escape sequences such as \t, \x09 or strings such as "tab" as a delimiter for table files (2)
Takashi Sawanaka [Sun, 25 Jul 2021 02:24:57 +0000 (11:24 +0900)]
Allow escape sequences such as \t, \x09 or strings such as "tab" as a delimiter for table files
Takashi Sawanaka [Sat, 24 Jul 2021 23:56:32 +0000 (08:56 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 23:56:22 +0000 (08:56 +0900)]
Update TranslationsStatus
Hugo Carvalho [Sat, 24 Jul 2021 22:19:53 +0000 (23:19 +0100)]
Update Portuguese.po translation (#898)
Takashi Sawanaka [Sat, 24 Jul 2021 14:20:29 +0000 (23:20 +0900)]
Add icon for Substitution filters dialog
Takashi Sawanaka [Sat, 24 Jul 2021 13:49:21 +0000 (22:49 +0900)]
Fix an issue where Editor script menu items are added to the Recent Files or Folders menu on Windows XP
Takashi Sawanaka [Sat, 24 Jul 2021 10:27:34 +0000 (19:27 +0900)]
Bump revision to 2.16.14
Takashi Sawanaka [Sat, 24 Jul 2021 10:20:03 +0000 (19:20 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 10:19:48 +0000 (19:19 +0900)]
Update TranslationsStatus
efi99 [Sat, 24 Jul 2021 10:04:22 +0000 (12:04 +0200)]
Update Hungarian.po (#897)
Takashi Sawanaka [Sat, 24 Jul 2021 06:10:24 +0000 (15:10 +0900)]
Rotated: %s → Roated: %d
Takashi Sawanaka [Sat, 24 Jul 2021 05:51:32 +0000 (14:51 +0900)]
UnitTests: Add tests
Takashi Sawanaka [Sat, 24 Jul 2021 03:44:11 +0000 (12:44 +0900)]
Merge.rc: fine-tune
Takashi Sawanaka [Sat, 24 Jul 2021 03:31:15 +0000 (12:31 +0900)]
InternalPlugins.cpp: Fix Plugin arguments for Editor script plugin specified in the Plugin Settings dialog not being used
Takashi Sawanaka [Sat, 24 Jul 2021 02:02:49 +0000 (11:02 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 02:02:32 +0000 (11:02 +0900)]
Update ALL.*.sln
Takashi Sawanaka [Sat, 24 Jul 2021 01:05:14 +0000 (10:05 +0900)]
Merge.rc: fine-tune
Takashi Sawanaka [Sat, 24 Jul 2021 01:04:45 +0000 (10:04 +0900)]
DirView.cpp: Disable "Swap * | *" menu items while comparing folders
Takashi Sawanaka [Fri, 23 Jul 2021 14:11:53 +0000 (23:11 +0900)]
Record not only file paths but also specified plugins etc. in a recent file or folder.
Takashi Sawanaka [Fri, 23 Jul 2021 07:01:53 +0000 (16:01 +0900)]
PluginListDlg.cpp: Show ProcessType in the Type column
Takashi Sawanaka [Fri, 23 Jul 2021 06:42:19 +0000 (15:42 +0900)]
strutils.*: Add strip_hot_key() function and to_str(const StringView&) function
Takashi Sawanaka [Fri, 23 Jul 2021 05:12:23 +0000 (14:12 +0900)]
Plugins.xml: Reword the plugin description slightly
Takashi Sawanaka [Fri, 23 Jul 2021 04:37:48 +0000 (13:37 +0900)]
Fix GUITest
Tichij [Fri, 23 Jul 2021 02:37:32 +0000 (05:37 +0300)]
Update of Lithuanian translation (#894)
Takashi Sawanaka [Thu, 22 Jul 2021 12:31:03 +0000 (21:31 +0900)]
Fix compilation errors on Test solution configuration
Takashi Sawanaka [Thu, 22 Jul 2021 12:11:28 +0000 (21:11 +0900)]
Add /fileext command line option
Thomas De Rocker [Thu, 22 Jul 2021 10:49:42 +0000 (12:49 +0200)]
Update Dutch.po (#893)
Jun Tajima [Thu, 22 Jul 2021 10:49:16 +0000 (19:49 +0900)]
Fix the Select Files or Folders dialog. (#892)
- Fix an issue where plugin items are added to the "Save Project ..." drop down button when files (instead of directories) are specified in the "File or Folder" fields.
Takashi Sawanaka [Thu, 22 Jul 2021 07:05:51 +0000 (16:05 +0900)]
Fix an error when the processing result of the file by the prediffer plugin becomes 0 bytes.
Takashi Sawanaka [Thu, 22 Jul 2021 06:20:54 +0000 (15:20 +0900)]
Add /new command line option
Takashi Sawanaka [Thu, 22 Jul 2021 04:29:45 +0000 (13:29 +0900)]
q.bat: Windows 11 on arm64 can run x64 binaries
Takashi Sawanaka [Thu, 22 Jul 2021 03:32:53 +0000 (12:32 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Thu, 22 Jul 2021 02:34:27 +0000 (11:34 +0900)]
- Update Apache Tika to version 2.0.0
- Update yq to version 4.11.1
- Add LICENSE.txt files
Mr-Update [Wed, 21 Jul 2021 22:39:48 +0000 (00:39 +0200)]
Update German.po (#890)
Takashi Sawanaka [Wed, 21 Jul 2021 13:45:49 +0000 (22:45 +0900)]
Add PrettifyHTML and ValidateHTML unpacker plugins
Takashi Sawanaka [Sun, 18 Jul 2021 14:44:09 +0000 (23:44 +0900)]
Add /table-delimiter, /table-quote and /table-allownewlinesinquotes command line options
Takashi Sawanaka [Sun, 18 Jul 2021 01:50:21 +0000 (10:50 +0900)]
Fix Code scanning alerts 630: Comparison result is always the same
Takashi Sawanaka [Sun, 18 Jul 2021 01:42:32 +0000 (10:42 +0900)]
Fix Code scanning alerts 631: Array argument size mismatch
Takashi Sawanaka [Sun, 18 Jul 2021 01:22:16 +0000 (10:22 +0900)]
Fix an infinite loop when "find what" in the substitution filters is empty. related to PR #881 (2)
Takashi Sawanaka [Sun, 18 Jul 2021 01:17:45 +0000 (10:17 +0900)]
Fix an infinite loop when "find what" in the substitution filters is empty. related to PR #881
Mr-Update [Sat, 17 Jul 2021 23:58:06 +0000 (01:58 +0200)]
Update German.po (#883)
Jun Tajima [Sat, 17 Jul 2021 14:47:30 +0000 (23:47 +0900)]
Fix the Select Files or Folders dialog. (#882)
- Fix an issue where the enabled state of "Folder: Filter" and "File: Unpacker Plugin" is not updated when loading a project with the "Load Project..." drop down button.
Takashi Sawanaka [Sat, 17 Jul 2021 08:07:30 +0000 (17:07 +0900)]
Test.cpp: Add CommandLineTest.WindowType
Takashi Sawanaka [Sat, 17 Jul 2021 07:30:35 +0000 (16:30 +0900)]
Move OnViewSwapPanesxx() functions from CMergeEditView class to CMergeDoc class
Takashi Sawanaka [Sat, 17 Jul 2021 07:05:01 +0000 (16:05 +0900)]
BinaryCompare: Fix an issue where window titles may not be updated
Takashi Sawanaka [Sat, 17 Jul 2021 05:02:57 +0000 (14:02 +0900)]
Add /t command line option to specify the type of window to display files in
Takashi Sawanaka [Sat, 17 Jul 2021 00:46:45 +0000 (09:46 +0900)]
Implement osdn.net #41528: command line option that specifies line number to jump after loading files