OSDN Git Service
Takashi Sawanaka [Mon, 26 Jul 2021 13:40:28 +0000 (22:40 +0900)]
Add ChangeLogJapanese.* and ReleaseNotesJapanese.* files
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
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 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
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:30:38 +0000 (14:30 +0900)]
Update translations
Takashi Sawanaka [Fri, 23 Jul 2021 05:14:13 +0000 (14:14 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
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 13:32:08 +0000 (22:32 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
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:51:00 +0000 (09:51 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
# Conflicts:
# Externals/freeimage
# Externals/frhed
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
# Translations/WinMerge/Galician.po
# Translations/WinMerge/Japanese.po
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
Takashi Sawanaka [Fri, 16 Jul 2021 11:41:11 +0000 (20:41 +0900)]
Fix Code scanning alerts 641: Expression has no effect
Takashi Sawanaka [Fri, 16 Jul 2021 11:32:44 +0000 (20:32 +0900)]
Fix Code scanning alerts 691, 692, 695, 696: Inconsistent nullness check
Tichij [Fri, 16 Jul 2021 11:09:15 +0000 (14:09 +0300)]
Update of Lithuanian translation (#879)
Takashi Sawanaka [Thu, 15 Jul 2021 23:38:29 +0000 (08:38 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Thu, 15 Jul 2021 23:35:40 +0000 (08:35 +0900)]
Improve plugin system (editor script) (#871)
Takashi Sawanaka [Thu, 15 Jul 2021 12:12:23 +0000 (21:12 +0900)]
Fix issue #878: Installer integrates with TortoiseGit and TortoiseSVN despite being told not to
Takashi Sawanaka [Thu, 15 Jul 2021 00:03:45 +0000 (09:03 +0900)]
Fix issue #876' Registry key with "Executable" and "ContextMenuEnabled" left behind when using an INI file for options
Tichij [Wed, 14 Jul 2021 14:03:06 +0000 (17:03 +0300)]
Update of Lithuanian translation (#875)
Takashi Sawanaka [Tue, 13 Jul 2021 23:50:50 +0000 (08:50 +0900)]
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice (3)
Hugo Carvalho [Tue, 13 Jul 2021 00:24:13 +0000 (01:24 +0100)]
Update Portuguese.po (#872)
Takashi Sawanaka [Mon, 12 Jul 2021 11:45:03 +0000 (20:45 +0900)]
Add /inifile command line option (2) related to https://github.com/WinMerge/winmerge/issues/248#issuecomment-
878083136
Takashi Sawanaka [Mon, 12 Jul 2021 00:17:03 +0000 (09:17 +0900)]
Update manual
Mr-Update [Sun, 11 Jul 2021 20:39:39 +0000 (22:39 +0200)]
Update German.po (#870)
Translation completed
Takashi Sawanaka [Sun, 11 Jul 2021 14:16:47 +0000 (23:16 +0900)]
ConfigLog.cpp: Do not output the path of the plugin described in Plugins.xml or the automatically generated plugin
Takashi Sawanaka [Sun, 11 Jul 2021 13:28:59 +0000 (22:28 +0900)]
Code scanning alerts 168,169: Unused static variable
Takashi Sawanaka [Sun, 11 Jul 2021 13:06:09 +0000 (22:06 +0900)]
Cppcheck: CWE: 398: Class 'CRegOptionsMgr' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).
Takashi Sawanaka [Sun, 11 Jul 2021 12:59:23 +0000 (21:59 +0900)]
Cppcheck: The function 'SetUnpacker' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sun, 11 Jul 2021 12:53:49 +0000 (21:53 +0900)]
Cppcheck: CWE: 398: Class '...' has a constructor with 1 argument that is not explicit. Such constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.
Takashi Sawanaka [Sun, 11 Jul 2021 12:50:29 +0000 (21:50 +0900)]
Cppcheck: CWE: 398: Parameter 'textValue' can be declared with const
Takashi Sawanaka [Sun, 11 Jul 2021 12:46:27 +0000 (21:46 +0900)]
Cppcheck: CWE: 398: Parameter 'events' is passed by value. It could be passed as a const reference which is usually faster and recommended in C++.
Takashi Sawanaka [Sun, 11 Jul 2021 12:43:48 +0000 (21:43 +0900)]
Cppcheck: CWE: 563: Variable 'colnum' is assigned a value that is never used.
LMS [Sun, 11 Jul 2021 12:09:53 +0000 (14:09 +0200)]
Galician translation update (#869)
* Update Galician.po
* Update Galician.po
* Update Galician.po
Galician translation update and corrections
* Galician translation update
* Galician translation update
* Galician translation update
Takashi Sawanaka [Sun, 11 Jul 2021 09:13:01 +0000 (18:13 +0900)]
Add /inifile command line option
Takashi Sawanaka [Sun, 11 Jul 2021 04:16:33 +0000 (13:16 +0900)]
Fix winmerge/winimerge issue #20: winmerge shows (differences) rotated image
Takashi Sawanaka [Fri, 9 Jul 2021 13:58:33 +0000 (22:58 +0900)]
Fix issue #834: Incorrect comparison (2)
This bug occurs when enabling both the 'Ignore blank lines' option and the 'Completely unhighlight the ignored differences' option.
Takashi Sawanaka [Fri, 9 Jul 2021 12:38:04 +0000 (21:38 +0900)]
Add PrettifyYAML and QueryYAML plugins (3)
Takashi Sawanaka [Thu, 8 Jul 2021 13:34:14 +0000 (22:34 +0900)]
Add PrettifyYAML and QueryYAML plugins (2)
Takashi Sawanaka [Thu, 8 Jul 2021 13:30:13 +0000 (22:30 +0900)]
Add PrettifyYAML and QueryYAML plugins
Takashi Sawanaka [Wed, 7 Jul 2021 23:49:04 +0000 (08:49 +0900)]
Fix code scanning alerts 464, 467, 468: Missing header guard
Takashi Sawanaka [Wed, 7 Jul 2021 23:34:30 +0000 (08:34 +0900)]
Fix issue #864: Improvement: Add check and error mesage in DownloadDeps.cmd that path to 7-zip exists
Takashi Sawanaka [Wed, 7 Jul 2021 14:31:57 +0000 (23:31 +0900)]
Use its q command even if it exists in the {WinMergeU.exe folder}\Command\q folder. (The same goes for Apache Tika.)
Tichij [Wed, 7 Jul 2021 13:02:24 +0000 (16:02 +0300)]
Update of Lithuanian translation (#866)
Takashi Sawanaka [Wed, 7 Jul 2021 12:59:39 +0000 (21:59 +0900)]
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice (2)
Takashi Sawanaka [Wed, 7 Jul 2021 00:06:39 +0000 (09:06 +0900)]
Fix code scanning alerts 36-40: Catching by value
Takashi Sawanaka [Tue, 6 Jul 2021 23:58:45 +0000 (08:58 +0900)]
Implement issue #772: Add preference option to clear "Don't ask … (#859)
Implement issue #772: Add preference option to clear "Don't ask this question again" CompareLargeFiles choice
Takashi Sawanaka [Tue, 6 Jul 2021 00:41:32 +0000 (09:41 +0900)]
Fix WinMerge/winmerge#862: ALL.vs2019.sln cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release (2)
Takashi Sawanaka [Tue, 6 Jul 2021 00:41:09 +0000 (09:41 +0900)]
Fix issue #862: ALL.vs2019.sln cl : command line warning D9035: option 'Gm' has been deprecated and will be removed in a future release
Takashi Sawanaka [Mon, 5 Jul 2021 13:19:38 +0000 (22:19 +0900)]
Fix issue #861: Project: heksedit cl : command line warning D9002: ignoring unknown option '/arch:SSE'
Takashi Sawanaka [Mon, 5 Jul 2021 11:41:52 +0000 (20:41 +0900)]
Bump revision to 2.16.12+-jp-4