OSDN Git Service

winmerge-jp/winmerge-jp.git
4 years agoUpdate of Lithuanian translation
Tichij [Tue, 18 Feb 2020 05:50:41 +0000 (07:50 +0200)]
Update of Lithuanian translation

4 years agoLocationView: Make the color close to the background color of the editor the backgrou...
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

4 years agoUpdate Spanish translation
Takashi Sawanaka [Mon, 17 Feb 2020 22:57:23 +0000 (07:57 +0900)]
Update Spanish translation

4 years agoUpdate release notes and changelog for 2.16.6 (2)
Takashi Sawanaka [Mon, 17 Feb 2020 22:56:31 +0000 (07:56 +0900)]
Update release notes and changelog for 2.16.6 (2)

4 years agoMerge remote-tracking branch 'origin/master'
Takashi Sawanaka [Mon, 17 Feb 2020 23:03:58 +0000 (08:03 +0900)]
Merge remote-tracking branch 'origin/master'

4 years agoMerge pull request #266 from borjafg/master
Takashi Sawanaka [Mon, 17 Feb 2020 22:41:18 +0000 (07:41 +0900)]
Merge pull request #266 from borjafg/master

Update spanish translation

4 years agoMerge branch 'master' of https://github.com/borjafg/winmerge
borjafg [Mon, 17 Feb 2020 15:47:27 +0000 (16:47 +0100)]
Merge branch 'master' of https://github.com/borjafg/winmerge

4 years agoUpdate spanish translation
borjafg [Mon, 17 Feb 2020 15:46:06 +0000 (16:46 +0100)]
Update spanish translation

4 years agoBump revision to 2.16.6
Takashi Sawanaka [Sat, 15 Feb 2020 07:19:09 +0000 (16:19 +0900)]
Bump revision to 2.16.6

4 years agoUpdate release notes and changelog for 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

4 years agoGUITestUtils.cpp: Add Arabic language
Takashi Sawanaka [Sat, 15 Feb 2020 05:51:37 +0000 (14:51 +0900)]
GUITestUtils.cpp: Add Arabic language

4 years agoappveyor.yml: Update InnoSetup to version 6.0.3
Takashi Sawanaka [Sat, 15 Feb 2020 01:36:06 +0000 (10:36 +0900)]
appveyor.yml: Update InnoSetup to version 6.0.3

4 years agoImgMergeFrm.cpp: Fix an issue where selecting Vector Image Scaling->25%-800% menu...
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

4 years agostringdiffs.cpp:The current diff3 algorithm does not correctly handle hunks when...
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.

4 years agoDiff3.h: Fix indentation
Takashi Sawanaka [Sun, 9 Feb 2020 23:06:50 +0000 (08:06 +0900)]
Diff3.h: Fix indentation

4 years agoFix GitHub issue #263: Third tgz doesn't get fully extracted (first two do)
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)

4 years agoMerge pull request #262 from m1na1p/jpManual
Takashi Sawanaka [Sat, 8 Feb 2020 07:41:37 +0000 (16:41 +0900)]
Merge pull request #262 from m1na1p/jpManual

Update Configuration.xml

4 years agoUpdate Configuration.xml
Taiki Minai [Fri, 7 Feb 2020 07:07:21 +0000 (16:07 +0900)]
Update Configuration.xml

目についた部分だけ変更

4 years agoMerge pull request #258 from Mr-Update/patch-8
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

4 years agoMerge pull request #257 from GreyMerlin/master
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

4 years agoUpdate German.po
Mr-Update [Sun, 26 Jan 2020 21:45:53 +0000 (22:45 +0100)]
Update German.po

Translation completed

4 years agoccrystaleditview.cpp: Fix an issue where "Replace All" would not replace all text
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

4 years agoGhostTextBuffer.cpp: Fix TEST(FileCompare, LastLineEOL) failed.
Takashi Sawanaka [Sun, 26 Jan 2020 10:40:00 +0000 (19:40 +0900)]
GhostTextBuffer.cpp: Fix TEST(FileCompare, LastLineEOL) failed.
(Fix broken redoing)

4 years agoPrevent silent abort with File Comparison of files whose size is an exact multiple...
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.

4 years agoGhostTextBuffer.cpp: Do not insert EOL after text without EOL if both of the followin...
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

4 years agoUpdate winimerge to 1.0.14.0
Takashi Sawanaka [Sat, 25 Jan 2020 07:15:27 +0000 (16:15 +0900)]
Update winimerge to 1.0.14.0

4 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 25 Jan 2020 07:14:19 +0000 (16:14 +0900)]
Update .gitignore

4 years agoxdiff_genudiff_compat.cpp: Improve the comparison speed when choosing patience or...
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

4 years agoRestore English.pot
Takashi Sawanaka [Tue, 21 Jan 2020 16:19:29 +0000 (01:19 +0900)]
Restore English.pot

4 years agoRestore StringBlacklist.txt
Takashi Sawanaka [Tue, 21 Jan 2020 16:16:37 +0000 (01:16 +0900)]
Restore StringBlacklist.txt

