OSDN Git Service

winmerge-jp/winmerge-jp.git
7 years agofix broken unit tests
Takashi Sawanaka [Sun, 29 Jan 2017 02:12:15 +0000 (11:12 +0900)]
fix broken unit tests

7 years agounicoder.cpp: CheckForInvalidUtf8() did not work correctly when text length is less...
Takashi Sawanaka [Sun, 29 Jan 2017 02:09:24 +0000 (11:09 +0900)]
unicoder.cpp: CheckForInvalidUtf8() did not work correctly when text length is less than 3. fixes bitbucket#57

7 years agoAdded tag 2.14.0+-jp-126 for changeset 7e8d73f57c1e
Takashi Sawanaka [Mon, 9 Jan 2017 14:06:08 +0000 (23:06 +0900)]
Added tag 2.14.0+-jp-126 for changeset 7e8d73f57c1e

7 years agoBump revision to 2.14.0+-jp-126 2.14.0+-jp-126
Takashi Sawanaka [Mon, 9 Jan 2017 14:05:39 +0000 (23:05 +0900)]
Bump revision to 2.14.0+-jp-126

7 years agoMerge
Takashi Sawanaka [Mon, 9 Jan 2017 12:43:08 +0000 (21:43 +0900)]
Merge

7 years agoEnabled to move to the next/previous file with the Up/Down key
Takashi Sawanaka [Mon, 9 Jan 2017 12:41:58 +0000 (21:41 +0900)]
Enabled to move to the next/previous file with the Up/Down key

7 years agoMessageBoxDialog.{cpp,h}: Add GetFormerResult() method that retrieves the former...
Takashi Sawanaka [Mon, 9 Jan 2017 03:34:49 +0000 (12:34 +0900)]
MessageBoxDialog.{cpp,h}: Add GetFormerResult() method that retrieves the former result of the message box

7 years agoMerge pull request #17 from Lippe35/master
Takashi Sawanaka [Sun, 8 Jan 2017 11:10:08 +0000 (20:10 +0900)]
Merge pull request #17 from Lippe35/master

Fix some translation (Portuguese.po) Part7

7 years agoFix some translation (Portuguese.po) Part7
Lippe35 [Sun, 8 Jan 2017 08:56:12 +0000 (08:56 +0000)]
Fix some translation (Portuguese.po) Part7

7 years agoDirScan.cpp: Fix assertion failure
Takashi Sawanaka [Sun, 8 Jan 2017 06:34:10 +0000 (15:34 +0900)]
DirScan.cpp: Fix assertion failure

7 years agoMerge pull request #16 from Lippe35/master
Takashi Sawanaka [Thu, 5 Jan 2017 13:32:23 +0000 (22:32 +0900)]
Merge pull request #16 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part7

7 years agoCorrections and Add missing translation (Portuguese.po) Part7
Lippe35 [Thu, 5 Jan 2017 09:46:33 +0000 (09:46 +0000)]
Corrections and Add missing translation (Portuguese.po) Part7

7 years agoPropCompareFolder.cpp: Disable the 'number of compare threads" text box when not...
Takashi Sawanaka [Tue, 3 Jan 2017 07:44:16 +0000 (16:44 +0900)]
PropCompareFolder.cpp: Disable the 'number of compare threads" text box when not selecting 'Full Content' and 'Quick Content' method

7 years agouse namespace
Takashi Sawanaka [Mon, 2 Jan 2017 12:04:34 +0000 (21:04 +0900)]
use namespace

7 years agoReplace FileTransform_* with FileTransform::*
Takashi Sawanaka [Mon, 2 Jan 2017 11:19:48 +0000 (20:19 +0900)]
Replace FileTransform_* with FileTransform::*

7 years agoReplace string_* with strutils::*
Takashi Sawanaka [Mon, 2 Jan 2017 10:54:25 +0000 (19:54 +0900)]
Replace string_* with strutils::*

7 years agoReplace sd_* with strdiff::*
Takashi Sawanaka [Mon, 2 Jan 2017 10:33:29 +0000 (19:33 +0900)]
Replace sd_* with strdiff::*

