OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoBump revision to 2.16.14+-jp-2 2.16.14+jp-2
Takashi Sawanaka [Sun, 22 Aug 2021 01:52:49 +0000 (10:52 +0900)]
Bump revision to 2.16.14+-jp-2

2 years agoUpdate translations
Takashi Sawanaka [Sun, 22 Aug 2021 01:52:07 +0000 (10:52 +0900)]
Update translations

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
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

2 years agoOptionsDef: use std::string_literals
Takashi Sawanaka [Sat, 21 Aug 2021 09:55:39 +0000 (18:55 +0900)]
OptionsDef: use std::string_literals

2 years agoFix Code scanning alerts #4: Upcast array used in pointer arithmetic
Takashi Sawanaka [Sat, 21 Aug 2021 02:02:54 +0000 (11:02 +0900)]
Fix Code scanning alerts #4: Upcast array used in pointer arithmetic

2 years agoMergeDocLineDiff.cpp: Fix crash when pressing Shift+F4 key
Takashi Sawanaka [Fri, 20 Aug 2021 23:52:46 +0000 (08:52 +0900)]
MergeDocLineDiff.cpp: Fix crash when pressing Shift+F4 key

2 years agoFix UploadToVirusTotal.cmd
Takashi Sawanaka [Fri, 20 Aug 2021 12:40:13 +0000 (21:40 +0900)]
Fix UploadToVirusTotal.cmd

2 years agoPlugins/Commands/*/*.bat: Verify SHA256 hash of downloaded file.
Takashi Sawanaka [Fri, 20 Aug 2021 12:37:21 +0000 (21:37 +0900)]
Plugins/Commands/*/*.bat: Verify SHA256 hash of downloaded file.

