OSDN Git Service
Takashi Sawanaka [Sun, 22 Mar 2020 00:56:16 +0000 (09:56 +0900)]
Update frhed and ShellExtension
Takashi Sawanaka [Sun, 22 Mar 2020 00:43:41 +0000 (09:43 +0900)]
Update Slovenian.po
Takashi Sawanaka [Sun, 22 Mar 2020 00:42:15 +0000 (09:42 +0900)]
ShellExtension: Bump revision to 1.17.12.0
Takashi Sawanaka [Sun, 22 Mar 2020 00:34:12 +0000 (09:34 +0900)]
Merge pull request #292 from qosobrin/master
Galician and Spanish translations update
LMS [Sat, 21 Mar 2020 18:37:44 +0000 (19:37 +0100)]
Shell Extension Spanish translation
LMS [Sat, 21 Mar 2020 18:36:24 +0000 (19:36 +0100)]
InnoSetup Spanish translation
LMS [Sat, 21 Mar 2020 18:35:43 +0000 (19:35 +0100)]
Shell Extension Galician translation
LMS [Sat, 21 Mar 2020 18:35:17 +0000 (19:35 +0100)]
InnoSetup Galician translation
Takashi Sawanaka [Sat, 21 Mar 2020 12:33:20 +0000 (21:33 +0900)]
Fix an issue where EOL differences are highlighted in diff blocks even though "Ignore carriage return differences" is enabled.
Takashi Sawanaka [Sat, 21 Mar 2020 03:17:52 +0000 (12:17 +0900)]
Installer: Add frhed/Languages/sl.po file to installer
Takashi Sawanaka [Sat, 21 Mar 2020 02:07:24 +0000 (11:07 +0900)]
Merge remote-tracking branch 'origin/master'
Takashi Sawanaka [Sat, 21 Mar 2020 01:41:56 +0000 (10:41 +0900)]
Update frhed and ShellExtension
Takashi Sawanaka [Sat, 21 Mar 2020 01:40:14 +0000 (10:40 +0900)]
Attempt to speed up
Takashi Sawanaka [Sat, 21 Mar 2020 01:39:14 +0000 (10:39 +0900)]
Attempt to speed up
Takashi Sawanaka [Sat, 21 Mar 2020 01:37:03 +0000 (10:37 +0900)]
RegOptionsMgr.cpp: Fix an compilation error in 32-bit build
Takashi Sawanaka [Sat, 21 Mar 2020 01:35:25 +0000 (10:35 +0900)]
Fix an compilation error in 32-bit build
Takashi Sawanaka [Sat, 21 Mar 2020 01:30:57 +0000 (10:30 +0900)]
ImgMergeFrm.cpp: Reduce compilation warnings
Takashi Sawanaka [Sat, 21 Mar 2020 01:29:19 +0000 (10:29 +0900)]
editor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn.net ticket #40266)
Takashi Sawanaka [Sat, 21 Mar 2020 01:27:16 +0000 (10:27 +0900)]
ShellExtnesion: Bump revision to 1.17.11.0
Takashi Sawanaka [Sat, 21 Mar 2020 00:50:07 +0000 (09:50 +0900)]
Merge pull request #291 from Tichij/master
Update of Lithuanian translation
Tichij [Fri, 20 Mar 2020 12:45:51 +0000 (14:45 +0200)]
Update of Lithuanian translation
Tichij [Fri, 20 Mar 2020 12:37:26 +0000 (14:37 +0200)]
Update of Lithuanian translation
Takashi Sawanaka [Thu, 19 Mar 2020 21:50:05 +0000 (06:50 +0900)]
Merge pull request #289 from qosobrin/master
Minor changes to translations README.md file
LMS [Thu, 19 Mar 2020 18:58:54 +0000 (19:58 +0100)]
Minor changes to translations README.md file
Takashi Sawanaka [Sat, 14 Mar 2020 23:44:05 +0000 (08:44 +0900)]
RegOptionsMgr.*: Make writing to the registry asynchronous (2)
Takashi Sawanaka [Sat, 14 Mar 2020 23:17:11 +0000 (08:17 +0900)]
RegOptionsMgr.*: Make writing to the registry asynchronous
Takashi Sawanaka [Sat, 14 Mar 2020 13:14:34 +0000 (22:14 +0900)]
Revert "SuperComboBox.cpp: performance improvement"
This reverts commit
c92f5aaa818cca37a6aae869506f15e984c62ed1.
Takashi Sawanaka [Sat, 14 Mar 2020 06:42:47 +0000 (15:42 +0900)]
Fix the problem that the character width becomes wider than version 2.16.4
Takashi Sawanaka [Sat, 14 Mar 2020 05:27:48 +0000 (14:27 +0900)]
Resolve keyboard accelerator conflict in SaveClosingDialog
Takashi Sawanaka [Sat, 14 Mar 2020 02:30:57 +0000 (11:30 +0900)]
GitHub issue #285: Slovenian traslations for WinMerge 2.16.6
Takashi Sawanaka [Sat, 14 Mar 2020 01:33:40 +0000 (10:33 +0900)]
Remove unused MyCom.h
Takashi Sawanaka [Sat, 14 Mar 2020 01:31:53 +0000 (10:31 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 12 Mar 2020 23:10:40 +0000 (08:10 +0900)]
SuperComboBox.cpp: performance improvement
Tim Gerundt [Thu, 12 Mar 2020 22:40:26 +0000 (23:40 +0100)]
Move Plugins.html developer doc to README.md
Tim Gerundt [Thu, 12 Mar 2020 21:25:21 +0000 (22:25 +0100)]
Use README.md files for list of plugin sources
Tim Gerundt [Thu, 12 Mar 2020 00:06:13 +0000 (01:06 +0100)]
Add ShellExtension README.md
Tim Gerundt [Wed, 11 Mar 2020 23:32:56 +0000 (00:32 +0100)]
Docs: Remove outdated "Releasing WinMerge" file
Tim Gerundt [Wed, 11 Mar 2020 23:19:08 +0000 (00:19 +0100)]
Manual: Add Arabic to language list
Tim Gerundt [Wed, 11 Mar 2020 23:18:30 +0000 (00:18 +0100)]
Manual: Use GitHub issues links
Takashi Sawanaka [Mon, 9 Mar 2020 23:08:45 +0000 (08:08 +0900)]
Add BuildAll.vs2019x64_vs2017Win32.cmd
Takashi Sawanaka [Sun, 8 Mar 2020 05:09:32 +0000 (14:09 +0900)]
Fix osdn.net ticket #39913: Displaying of connecting lines of moved lines appear strange
Takashi Sawanaka [Sat, 7 Mar 2020 13:51:12 +0000 (22:51 +0900)]
Fix osdn.net ticket #40224: '=' should be included in word separator
Takashi Sawanaka [Sat, 7 Mar 2020 13:16:17 +0000 (22:16 +0900)]
Merge pull request #280 from marogo2310/patch-1
Update ShellExtensionPolish.rc
marogo2310 [Fri, 6 Mar 2020 22:08:38 +0000 (23:08 +0100)]
Update ShellExtensionPolish.rc
Correct: IDS_RESELECT_FIRST "Wybierz powtórnie"
Tim Gerundt [Thu, 5 Mar 2020 22:35:22 +0000 (23:35 +0100)]
Move translations instructions to README.md
Takashi Sawanaka [Sat, 29 Feb 2020 00:25:29 +0000 (09:25 +0900)]
Fix osdn.net ticket #40205: Scrolling behavior when dragging images is wrong
Fix osdn.net ticket #40205: Scrolling behavior when dragging images is wrong
Takashi Sawanaka [Tue, 25 Feb 2020 23:09:17 +0000 (08:09 +0900)]
Update Contributors.txt
Takashi Sawanaka [Tue, 25 Feb 2020 23:08:22 +0000 (08:08 +0900)]
Update Russian.po
Takashi Sawanaka [Tue, 25 Feb 2020 23:05:35 +0000 (08:05 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 25 Feb 2020 22:54:27 +0000 (07:54 +0900)]
Bump revision to 2.16.7
Takashi Sawanaka [Tue, 25 Feb 2020 22:51:32 +0000 (07:51 +0900)]
Merge pull request #272 from wvxwxvw/patch-2
Update Russian.po
Takashi Sawanaka [Tue, 25 Feb 2020 22:51:01 +0000 (07:51 +0900)]
Merge pull request #271 from wvxwxvw/patch-1
Update Russian.po
wvxwxvw [Tue, 25 Feb 2020 20:58:41 +0000 (23:58 +0300)]
Update Russian.po
wvxwxvw [Tue, 25 Feb 2020 20:53:56 +0000 (23:53 +0300)]
Update Russian.po
Takashi Sawanaka [Sun, 23 Feb 2020 23:33:27 +0000 (08:33 +0900)]
Merge pull request #269 from cswartzvi/master
Include Excel Addin files (*.xlam)
Charles W. Swartz VI [Sat, 22 Feb 2020 21:28:10 +0000 (16:28 -0500)]
Updated plugin for Excel Addin files.
Takashi Sawanaka [Sat, 22 Feb 2020 11:36:26 +0000 (20:36 +0900)]
Fix GitHub WinMerge/winimerge issue #6: Support 16-bit images
Takashi Sawanaka [Sat, 22 Feb 2020 11:30:01 +0000 (20:30 +0900)]
Update release notes and changelog for 2.16.6 (3)
Takashi Sawanaka [Wed, 19 Feb 2020 23:08:44 +0000 (08:08 +0900)]
Merge pull request #268 from YankoNik/patch-1
Update Bulgarian.po
YankoNik [Wed, 19 Feb 2020 20:35:34 +0000 (22:35 +0200)]
Update Bulgarian.po
Takashi Sawanaka [Tue, 18 Feb 2020 15:29:08 +0000 (00:29 +0900)]
Merge pull request #267 from Tichij/master
Update of Lithuanian translation
Tichij [Tue, 18 Feb 2020 05:50:41 +0000 (07:50 +0200)]
Update of Lithuanian translation
Takashi Sawanaka [Mon, 17 Feb 2020 23:01:23 +0000 (08:01 +0900)]
LocationView: Make the color close to the background color of the editor the background color of the location pane
Takashi Sawanaka [Mon, 17 Feb 2020 22:57:23 +0000 (07:57 +0900)]
Update Spanish translation
Takashi Sawanaka [Mon, 17 Feb 2020 22:56:31 +0000 (07:56 +0900)]
Update release notes and changelog for 2.16.6 (2)
Takashi Sawanaka [Mon, 17 Feb 2020 23:03:58 +0000 (08:03 +0900)]
Merge remote-tracking branch 'origin/master'
Takashi Sawanaka [Mon, 17 Feb 2020 22:41:18 +0000 (07:41 +0900)]
Merge pull request #266 from borjafg/master
Update spanish translation
borjafg [Mon, 17 Feb 2020 15:47:27 +0000 (16:47 +0100)]
Merge branch 'master' of https://github.com/borjafg/winmerge
borjafg [Mon, 17 Feb 2020 15:46:06 +0000 (16:46 +0100)]
Update spanish translation
Takashi Sawanaka [Sat, 15 Feb 2020 07:19:09 +0000 (16:19 +0900)]
Bump revision to 2.16.6
Takashi Sawanaka [Sat, 15 Feb 2020 06:52:21 +0000 (15:52 +0900)]
Update release notes and changelog for 2.16.6
Takashi Sawanaka [Sat, 15 Feb 2020 05:51:37 +0000 (14:51 +0900)]
GUITestUtils.cpp: Add Arabic language
Takashi Sawanaka [Sat, 15 Feb 2020 01:36:06 +0000 (10:36 +0900)]
appveyor.yml: Update InnoSetup to version 6.0.3
Takashi Sawanaka [Sat, 15 Feb 2020 01:28:23 +0000 (10:28 +0900)]
ImgMergeFrm.cpp: Fix an issue where selecting Vector Image Scaling->25%-800% menu items does not mark the menu item
Takashi Sawanaka [Sun, 9 Feb 2020 23:14:19 +0000 (08:14 +0900)]
stringdiffs.cpp:The current diff3 algorithm does not correctly handle hunks when ignore_space_change or ignore_all_space is enabled. Therefore, ignore this flag.
Takashi Sawanaka [Sun, 9 Feb 2020 23:06:50 +0000 (08:06 +0900)]
Diff3.h: Fix indentation
Takashi Sawanaka [Sun, 9 Feb 2020 01:23:42 +0000 (10:23 +0900)]
Fix GitHub issue #263: Third tgz doesn't get fully extracted (first two do)
Takashi Sawanaka [Sat, 8 Feb 2020 07:41:37 +0000 (16:41 +0900)]
Merge pull request #262 from m1na1p/jpManual
Update Configuration.xml
Taiki Minai [Fri, 7 Feb 2020 07:07:21 +0000 (16:07 +0900)]
Update Configuration.xml
目についた部分だけ変更
Takashi Sawanaka [Sun, 26 Jan 2020 22:33:32 +0000 (07:33 +0900)]
Merge pull request #258 from Mr-Update/patch-8
Update German.po
Takashi Sawanaka [Sun, 26 Jan 2020 22:32:45 +0000 (07:32 +0900)]
Merge pull request #257 from GreyMerlin/master
Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes
Mr-Update [Sun, 26 Jan 2020 21:45:53 +0000 (22:45 +0100)]
Update German.po
Translation completed
Takashi Sawanaka [Sun, 26 Jan 2020 12:28:38 +0000 (21:28 +0900)]
ccrystaleditview.cpp: Fix an issue where "Replace All" would not replace all text
Takashi Sawanaka [Sun, 26 Jan 2020 10:40:00 +0000 (19:40 +0900)]
GhostTextBuffer.cpp: Fix TEST(FileCompare, LastLineEOL) failed.
(Fix broken redoing)
GreyMerlin [Sat, 25 Jan 2020 23:59:56 +0000 (15:59 -0800)]
Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes
* File size values that were all zero in the low 32 bits were assumed to be empty,
and thus did not have some critical pointers initialized. This resulted in WinMerge
silently aborting with no message.
* WinMerge will now properly continue, but will likely display an "Out of memory" error
message box.
* I discovered this when attempting to compare two files that are exactly 0x3700000000
(236,223,201,280) bytes long. A pointless exercise of course... Memory eventually fills up
and an "Out of memory" error is displayed. After clicking "OK", WinMerge terminates the
comparison, and returns to the "Select Files or Folders" dialog, but does not actually
release the memory until the program has completely terminated !!
* Folder Comparison with files of this extreme size does not exhibit this problem.
Takashi Sawanaka [Sat, 25 Jan 2020 14:20:26 +0000 (23:20 +0900)]
GhostTextBuffer.cpp: Do not insert EOL after text without EOL if both of the following are true:
-When inserting text without EOL into the ghost line
-If there is no real line after the ghost line
Takashi Sawanaka [Sat, 25 Jan 2020 07:15:27 +0000 (16:15 +0900)]
Update winimerge to 1.0.14.0
Takashi Sawanaka [Sat, 25 Jan 2020 07:14:19 +0000 (16:14 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 25 Jan 2020 03:50:53 +0000 (12:50 +0900)]
xdiff_genudiff_compat.cpp: Improve the comparison speed when choosing patience or histogram for the diff algorithm and enabling moved block detection
Takashi Sawanaka [Tue, 21 Jan 2020 16:19:29 +0000 (01:19 +0900)]
Restore English.pot
Takashi Sawanaka [Tue, 21 Jan 2020 16:16:37 +0000 (01:16 +0900)]
Restore StringBlacklist.txt
Takashi Sawanaka [Mon, 20 Jan 2020 23:24:20 +0000 (08:24 +0900)]
Oops!
Takashi Sawanaka [Mon, 20 Jan 2020 23:06:12 +0000 (08:06 +0900)]
Implement GitHub #254: It would be nice if touchpad horizontal scroll can work with Winmerge
Takashi Sawanaka [Sun, 19 Jan 2020 16:07:00 +0000 (01:07 +0900)]
Fix GitHub issue #252: Crash when generating patch for multiple files and a file only on one side (2)
Takashi Sawanaka [Sun, 19 Jan 2020 13:09:26 +0000 (22:09 +0900)]
Update copyright year to 2020
Takashi Sawanaka [Sun, 19 Jan 2020 12:47:58 +0000 (21:47 +0900)]
Fix osdn issue #39924: An error message is shown when pressing Enter key in Diff pane
Takashi Sawanaka [Sun, 19 Jan 2020 12:43:27 +0000 (21:43 +0900)]
Add support for PDF, SVG, WMF and EMF flie format
Takashi Sawanaka [Sat, 11 Jan 2020 07:20:42 +0000 (16:20 +0900)]
Fix GitHub issue #252: Crash when generating patch for multiple files and a file only on one side
Takashi Sawanaka [Wed, 8 Jan 2020 15:44:45 +0000 (00:44 +0900)]
Merge pull request #251 from louistio/fix-french-compare-non-horizontal
Fix french translations for non-horizontal compare
Adam Gauthier [Wed, 8 Jan 2020 02:57:49 +0000 (21:57 -0500)]
Fix french translations for non-horizontal compare
- Remove extra spaces around ampersand character
- Prefer "comparer" to "comparaison" for compare action
- Add translation for msgid "Compare Non-hor&izontally..."