7 years agocharset.c: map the encoding 'asmo-708' to codepage 708
Takashi Sawanaka [Mon, 2 Jan 2017 09:31:32 +0000 (18:31 +0900)]
charset.c: map the encoding 'asmo-708' to codepage 708

7 years agoRemove codepage.*
Takashi Sawanaka [Mon, 2 Jan 2017 08:50:55 +0000 (17:50 +0900)]
Remove codepage.*

7 years agoRemove dllproxy.*
Takashi Sawanaka [Mon, 2 Jan 2017 06:23:11 +0000 (15:23 +0900)]
Remove dllproxy.*

7 years agoReduce warnings
Takashi Sawanaka [Sun, 1 Jan 2017 10:44:42 +0000 (19:44 +0900)]
Reduce warnings

7 years agoAdd git_clone.cmd and hg_clone.cmd
Takashi Sawanaka [Thu, 29 Dec 2016 15:07:39 +0000 (00:07 +0900)]
Add git_clone.cmd and hg_clone.cmd

7 years agoReduce the height of Open dialog
Takashi Sawanaka [Thu, 29 Dec 2016 12:51:59 +0000 (21:51 +0900)]
Reduce the height of Open dialog

7 years agoAdd 'Alpha Blend Animation" menu item
Takashi Sawanaka [Thu, 29 Dec 2016 12:16:58 +0000 (21:16 +0900)]
Add 'Alpha Blend Animation" menu item

7 years agoDirScan.cpp: When the number of CPU cores exceeds 16, comparison of folders did not...
Takashi Sawanaka [Thu, 29 Dec 2016 08:45:39 +0000 (17:45 +0900)]
DirScan.cpp: When the number of CPU cores exceeds 16, comparison of folders did not proceed.

7 years agoAdded tag 2.14.0+-jp-125 for changeset 87a56f21d0bb 2.14.0+-jp-125ii
Takashi Sawanaka [Wed, 14 Dec 2016 16:18:35 +0000 (01:18 +0900)]
Added tag 2.14.0+-jp-125 for changeset 87a56f21d0bb

7 years agoBump revision to 2.14.0+-jp-125 2.14.0+-jp-125
Takashi Sawanaka [Wed, 14 Dec 2016 16:18:21 +0000 (01:18 +0900)]
Bump revision to 2.14.0+-jp-125

7 years agoAdd 'Number of compare threads' textbox to Options dialog. (Merge from WinMerge2011)
Takashi Sawanaka [Wed, 14 Dec 2016 16:18:04 +0000 (01:18 +0900)]
Add 'Number of compare threads' textbox to Options dialog. (Merge from WinMerge2011)

7 years agoAdd Calvin Lin to Contributors.txt
Takashi Sawanaka [Mon, 12 Dec 2016 14:43:02 +0000 (23:43 +0900)]
Add Calvin Lin to Contributors.txt

7 years agoTraditional Chinese translation update submitted by Calvin Lin
Takashi Sawanaka [Fri, 9 Dec 2016 15:53:49 +0000 (00:53 +0900)]
Traditional Chinese translation update submitted by Calvin Lin

7 years agoMerge pull request #15 from Lippe35/master
Takashi Sawanaka [Thu, 8 Dec 2016 14:07:50 +0000 (23:07 +0900)]
Merge pull request #15 from Lippe35/master

Add translation Portuguese.isl

7 years agoAdd translation Portuguese.isl
Lippe35 [Wed, 7 Dec 2016 15:54:44 +0000 (15:54 +0000)]
Add translation Portuguese.isl

7 years agoMerge pull request #14 from Lippe35/master
Takashi Sawanaka [Mon, 5 Dec 2016 14:16:55 +0000 (23:16 +0900)]
Merge pull request #14 from Lippe35/master

Add translation Portuguese.isl and Portuguese.po

7 years agoAdd translation Portuguese.isl and Portuguese.po
Lippe35 [Sun, 4 Dec 2016 21:18:15 +0000 (21:18 +0000)]
Add translation Portuguese.isl and Portuguese.po