4 years agoOops!
Takashi Sawanaka [Mon, 20 Jan 2020 23:24:20 +0000 (08:24 +0900)]
Oops!

4 years agoImplement GitHub #254: It would be nice if touchpad horizontal scroll can work with...
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

4 years agoFix GitHub issue #252: Crash when generating patch for multiple files and a file...
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)

4 years agoUpdate copyright year to 2020
Takashi Sawanaka [Sun, 19 Jan 2020 13:09:26 +0000 (22:09 +0900)]
Update copyright year to 2020

4 years agoFix osdn issue #39924: An error message is shown when pressing Enter key in Diff...
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

4 years agoAdd support for PDF, SVG, WMF and EMF flie format
Takashi Sawanaka [Sun, 19 Jan 2020 12:43:27 +0000 (21:43 +0900)]
Add support for PDF, SVG, WMF and EMF flie format

4 years agoFix GitHub issue #252: Crash when generating patch for multiple files and a file...
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

4 years agoMerge pull request #251 from louistio/fix-french-compare-non-horizontal
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

4 years agoFix 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..."

4 years agoMerge.cpp: Allow path starting '\' without drive name in the project file
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

4 years agoMake it possible to select whether to close the main window (if no chlid window)...
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

4 years agoFix broken build (2)
Takashi Sawanaka [Fri, 3 Jan 2020 01:41:56 +0000 (10:41 +0900)]
Fix broken build (2)

4 years agoFix broken build
Takashi Sawanaka [Fri, 3 Jan 2020 01:33:23 +0000 (10:33 +0900)]
Fix broken build

4 years agoMerge pull request #247 from mesajflaviu/new_branch
Takashi Sawanaka [Fri, 3 Jan 2020 00:53:39 +0000 (09:53 +0900)]
Merge pull request #247 from mesajflaviu/new_branch

New branch

