OSDN Git Service

winmerge-jp/winmerge-jp.git
15 months agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 1 May 2023 13:23:20 +0000 (22:23 +0900)]
Update Contributors.txt

15 months agoConfirm copy all in file merge (#1827)
wilfzim [Mon, 1 May 2023 13:14:43 +0000 (15:14 +0200)]
Confirm copy all in file merge (#1827)

* warning message before copying all differences to other file

* make translation work

15 months agoFix input range check processing in "Go to" dialog. (#1826)
Jun Tajima [Sun, 30 Apr 2023 08:35:55 +0000 (17:35 +0900)]
Fix input range check processing in "Go to" dialog. (#1826)

Fix the following issues:
- When "Go to what" is "Line", specifying a line greater than the number of lines in the selected pane when opening the dialog navigates to the wrong line.
  (Navigate to a line equal to the number of lines in the pane selected when the dialog was opened.)
- When "Go to what" is "Difference" in debug build, if a number larger than the number of comparison differences is specified, a debug error occurs in the CMergeEditView::SelectDiff() check process.

15 months agoReduce compiler warnings
Takashi Sawanaka [Sat, 29 Apr 2023 14:24:34 +0000 (23:24 +0900)]
Reduce compiler warnings

15 months agoUpdate Contributors.txt
Takashi Sawanaka [Sat, 29 Apr 2023 14:23:24 +0000 (23:23 +0900)]
Update Contributors.txt

15 months agoUpdate Bulgarian.po
Takashi Sawanaka [Sat, 29 Apr 2023 06:26:54 +0000 (15:26 +0900)]
Update Bulgarian.po

15 months agoUpdate Russian.po
Takashi Sawanaka [Sat, 29 Apr 2023 06:26:27 +0000 (15:26 +0900)]
Update Russian.po

15 months agoUpdate to winimerge to 1.0.39
Takashi Sawanaka [Sat, 29 Apr 2023 02:24:27 +0000 (11:24 +0900)]
Update to winimerge to 1.0.39

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 29 Apr 2023 02:24:00 +0000 (11:24 +0900)]
Update TranslationsStatus

15 months agoUpdate Russian.po (#1825)
wvxwxvw [Fri, 28 Apr 2023 22:59:08 +0000 (01:59 +0300)]
Update Russian.po (#1825)

15 months agoUpdate Russian.po (#1824)
wvxwxvw [Fri, 28 Apr 2023 22:58:28 +0000 (01:58 +0300)]
Update Russian.po (#1824)

15 months agoUpdate Bulgarian.po (#1822)
StoyanDimitrov [Fri, 28 Apr 2023 00:03:54 +0000 (00:03 +0000)]
Update Bulgarian.po (#1822)

15 months agoUpdate Korean.po (#1821)
VenusGirl❤ [Thu, 27 Apr 2023 12:29:04 +0000 (21:29 +0900)]
Update Korean.po (#1821)

15 months agoUpdate Korean.po (#1820)
VenusGirl❤ [Thu, 27 Apr 2023 03:20:42 +0000 (12:20 +0900)]
Update Korean.po (#1820)

15 months agoBump revision to 2.16.30
Takashi Sawanaka [Wed, 26 Apr 2023 12:49:52 +0000 (21:49 +0900)]
Bump revision to 2.16.30

15 months agoUpdate manual
Takashi Sawanaka [Wed, 26 Apr 2023 12:48:20 +0000 (21:48 +0900)]
Update manual

15 months agoFix ConfigText.cpp
Takashi Sawanaka [Wed, 26 Apr 2023 12:48:07 +0000 (21:48 +0900)]
Fix ConfigText.cpp

15 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Mon, 24 Apr 2023 13:44:49 +0000 (22:44 +0900)]
Update ChangeLog&ReleaseNotes (3)

15 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Mon, 24 Apr 2023 13:36:44 +0000 (22:36 +0900)]
Update ChangeLog&ReleaseNotes (2)

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 24 Apr 2023 12:13:30 +0000 (21:13 +0900)]
Update TranslationsStatus

15 months agoUpdate Lithuanian.po (#1817)
Tichij [Mon, 24 Apr 2023 12:06:30 +0000 (15:06 +0300)]
Update Lithuanian.po (#1817)

Update of Lithuanian translation

15 months agoRevert "To reduce the size of the executable file, convert the image "ToolbarEnabled8...
Takashi Sawanaka [Sun, 23 Apr 2023 14:44:36 +0000 (23:44 +0900)]
Revert "To reduce the size of the executable file, convert the image "ToolbarEnabled8bit.bmp" to a 1-bit bitmap image, as it is not actually displayed."

This reverts commit a630c53b7fa46c087b6f71c5a0ca35e6c1862257.

15 months agoTo reduce the size of the executable file, convert the image "ToolbarEnabled8bit...
Takashi Sawanaka [Sun, 23 Apr 2023 14:36:17 +0000 (23:36 +0900)]
To reduce the size of the executable file, convert the image "ToolbarEnabled8bit.bmp" to a 1-bit bitmap image, as it is not actually displayed.

15 months agoRegisterDragDrop is now called at idle to reduce startup time since it is slow.
Takashi Sawanaka [Sun, 23 Apr 2023 14:34:24 +0000 (23:34 +0900)]
RegisterDragDrop is now called at idle to reduce startup time since it is slow.

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 23 Apr 2023 05:56:57 +0000 (14:56 +0900)]
Update TranslationsStatus

15 months agoReduce the executable file size. This is especially effective in the x86 version.
Takashi Sawanaka [Sun, 23 Apr 2023 05:56:23 +0000 (14:56 +0900)]
Reduce the executable file size. This is especially effective in the x86 version.

15 months agoUpdate Polish.po (#1815)
Mirosław Żylewicz [Sun, 23 Apr 2023 01:49:20 +0000 (03:49 +0200)]
Update Polish.po (#1815)

15 months agoFix problem of not moving to conflicted line after auto-merge
Takashi Sawanaka [Sat, 22 Apr 2023 12:31:22 +0000 (21:31 +0900)]
Fix problem of not moving to conflicted line after auto-merge

15 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Sat, 22 Apr 2023 09:33:18 +0000 (18:33 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (4)

15 months agoUpdate ShellExtension/Russion.po
Takashi Sawanaka [Sat, 22 Apr 2023 05:54:35 +0000 (14:54 +0900)]
Update ShellExtension/Russion.po

15 months agoFix the issue of missing part of the date in the Brazilian line in TranslationsStatus.md.
Takashi Sawanaka [Sat, 22 Apr 2023 05:51:52 +0000 (14:51 +0900)]
Fix the issue of missing part of the date in the Brazilian line in TranslationsStatus.md.

15 months agoFix the problem that the plug-in setting window cannot be opened on 32-bit OS
Takashi Sawanaka [Sat, 22 Apr 2023 04:09:03 +0000 (13:09 +0900)]
Fix the problem that the plug-in setting window cannot be opened on 32-bit OS

15 months agoFix the problem that the /fr option is ignored when specifying the command line optio...
Takashi Sawanaka [Sat, 22 Apr 2023 03:26:16 +0000 (12:26 +0900)]
Fix the problem that the /fr option is ignored when specifying the command line option /new

15 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 22 Apr 2023 00:43:33 +0000 (09:43 +0900)]
Update ChangeLog&ReleaseNotes

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 20 Apr 2023 22:41:33 +0000 (07:41 +0900)]
Update TranslationsStatus

15 months agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Thu, 20 Apr 2023 22:40:45 +0000 (07:40 +0900)]
Update Slovenian translation. Submitted by JadranR

15 months agoUpdate winimerge to 1.0.38.0
Takashi Sawanaka [Wed, 19 Apr 2023 23:44:27 +0000 (08:44 +0900)]
Update winimerge to 1.0.38.0

15 months agoFix an issue where the changed Color distance threshold value reverts to 0 the next...
Takashi Sawanaka [Wed, 19 Apr 2023 14:57:41 +0000 (23:57 +0900)]
Fix an issue where the changed Color distance threshold value reverts to 0 the next time WinMerge is started

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 18 Apr 2023 13:55:06 +0000 (22:55 +0900)]
Update TranslationsStatus

15 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Tue, 18 Apr 2023 13:54:31 +0000 (22:54 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (3)

15 months agoUpdate Hungarian.po (#1809)
efi99 [Tue, 18 Apr 2023 00:26:27 +0000 (02:26 +0200)]
Update Hungarian.po (#1809)

15 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Tue, 18 Apr 2023 00:21:14 +0000 (09:21 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (2)

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 17 Apr 2023 15:10:41 +0000 (00:10 +0900)]
Update TranslationsStatus

15 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Mon, 17 Apr 2023 15:10:20 +0000 (00:10 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog

15 months agoupdate zh-cn translation (#1808)
YIN, Gang [Mon, 17 Apr 2023 13:06:41 +0000 (21:06 +0800)]
update zh-cn translation (#1808)

* update zh-cn translation

* update last commit

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 16 Apr 2023 23:06:46 +0000 (08:06 +0900)]
Update TranslationsStatus

15 months agoUpdate German.po (#1807)
Mr-Update [Sun, 16 Apr 2023 23:05:43 +0000 (01:05 +0200)]
Update German.po (#1807)

15 months agoUpdate Brazilian.po (#1806)
Marcellomco [Sun, 16 Apr 2023 23:04:46 +0000 (20:04 -0300)]
Update Brazilian.po (#1806)

Translation for 'Make the plugin settings dialog translatable and enable saving settin...'

15 months agoAllow UTF-8 without BOM for the file filters
Takashi Sawanaka [Sun, 16 Apr 2023 12:10:25 +0000 (21:10 +0900)]
Allow UTF-8 without BOM for the file filters

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 16 Apr 2023 11:00:00 +0000 (20:00 +0900)]
Update TranslationsStatus

15 months agoMake the plugin settings dialog translatable and enable saving settings to an INI...
Takashi Sawanaka [Sun, 16 Apr 2023 10:58:05 +0000 (19:58 +0900)]
Make the plugin settings dialog translatable and enable saving settings to an INI file (#1783)

15 months agoAdd "Plugin Settings" button to the "Select Plugin" window
Takashi Sawanaka [Sun, 16 Apr 2023 01:11:53 +0000 (10:11 +0900)]
Add "Plugin Settings" button to the "Select Plugin" window

15 months agoIgnoreColumns, IgnoreFieldsComma, IgnoreFieldsTab: Fix build for VS2017 and VS2019
Takashi Sawanaka [Sun, 16 Apr 2023 00:07:29 +0000 (09:07 +0900)]
IgnoreColumns, IgnoreFieldsComma, IgnoreFieldsTab: Fix build for VS2017 and VS2019

15 months agoPlugins/BuildBin.vs2017.cmd: Fix build for VS2017
Takashi Sawanaka [Sat, 15 Apr 2023 23:58:43 +0000 (08:58 +0900)]
Plugins/BuildBin.vs2017.cmd: Fix build for VS2017
Plugins/BuildBin.vs2019.cmd: Fix build for VS2019

15 months agoFix issue #1802: Unsuccessful installation, Portable Win32 version
Takashi Sawanaka [Fri, 14 Apr 2023 12:48:47 +0000 (21:48 +0900)]
Fix issue #1802: Unsuccessful installation, Portable Win32 version

15 months agoFix issue with ApplyPatch plugin not functioning correctly when 'Plugins->Manual...
Takashi Sawanaka [Thu, 13 Apr 2023 12:53:34 +0000 (21:53 +0900)]
Fix issue with ApplyPatch plugin not functioning correctly when 'Plugins->Manual Unpacking' menu item is checked"

15 months agoFix issue #1799: When using an ini file all differences are displayed as black sections
Takashi Sawanaka [Tue, 11 Apr 2023 12:27:15 +0000 (21:27 +0900)]
Fix issue #1799: When using an ini file all differences are displayed as black sections

15 months agoFix issue #1793: Opening a project fails when a path has environmental variables...
Takashi Sawanaka [Thu, 6 Apr 2023 13:58:00 +0000 (22:58 +0900)]
Fix issue #1793: Opening a project fails when a path has environmental variables in it.

15 months agoUpdate Korean.po (#1791)
VenusGirl❤ [Wed, 5 Apr 2023 12:06:58 +0000 (21:06 +0900)]
Update Korean.po (#1791)

15 months agoUpdate Korean.po (#1790)
VenusGirl❤ [Tue, 4 Apr 2023 22:28:10 +0000 (07:28 +0900)]
Update Korean.po (#1790)

15 months agoTranslations/InnoSetup/Unbundled.is5/Korean.isl: Change the file encoding from UTF...
Takashi Sawanaka [Tue, 4 Apr 2023 14:44:44 +0000 (23:44 +0900)]
Translations/InnoSetup/Unbundled.is5/Korean.isl: Change the file encoding from UTF-8 to CP-949

15 months agoUpdate Korean.isl (#1788)
VenusGirl❤ [Tue, 4 Apr 2023 14:38:51 +0000 (23:38 +0900)]
Update Korean.isl (#1788)

15 months agoUpdate portuguese translation (#1787)
Hugo Carvalho [Mon, 3 Apr 2023 23:06:24 +0000 (00:06 +0100)]
Update portuguese translation (#1787)

16 months agoFix issue #1785: Middle Click to close image tab crash (2)
Takashi Sawanaka [Sat, 1 Apr 2023 14:08:11 +0000 (23:08 +0900)]
Fix issue #1785: Middle Click to close image tab crash (2)

16 months agoFix issue #1785: Middle Click to close image tab crash
Takashi Sawanaka [Sat, 1 Apr 2023 13:21:24 +0000 (22:21 +0900)]
Fix issue #1785: Middle Click to close image tab crash

16 months agoFix osdn.net ticket #47553: Allow text to wrap in the Table Compare Window and unwrap...
Takashi Sawanaka [Thu, 30 Mar 2023 15:02:12 +0000 (00:02 +0900)]
Fix osdn.net ticket #47553: Allow text to wrap in the Table Compare Window and unwrap lines in the Text Compare Window (2)

16 months agoFix EOL character not displayed on ARM64 version
Takashi Sawanaka [Mon, 27 Mar 2023 14:08:04 +0000 (23:08 +0900)]
Fix EOL character not displayed on ARM64 version

16 months agorefactor
Takashi Sawanaka [Sun, 26 Mar 2023 04:56:25 +0000 (13:56 +0900)]
refactor

16 months agoModify the "Go to" dialog. (#1779)
Jun Tajima [Sun, 26 Mar 2023 04:53:33 +0000 (13:53 +0900)]
Modify the "Go to" dialog. (#1779)

- Disable the "Middle" radio button when doing 2-way file comparisons.

16 months agoReduce Win32API type usage in code
Takashi Sawanaka [Sun, 26 Mar 2023 01:30:18 +0000 (10:30 +0900)]
Reduce Win32API type usage in code

16 months agoFix the issue where XML format files, such as vcxproj, are not being syntax highlighted
Takashi Sawanaka [Sun, 26 Mar 2023 00:28:07 +0000 (09:28 +0900)]
Fix the issue where XML format files, such as vcxproj, are not being syntax highlighted

16 months agoUse String instead of CString
Takashi Sawanaka [Sat, 25 Mar 2023 23:53:10 +0000 (08:53 +0900)]
Use String instead of CString

16 months agoSeparate plugin-related strings from Merge.rc into Strings.rc to reduce executable...
Takashi Sawanaka [Fri, 24 Mar 2023 14:49:55 +0000 (23:49 +0900)]
Separate plugin-related strings from Merge.rc into Strings.rc to reduce executable size.

16 months agorefactor
Takashi Sawanaka [Fri, 24 Mar 2023 13:55:23 +0000 (22:55 +0900)]
refactor

16 months agorefactor
Takashi Sawanaka [Thu, 23 Mar 2023 15:42:17 +0000 (00:42 +0900)]
refactor

16 months agocrystaledit: Change Output Directory and Intermediate Directory
Takashi Sawanaka [Wed, 22 Mar 2023 14:39:12 +0000 (23:39 +0900)]
crystaledit: Change Output Directory and Intermediate Directory

16 months agoUpdate Korean.isl (#1774) (2)
Takashi Sawanaka [Tue, 21 Mar 2023 13:52:05 +0000 (22:52 +0900)]
Update Korean.isl (#1774) (2)
Change the file encoding from UTF-8 to CP-949

16 months agoUpdate Korean.isl (#1774)
VenusGirl❤ [Tue, 21 Mar 2023 13:49:20 +0000 (22:49 +0900)]
Update Korean.isl (#1774)

16 months ago"&Include Subfolders" -> "&Include subfolders"
Takashi Sawanaka [Tue, 21 Mar 2023 13:08:22 +0000 (22:08 +0900)]
"&Include Subfolders" -> "&Include subfolders"

16 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 21 Mar 2023 12:30:41 +0000 (21:30 +0900)]
Update TranslationsStatus

16 months agoFix broken shell integration category page in Options dialog
Takashi Sawanaka [Tue, 21 Mar 2023 12:18:42 +0000 (21:18 +0900)]
Fix broken shell integration category page in Options dialog

16 months agoUpdate Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Tue, 21 Mar 2023 11:06:29 +0000 (20:06 +0900)]
Update Slovenian.po. Submitted by JadranR

16 months agoFix build errors in VS2017
Takashi Sawanaka [Mon, 20 Mar 2023 16:36:43 +0000 (01:36 +0900)]
Fix build errors in VS2017

16 months agoBump revision to 2.16.29
Takashi Sawanaka [Mon, 20 Mar 2023 15:06:40 +0000 (00:06 +0900)]
Bump revision to 2.16.29

16 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Mon, 20 Mar 2023 15:06:26 +0000 (00:06 +0900)]
Update ChangeLog&ReleaseNotes (3)

16 months agoFix problems with non-default Diff algorithm:
Takashi Sawanaka [Mon, 20 Mar 2023 14:58:39 +0000 (23:58 +0900)]
Fix problems with non-default Diff algorithm:
- Even though the Ignore carriage return differences option was disabled, EOL differences were ignored when the option to ignore whitespace differences was enabled.
- Differences between CR and CR+LF were not ignored even though Ignore carriage return differences option was enabled.

16 months agoHexMergeView.cpp: Fix an issue where an infinite loop occurred when the file size...
Takashi Sawanaka [Mon, 20 Mar 2023 06:12:45 +0000 (15:12 +0900)]
HexMergeView.cpp: Fix an issue where an infinite loop occurred when the file size was truncated during file loading.

16 months agoFix Test.cpp
Takashi Sawanaka [Sun, 19 Mar 2023 13:15:18 +0000 (22:15 +0900)]
Fix Test.cpp

16 months agoAllow the CSV file separator to be a semicolon or another character instead of a...
Takashi Sawanaka [Sun, 19 Mar 2023 12:05:42 +0000 (21:05 +0900)]
Allow the CSV file separator to be a semicolon or another character instead of a fixed comma.

16 months agoFix not working correctly when unchecking Regular expression and checking Match whole...
Takashi Sawanaka [Sun, 19 Mar 2023 01:19:42 +0000 (10:19 +0900)]
Fix not working correctly when unchecking Regular expression and checking Match whole word only on Substitution filters page.

16 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sat, 18 Mar 2023 14:05:42 +0000 (23:05 +0900)]
Update ChangeLog&ReleaseNotes (2)

16 months agoAdd MATLAB syntax highlighting. (#1766) (2)
Takashi Sawanaka [Sat, 18 Mar 2023 14:04:11 +0000 (23:04 +0900)]
Add MATLAB syntax highlighting. (#1766) (2)

16 months agoAdd MATLAB syntax highlighting. (#1766)
wiera987 [Sat, 18 Mar 2023 13:59:29 +0000 (22:59 +0900)]
Add MATLAB syntax highlighting. (#1766)

* Add MATLAB syntax highlighting.

* Add MATLAB syntax highlighting.

16 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 18 Mar 2023 05:28:07 +0000 (14:28 +0900)]
Update TranslationsStatus

16 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 18 Mar 2023 05:25:59 +0000 (14:25 +0900)]
Update ChangeLog&ReleaseNotes

16 months agoupdate zh-cn translation (#1765)
YIN, Gang [Sat, 18 Mar 2023 01:21:46 +0000 (09:21 +0800)]
update zh-cn translation (#1765)

16 months agoUpdate Polish.po (#1764)
Mirosław Żylewicz [Sat, 18 Mar 2023 01:20:51 +0000 (02:20 +0100)]
Update Polish.po (#1764)

16 months agoUpdate Polish.po (#1763)
Mirosław Żylewicz [Sat, 18 Mar 2023 01:19:04 +0000 (02:19 +0100)]
Update Polish.po (#1763)

16 months agoMove Windows dependent code from ClipBoard.h to Clipboard.cpp
Takashi Sawanaka [Fri, 17 Mar 2023 14:45:44 +0000 (23:45 +0900)]
Move Windows dependent code from ClipBoard.h to Clipboard.cpp

16 months agorefactor
Takashi Sawanaka [Fri, 17 Mar 2023 00:17:10 +0000 (09:17 +0900)]
refactor