7 years agoAdded tag 2.14.0+-jp-124 for changeset fa8535a7ac3c
Takashi Sawanaka [Sun, 4 Dec 2016 13:40:20 +0000 (22:40 +0900)]
Added tag 2.14.0+-jp-124 for changeset fa8535a7ac3c

7 years agoBump revision to 2.14.0+-jp-124 2.14.0+-jp-124
Takashi Sawanaka [Sun, 4 Dec 2016 13:38:10 +0000 (22:38 +0900)]
Bump revision to 2.14.0+-jp-124

7 years agoReplace env_* with env::*
Takashi Sawanaka [Sun, 4 Dec 2016 11:38:32 +0000 (20:38 +0900)]
Replace env_* with env::*

7 years agoReplace paths_* with paths::*
Takashi Sawanaka [Sun, 4 Dec 2016 11:00:04 +0000 (20:00 +0900)]
Replace paths_* with paths::*

7 years agoRetry to detect the encoding of a file using all content when occurred encoding error...
Takashi Sawanaka [Sun, 4 Dec 2016 07:37:19 +0000 (16:37 +0900)]
Retry to detect the encoding of a file using all content when occurred encoding error. fixes github-issue#13.

7 years agoMerge pull request #12 from Lippe35/master
Takashi Sawanaka [Fri, 2 Dec 2016 13:57:48 +0000 (22:57 +0900)]
Merge pull request #12 from Lippe35/master

Corrections and add missing translation (Portuguese.isl) Part3

7 years agoCorrections and add missing translation (Portuguese.isl) Part3
Lippe35 [Fri, 2 Dec 2016 10:32:35 +0000 (10:32 +0000)]
Corrections and add missing translation (Portuguese.isl) Part3

7 years agoMerge pull request #11 from Lippe35/master
Takashi Sawanaka [Thu, 1 Dec 2016 14:39:21 +0000 (23:39 +0900)]
Merge pull request #11 from Lippe35/master

More add missing translation (Portuguese.isl)

7 years agoMerge pull request #10 from Lippe35/master
Takashi Sawanaka [Thu, 1 Dec 2016 14:38:58 +0000 (23:38 +0900)]
Merge pull request #10 from Lippe35/master

Add missing translation (Portuguese.isl)

7 years agoMore add missing translation (Portuguese.isl)
Lippe35 [Wed, 30 Nov 2016 19:17:34 +0000 (19:17 +0000)]
More add missing translation (Portuguese.isl)

7 years agoAdd missing translation (Portuguese.isl)
Lippe35 [Wed, 30 Nov 2016 18:11:00 +0000 (18:11 +0000)]
Add missing translation (Portuguese.isl)

7 years agoAdded tag 2.14.0+-jp-123 for changeset 0b52022c996c
Takashi Sawanaka [Wed, 30 Nov 2016 15:06:34 +0000 (00:06 +0900)]
Added tag 2.14.0+-jp-123 for changeset 0b52022c996c

7 years agoBump revision to 2.14.0+-jp-123 2.14.0+-jp-123
Takashi Sawanaka [Wed, 30 Nov 2016 15:05:53 +0000 (00:05 +0900)]
Bump revision to 2.14.0+-jp-123

7 years agoAdded tag 2.14.0+-jp-122 for changeset c695cb7835ff
Takashi Sawanaka [Tue, 29 Nov 2016 14:57:37 +0000 (23:57 +0900)]
Added tag 2.14.0+-jp-122 for changeset c695cb7835ff

7 years agoMerge 2.14.0+-jp-122
Takashi Sawanaka [Tue, 29 Nov 2016 14:37:00 +0000 (23:37 +0900)]
Merge

7 years agoBump revision to 2.14.0+-jp-122
Takashi Sawanaka [Sun, 27 Nov 2016 14:11:29 +0000 (23:11 +0900)]
Bump revision to 2.14.0+-jp-122

7 years agoBuildBin.cmd: The file "2" was created after BuildBin.cmd was executed.
Takashi Sawanaka [Sun, 27 Nov 2016 12:17:12 +0000 (21:17 +0900)]
BuildBin.cmd: The file "2" was created after BuildBin.cmd was executed.