4 years agoMerge pull request #246 from csware/spelling-of-git
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

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:08:04 +0000 (20:08 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:07:53 +0000 (20:07 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:07:34 +0000 (20:07 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:07:22 +0000 (20:07 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:07:16 +0000 (20:07 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:06:58 +0000 (20:06 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:06:45 +0000 (20:06 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:06:33 +0000 (20:06 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:06:19 +0000 (20:06 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:06:16 +0000 (20:06 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:05:55 +0000 (20:05 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:05:38 +0000 (20:05 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:05:22 +0000 (20:05 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 18:05:06 +0000 (20:05 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 17:41:28 +0000 (19:41 +0200)]
modifications

4 years agomodifications
Flaviu [Thu, 2 Jan 2020 17:41:15 +0000 (19:41 +0200)]
modifications

4 years agoFix spelling of Git
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>
4 years agoPATCH: [ 3038 ] Arabic translation (4)
Takashi Sawanaka [Tue, 31 Dec 2019 05:57:27 +0000 (14:57 +0900)]
PATCH: [ 3038 ] Arabic translation (4)

4 years agoPATCH: [ 3038 ] Arabic translation (3)
Takashi Sawanaka [Tue, 31 Dec 2019 05:03:55 +0000 (14:03 +0900)]
PATCH: [ 3038 ] Arabic translation (3)

4 years agoPATCH: [ 3038 ] Arabic translation (2)
Takashi Sawanaka [Tue, 31 Dec 2019 04:16:48 +0000 (13:16 +0900)]
PATCH: [ 3038 ] Arabic translation (2)

4 years agoPATCH: [ 3038 ] Arabic translation
Takashi Sawanaka [Tue, 31 Dec 2019 04:07:24 +0000 (13:07 +0900)]
PATCH: [ 3038 ] Arabic translation

4 years agoGUITestUtils.cpp: do not test all languages when command line arguments are empty
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

4 years agoFix typo
Takashi Sawanaka [Sun, 29 Dec 2019 10:47:21 +0000 (19:47 +0900)]
Fix typo

4 years agoMake UI look flatter (5)
Takashi Sawanaka [Sun, 29 Dec 2019 10:35:31 +0000 (19:35 +0900)]
Make UI look flatter (5)

4 years agoMerge pull request #244 from datadiode/ghosttextbuffer-empty-line-between-ghost-lines...
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…

4 years agoFix issue osdn#39851: Non-moved lines are treated as moved lines
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

4 years agoMerge pull request #245 from Mr-Update/patch-7
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

4 years agoUpdate 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

4 years agoGhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete
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.

4 years agoMerge pull request #242 from datadiode/foldercmp-reduce-code-duplication
Takashi Sawanaka [Sat, 28 Dec 2019 02:44:25 +0000 (11:44 +0900)]
Merge pull request #242 from datadiode/foldercmp-reduce-code-duplication

Consolidate FolderCmp (5)

4 years agoConsolidate FolderCmp (5)
datadiode [Fri, 27 Dec 2019 18:04:58 +0000 (19:04 +0100)]
Consolidate FolderCmp (5)

Reduce code duplication.
Don't repeat initialization steps which are (supposedly) meant to be one-time.

4 years agoMerge pull request #240 from datadiode/master
Takashi Sawanaka [Thu, 26 Dec 2019 22:45:20 +0000 (07:45 +0900)]
Merge pull request #240 from datadiode/master

Consolidate FolderCmp (4)

4 years agoConsolidate FolderCmp (4)
datadiode [Thu, 26 Dec 2019 10:24:14 +0000 (11:24 +0100)]
Consolidate FolderCmp (4)

Remove some obsolete error handling for legacy non-standard operator new.

4 years agoCMDIClient: Intercepting WM_MDINEXT seems unnecessary and causes an extra redraw
datadiode [Thu, 26 Dec 2019 09:27:43 +0000 (10:27 +0100)]
CMDIClient: Intercepting WM_MDINEXT seems unnecessary and causes an extra redraw

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:40 +0000 (07:54 +0900)]
Update Contributors.txt

4 years agoCppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:17 +0000 (07:54 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.

4 years agoMerge pull request #239 from Mr-Update/patch-6
Takashi Sawanaka [Mon, 23 Dec 2019 22:48:58 +0000 (07:48 +0900)]
Merge pull request #239 from Mr-Update/patch-6

Update German.po

4 years agoUpdate German.po
Mr-Update [Mon, 23 Dec 2019 22:03:11 +0000 (23:03 +0100)]
Update German.po

German translation completed

4 years agoMake UI look flatter (4)
Takashi Sawanaka [Sun, 22 Dec 2019 10:38:29 +0000 (19:38 +0900)]
Make UI look flatter (4)

4 years agocrystaledit: use U+21b2(Downwards Arrow with Tip Leftwards) as CRLF when the renderin...
Takashi Sawanaka [Sun, 22 Dec 2019 05:34:12 +0000 (14:34 +0900)]
crystaledit: use U+21b2(Downwards Arrow with Tip Leftwards) as CRLF when the rendering mode is not GDI

4 years agoCppcheck: Member variable 'CGhostTextView::...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 22 Dec 2019 04:05:57 +0000 (13:05 +0900)]
Cppcheck: Member variable 'CGhostTextView::...' is not initialized in the constructor.

4 years agoCppcheck: Class 'Heksedit' does not have a copy constructor which is recommended...
Takashi Sawanaka [Sun, 22 Dec 2019 02:56:41 +0000 (11:56 +0900)]
Cppcheck: Class 'Heksedit' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).

4 years agoCppcheck: Member variable 'COpenDoc::m_infoHandler' is not initialized in the constru...
Takashi Sawanaka [Sun, 22 Dec 2019 02:45:58 +0000 (11:45 +0900)]
Cppcheck: Member variable 'COpenDoc::m_infoHandler' is not initialized in the constructor.

4 years agoCppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'UINT...
Takashi Sawanaka [Sun, 22 Dec 2019 02:20:09 +0000 (11:20 +0900)]
Cppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'UINT {aka unsigned int}'.

4 years agoCppcheck: Variable '...' is assigned in constructor body. Consider performing initial...
Takashi Sawanaka [Sun, 22 Dec 2019 01:58:14 +0000 (10:58 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list

4 years agoWarning C26495 Variable '...' is uninitialized. Always initialize a member variable...
Takashi Sawanaka [Sun, 22 Dec 2019 01:15:23 +0000 (10:15 +0900)]
Warning C26495 Variable '...' is uninitialized. Always initialize a member variable (type.6).

4 years agoUpdate boost to 1.72.0
Takashi Sawanaka [Sun, 22 Dec 2019 00:34:03 +0000 (09:34 +0900)]
Update boost to 1.72.0

4 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 21 Dec 2019 22:10:32 +0000 (07:10 +0900)]
Update .gitignore

4 years agoFix issue where active pane is not restored correctly (2)
Takashi Sawanaka [Sat, 21 Dec 2019 22:07:36 +0000 (07:07 +0900)]
Fix issue where active pane is not restored correctly (2)

4 years agoFix issue where active pane is not restored correctly
Takashi Sawanaka [Sat, 21 Dec 2019 13:33:16 +0000 (22:33 +0900)]
Fix issue where active pane is not restored correctly

4 years agoMergeEditFrm.cpp: Fix crash when closing the File Compare Window under the following...
Takashi Sawanaka [Sat, 21 Dec 2019 12:31:35 +0000 (21:31 +0900)]
MergeEditFrm.cpp: Fix crash when closing the File Compare Window under the following conditions:
- View -> Split Vertically menu item is unchecked
- The second pane is focused

4 years agoMake UI look flatter (3)
Takashi Sawanaka [Sat, 21 Dec 2019 06:56:44 +0000 (15:56 +0900)]
Make UI look flatter (3)

4 years agoccrystalrendererdirectwrite.cpp: tweak
Takashi Sawanaka [Sat, 21 Dec 2019 06:44:36 +0000 (15:44 +0900)]
ccrystalrendererdirectwrite.cpp: tweak

4 years agoMake UI look flatter (2)
Takashi Sawanaka [Sat, 21 Dec 2019 03:46:56 +0000 (12:46 +0900)]
Make UI look flatter (2)

4 years agoMake UI look more flat
Takashi Sawanaka [Sun, 15 Dec 2019 05:43:14 +0000 (14:43 +0900)]
Make UI look more flat