OSDN Git Service
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..."
Takashi Sawanaka [Sun, 5 Jan 2020 04:40:58 +0000 (13:40 +0900)]
Merge.cpp: Allow path starting '\' without drive name in the project file
Takashi Sawanaka [Sun, 5 Jan 2020 01:44:57 +0000 (10:44 +0900)]
Make it possible to select whether to close the main window (if no chlid window) or only the child window when pressing the ESC key
Takashi Sawanaka [Fri, 3 Jan 2020 01:41:56 +0000 (10:41 +0900)]
Fix broken build (2)
Takashi Sawanaka [Fri, 3 Jan 2020 01:33:23 +0000 (10:33 +0900)]
Fix broken build
Takashi Sawanaka [Fri, 3 Jan 2020 00:53:39 +0000 (09:53 +0900)]
Merge pull request #247 from mesajflaviu/new_branch
New branch
Takashi Sawanaka [Fri, 3 Jan 2020 00:53:17 +0000 (09:53 +0900)]
Merge pull request #246 from csware/spelling-of-git
Fix spelling of Git
Flaviu [Thu, 2 Jan 2020 18:08:04 +0000 (20:08 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:53 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:34 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:22 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:16 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:58 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:45 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:33 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:19 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:16 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:55 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:38 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:22 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:06 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 17:41:28 +0000 (19:41 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 17:41:15 +0000 (19:41 +0200)]
modifications
Sven Strickroth [Thu, 2 Jan 2020 14:53:44 +0000 (15:53 +0100)]
Fix spelling of Git
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Takashi Sawanaka [Tue, 31 Dec 2019 05:57:27 +0000 (14:57 +0900)]
PATCH: [ 3038 ] Arabic translation (4)
Takashi Sawanaka [Tue, 31 Dec 2019 05:03:55 +0000 (14:03 +0900)]
PATCH: [ 3038 ] Arabic translation (3)
Takashi Sawanaka [Tue, 31 Dec 2019 04:16:48 +0000 (13:16 +0900)]
PATCH: [ 3038 ] Arabic translation (2)
Takashi Sawanaka [Tue, 31 Dec 2019 04:07:24 +0000 (13:07 +0900)]
PATCH: [ 3038 ] Arabic translation
Takashi Sawanaka [Sun, 29 Dec 2019 10:51:25 +0000 (19:51 +0900)]
GUITestUtils.cpp: do not test all languages when command line arguments are empty
Takashi Sawanaka [Sun, 29 Dec 2019 10:47:21 +0000 (19:47 +0900)]
Fix typo
Takashi Sawanaka [Sun, 29 Dec 2019 10:35:31 +0000 (19:35 +0900)]
Make UI look flatter (5)
Takashi Sawanaka [Sun, 29 Dec 2019 07:16:29 +0000 (16:16 +0900)]
Merge pull request #244 from datadiode/ghosttextbuffer-empty-line-between-ghost-lines-comes-back-after-deletion
GhostTextBuffer: Don't unexpectedly bring back empty lines user wants…
Takashi Sawanaka [Sun, 29 Dec 2019 05:26:19 +0000 (14:26 +0900)]
Fix issue osdn#39851: Non-moved lines are treated as moved lines
Takashi Sawanaka [Sun, 29 Dec 2019 02:23:18 +0000 (11:23 +0900)]
Merge pull request #245 from Mr-Update/patch-7
Update German.po
Mr-Update [Sat, 28 Dec 2019 22:02:17 +0000 (23:02 +0100)]
Update German.po
Double hotkeys in all menus, context menus and options corrected
datadiode [Sat, 28 Dec 2019 09:02:11 +0000 (10:02 +0100)]
GhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete
Happens with empty lines enclosed between ghost lines.
Besides, this change seems to also save some extra messing to prevent lines from accidentally losing an EOL.