7 years agoMergeDoc.cpp: Use std::int64_t instead of boost::int64_t
Takashi Sawanaka [Sun, 27 Nov 2016 11:32:14 +0000 (20:32 +0900)]
MergeDoc.cpp: Use std::int64_t instead of boost::int64_t

7 years agoMerge.rc: fine-tune button position
Takashi Sawanaka [Sun, 27 Nov 2016 11:24:22 +0000 (20:24 +0900)]
Merge.rc: fine-tune button position

7 years agoRemove unused #include directives
Takashi Sawanaka [Sun, 27 Nov 2016 11:23:26 +0000 (20:23 +0900)]
Remove unused #include directives

7 years agopaths.*: Add paths_ToWindowsPath() and paths_ToUnixPath() function
Takashi Sawanaka [Sat, 26 Nov 2016 13:35:52 +0000 (22:35 +0900)]
paths.*: Add paths_ToWindowsPath() and paths_ToUnixPath() function

7 years agoFolderCompare.exe: make FolderCompare.exe buildable with MinGW again
Takashi Sawanaka [Sat, 26 Nov 2016 11:04:17 +0000 (20:04 +0900)]
FolderCompare.exe: make FolderCompare.exe buildable with MinGW again

7 years agoMerge
Takashi Sawanaka [Sat, 19 Nov 2016 21:48:12 +0000 (06:48 +0900)]
Merge

7 years agoRemove wrongly pushed WinIMerge sources
Takashi Sawanaka [Sat, 19 Nov 2016 21:42:55 +0000 (06:42 +0900)]
Remove wrongly pushed WinIMerge sources

7 years agoMerge pull request #9 from Lippe35/master
Takashi Sawanaka [Sat, 19 Nov 2016 21:07:14 +0000 (06:07 +0900)]
Merge pull request #9 from Lippe35/master

Fix line 358 (Portuguese.isl)

7 years agoFix line 358 (Portuguese.isl)
Lippe35 [Sat, 19 Nov 2016 14:44:30 +0000 (14:44 +0000)]
Fix line 358 (Portuguese.isl)

7 years agoMerge pull request #8 from Lippe35/master
Takashi Sawanaka [Fri, 18 Nov 2016 14:15:14 +0000 (23:15 +0900)]
Merge pull request #8 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part6

7 years agoCorrections and Add missing translation (Portuguese.po) Part6
Lippe35 [Fri, 18 Nov 2016 06:58:36 +0000 (06:58 +0000)]
Corrections and Add missing translation (Portuguese.po) Part6

Add missing translation in (Portuguese.isl)

7 years agoAdded tag 2.14.0+-jp-121 for changeset 9d85a0db6c7d
Takashi Sawanaka [Sun, 13 Nov 2016 10:47:10 +0000 (19:47 +0900)]
Added tag 2.14.0+-jp-121 for changeset 9d85a0db6c7d

7 years agoBump revision to 2.14.0+-jp-121 2.14.0+-jp-121
Takashi Sawanaka [Sun, 13 Nov 2016 10:44:00 +0000 (19:44 +0900)]
Bump revision to 2.14.0+-jp-121

7 years agoUpdate WinIMerge to 1.0.4.0
Takashi Sawanaka [Sun, 13 Nov 2016 10:42:53 +0000 (19:42 +0900)]
Update WinIMerge to 1.0.4.0

7 years agoBump revision to 1.0.4.0 1.0.4.0
Takashi Sawanaka [Sun, 13 Nov 2016 09:18:56 +0000 (18:18 +0900)]
Bump revision to 1.0.4.0

7 years ago- Make diff block blinkable
Takashi Sawanaka [Sun, 13 Nov 2016 09:04:21 +0000 (18:04 +0900)]
- Make diff block blinkable
- Add 'Alpha Animation' item to 'Overlay' combobox