2 years agoUpdate Russian.po (#927)
wvxwxvw [Wed, 18 Aug 2021 23:31:32 +0000 (02:31 +0300)]
Update Russian.po (#927)

2 years agoDownloadDeps.cmd: Update ShellExtension to 1.17.16.0
Takashi Sawanaka [Wed, 18 Aug 2021 11:34:35 +0000 (20:34 +0900)]
DownloadDeps.cmd: Update ShellExtension to 1.17.16.0

2 years agoCreateMasterPotFile.vbs: ShellExtensionTemplate.rc → ShellExtension.rc ShellExtension-1.17.16.0
Takashi Sawanaka [Wed, 18 Aug 2021 11:25:02 +0000 (20:25 +0900)]
CreateMasterPotFile.vbs: ShellExtensionTemplate.rc → ShellExtension.rc

2 years agoMergeLang.vcxproj*: Add *.po files for ShellExtension
Takashi Sawanaka [Wed, 18 Aug 2021 11:24:26 +0000 (20:24 +0900)]
MergeLang.vcxproj*: Add *.po files for ShellExtension

2 years agoShellExtension: Bump revision to 1.17.16.0
Takashi Sawanaka [Wed, 18 Aug 2021 11:14:07 +0000 (20:14 +0900)]
ShellExtension: Bump revision to 1.17.16.0

2 years agoShellExtension: Fix an issue where the Shell Extension menu string did not switch...
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.

2 years agoTranslations/ShellExtension: Add UpdatePoFilesFromPotFile.ps1
Takashi Sawanaka [Wed, 18 Aug 2021 11:04:45 +0000 (20:04 +0900)]
Translations/ShellExtension: Add UpdatePoFilesFromPotFile.ps1

2 years agoTranslation/ShellExtension/*.po: Remove BOM
Takashi Sawanaka [Wed, 18 Aug 2021 11:02:58 +0000 (20:02 +0900)]
Translation/ShellExtension/*.po: Remove BOM

2 years agoShellExtension: As with WinMergeU.exe, do not embed translation strings in ShellExten...
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.

2 years agoUpdate Dutch.po (#921) ShellExtension-1.17.15.0
Thomas De Rocker [Tue, 17 Aug 2021 23:22:48 +0000 (01:22 +0200)]
Update Dutch.po (#921)

2 years agoFix issue #249: Right click - compare - is unclear
Takashi Sawanaka [Tue, 17 Aug 2021 11:49:39 +0000 (20:49 +0900)]
Fix issue #249: Right click - compare - is unclear

2 years agoAdd /EnableExitCode command line switch
Takashi Sawanaka [Sun, 15 Aug 2021 23:56:37 +0000 (08:56 +0900)]
Add /EnableExitCode command line switch

2 years agoUpdate Merge.vcxproj.*
Takashi Sawanaka [Sun, 15 Aug 2021 12:26:57 +0000 (21:26 +0900)]
Update Merge.vcxproj.*

2 years agoDirView.cpp: Sort MESSAGE_MAP in menu order
Takashi Sawanaka [Sun, 15 Aug 2021 12:13:35 +0000 (21:13 +0900)]
DirView.cpp: Sort MESSAGE_MAP in menu order

2 years agoSet the comparison options read from the project file to memory temporarily instead...
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.

2 years agoSet the exit status of the process to 0 if the comparison result is identical, 1...
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)

2 years agoAdd a feature to save/restore compare options to/from a project file. (#915)
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.

2 years agoFix issue #914: Unicode SMP chars misrendered after performing a find
Takashi Sawanaka [Fri, 13 Aug 2021 11:43:03 +0000 (20:43 +0900)]
Fix issue #914: Unicode SMP chars misrendered after performing a find

2 years agoConfigLog.cpp: Add Current Directory
Takashi Sawanaka [Fri, 13 Aug 2021 06:53:22 +0000 (15:53 +0900)]
ConfigLog.cpp: Add Current Directory

2 years agoDon't load file filters until they are used (2)
Takashi Sawanaka [Fri, 13 Aug 2021 06:28:06 +0000 (15:28 +0900)]
Don't load file filters until they are used (2)

2 years agoDon't load file filters until they are used
Takashi Sawanaka [Thu, 12 Aug 2021 15:43:15 +0000 (00:43 +0900)]
Don't load file filters until they are used

2 years agoPerfTest.cmd: Add the measurement result to the CSV file
Takashi Sawanaka [Thu, 12 Aug 2021 13:43:06 +0000 (22:43 +0900)]
PerfTest.cmd: Add the measurement result to the CSV file

2 years agoUnitTests: Add DiffItemListTest
Takashi Sawanaka [Thu, 12 Aug 2021 12:09:54 +0000 (21:09 +0900)]
UnitTests: Add DiffItemListTest

2 years ago- Fix an issue where the horizontal scrollbar was not disabled when comparing files...
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)

2 years ago- Fix an issue where the horizontal scrollbar was not disabled when comparing files...
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

2 years agoRemove USES_CONVERSION
Takashi Sawanaka [Wed, 11 Aug 2021 00:02:44 +0000 (09:02 +0900)]
Remove USES_CONVERSION

2 years agoCode scanning alerts 744: Cast between HRESULT and a Boolean type
Takashi Sawanaka [Tue, 10 Aug 2021 23:26:42 +0000 (08:26 +0900)]
Code scanning alerts 744: Cast between HRESULT and a Boolean type

2 years agoShellExtension: Fix osdn.net ticket #42702: WinMerge's extended menu item was double...
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.

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 9 Aug 2021 23:33:54 +0000 (08:33 +0900)]
Update TranslationsStatus

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 9 Aug 2021 23:33:35 +0000 (08:33 +0900)]
Update Contributors.txt

2 years agoUpdated Italian Translation (#911)
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 ;)

2 years agoUpdated translations (#910)
Felipe [Mon, 9 Aug 2021 23:27:45 +0000 (20:27 -0300)]
Updated translations (#910)

* Add files via upload

* Add files via upload

2 years agoAdd /c command line option
Takashi Sawanaka [Mon, 9 Aug 2021 06:28:53 +0000 (15:28 +0900)]
Add /c command line option

2 years agoRename SetDefaults() to Init()
Takashi Sawanaka [Mon, 9 Aug 2021 01:46:01 +0000 (10:46 +0900)]
Rename SetDefaults() to Init()

2 years agoFix crash when registry is set to an unexpected value (3)
Takashi Sawanaka [Sun, 8 Aug 2021 14:09:56 +0000 (23:09 +0900)]
Fix crash when registry is set to an unexpected value (3)

2 years agoUpdate googletest to v1.11.0
Takashi Sawanaka [Sun, 8 Aug 2021 14:04:48 +0000 (23:04 +0900)]
Update googletest to v1.11.0

2 years agoFix crash when registry is set to an unexpected value (2)
Takashi Sawanaka [Sun, 8 Aug 2021 05:48:43 +0000 (14:48 +0900)]
Fix crash when registry is set to an unexpected value (2)

2 years agoFix crash when registry is set to an unexpected value
Takashi Sawanaka [Sun, 8 Aug 2021 05:32:00 +0000 (14:32 +0900)]
Fix crash when registry is set to an unexpected value

2 years agoSplitterWndEx.cpp: Fix wrong row height calculation
Takashi Sawanaka [Fri, 6 Aug 2021 00:28:50 +0000 (09:28 +0900)]
SplitterWndEx.cpp: Fix wrong row height calculation

2 years agoIniOptionsMgr.cpp: Fix crash when an integer parameter in the INI file contains an...
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

2 years agoFix the problem that "CoInitialize has not been called." is displayed in the output...
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.

2 years agoMake CreateOptionsManager() function static function
Takashi Sawanaka [Sun, 1 Aug 2021 04:32:17 +0000 (13:32 +0900)]
Make CreateOptionsManager() function static function

2 years agoMainFrm.cpp: Fix an issue where a two-pane window was displayed even though New ...
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.

2 years agoBInary Compare: Fix "Save Middle" and "Save Middle As" menu items not being enabled
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

2 years ago- Move some CMergeEditVew::On* functions to CMergeDoc class
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

2 years agoFix mouse cursor not being in Wait state when loading files and plugins take a long...
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

2 years agoUpdate ChangeLogJapanese&ReleaseNotesJapanse
Takashi Sawanaka [Fri, 30 Jul 2021 13:09:32 +0000 (22:09 +0900)]
Update ChangeLogJapanese&ReleaseNotesJapanse

2 years agoFix issue #905: Duplicate menu shortcut in translations (2)
Takashi Sawanaka [Fri, 30 Jul 2021 13:04:32 +0000 (22:04 +0900)]
Fix issue #905: Duplicate menu shortcut in translations (2)

2 years agoFix issue #905: Duplicate menu shortcut in translations
Takashi Sawanaka [Fri, 30 Jul 2021 11:46:48 +0000 (20:46 +0900)]
Fix issue #905: Duplicate menu shortcut in translations

2 years agoAdd Tools/Scripts/URLFileSizeSHA256.*
Takashi Sawanaka [Tue, 27 Jul 2021 23:47:01 +0000 (08:47 +0900)]
Add Tools/Scripts/URLFileSizeSHA256.*

2 years agoUpdate Russian.po (#901)
wvxwxvw [Mon, 26 Jul 2021 14:56:55 +0000 (17:56 +0300)]
Update Russian.po (#901)

2 years agoAdd ChangeLogJapanese.* and ReleaseNotesJapanese.* files 2.16.14+jp-1
Takashi Sawanaka [Mon, 26 Jul 2021 13:40:28 +0000 (22:40 +0900)]
Add ChangeLogJapanese.* and ReleaseNotesJapanese.* files

2 years agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 25 Jul 2021 23:32:51 +0000 (08:32 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Translations/WinMerge/Turkish.po

2 years agoAdd CMergeApp::GetLangName() function
Takashi Sawanaka [Sun, 25 Jul 2021 23:28:48 +0000 (08:28 +0900)]
Add CMergeApp::GetLangName() function

2 years agoUpdate Slovenian translation. Submited by JadranR
Takashi Sawanaka [Sun, 25 Jul 2021 23:21:39 +0000 (08:21 +0900)]
Update Slovenian translation. Submited by JadranR

2 years agoTurkish translation update 2.16.14 (#899)
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

2 years agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 25 Jul 2021 10:22:31 +0000 (19:22 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Translations/WinMerge/English.pot
# Translations/WinMerge/Portuguese.po
# Version.h

2 years agoPlugins/Commands/q/q.bat: Allow the 64-bit version of the q command to be executed... v2.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,

2 years agoPlugins/Commands: Fix an issue where file download would fail if the% APPDATA%\WinMer...
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

2 years agoPlugins.xml: Remove unnecessary double quotation marks
Takashi Sawanaka [Sun, 25 Jul 2021 04:03:50 +0000 (13:03 +0900)]
Plugins.xml: Remove unnecessary double quotation marks

2 years agoAllow escape sequences such as \t, \x09 or strings such as "tab" as a delimiter for...
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)

2 years agoAllow escape sequences such as \t, \x09 or strings such as "tab" as a delimiter for...
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

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 23:56:32 +0000 (08:56 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 24 Jul 2021 23:56:22 +0000 (08:56 +0900)]
Update TranslationsStatus

2 years agoUpdate Portuguese.po translation (#898)
Hugo Carvalho [Sat, 24 Jul 2021 22:19:53 +0000 (23:19 +0100)]
Update Portuguese.po translation (#898)

2 years agoAdd icon for Substitution filters dialog
Takashi Sawanaka [Sat, 24 Jul 2021 14:20:29 +0000 (23:20 +0900)]
Add icon for Substitution filters dialog

2 years agoFix an issue where Editor script menu items are added to the Recent Files or Folders...
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

2 years agoBump revision to 2.16.14
Takashi Sawanaka [Sat, 24 Jul 2021 10:27:34 +0000 (19:27 +0900)]
Bump revision to 2.16.14

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 10:20:03 +0000 (19:20 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 24 Jul 2021 10:19:48 +0000 (19:19 +0900)]
Update TranslationsStatus

2 years agoUpdate Hungarian.po (#897)
efi99 [Sat, 24 Jul 2021 10:04:22 +0000 (12:04 +0200)]
Update Hungarian.po (#897)

2 years agoRotated: %s → Roated: %d
Takashi Sawanaka [Sat, 24 Jul 2021 06:10:24 +0000 (15:10 +0900)]
Rotated: %s → Roated: %d

2 years agoUnitTests: Add tests
Takashi Sawanaka [Sat, 24 Jul 2021 05:51:32 +0000 (14:51 +0900)]
UnitTests: Add tests

2 years agoMerge.rc: fine-tune
Takashi Sawanaka [Sat, 24 Jul 2021 03:44:11 +0000 (12:44 +0900)]
Merge.rc: fine-tune

2 years agoInternalPlugins.cpp: Fix Plugin arguments for Editor script plugin specified in the...
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

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 24 Jul 2021 02:02:49 +0000 (11:02 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoUpdate ALL.*.sln
Takashi Sawanaka [Sat, 24 Jul 2021 02:02:32 +0000 (11:02 +0900)]
Update ALL.*.sln

2 years agoMerge.rc: fine-tune
Takashi Sawanaka [Sat, 24 Jul 2021 01:05:14 +0000 (10:05 +0900)]
Merge.rc: fine-tune

2 years agoDirView.cpp: Disable "Swap * | *" menu items while comparing folders
Takashi Sawanaka [Sat, 24 Jul 2021 01:04:45 +0000 (10:04 +0900)]
DirView.cpp: Disable "Swap * | *" menu items while comparing folders

2 years agoRecord not only file paths but also specified plugins etc. in a recent file or folder.
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.

2 years agoPluginListDlg.cpp: Show ProcessType in the Type column
Takashi Sawanaka [Fri, 23 Jul 2021 07:01:53 +0000 (16:01 +0900)]
PluginListDlg.cpp: Show ProcessType in the Type column

2 years agostrutils.*: Add strip_hot_key() function and to_str(const StringView&) function
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

2 years agoUpdate translations
Takashi Sawanaka [Fri, 23 Jul 2021 05:30:38 +0000 (14:30 +0900)]
Update translations

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Fri, 23 Jul 2021 05:14:13 +0000 (14:14 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoPlugins.xml: Reword the plugin description slightly
Takashi Sawanaka [Fri, 23 Jul 2021 05:12:23 +0000 (14:12 +0900)]
Plugins.xml: Reword the plugin description slightly

2 years agoFix GUITest
Takashi Sawanaka [Fri, 23 Jul 2021 04:37:48 +0000 (13:37 +0900)]
Fix GUITest

2 years agoUpdate of Lithuanian translation (#894)
Tichij [Fri, 23 Jul 2021 02:37:32 +0000 (05:37 +0300)]
Update of Lithuanian translation (#894)

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Thu, 22 Jul 2021 13:32:08 +0000 (22:32 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoFix compilation errors on Test solution configuration
Takashi Sawanaka [Thu, 22 Jul 2021 12:31:03 +0000 (21:31 +0900)]
Fix compilation errors on Test solution configuration

2 years agoAdd /fileext command line option
Takashi Sawanaka [Thu, 22 Jul 2021 12:11:28 +0000 (21:11 +0900)]
Add /fileext command line option

2 years agoUpdate Dutch.po (#893)
Thomas De Rocker [Thu, 22 Jul 2021 10:49:42 +0000 (12:49 +0200)]
Update Dutch.po (#893)

2 years agoFix the Select Files or Folders dialog. (#892)
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.