OSDN Git Service
Takashi Sawanaka [Sat, 6 Aug 2022 00:20:22 +0000 (09:20 +0900)]
Fix issue #1438: Non existing backup directory should be automatically created
Marcello-mco [Wed, 3 Aug 2022 00:08:32 +0000 (21:08 -0300)]
Update Brazilian.po (#1437)
I missed one message to translate. Now I think everythig is fine.
Takashi Sawanaka [Mon, 1 Aug 2022 23:26:17 +0000 (08:26 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 1 Aug 2022 23:25:54 +0000 (08:25 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 1 Aug 2022 23:24:52 +0000 (08:24 +0900)]
Update Contributors.txt
Marcello-mco [Mon, 1 Aug 2022 23:20:13 +0000 (20:20 -0300)]
Update Brazilian.po (#1436)
I've translated de missing pieces.
Takashi Sawanaka [Sun, 31 Jul 2022 15:24:14 +0000 (00:24 +0900)]
Fix issue #1433: Remember zoom level for all files
Jun Tajima [Sun, 31 Jul 2022 12:47:22 +0000 (21:47 +0900)]
Disable rename operations when in read-only mode in the folder compare window. (#1434)
Takashi Sawanaka [Sat, 30 Jul 2022 01:23:14 +0000 (10:23 +0900)]
Update 7-Zip to 22.01 (2)
Takashi Sawanaka [Sat, 30 Jul 2022 00:58:05 +0000 (09:58 +0900)]
Update 7-Zip to 22.01
Inskipp [Sat, 30 Jul 2022 00:23:33 +0000 (18:23 -0600)]
Create Midnight.ini (#1430)
* Create Dark Mode.ini
Added an additional color scheme that is easy on the eyes.
* Update and rename Dark Mode.ini to Midnight.ini
Changed The colors of the folder window to better differentiate this scheme from Solarized Dark.
* Update Midnight.ini
I've altered the value of the background for diff items in the folder window to better contrast with the text. I didn't want increase the contrast too high here, as that would defeat the purpose of a dark theme, but I think this is a good compromise between ease of readability and lack of eye strain.
Tichij [Fri, 29 Jul 2022 14:51:55 +0000 (17:51 +0300)]
Update of Lithuanian translation (#1431)
Mirosław Żylewicz [Wed, 27 Jul 2022 23:52:57 +0000 (01:52 +0200)]
Update Polish.po (#1427)
wvxwxvw [Wed, 27 Jul 2022 22:23:50 +0000 (01:23 +0300)]
Update Russian.po (#1426)
Takashi Sawanaka [Wed, 27 Jul 2022 09:35:00 +0000 (18:35 +0900)]
Update Slovenian.po Submitted by JadranR
Takashi Sawanaka [Mon, 25 Jul 2022 23:39:40 +0000 (08:39 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sun, 24 Jul 2022 12:13:31 +0000 (21:13 +0900)]
Bump revision to 2.16.22.0
Takashi Sawanaka [Sun, 24 Jul 2022 12:12:08 +0000 (21:12 +0900)]
Update ChangeLog&ReleaseNotes (4)
slolo2000 [Sat, 23 Jul 2022 13:07:55 +0000 (15:07 +0200)]
Update French.po (#1418)
Takashi Sawanaka [Sat, 23 Jul 2022 00:07:38 +0000 (09:07 +0900)]
ImgMergefrm.cpp: Fix different widths of left and right header bars
Takashi Sawanaka [Sat, 23 Jul 2022 00:01:20 +0000 (09:01 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Fri, 22 Jul 2022 22:57:43 +0000 (07:57 +0900)]
Update ChangeLog&ReleaseNotes (2)
Hugo Carvalho [Fri, 22 Jul 2022 14:15:16 +0000 (15:15 +0100)]
Update Portuguese translation (#1416)
stonee-K [Wed, 20 Jul 2022 15:13:48 +0000 (00:13 +0900)]
Optimize snake function (#1411)
Jun Tajima [Mon, 18 Jul 2022 13:21:40 +0000 (22:21 +0900)]
Fix an issue where the folder column is not updated for child items after renaming a directory in the folder compare window. (#1408)
- Add a process to update the path of child items after renaming a directory.
- This commit also fixes an issue where file comparisons of child items after renaming a directory would result in empty files comparison instead of the intended files comparison.
Takashi Sawanaka [Sat, 16 Jul 2022 03:53:07 +0000 (12:53 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 16 Jul 2022 01:13:35 +0000 (10:13 +0900)]
Fix the status bar no longer shows Elapsed time after folder comparison.
Takashi Sawanaka [Tue, 12 Jul 2022 15:15:07 +0000 (00:15 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 12 Jul 2022 15:14:45 +0000 (00:14 +0900)]
Fix issue #1395: Allow renaming of untitled pages (3)
LMS [Tue, 12 Jul 2022 00:35:08 +0000 (02:35 +0200)]
Galician translation update (#1400)
Mr-Update [Sun, 10 Jul 2022 23:01:16 +0000 (01:01 +0200)]
Update German.po (#1399)
- Translation completed
- Hotkeys removed because they cannot be used
Takashi Sawanaka [Sun, 10 Jul 2022 14:55:29 +0000 (23:55 +0900)]
WIP(10)Fix issue #1395: Allow renaming of untitled pages (2)
efi99 [Sun, 10 Jul 2022 12:42:47 +0000 (14:42 +0200)]
Update Hungarian.po (#1398)
Takashi Sawanaka [Sun, 10 Jul 2022 05:17:00 +0000 (14:17 +0900)]
Fix issue #1395: Allow renaming of untitled pages
Mr-Update [Wed, 6 Jul 2022 22:59:30 +0000 (00:59 +0200)]
Update German.po (#1396)
Takashi Sawanaka [Mon, 4 Jul 2022 12:12:42 +0000 (21:12 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 4 Jul 2022 12:12:07 +0000 (21:12 +0900)]
Update Japanese.po
Tichij [Mon, 4 Jul 2022 12:07:44 +0000 (15:07 +0300)]
Update of Lithuanian translation (#1394)
efi99 [Mon, 4 Jul 2022 12:06:09 +0000 (14:06 +0200)]
Update Hungarian.po (#1393)
Takashi Sawanaka [Sun, 3 Jul 2022 13:16:07 +0000 (22:16 +0900)]
Fix issue #1386: vertical editing for .h file is quite slow
Takashi Sawanaka [Sun, 3 Jul 2022 13:15:39 +0000 (22:15 +0900)]
Reduce compiler warnings
Takashi Sawanaka [Sun, 3 Jul 2022 13:15:08 +0000 (22:15 +0900)]
Update Contributors.txt
Jun Tajima [Sun, 3 Jul 2022 13:04:23 +0000 (22:04 +0900)]
Fix the problem that the comparison result is not displayed correctly when renaming a file (directory) that exists on only one side to a name where the file (directory) with the same name exists. (#1392)
- Rescan the renamed item if the side flag changes due to renaming.
- Delete the item with the same file name as after renaming.
Mauricio Gracia Gutierrez [Sun, 3 Jul 2022 13:03:28 +0000 (08:03 -0500)]
Keep hidden items (#1377)
* When items are hidden add them to a DiffContext list
* no need to keep m_nHiddenItems since we now have a list of the currently hidden items.
* remove two introduced warnings
* .winmerge stores a list of hidden items
* hidde-item in singular (not plural)
* saveHiddenItems inside <path> node
* Fixing indentation to use Eric Allman style
* load the hiddenItems from the .winmerge project file + keep an use the token
* load hidden-items from .winmerge and hidding some test items
* https://github.com/WinMerge/winmerge/pull/1377#issuecomment-
1164375545
* Add "Hidden Items" to the project options
* Update ChangeLog.md
* revert ChangeLog.md and README.md, applying requested changes
* rever ChangeLog.md empty space
* https://github.com/WinMerge/winmerge/pull/1377#discussion_r912328299
* update ChangeLog.md
Co-authored-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Takashi Sawanaka [Sat, 2 Jul 2022 15:30:31 +0000 (00:30 +0900)]
Fix issue #1387: replace text using regular expressions behaves inco… (#1388)
stonee-K [Fri, 1 Jul 2022 14:20:27 +0000 (23:20 +0900)]
Make wsc files available as plug-in (#1390)
Takashi Sawanaka [Mon, 27 Jun 2022 11:56:24 +0000 (20:56 +0900)]
Fix issue #1380: “Match case” in Search always enabled
Takashi Sawanaka [Sat, 25 Jun 2022 00:55:41 +0000 (09:55 +0900)]
Update 7-Zip to 22.00 (2)
Takashi Sawanaka [Sat, 25 Jun 2022 00:23:13 +0000 (09:23 +0900)]
Update 7-Zip to 22.00
Ikko Ashimine [Thu, 23 Jun 2022 23:04:49 +0000 (08:04 +0900)]
Fix typo in SuperComboBox.cpp (#1379)
alway -> always
Takashi Sawanaka [Tue, 21 Jun 2022 13:19:01 +0000 (22:19 +0900)]
Disable the Replace button if text is selected, as it cannot solve the strange behavior such as crashes when the Replace button is pressed while text is selected.
Takashi Sawanaka [Tue, 21 Jun 2022 13:16:51 +0000 (22:16 +0900)]
Fix issue #1376: "Replace All" doesn't work when Replace in "Selection" and the new string contains the old string.
StoyanDimitrov [Mon, 20 Jun 2022 22:20:55 +0000 (22:20 +0000)]
Update Bulgarian.po (#1375)
stonee-K [Mon, 20 Jun 2022 13:38:51 +0000 (22:38 +0900)]
* Disable Shift + Numeric Key (#1374)
* Enable CTRL-X, CTRL-C, CTRL-V, CTRL-Z
* Allow pasting when the clipboard string is numeric
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:48 +0000 (21:14 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (2)
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:05 +0000 (21:14 +0900)]
Update ChangeLog&ReleaseNotes (2)
Jun Tajima [Sun, 19 Jun 2022 12:07:47 +0000 (21:07 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (#1372)
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:59 +0000 (23:11 +0900)]
Bump revision to 2.16.21
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:24 +0000 (23:11 +0900)]
Update ALL.*.sln
Takashi Sawanaka [Sat, 18 Jun 2022 04:21:52 +0000 (13:21 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Thu, 16 Jun 2022 15:35:20 +0000 (00:35 +0900)]
Binary Compare: Allow the "Split Vertically" menu item to be unchecked.
Takashi Sawanaka [Wed, 15 Jun 2022 14:06:30 +0000 (23:06 +0900)]
Image Compare, Webpage Compare: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
Takashi Sawanaka [Tue, 14 Jun 2022 12:30:23 +0000 (21:30 +0900)]
Fix issue #1367: Tab behaviour on comparisons of files vs folders
Takashi Sawanaka [Tue, 7 Jun 2022 13:14:47 +0000 (22:14 +0900)]
Fix issue #1363: Crash on command line compare
Takashi Sawanaka [Tue, 7 Jun 2022 12:30:36 +0000 (21:30 +0900)]
Fix issue #1192: [Bug Report] WinMerge does not recognize Win 11
Takashi Sawanaka [Tue, 7 Jun 2022 11:34:35 +0000 (20:34 +0900)]
Fix issue #1362: Line difference coloring in “Word-level” mode does not work correctly for Cyrillic-based languages
stonee-K [Mon, 6 Jun 2022 12:24:22 +0000 (21:24 +0900)]
Initialize variables defined at "diff.h" (#1360)
Jun Tajima [Sat, 4 Jun 2022 22:56:26 +0000 (07:56 +0900)]
Make the file name refreshed to detect case changes when running "Refresh Selected". (#1358)
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:59 +0000 (07:11 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:28 +0000 (07:11 +0900)]
Update Contributors.txt
Simone Saviolo [Wed, 1 Jun 2022 22:10:20 +0000 (00:10 +0200)]
Updated Italian translation (#1355)
Takashi Sawanaka [Tue, 31 May 2022 11:15:45 +0000 (20:15 +0900)]
Fix issue #1354: Syntax highlighting: SQL comments
stonee-K [Mon, 30 May 2022 13:29:51 +0000 (22:29 +0900)]
diffutils ver2.7 (#1351)
> Mon Sep 12 15:52:22 1994
> Use isupper+tolower instead of islower+toupper, for consistency.
Takashi Sawanaka [Sun, 29 May 2022 07:32:28 +0000 (16:32 +0900)]
Installer: Disable commit
68b4e3ea
Takashi Sawanaka [Sat, 28 May 2022 15:14:52 +0000 (00:14 +0900)]
Installer: If there are Explorer processes started as separate processes, the Shell Extension installation will fail to terminate Explorer, so terminate those Explorer processes except during file operations.
Takashi Sawanaka [Wed, 25 May 2022 14:42:58 +0000 (23:42 +0900)]
Fix issue #1349: Refresh Selected Marks Unscanned Folders as Identical
Takashi Sawanaka [Wed, 25 May 2022 12:39:44 +0000 (21:39 +0900)]
Installer: Start Explorer just before exiting the installer if the Explorer restart that was run to install the ShellExtension fails.
Takashi Sawanaka [Mon, 23 May 2022 13:26:41 +0000 (22:26 +0900)]
Update ShellExtension to 1.8.5.0
Takashi Sawanaka [Mon, 23 May 2022 13:13:36 +0000 (22:13 +0900)]
WinMergeContextMenu: Fix build error
Takashi Sawanaka [Mon, 23 May 2022 13:03:52 +0000 (22:03 +0900)]
WinMergeContextMenu: Fix build error on VS2017
Takashi Sawanaka [Mon, 23 May 2022 12:58:19 +0000 (21:58 +0900)]
ShellExtension: Bump revision to 1.18.5.0
Takashi Sawanaka [Mon, 23 May 2022 12:52:31 +0000 (21:52 +0900)]
WinMergeContextMenu: Fix the problem that the WinMerge icon is not correctly displayed on the taskbar when WinMerge is started from the Windows 11 context menu.
I referred to the following URL
- https://gitlab.com/tortoisegit/tortoisegit/-/merge_requests/187
- https://devblogs.microsoft.com/oldnewthing/
20131118-00/?p=2643
- https://devblogs.microsoft.com/oldnewthing/
20130318-00/?p=4933
Takashi Sawanaka [Mon, 23 May 2022 12:45:54 +0000 (21:45 +0900)]
WinMergeContextMenu: Fix an issue where the WinMerge menu displayed in the "Show more options" menu of the Windows 11 Explorer context menu is not an advanced menu, even though the advanced menu is enabled.
Takashi Sawanaka [Sun, 22 May 2022 12:30:16 +0000 (21:30 +0900)]
Call Windows 7 or later API functions directly since WinMerge 64-bit version only works with Windows 7 or later,
Takashi Sawanaka [Sun, 22 May 2022 12:24:55 +0000 (21:24 +0900)]
Undo accidentally committed file
Takashi Sawanaka [Sun, 22 May 2022 12:10:59 +0000 (21:10 +0900)]
Issue #1340: Request for updating code: a new language(ABAP) in "syntax highlighting" Submitted by yuanshouyan1823
Takashi Sawanaka [Sun, 22 May 2022 01:53:31 +0000 (10:53 +0900)]
Update .gitignore
Takashi Sawanaka [Sun, 22 May 2022 01:43:22 +0000 (10:43 +0900)]
Update winimerge to 1.0.34 (2)
Takashi Sawanaka [Sun, 22 May 2022 01:42:57 +0000 (10:42 +0900)]
Update winwebdiff to 1.0.3
Takashi Sawanaka [Sat, 21 May 2022 15:16:07 +0000 (00:16 +0900)]
Fix issue #1312: In windows 11 i have error 78 sidebyside with the winmerge manifest
Takashi Sawanaka [Sat, 21 May 2022 14:28:14 +0000 (23:28 +0900)]
Update TranslationsStatus format for Corsican (#1347) (2)
Patriccollu [Sat, 21 May 2022 14:21:10 +0000 (16:21 +0200)]
Update TranslationsStatus format for Corsican (#1347)
Takashi Sawanaka [Sat, 21 May 2022 13:37:26 +0000 (22:37 +0900)]
Fix issue #1326: Backup files: Misleading error message when file cannot be written
Takashi Sawanaka [Sat, 21 May 2022 06:19:41 +0000 (15:19 +0900)]
- Image compare: Make patience and histogram diff algorithm selectable.
- Update winimerge to 1.0.34
Takashi Sawanaka [Sat, 21 May 2022 06:16:42 +0000 (15:16 +0900)]
Update TranslationsStatus
Hugo Carvalho [Fri, 20 May 2022 22:32:40 +0000 (23:32 +0100)]
Update Portuguese translation (#1345)
Jun Tajima [Fri, 20 May 2022 15:34:31 +0000 (00:34 +0900)]
Fix report generation process. (#1344)
- The string with the hyperlink to the file comparie report is now replaced with the HTML entity, when generating an HTML-style folder compare report with the "Include File Compare Report" option enabled.
stonee-K [Fri, 20 May 2022 00:10:18 +0000 (09:10 +0900)]
Fix typo: GPL (#1342)
* Fix typo: GPL
Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".
* Fix typo: GPL
Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".
stonee-K [Mon, 16 May 2022 11:19:23 +0000 (20:19 +0900)]
Update Japanese.po (Codepage dialog) (#1338)
"both" means loading and saving, not left pane and right pane.
Takashi Sawanaka [Mon, 16 May 2022 00:11:19 +0000 (09:11 +0900)]
Fix issue #1335: Alt/Shift key highlighting issue not resetting start point from move.