7 years agoCrystalEdit Sample: Fix crash when loading a file that includes a line over 256 chars
Takashi Sawanaka [Sun, 6 Nov 2016 13:02:31 +0000 (22:02 +0900)]
CrystalEdit Sample: Fix crash when loading a file that includes a line over 256 chars

7 years agoCppcheck: Variable 'bMayOverwrite' is reassigned a value before the old one has been...
Takashi Sawanaka [Sun, 6 Nov 2016 12:05:49 +0000 (21:05 +0900)]
Cppcheck: Variable 'bMayOverwrite' is reassigned a value before the old one has been used.

7 years agoFilepathEdit.cpp: Fix a buffer overflow problem
Takashi Sawanaka [Sun, 6 Nov 2016 07:18:11 +0000 (16:18 +0900)]
FilepathEdit.cpp: Fix a buffer overflow problem

7 years agoFix: 3rd header bar was not resized when resizing 3rd pane
Takashi Sawanaka [Sat, 5 Nov 2016 13:01:30 +0000 (22:01 +0900)]
Fix: 3rd header bar was not resized when resizing 3rd pane

7 years agoMerge pull request #7 from Lippe35/master
Takashi Sawanaka [Thu, 3 Nov 2016 14:39:23 +0000 (23:39 +0900)]
Merge pull request #7 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part5

7 years agoCorrections and Add missing translation (Portuguese.po) Part5
Lippe35 [Thu, 3 Nov 2016 13:01:59 +0000 (13:01 +0000)]
Corrections and Add missing translation (Portuguese.po) Part5

7 years agoMerge pull request #6 from Lippe35/master
Takashi Sawanaka [Wed, 2 Nov 2016 14:34:20 +0000 (23:34 +0900)]
Merge pull request #6 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part4

7 years agoCorrections and Add missing translation (Portuguese.po) Part4
Lippe35 [Wed, 2 Nov 2016 12:01:21 +0000 (12:01 +0000)]
Corrections and Add missing translation (Portuguese.po) Part4

7 years agoAdded tag 2.14.0+-jp-120 for changeset 99bb6a5a83a0
Takashi Sawanaka [Mon, 31 Oct 2016 15:32:00 +0000 (00:32 +0900)]
Added tag 2.14.0+-jp-120 for changeset 99bb6a5a83a0

7 years agoBump revision to 2.14.0+-jp-120 2.14.0+-jp-120
Takashi Sawanaka [Mon, 31 Oct 2016 15:31:45 +0000 (00:31 +0900)]
Bump revision to 2.14.0+-jp-120

7 years agoInstaller: Update 7-zip to 16.04
Takashi Sawanaka [Mon, 31 Oct 2016 15:31:11 +0000 (00:31 +0900)]
Installer: Update 7-zip to 16.04

7 years agoBuildArc.cmd: Include all *.po files indto zip archive file
Takashi Sawanaka [Mon, 31 Oct 2016 14:54:13 +0000 (23:54 +0900)]
BuildArc.cmd: Include all *.po files indto zip archive file

7 years agoUpdate 7-zip to 16.04
Takashi Sawanaka [Sun, 30 Oct 2016 08:20:05 +0000 (17:20 +0900)]
Update 7-zip to 16.04

7 years agoMerge pull request #5 from Lippe35/master
Takashi Sawanaka [Sat, 29 Oct 2016 12:39:16 +0000 (21:39 +0900)]
Merge pull request #5 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part3

7 years agoCorrections and Add missing translation (Portuguese.po) Part3
Lippe35 [Fri, 28 Oct 2016 22:16:37 +0000 (23:16 +0100)]
Corrections and Add missing translation (Portuguese.po) Part3

7 years agoAdded tag 2.14.0+-jp-119 for changeset 40629ddb1446
Takashi Sawanaka [Sun, 23 Oct 2016 13:19:16 +0000 (22:19 +0900)]
Added tag 2.14.0+-jp-119 for changeset 40629ddb1446

7 years agoBump revision to 2.14.0+-jp-119 2.14.0+-jp-119
Takashi Sawanaka [Sun, 23 Oct 2016 12:51:08 +0000 (21:51 +0900)]
Bump revision to 2.14.0+-jp-119

