OSDN Git Service

winmerge-jp/winmerge-jp.git
20 months agoAttempt to fix issue #1558 "Crash when copying files/folders"
Takashi Sawanaka [Sun, 6 Nov 2022 13:04:08 +0000 (22:04 +0900)]
Attempt to fix issue #1558 "Crash when copying files/folders"

20 months agoBinary compare: Allow 64bit versions to open files larger than 2GB. (#1549)
Takashi Sawanaka [Sun, 6 Nov 2022 07:26:28 +0000 (16:26 +0900)]
Binary compare: Allow 64bit versions to open files larger than 2GB. (#1549)

20 months agoUpdate Russian.po
Takashi Sawanaka [Sun, 6 Nov 2022 05:17:01 +0000 (14:17 +0900)]
Update Russian.po

20 months agoFix issue #1556: Selection in "Replace" by regular expression doesn't work with \n
Takashi Sawanaka [Sat, 5 Nov 2022 05:47:20 +0000 (14:47 +0900)]
Fix issue #1556: Selection in "Replace" by regular expression doesn't work with \n

20 months agoFix the problem that the "According to WinMerge User Interface" option in the Codepag...
Takashi Sawanaka [Fri, 4 Nov 2022 13:59:49 +0000 (22:59 +0900)]
Fix the problem that the "According to WinMerge User Interface" option in the Codepage category of the Options dialog would always result in the codepage being 1252.

20 months agoUpdate Contributors.txt
Takashi Sawanaka [Tue, 1 Nov 2022 23:09:59 +0000 (08:09 +0900)]
Update Contributors.txt

20 months agoReadMe-Russian.txt: Change the file encoding from UTF-8 to CP-1251
Takashi Sawanaka [Tue, 1 Nov 2022 23:08:50 +0000 (08:08 +0900)]
ReadMe-Russian.txt: Change the file encoding from UTF-8 to CP-1251

20 months agoUpdate ReadMe-Russian.txt (#1555)
Den1704 [Tue, 1 Nov 2022 23:05:26 +0000 (02:05 +0300)]
Update ReadMe-Russian.txt (#1555)

20 months agoUpdate Russian.po (#1554)
Den1704 [Tue, 1 Nov 2022 23:04:43 +0000 (02:04 +0300)]
Update Russian.po (#1554)

20 months agoUpdate Russian.po (#1553)
Den1704 [Tue, 1 Nov 2022 23:03:44 +0000 (02:03 +0300)]
Update Russian.po (#1553)

20 months agoInstaller: Run powershell.exe with full path. issue #1548
Takashi Sawanaka [Mon, 31 Oct 2022 14:49:58 +0000 (23:49 +0900)]
Installer: Run powershell.exe with full path. issue #1548

20 months agoAdd processing to indicate that two files are identical in the "Comparison result...
Jun Tajima [Sat, 29 Oct 2022 14:52:58 +0000 (23:52 +0900)]
Add processing to indicate that two files are identical in the "Comparison result" column when one file does not exist and the other two files are identical in a 3-way folder comparison. (#1545)

20 months agopng optimization (#1541)
pea-sys [Sat, 29 Oct 2022 13:30:02 +0000 (22:30 +0900)]
png optimization (#1541)

20 months agoGet codepage list asynchronously, because the Codepage dialog appears slow.
Takashi Sawanaka [Sat, 29 Oct 2022 04:53:40 +0000 (13:53 +0900)]
Get codepage list asynchronously, because the Codepage dialog appears slow.

20 months agoUpdate manual
Takashi Sawanaka [Wed, 26 Oct 2022 14:49:56 +0000 (23:49 +0900)]
Update manual

20 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Wed, 26 Oct 2022 14:16:51 +0000 (23:16 +0900)]
Update ChangeLog&ReleaseNotes (3)

20 months agoUpdate French.po (#1538)
slolo2000 [Wed, 26 Oct 2022 14:13:58 +0000 (16:13 +0200)]
Update French.po (#1538)

20 months agoBump revision to 2.16.24
Takashi Sawanaka [Tue, 25 Oct 2022 14:41:24 +0000 (23:41 +0900)]
Bump revision to 2.16.24

20 months agoSelect Files or Folders Window: Make it possible to specify the Prediffer plugin (2)
Takashi Sawanaka [Tue, 25 Oct 2022 14:39:13 +0000 (23:39 +0900)]
Select Files or Folders Window: Make it possible to specify the Prediffer plugin (2)

20 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 23 Oct 2022 09:38:57 +0000 (18:38 +0900)]
Update ChangeLog&ReleaseNotes (2)

20 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 23 Oct 2022 09:31:58 +0000 (18:31 +0900)]
Update ChangeLog&ReleaseNotes

20 months agoFix osdn#45935: The command line section in the generated patch file is garbled (2)
Takashi Sawanaka [Sun, 23 Oct 2022 09:30:52 +0000 (18:30 +0900)]
Fix osdn#45935: The command line section in the generated patch file is garbled (2)

20 months agoFix an issue where the following message displayed when two files are identical in...
Jun Tajima [Sun, 23 Oct 2022 08:44:09 +0000 (17:44 +0900)]
Fix an issue where the following message displayed when two files are identical in a 3-way folder comparison is not translated. (#1535)

- (Middle and right are identical)
- (Left and right are identical)
- (Left and middle are identical)

The strings defined in Merge.rc have leading spaces, but the strings in DirViewColItems.cpp do not.
So add a space to the beginning of the string in DirViewColItems.cpp.

20 months agoFix osdn#45935: The command line section in the generated patch file is garbled
Takashi Sawanaka [Sat, 22 Oct 2022 00:27:53 +0000 (09:27 +0900)]
Fix osdn#45935: The command line section in the generated patch file is garbled

21 months agoFix osdn.net ticket #45916: Fix crash when displaying file menu if jump list contains...
Takashi Sawanaka [Tue, 18 Oct 2022 14:44:11 +0000 (23:44 +0900)]
Fix osdn.net ticket #45916: Fix crash when displaying file menu if jump list contains invalid title.

21 months agoUpdate Portuguese translation (#1529)
Hugo Carvalho [Mon, 17 Oct 2022 23:12:15 +0000 (00:12 +0100)]
Update Portuguese translation (#1529)

21 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 17 Oct 2022 15:29:59 +0000 (00:29 +0900)]
Update TranslationsStatus

21 months agoUpdate German.po (#1528)
Mr-Update [Mon, 17 Oct 2022 15:28:04 +0000 (17:28 +0200)]
Update German.po (#1528)

21 months agoUpdate Corsican translation for 2.16.24 (Oct. 17th) (#1527)
Patriccollu [Mon, 17 Oct 2022 15:27:11 +0000 (17:27 +0200)]
Update Corsican translation for 2.16.24 (Oct. 17th) (#1527)

* Update Corsican translation for 2.16.24 (Oct. 17th)

* Update Corsican translation for 2.16.24 (Oct. 17th)

21 months agoUpdate of Lithuanian translation (#1526)
Tichij [Mon, 17 Oct 2022 15:26:28 +0000 (18:26 +0300)]
Update of Lithuanian translation (#1526)

21 months agoUpdate Polish.po (#1525)
Mirosław Żylewicz [Sun, 16 Oct 2022 23:31:48 +0000 (01:31 +0200)]
Update Polish.po (#1525)

21 months agoUpdate Hungarian.po (#1524)
efi99 [Sun, 16 Oct 2022 23:30:48 +0000 (01:30 +0200)]
Update Hungarian.po (#1524)

21 months agoFix that <Automatic> is displayed in the status bar when New→Binary or New→Image...
Takashi Sawanaka [Sun, 16 Oct 2022 12:58:51 +0000 (21:58 +0900)]
Fix that <Automatic> is displayed in the status bar when New→Binary or New→Image menu item is selected while Plugins→Automatic Unpacking menu item is selected.

21 months agoUpdate Brazilian.po (#1523)
Marcello-mco [Sat, 15 Oct 2022 22:22:41 +0000 (19:22 -0300)]
Update Brazilian.po (#1523)

Adding translation for Options dialog: Change "Number of compare threads (...)" to "Number o…

21 months agoOptions dialog: Change "Number of compare threads (...)" to "Number of CPU cores...
Takashi Sawanaka [Sat, 15 Oct 2022 15:59:25 +0000 (00:59 +0900)]
Options dialog: Change "Number of compare threads (...)" to "Number of CPU cores to use".
If the value stored in the registry is negative, the "Number of CPU cores to use" text box will display the value obtained by adding the number of CPU cores.
related to PR  #1513

21 months agoUpdate winimerge to 1.0.37
Takashi Sawanaka [Thu, 13 Oct 2022 13:24:25 +0000 (22:24 +0900)]
Update winimerge to 1.0.37

21 months agoFix typo in lwdisp.c (#1515) (2)
Takashi Sawanaka [Wed, 12 Oct 2022 12:38:57 +0000 (21:38 +0900)]
Fix typo in lwdisp.c (#1515) (2)

21 months agoFix typo in lwdisp.c (#1515)
Ikko Ashimine [Wed, 12 Oct 2022 12:23:25 +0000 (21:23 +0900)]
Fix typo in lwdisp.c (#1515)

accross -> across

21 months agoUpdate of Lithuanian translation (#1514)
Tichij [Mon, 10 Oct 2022 13:26:39 +0000 (16:26 +0300)]
Update of Lithuanian translation (#1514)

21 months agoUpdate Brazilian.po (#1511)
Marcello-mco [Mon, 10 Oct 2022 00:22:52 +0000 (21:22 -0300)]
Update Brazilian.po (#1511)

Select Files or Folders Window: Make it possible to specify the Prediffer plugin

21 months agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Mon, 10 Oct 2022 00:22:11 +0000 (09:22 +0900)]
Update Slovenian translation. Submitted by JadranR

21 months agoUpdate Corsican translation for 2.16.24 (Oct. 9th) (#1510)
Patriccollu [Mon, 10 Oct 2022 00:18:43 +0000 (02:18 +0200)]
Update Corsican translation for 2.16.24 (Oct. 9th) (#1510)

21 months agoUpdate German.po (#1509)
Mr-Update [Sun, 9 Oct 2022 11:46:31 +0000 (13:46 +0200)]
Update German.po (#1509)

21 months agoUpdate Hungarian.po (#1508)
efi99 [Sun, 9 Oct 2022 09:50:27 +0000 (11:50 +0200)]
Update Hungarian.po (#1508)

21 months agoSelect Files or Folders Window: Make it possible to specify the Prediffer plugin
Takashi Sawanaka [Sun, 9 Oct 2022 07:48:55 +0000 (16:48 +0900)]
Select Files or Folders Window: Make it possible to specify the Prediffer plugin

21 months agoEditorFilepathBar: Rename menu item from "Select..." to "Open..."
Takashi Sawanaka [Sun, 9 Oct 2022 07:40:50 +0000 (16:40 +0900)]
EditorFilepathBar: Rename menu item from "Select..." to "Open..."

21 months agoFix an issue where, when a TSV file was displayed in table mode with word wrap enable...
Takashi Sawanaka [Sat, 8 Oct 2022 14:08:39 +0000 (23:08 +0900)]
Fix an issue where, when a TSV file was displayed in table mode with word wrap enabled, clicking on a character would not move the caret to that character's position (2)

21 months agoFix an issue where, when a TSV file was displayed in table mode with word wrap enable...
Takashi Sawanaka [Sat, 8 Oct 2022 13:58:05 +0000 (22:58 +0900)]
Fix an issue where, when a TSV file was displayed in table mode with word wrap enabled, clicking on a character would not move the caret to that character's position

21 months agoUpdate ChangeLog&ReleaseNotes(3)
Takashi Sawanaka [Sat, 8 Oct 2022 05:25:06 +0000 (14:25 +0900)]
Update ChangeLog&ReleaseNotes(3)

21 months agoUpdate winwebdiff
Takashi Sawanaka [Mon, 3 Oct 2022 14:25:05 +0000 (23:25 +0900)]
Update winwebdiff

21 months agoAllow saving of left-side and right-side description and window type in the project...
Takashi Sawanaka [Sun, 2 Oct 2022 13:58:22 +0000 (22:58 +0900)]
Allow saving of left-side and right-side description and window type in the project file. (2)

21 months agoSelect Plugin dialog: Fix that "Display all plugins" checkbox does not work
Takashi Sawanaka [Sun, 2 Oct 2022 13:01:10 +0000 (22:01 +0900)]
Select Plugin dialog: Fix that "Display all plugins" checkbox does not work

21 months agoUpdate UnitTests
Takashi Sawanaka [Sun, 2 Oct 2022 12:26:34 +0000 (21:26 +0900)]
Update UnitTests

21 months agoAllow saving table delimiter in the project file.
Takashi Sawanaka [Sun, 2 Oct 2022 03:54:28 +0000 (12:54 +0900)]
Allow saving table delimiter in the project file.

21 months agotypo fixed in README.md (#1504)
S.M. Raihanul Bashir Hridoy [Sat, 1 Oct 2022 23:04:49 +0000 (05:04 +0600)]
typo fixed in README.md (#1504)

21 months agoAllow saving of left-side and right-side description and window type in the project...
Takashi Sawanaka [Sat, 1 Oct 2022 14:15:38 +0000 (23:15 +0900)]
Allow saving of left-side and right-side description and window type in the project file.

21 months agoFix comparison failure when the left file path and the right file path in the project...
Takashi Sawanaka [Sat, 1 Oct 2022 05:31:12 +0000 (14:31 +0900)]
Fix comparison failure when the left file path and the right file path in the project file are URLs.

21 months agoChange the operation of displaying dialogs and context menus from the status bar...
Takashi Sawanaka [Sat, 1 Oct 2022 04:59:47 +0000 (13:59 +0900)]
Change the operation of displaying dialogs and context menus from the status bar from double-click to single-click.

21 months agoUpdate winwebdiff
Takashi Sawanaka [Sat, 1 Oct 2022 01:00:24 +0000 (10:00 +0900)]
Update winwebdiff

21 months agoFixed English verbiage (#1499) (2)
Takashi Sawanaka [Tue, 27 Sep 2022 14:05:47 +0000 (23:05 +0900)]
Fixed English verbiage (#1499) (2)

21 months agoFixed English verbiage (#1499)
Gitoffthelawn [Tue, 27 Sep 2022 14:02:15 +0000 (07:02 -0700)]
Fixed English verbiage (#1499)

Although this PR won't hurt anything, I'm not sure if this is the correct place to make this fix for all future releases.  If it's not the correct place, where would that be?

21 months agoChange the fileencoding from UTF-8 to CP-1252
Takashi Sawanaka [Mon, 26 Sep 2022 23:24:45 +0000 (08:24 +0900)]
Change the fileencoding from UTF-8 to CP-1252

21 months agoUpdate German.isl (#1498)
Mr-Update [Mon, 26 Sep 2022 23:19:54 +0000 (01:19 +0200)]
Update German.isl (#1498)

Translation improved.
Please keep using ISO 8859-1.

21 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sun, 25 Sep 2022 14:00:03 +0000 (23:00 +0900)]
Update ChangeLog&ReleaseNotes (3)

21 months agoBump revision to 2.16.23
Takashi Sawanaka [Sun, 25 Sep 2022 13:15:02 +0000 (22:15 +0900)]
Bump revision to 2.16.23

21 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 25 Sep 2022 13:13:46 +0000 (22:13 +0900)]
Update ChangeLog&ReleaseNotes (2)

21 months agoupdate winimerge to 1.0.35
Takashi Sawanaka [Sun, 25 Sep 2022 11:02:03 +0000 (20:02 +0900)]
update winimerge to 1.0.35

21 months agoUpdate winwebdiff
Takashi Sawanaka [Sun, 25 Sep 2022 09:46:48 +0000 (18:46 +0900)]
Update winwebdiff

21 months agoUpdate freeimage
Takashi Sawanaka [Sun, 25 Sep 2022 09:46:18 +0000 (18:46 +0900)]
Update freeimage

21 months ago[EXPERIMENTAL] Webpage Compare: Highlight differences (#1357)
Takashi Sawanaka [Sun, 25 Sep 2022 03:08:18 +0000 (12:08 +0900)]
[EXPERIMENTAL] Webpage Compare: Highlight differences (#1357)

21 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Fri, 23 Sep 2022 11:49:44 +0000 (20:49 +0900)]
Update ChangeLog&ReleaseNotes

21 months agoFix an issue where compare flags may not update properly when doing a "Left to Right...
Jun Tajima [Fri, 23 Sep 2022 11:15:53 +0000 (20:15 +0900)]
Fix an issue where compare flags may not update properly when doing a "Left to Right" or "Right to Left" copy in 2-way folder comparison. (#1495)

21 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 22 Sep 2022 14:53:39 +0000 (23:53 +0900)]
Update TranslationsStatus

21 months agoUpdate Contributors.txt
Takashi Sawanaka [Thu, 22 Sep 2022 14:53:22 +0000 (23:53 +0900)]
Update Contributors.txt

21 months agoCrystalEdit/parsers/SQL: Added more keywords (#1493) (2) sort keywords
Takashi Sawanaka [Thu, 22 Sep 2022 14:52:08 +0000 (23:52 +0900)]
CrystalEdit/parsers/SQL: Added more keywords (#1493) (2) sort keywords

21 months agoCrystalEdit/parsers/SQL: Added more keywords (#1493)
baka0815 [Thu, 22 Sep 2022 14:49:24 +0000 (16:49 +0200)]
CrystalEdit/parsers/SQL: Added more keywords (#1493)

Added some more keywords and datatypes.

21 months agoUpdate French.po (#1491)
slolo2000 [Wed, 21 Sep 2022 14:05:17 +0000 (16:05 +0200)]
Update French.po (#1491)

22 months agoReduce compiler warnings
Takashi Sawanaka [Thu, 15 Sep 2022 13:25:50 +0000 (22:25 +0900)]
Reduce compiler warnings

22 months agoPR #1481 (7)
Takashi Sawanaka [Thu, 15 Sep 2022 12:41:44 +0000 (21:41 +0900)]
PR #1481 (7)

22 months agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 14 Sep 2022 23:32:37 +0000 (08:32 +0900)]
Update TranslationsStatus

22 months agoUpdate Portuguese translation (#1490)
Hugo Carvalho [Wed, 14 Sep 2022 23:29:20 +0000 (00:29 +0100)]
Update Portuguese translation (#1490)

For commit: 3f585b068697b6407bdc2523d8de6b7214bea906

22 months agoUpdate Japanese translation
Takashi Sawanaka [Wed, 14 Sep 2022 23:28:37 +0000 (08:28 +0900)]
Update Japanese translation

22 months agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Wed, 14 Sep 2022 23:28:17 +0000 (08:28 +0900)]
Update Slovenian translation. Submitted by JadranR

22 months agoUpdate Brazilian.po (#1486)
Marcello-mco [Wed, 14 Sep 2022 13:23:27 +0000 (10:23 -0300)]
Update Brazilian.po (#1486)

Correcting missing translation line.

22 months agoPR #1481 (6)
Takashi Sawanaka [Wed, 14 Sep 2022 13:22:00 +0000 (22:22 +0900)]
PR #1481 (6)
revert part of PR #1481

22 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 13 Sep 2022 14:19:14 +0000 (23:19 +0900)]
Update TranslationsStatus

22 months agoPR #1481 (5)
Takashi Sawanaka [Tue, 13 Sep 2022 14:18:22 +0000 (23:18 +0900)]
PR #1481 (5)

22 months agoUpdate of Lithuanian translation (#1485)
Tichij [Tue, 13 Sep 2022 14:17:31 +0000 (17:17 +0300)]
Update of Lithuanian translation (#1485)

22 months agoUpdate German.po (#1484)
Mr-Update [Mon, 12 Sep 2022 22:46:18 +0000 (00:46 +0200)]
Update German.po (#1484)

22 months agoPR #1481 (4)
Takashi Sawanaka [Mon, 12 Sep 2022 15:04:36 +0000 (00:04 +0900)]
PR #1481 (4)

22 months agoPR #1481 (3)
Takashi Sawanaka [Mon, 12 Sep 2022 14:55:58 +0000 (23:55 +0900)]
PR #1481 (3)

22 months agoPR #1481 (2)
Takashi Sawanaka [Mon, 12 Sep 2022 14:53:53 +0000 (23:53 +0900)]
PR #1481 (2)

22 months agoThe feature will allow the user to right-click the selected lines and add them to...
Srdzank [Mon, 12 Sep 2022 14:49:35 +0000 (16:49 +0200)]
The feature will allow the user to right-click the selected lines and add them to Line Filter, so that those lines added to the Line Filter will be ignore if found in any file. (#1481)

22 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 10 Sep 2022 09:49:33 +0000 (18:49 +0900)]
Update TranslationsStatus

22 months agoTableCompare: Fix the problem that the inline difference is not displayed even if...
Takashi Sawanaka [Sat, 10 Sep 2022 09:44:42 +0000 (18:44 +0900)]
TableCompare: Fix the problem that the inline difference is not displayed even if the caret is moved to the position of the inline difference that is hidden due to the narrow column width.

22 months agoUpdate Corsican translation in September (#1480)
Patriccollu [Fri, 9 Sep 2022 14:17:40 +0000 (16:17 +0200)]
Update Corsican translation in September (#1480)

22 months agoUpdate Dutch.po (#1474)
Thomas De Rocker [Sun, 4 Sep 2022 22:25:32 +0000 (00:25 +0200)]
Update Dutch.po (#1474)

22 months agoFix an issue where filenames containing "&" are not displayed properly in the MDI...
Jun Tajima [Tue, 23 Aug 2022 14:13:04 +0000 (23:13 +0900)]
Fix an issue where filenames containing "&" are not displayed properly in the MDI tab bar and its tooltips. (#1466)

- Add processing to escape "&" in the MDI tab bar.
- Add TTS_NOPREFIX to the tooltip style.

22 months agoMergeEditView.cpp: Fix "Copy to Right" or "Copy to Left" icons not being enabled...
Takashi Sawanaka [Sun, 21 Aug 2022 12:32:18 +0000 (21:32 +0900)]
MergeEditView.cpp: Fix "Copy to Right" or "Copy to Left" icons not being enabled when selecting lines containing a diff block

22 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 20 Aug 2022 03:02:15 +0000 (12:02 +0900)]
Update TranslationsStatus