OSDN Git Service

winmerge-jp/winmerge-jp.git
7 months agoFix build error on VS2017
Takashi Sawanaka [Sat, 7 Oct 2023 04:14:02 +0000 (13:14 +0900)]
Fix build error on VS2017

7 months agoMove the parser source files in editlib.vcxitems to editlibparsers.vcxitems.
Takashi Sawanaka [Sat, 7 Oct 2023 04:00:49 +0000 (13:00 +0900)]
Move the parser source files in editlib.vcxitems to editlibparsers.vcxitems.

7 months agoUpdate French.po
Takashi Sawanaka [Sat, 7 Oct 2023 01:02:59 +0000 (10:02 +0900)]
Update French.po

7 months agoUpdate French.po
Takashi Sawanaka [Sat, 7 Oct 2023 01:02:30 +0000 (10:02 +0900)]
Update French.po

7 months agoDiffWrapper.cpp: Remove unnecessary #include
Takashi Sawanaka [Sat, 7 Oct 2023 00:39:09 +0000 (09:39 +0900)]
DiffWrapper.cpp: Remove unnecessary #include

7 months agoUpdate French.po 16.30 => 16.32 (#2058)
Need74 [Sat, 7 Oct 2023 00:23:43 +0000 (02:23 +0200)]
Update French.po 16.30 => 16.32 (#2058)

* Update French.po 16.30 => 16.32

Hi
I have just made this update (16.32) including the few latest new features since version 16.30 and also by tweaking the slightly French formulations (clumsy word-for-word translation) or sometimes errors in the meaning of the text in English compared to what is actually happens by activating the command (2 or 3 cases at most).

Aware that I have still made many small modifications which require verification, I remain attentive and in no way claim to have the absolute truth.

My pleasure is still great to work with WinMerge in parallel with Notepad++ and translating it is a real pleasure for me to share my passion for this program.

* Update French.po on spell error "caractères"

The error is corrected

Now I wait for 16.33 version

7 months agoKorean.isl: Change the file encoding from UTF-8 to CP-949
Takashi Sawanaka [Fri, 6 Oct 2023 14:25:43 +0000 (23:25 +0900)]
Korean.isl: Change the file encoding from UTF-8 to CP-949

7 months agoUpdate Korean.isl (#2060)
VenusGirl❤ [Fri, 6 Oct 2023 14:20:00 +0000 (23:20 +0900)]
Update Korean.isl (#2060)

7 months agoUpdate Korean.isl (#2059)
VenusGirl❤ [Fri, 6 Oct 2023 14:19:16 +0000 (23:19 +0900)]
Update Korean.isl (#2059)

7 months agoAdd excel.xlsx, excel.xlsm
Takashi Sawanaka [Thu, 5 Oct 2023 11:47:18 +0000 (20:47 +0900)]
Add excel.xlsx, excel.xlsm

7 months agoUpdate Testing/Data/Compare/Dir*/ignore_comments.cpp
Takashi Sawanaka [Thu, 5 Oct 2023 11:15:18 +0000 (20:15 +0900)]
Update Testing/Data/Compare/Dir*/ignore_comments.cpp

7 months agoImprove line filters and substitution filters (#2032) (5)
Takashi Sawanaka [Thu, 5 Oct 2023 00:04:43 +0000 (09:04 +0900)]
Improve line filters and substitution filters (#2032) (5)

7 months agoAllow NUL and \\.\NUL in paths specified as command line arguments (#2056)
Takashi Sawanaka [Wed, 4 Oct 2023 23:27:53 +0000 (08:27 +0900)]
Allow NUL and \\.\NUL in paths specified as command line arguments (#2056)

7 months agoUpdate Korean.po (#2057)
VenusGirl❤ [Wed, 4 Oct 2023 21:12:40 +0000 (06:12 +0900)]
Update Korean.po (#2057)

7 months agoUpdate French.po (#2055)
slolo2000 [Wed, 4 Oct 2023 11:02:00 +0000 (13:02 +0200)]
Update French.po (#2055)

7 months agoAdd "(F4)" to the description of the toolbar icon "Difference in the Current Line...
Takashi Sawanaka [Wed, 4 Oct 2023 10:58:31 +0000 (19:58 +0900)]
Add "(F4)" to the description of the toolbar icon "Difference in the Current Line". refs #2050 (2)

7 months agoAdd "(F4)" to the description of the toolbar icon "Difference in the Current Line...
Takashi Sawanaka [Mon, 2 Oct 2023 12:40:38 +0000 (21:40 +0900)]
Add "(F4)" to the description of the toolbar icon "Difference in the Current Line". refs #2050

7 months agoUpdate ignore_comments.cpp
Takashi Sawanaka [Sun, 1 Oct 2023 06:42:47 +0000 (15:42 +0900)]
Update ignore_comments.cpp

7 months agoFix typo
Takashi Sawanaka [Sun, 1 Oct 2023 06:32:59 +0000 (15:32 +0900)]
Fix typo

7 months agoImprove line filters and substitution filters (#2032) (4)
Takashi Sawanaka [Sun, 1 Oct 2023 06:31:20 +0000 (15:31 +0900)]
Improve line filters and substitution filters (#2032) (4)

7 months agoImprove line filters and substitution filters (#2032) (3)
Takashi Sawanaka [Sun, 1 Oct 2023 04:14:11 +0000 (13:14 +0900)]
Improve line filters and substitution filters (#2032) (3)

7 months agoImprove line filters and substitution filters (#2032) (2)
sdottaka [Sun, 1 Oct 2023 02:47:10 +0000 (11:47 +0900)]
Improve line filters and substitution filters (#2032) (2)

7 months agoUpdate
sdottaka [Sun, 1 Oct 2023 02:26:05 +0000 (11:26 +0900)]
Update

7 months agorefactor
sdottaka [Sat, 30 Sep 2023 11:02:13 +0000 (20:02 +0900)]
refactor

7 months agoModify the "Line Filters" dialog. (#2047)
Jun Tajima [Sat, 30 Sep 2023 09:39:49 +0000 (18:39 +0900)]
Modify the "Line Filters" dialog. (#2047)

- Disable the "Edit" and "Remove" buttons when no filter is selected.

7 months agoFix issue #2046: Folder compare omits unique folders from results if they contain...
Takashi Sawanaka [Fri, 29 Sep 2023 13:33:52 +0000 (22:33 +0900)]
Fix issue #2046: Folder compare omits unique folders from results if they contain any files and/or subfolders
Revert commit "Fix issue #1588: File Duplication Bug In Outputted Zips" and redo the fix.

7 months agorefactor
Takashi Sawanaka [Wed, 27 Sep 2023 15:16:37 +0000 (00:16 +0900)]
refactor

7 months agoFix sf.net ticket #2163: Save As: default directory should be file's original directo...
Takashi Sawanaka [Wed, 27 Sep 2023 14:25:00 +0000 (23:25 +0900)]
Fix sf.net ticket #2163: Save As: default directory should be file's original directory (2)

7 months agoFix issue #2045: WinMerge Crashed for Comparing Clipboard Texts
Takashi Sawanaka [Wed, 27 Sep 2023 14:01:33 +0000 (23:01 +0900)]
Fix issue #2045: WinMerge Crashed for Comparing Clipboard Texts

7 months agoUpdate winimerge to 1.0.41
Takashi Sawanaka [Tue, 26 Sep 2023 23:30:38 +0000 (08:30 +0900)]
Update winimerge to 1.0.41

7 months agoSmall code changes for CMDIChildWnd handling (#2043)
Flaviu_ [Mon, 25 Sep 2023 14:10:52 +0000 (17:10 +0300)]
Small code changes for CMDIChildWnd handling (#2043)

7 months agorefactor
Takashi Sawanaka [Sun, 24 Sep 2023 23:36:02 +0000 (08:36 +0900)]
refactor

7 months agoIntroduce IDirDoc interface
Takashi Sawanaka [Sun, 24 Sep 2023 13:45:05 +0000 (22:45 +0900)]
Introduce IDirDoc interface

7 months agoMergeDoc.cpp: Change it to get the Prediffer plugin without depending on CDirDoc.
Takashi Sawanaka [Sun, 24 Sep 2023 07:23:54 +0000 (16:23 +0900)]
MergeDoc.cpp: Change it to get the Prediffer plugin without depending on CDirDoc.

7 months agoKorean.isl: Change the file encoding from UTF-8 to CP-949
Takashi Sawanaka [Thu, 21 Sep 2023 10:16:44 +0000 (19:16 +0900)]
Korean.isl: Change the file encoding from UTF-8 to CP-949

7 months agoUpdate Korean.isl (#2041)
VenusGirl❤ [Thu, 21 Sep 2023 10:10:59 +0000 (19:10 +0900)]
Update Korean.isl (#2041)

7 months agoUpdate jq to version 1.7 (2)
Takashi Sawanaka [Wed, 20 Sep 2023 14:30:30 +0000 (23:30 +0900)]
Update jq to version 1.7 (2)

7 months agoFix build error
Takashi Sawanaka [Wed, 20 Sep 2023 13:18:37 +0000 (22:18 +0900)]
Fix build error

7 months agoBump revision to 2.16.33
Takashi Sawanaka [Wed, 20 Sep 2023 12:31:01 +0000 (21:31 +0900)]
Bump revision to 2.16.33

7 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Wed, 20 Sep 2023 12:30:41 +0000 (21:30 +0900)]
Update ChangeLog&ReleaseNotes (2)

7 months agoSubstituion filters page: Fix the garbled message that is displayed when you enter...
Takashi Sawanaka [Wed, 20 Sep 2023 12:20:35 +0000 (21:20 +0900)]
Substituion filters page: Fix the garbled message that is displayed when you enter an invalid regular expression and press the OK button.

7 months agoImprove line filters and substitution filters (#2032)
Takashi Sawanaka [Wed, 20 Sep 2023 11:48:28 +0000 (20:48 +0900)]
Improve line filters and substitution filters (#2032)

8 months agoRemove unused function
sdottaka [Sun, 17 Sep 2023 08:08:11 +0000 (17:08 +0900)]
Remove unused function

8 months agoFix an issue where values in the Left/Right EOL column may not display correctly...
sdottaka [Sun, 17 Sep 2023 07:11:06 +0000 (16:11 +0900)]
Fix an issue where values in the Left/Right EOL column may not display correctly when using the Quick contents compare method.

8 months agorefactor
sdottaka [Sun, 17 Sep 2023 04:23:32 +0000 (13:23 +0900)]
refactor

8 months agoUpdate ChangeLog&ReleaseNotes
sdottaka [Sat, 16 Sep 2023 02:26:40 +0000 (11:26 +0900)]
Update ChangeLog&ReleaseNotes

8 months agoUpdate Japanese.po
sdottaka [Fri, 15 Sep 2023 00:20:06 +0000 (09:20 +0900)]
Update Japanese.po

8 months agoUpdate jq to version 1.7
Takashi Sawanaka [Thu, 14 Sep 2023 23:59:45 +0000 (08:59 +0900)]
Update jq to version 1.7

8 months agoAdd diff_2_buffers_xdiff() function
Takashi Sawanaka [Mon, 11 Sep 2023 23:16:03 +0000 (08:16 +0900)]
Add diff_2_buffers_xdiff() function

8 months agoRemove unused function
Takashi Sawanaka [Mon, 11 Sep 2023 22:14:51 +0000 (07:14 +0900)]
Remove unused function

8 months agoUpdate Korean.po (#2030)
VenusGirl❤ [Mon, 11 Sep 2023 21:35:27 +0000 (06:35 +0900)]
Update Korean.po (#2030)

8 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 11 Sep 2023 11:57:31 +0000 (20:57 +0900)]
Update TranslationsStatus

8 months agoUpdate Merge.vcxproj
Takashi Sawanaka [Mon, 11 Sep 2023 11:56:56 +0000 (20:56 +0900)]
Update Merge.vcxproj

8 months agoUpdate of Lithuanian translation (#2027)
Tichij [Mon, 11 Sep 2023 11:17:47 +0000 (14:17 +0300)]
Update of Lithuanian translation (#2027)

8 months agoupdate zh-cn translations (#2026)
Gang Yin [Mon, 11 Sep 2023 11:16:45 +0000 (19:16 +0800)]
update zh-cn translations (#2026)

8 months ago[XML] Update Brazilian.po (#2025)
Marcellomco [Sun, 10 Sep 2023 22:48:23 +0000 (19:48 -0300)]
[XML] Update Brazilian.po (#2025)

Translation for "Folder compare: Add Both Shell Menu"

8 months agoUpdate Corsican translation for 2.16.33 (#2022)
Patriccollu [Sun, 10 Sep 2023 22:47:15 +0000 (00:47 +0200)]
Update Corsican translation for 2.16.33 (#2022)

8 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 10 Sep 2023 09:23:47 +0000 (18:23 +0900)]
Update TranslationsStatus

8 months agoFolder compare: Add Both Shell Menu (refs #1986) (#2021)
Takashi Sawanaka [Sun, 10 Sep 2023 09:14:02 +0000 (18:14 +0900)]
Folder compare: Add Both Shell Menu (refs #1986) (#2021)

8 months agoRevert "Fix an issue where clicking the Left/Right Shell Menu menu item would sometim...
Takashi Sawanaka [Sun, 10 Sep 2023 07:32:15 +0000 (16:32 +0900)]
Revert "Fix an issue where clicking the Left/Right Shell Menu menu item would sometimes not show the shell menu"

This reverts commit c0a92868ce653cfdc4622d58219cb573f1c2b7d3.

8 months agoUpdate of Lithuanian translation (#2018)
Tichij [Thu, 7 Sep 2023 12:51:07 +0000 (15:51 +0300)]
Update of Lithuanian translation (#2018)

8 months agoFix an issue where clicking the Left/Right Shell Menu menu item would sometimes not...
Takashi Sawanaka [Thu, 7 Sep 2023 12:50:36 +0000 (21:50 +0900)]
Fix an issue where clicking the Left/Right Shell Menu menu item would sometimes not show the shell menu

8 months agoupdate zh-cn translations (#2017)
Gang Yin [Thu, 7 Sep 2023 11:00:26 +0000 (19:00 +0800)]
update zh-cn translations (#2017)

* update zh-cn translations

* fix last commit

8 months agoAllow Diff algorithms (patience, histogram) other than default to be … (#2015)
Takashi Sawanaka [Thu, 7 Sep 2023 00:07:50 +0000 (09:07 +0900)]
Allow Diff algorithms (patience, histogram) other than default to be … (#2015)

8 months agoFixed an issue where Differences, Left/Right EOL columns, etc. were displayed as...
Takashi Sawanaka [Wed, 6 Sep 2023 23:27:43 +0000 (08:27 +0900)]
Fixed an issue where Differences, Left/Right EOL columns, etc. were displayed as undefined values when the file comparison method was Full Contents or Quick Contents and the file size exceeded 64MB.

8 months agoWhen "Use First Line as Header" is enabled, make the header display the first line...
Takashi Sawanaka [Wed, 6 Sep 2023 12:54:05 +0000 (21:54 +0900)]
When "Use First Line as Header" is enabled, make the header display the first line regardless of the scroll position when the first line is hidden.

8 months agoUpdate Portuguese.po (#2014)
Hugo Carvalho [Sun, 3 Sep 2023 22:09:12 +0000 (23:09 +0100)]
Update Portuguese.po (#2014)

8 months agoFix issue #2008: "Ignore comment differences" still compares inline comments
Takashi Sawanaka [Sun, 3 Sep 2023 01:35:26 +0000 (10:35 +0900)]
Fix issue #2008: "Ignore comment differences" still compares inline comments

8 months agoOptimize inserts in std containers using reserve (#2000) (2)
Takashi Sawanaka [Tue, 29 Aug 2023 14:24:15 +0000 (23:24 +0900)]
Optimize inserts in std containers using reserve (#2000) (2)

8 months agoUpdate Brazilian.po (#2001)
Marcellomco [Tue, 29 Aug 2023 13:19:57 +0000 (10:19 -0300)]
Update Brazilian.po (#2001)

Added translation for "Show confirmation message when closing a window that took a long time…"

8 months agoOptimize inserts in std containers using reserve (#2000)
Herman Semenov [Mon, 28 Aug 2023 23:30:36 +0000 (23:30 +0000)]
Optimize inserts in std containers using reserve (#2000)

8 months agoUpdate Hungarian.po (#1999)
efi99 [Mon, 28 Aug 2023 22:53:28 +0000 (00:53 +0200)]
Update Hungarian.po (#1999)

8 months agoManual: Use po4a for manual translation (#1994) (5)
Takashi Sawanaka [Sun, 27 Aug 2023 12:40:58 +0000 (21:40 +0900)]
Manual: Use po4a for manual translation (#1994) (5)

8 months agoupdate freeimage
Takashi Sawanaka [Sun, 27 Aug 2023 12:32:50 +0000 (21:32 +0900)]
update freeimage

8 months agoShow confirmation message when closing a window that took a long time to compare...
Takashi Sawanaka [Sun, 27 Aug 2023 12:16:57 +0000 (21:16 +0900)]
Show confirmation message when closing a window that took a long time to compare folders

8 months agoAvoid infinite loops in the RegularExpression::subst() function when the length of...
Takashi Sawanaka [Sun, 27 Aug 2023 12:06:55 +0000 (21:06 +0900)]
Avoid infinite loops in the RegularExpression::subst() function when the length of the string matching the pattern is 0. ref  #1997

8 months agoUpdate Rust syntax highlighting keyword list. (#1998)
Jun Tajima [Sun, 27 Aug 2023 10:51:58 +0000 (19:51 +0900)]
Update Rust syntax highlighting keyword list. (#1998)

- Added some keywords defined in version 1.72.0.
  - https://doc.rust-lang.org/book/appendix-01-keywords.html
  - https://doc.rust-lang.org/std/index.html

8 months agoUpdate German.po
sdottaka [Sat, 26 Aug 2023 12:29:50 +0000 (21:29 +0900)]
Update German.po

8 months agoManual: Use po4a for manual translation (#1994) (4)
sdottaka [Sat, 26 Aug 2023 12:29:36 +0000 (21:29 +0900)]
Manual: Use po4a for manual translation (#1994) (4)

8 months agoManual: Use po4a for manual translation (#1994) (3)
sdottaka [Sat, 26 Aug 2023 12:21:29 +0000 (21:21 +0900)]
Manual: Use po4a for manual translation (#1994) (3)

8 months agoManual: Use po4a for manual translation (#1994) (2)
sdottaka [Sat, 26 Aug 2023 11:16:57 +0000 (20:16 +0900)]
Manual: Use po4a for manual translation (#1994) (2)

8 months agoManual: Use po4a for manual translation (#1994)
Takashi Sawanaka [Sat, 26 Aug 2023 07:12:43 +0000 (16:12 +0900)]
Manual: Use po4a for manual translation (#1994)

8 months agoManual: Fix typos
sdottaka [Sat, 26 Aug 2023 06:08:22 +0000 (15:08 +0900)]
Manual: Fix typos

8 months agoChange the folder name from Docs/Manual/EN to Docs/Manual/English, and from Docs...
Takashi Sawanaka [Thu, 24 Aug 2023 11:48:08 +0000 (20:48 +0900)]
Change the folder name from Docs/Manual/EN to Docs/Manual/English, and from Docs/Manual/JP to Docs/Manual/Japanese.

8 months agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 23 Aug 2023 14:39:17 +0000 (23:39 +0900)]
Update TranslationsStatus

8 months agorefactor
Takashi Sawanaka [Wed, 23 Aug 2023 14:38:33 +0000 (23:38 +0900)]
refactor

8 months agoUpdate Polish.po (#1990)
Mirosław Żylewicz [Sun, 20 Aug 2023 23:02:56 +0000 (01:02 +0200)]
Update Polish.po (#1990)

8 months agoUpdate (#1989)
Justman10000 [Sun, 20 Aug 2023 23:02:24 +0000 (01:02 +0200)]
Update (#1989)

* Update TranslationsStatus

* Fixed syntax errors and improved Language

8 months agoRemove far modifier and _MFC_VER
Takashi Sawanaka [Sun, 20 Aug 2023 04:25:03 +0000 (13:25 +0900)]
Remove far modifier and _MFC_VER

8 months agoReduce startup time and decrease the usage of Win32 user objects.
sdottaka [Sat, 19 Aug 2023 12:09:44 +0000 (21:09 +0900)]
Reduce startup time and decrease the usage of Win32 user objects.

8 months agoFix issue #1985: Wimerge saves changes to the wrong file (#1988)
Takashi Sawanaka [Sat, 19 Aug 2023 04:58:02 +0000 (13:58 +0900)]
Fix issue #1985: Wimerge saves changes to the wrong file (#1988)

9 months agoGenerate reports in tabular format for table comparisons. (#1983)
Takashi Sawanaka [Fri, 18 Aug 2023 06:13:34 +0000 (15:13 +0900)]
Generate reports in tabular format for table comparisons. (#1983)

Generate reports in tabular format for table comparisons

9 months agoExecute the "pause" command to prevent the error message from disappearing if the...
sdottaka [Thu, 17 Aug 2023 01:11:45 +0000 (10:11 +0900)]
Execute the "pause" command to prevent the error message from disappearing if the registration of the ShellExtension for Windows 11 fails

9 months agoFix issue #1980: Current Difference" specified by double-clicking cannot merge using...
sdottaka [Sun, 13 Aug 2023 00:04:41 +0000 (09:04 +0900)]
Fix issue #1980: Current Difference" specified by double-clicking cannot merge using the "Copy to Right (or Left)" menu.
- When double-clicking on a line, only select text word-by-word if the line is the current difference or non-difference line

9 months agoAdd Convert to HTML and View Line Numbers menu item
sdottaka [Sat, 12 Aug 2023 05:34:59 +0000 (14:34 +0900)]
Add Convert to HTML and View Line Numbers menu item

9 months agoAn attempt to reduce build time
sdottaka [Fri, 11 Aug 2023 23:53:43 +0000 (08:53 +0900)]
An attempt to reduce build time

9 months agoUpdate Korean.po (#1979)
VenusGirl❤ [Fri, 11 Aug 2023 23:10:48 +0000 (08:10 +0900)]
Update Korean.po (#1979)

9 months agoUpdate Slovenian.po. Submitted By JadranR
sdottaka [Fri, 11 Aug 2023 23:09:13 +0000 (08:09 +0900)]
Update Slovenian.po. Submitted By JadranR

9 months agoFix the problem that when comparing with the BinaryContents compare method, the conte...
sdottaka [Fri, 11 Aug 2023 08:32:00 +0000 (17:32 +0900)]
Fix the problem that when comparing with the BinaryContents compare method, the contents of the files are identical, but if one side is a symbolic link, it is judged to be different. refs #1976

9 months agoFix the issue where the Apache Tika plugin becomes enabled again when reopening the...
Takashi Sawanaka [Wed, 9 Aug 2023 12:49:22 +0000 (21:49 +0900)]
Fix the issue where the Apache Tika plugin becomes enabled again when reopening the Plugins window, despite having unchecked the Apache Tika plugin in the Plugins window