7 years agoImgMergeFrm.*: Update tabbar item when comparing image files are changed
Takashi Sawanaka [Sun, 23 Oct 2016 12:24:28 +0000 (21:24 +0900)]
ImgMergeFrm.*: Update tabbar item when comparing image files are changed

7 years agobinary files were recognized as text files when comparing two same folder paths
Takashi Sawanaka [Sat, 22 Oct 2016 12:57:31 +0000 (21:57 +0900)]
binary files were recognized as text files when comparing two same folder paths

7 years agoAdd 'View->Diff Context->Toggle All and 0-9 Lines' menu item
Takashi Sawanaka [Sat, 22 Oct 2016 11:11:07 +0000 (20:11 +0900)]
Add 'View->Diff Context->Toggle All and 0-9 Lines' menu item

7 years agoreadme.md edited online with Bitbucket
Takashi Sawanaka [Sun, 9 Oct 2016 12:00:01 +0000 (12:00 +0000)]
readme.md edited online with Bitbucket

7 years agoMerge pull request #4 from Lippe35/master
Takashi Sawanaka [Fri, 7 Oct 2016 15:41:59 +0000 (00:41 +0900)]
Merge pull request #4 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part2

7 years agoCorrections and Add missing translation (Portuguese.po) Part2
Lippe35 [Thu, 6 Oct 2016 19:49:06 +0000 (20:49 +0100)]
Corrections and Add missing translation (Portuguese.po) Part2

7 years agoPortuguese.po: Recover broken text
Takashi Sawanaka [Sat, 1 Oct 2016 04:29:42 +0000 (13:29 +0900)]
Portuguese.po: Recover broken text

7 years agoContributors.txt: Add Lippe35 as Portuguese translater to Contributors.txt
Takashi Sawanaka [Fri, 30 Sep 2016 22:16:28 +0000 (07:16 +0900)]
Contributors.txt: Add Lippe35 as Portuguese translater to Contributors.txt

7 years agoPortuguese.po: Fix the error "Unresolved or mismatched references detected when atemp...
Takashi Sawanaka [Fri, 30 Sep 2016 22:12:55 +0000 (07:12 +0900)]
Portuguese.po: Fix the error "Unresolved or mismatched references detected when atempting to read translations from ..."

7 years agoMerge pull request #3 from Lippe35/master
Takashi Sawanaka [Fri, 30 Sep 2016 21:58:40 +0000 (06:58 +0900)]
Merge pull request #3 from Lippe35/master

Corrections and Add missing translation (Portuguese.po) Part1

7 years agoCorrections and Add missing translation (Portuguese.po) Part1
Lippe35 [Fri, 30 Sep 2016 14:59:55 +0000 (15:59 +0100)]
Corrections and Add missing translation (Portuguese.po) Part1

7 years agoAdded tag 2.14.0+-jp-118 for changeset 12534262c011
Takashi Sawanaka [Sun, 25 Sep 2016 14:25:00 +0000 (23:25 +0900)]
Added tag 2.14.0+-jp-118 for changeset 12534262c011

7 years agoRemoved tag 2.14.0+-jp-118 2.14.0+-jp-118
Takashi Sawanaka [Sun, 25 Sep 2016 14:24:46 +0000 (23:24 +0900)]
Removed tag 2.14.0+-jp-118

7 years agoForget to merge from WinMerge2011
Takashi Sawanaka [Sun, 25 Sep 2016 14:14:38 +0000 (23:14 +0900)]
Forget to merge from WinMerge2011

7 years agoAdded tag 2.14.0+-jp-118 for changeset b0fb758b8bae
Takashi Sawanaka [Sun, 25 Sep 2016 11:23:27 +0000 (20:23 +0900)]
Added tag 2.14.0+-jp-118 for changeset b0fb758b8bae

7 years agoBump revision to 2.14.0+-jp-118
Takashi Sawanaka [Sun, 25 Sep 2016 11:23:16 +0000 (20:23 +0900)]
Bump revision to 2.14.0+-jp-118