OSDN Git Service

winmerge-jp/winmerge-jp.git
4 years agoUpdate main.yml
Takashi Sawanaka [Thu, 9 Apr 2020 10:30:17 +0000 (19:30 +0900)]
Update main.yml

4 years agoCreate main.yml
Takashi Sawanaka [Thu, 9 Apr 2020 10:10:27 +0000 (19:10 +0900)]
Create main.yml

4 years agoDirView.cpp: Fix parent folder lines not being colored
Takashi Sawanaka [Thu, 9 Apr 2020 05:30:58 +0000 (14:30 +0900)]
DirView.cpp: Fix parent folder lines not being colored

4 years agoFix Github issue #307: Diff Pane issues(1.)
Takashi Sawanaka [Thu, 9 Apr 2020 05:02:28 +0000 (14:02 +0900)]
Fix Github issue #307: Diff Pane issues(1.)

4 years agoFix crash when selecting the Window->Split menu item in Diff Pane.
Takashi Sawanaka [Thu, 9 Apr 2020 05:00:43 +0000 (14:00 +0900)]
Fix crash when selecting the Window->Split menu item in Diff Pane.

4 years agoCurrently, for some reason it takes 90 seconds to run UpdatePoFilesFromPotFile.vbs...
Takashi Sawanaka [Thu, 9 Apr 2020 00:34:09 +0000 (09:34 +0900)]
Currently, for some reason it takes 90 seconds to run UpdatePoFilesFromPotFile.vbs, so I rewrote UpdatePoFilesFromPotFile.vbs with Powershell+C#.

4 years agoRemove unused variables
Takashi Sawanaka [Tue, 7 Apr 2020 13:02:10 +0000 (22:02 +0900)]
Remove unused variables

4 years agoFix osdn.net ticket #40308: Pressing the [Compare/Binary] category button in the...
Takashi Sawanaka [Mon, 6 Apr 2020 23:19:45 +0000 (08:19 +0900)]
Fix osdn.net ticket #40308: Pressing the [Compare/Binary] category button in the Options dialog twice will cause a crash.

4 years agoMergeStatusBar.cpp: Fix the font color not being applied.
Takashi Sawanaka [Sun, 5 Apr 2020 11:29:54 +0000 (20:29 +0900)]
MergeStatusBar.cpp: Fix the font color not being applied.

4 years agoPreferencesDlg.*: Remove an unused function
Takashi Sawanaka [Sun, 5 Apr 2020 11:20:09 +0000 (20:20 +0900)]
PreferencesDlg.*: Remove an unused function

4 years agoMergeApp.h: Fix mixed eol-style
Takashi Sawanaka [Sun, 5 Apr 2020 11:19:28 +0000 (20:19 +0900)]
MergeApp.h: Fix mixed eol-style

4 years agoMerge pull request #306 from Gitoffthelawn/patch-1
Takashi Sawanaka [Sun, 5 Apr 2020 10:20:43 +0000 (19:20 +0900)]
Merge pull request #306 from Gitoffthelawn/patch-1

Update winmerge.org URL to HTTPS, many small improvements

4 years agoUpdate winmerge.org URL to HTTPS, many small improvements
Gitoffthelawn [Sun, 5 Apr 2020 05:05:30 +0000 (22:05 -0700)]
Update winmerge.org URL to HTTPS, many small improvements

Thank you to everyone working on WinMerge!

4 years agoUpdate Spanish.po
Takashi Sawanaka [Sat, 4 Apr 2020 12:38:04 +0000 (21:38 +0900)]
Update Spanish.po

4 years agoMerge pull request #305 from Lippe35/patch-1
Takashi Sawanaka [Sat, 4 Apr 2020 11:46:00 +0000 (20:46 +0900)]
Merge pull request #305 from Lippe35/patch-1

Correction Portuguese Portugal

4 years agoMerge pull request #304 from njarizas/spanishtranslation
Takashi Sawanaka [Sat, 4 Apr 2020 11:45:37 +0000 (20:45 +0900)]
Merge pull request #304 from njarizas/spanishtranslation

spanish translation

4 years agominor changes
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 19:55:17 +0000 (14:55 -0500)]
minor changes

4 years agoprogress in Spanish translation. keyboard shortcuts are corrected, trying to make...
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 19:47:24 +0000 (14:47 -0500)]
progress in Spanish translation. keyboard shortcuts are corrected, trying to make them as similar as possible to English

4 years agoCorrection
Lippe35 [Fri, 3 Apr 2020 17:52:15 +0000 (18:52 +0100)]
Correction

4 years agospanish translation
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 14:56:08 +0000 (09:56 -0500)]
spanish translation

4 years agoFix the problem of HTML Flie Compare Report not showing whitespace at the beginning...
Takashi Sawanaka [Fri, 3 Apr 2020 12:43:48 +0000 (21:43 +0900)]
Fix the problem of HTML Flie Compare Report not showing whitespace at the beginning of a line

4 years agoUpdate Russian.po
Takashi Sawanaka [Fri, 3 Apr 2020 11:32:25 +0000 (20:32 +0900)]
Update Russian.po

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Fri, 3 Apr 2020 11:27:18 +0000 (20:27 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoFix GitHub issue #299: DST causes incorrect dates shown in Date column
Takashi Sawanaka [Fri, 3 Apr 2020 11:26:53 +0000 (20:26 +0900)]
Fix GitHub issue #299: DST causes incorrect dates shown in Date column

4 years agoMerge pull request #303 from mayswind/master
Takashi Sawanaka [Thu, 2 Apr 2020 22:48:46 +0000 (07:48 +0900)]
Merge pull request #303 from mayswind/master

update Simplified Chinese translation

4 years agoMerge pull request #302 from wvxwxvw/patch-1
Takashi Sawanaka [Thu, 2 Apr 2020 22:48:23 +0000 (07:48 +0900)]
Merge pull request #302 from wvxwxvw/patch-1

Update Russian.po

4 years agoUpdate ChineseSimplified.po
mayswind [Thu, 2 Apr 2020 11:53:13 +0000 (19:53 +0800)]
Update ChineseSimplified.po

4 years agoUpdate Russian.po
wvxwxvw [Thu, 2 Apr 2020 09:12:53 +0000 (12:12 +0300)]
Update Russian.po

4 years agoFix GitHub issue #297: Allow specifying default for EOL warning checkbox
Takashi Sawanaka [Wed, 1 Apr 2020 23:05:45 +0000 (08:05 +0900)]
Fix GitHub issue #297: Allow specifying default for EOL warning checkbox

4 years agoFolder Compare: Fix a problem where a text file could be considered a binary file...
Takashi Sawanaka [Tue, 31 Mar 2020 23:05:24 +0000 (08:05 +0900)]
Folder Compare: Fix a problem where a text file could be considered a binary file. (osdn.net #40296)

4 years agoMerge pull request #300 from scscgit/master
Takashi Sawanaka [Mon, 30 Mar 2020 22:55:32 +0000 (07:55 +0900)]
Merge pull request #300 from scscgit/master

Translation fix: Slovak "To right:" was "To left:"

4 years agoMerge pull request #298 from Tichij/master
Takashi Sawanaka [Mon, 30 Mar 2020 22:54:02 +0000 (07:54 +0900)]
Merge pull request #298 from Tichij/master

Update of Lithuanian translation

4 years agoTranslation fix: Slovak "To right:" was "To left:"
scscgit [Mon, 30 Mar 2020 20:00:41 +0000 (22:00 +0200)]
Translation fix: Slovak "To right:" was "To left:"

4 years agoUpdate of Lithuanian translation
Tichij [Mon, 30 Mar 2020 04:49:01 +0000 (07:49 +0300)]
Update of Lithuanian translation

4 years ago- Add Solarized Dark/Light color scheme
Takashi Sawanaka [Sun, 29 Mar 2020 14:18:44 +0000 (23:18 +0900)]
- Add Solarized Dark/Light color scheme
- Add the Color Schemes category to the Options dialog
- Fix the problem of margin color and text color not being applied to HTML reports

4 years agoFix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag/drop
Takashi Sawanaka [Wed, 25 Mar 2020 13:26:44 +0000 (22:26 +0900)]
Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag/drop

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 23 Mar 2020 22:20:33 +0000 (07:20 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoeditor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn...
Takashi Sawanaka [Mon, 23 Mar 2020 22:19:56 +0000 (07:19 +0900)]
editor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn.net ticket #40266) (2)

4 years agoMerge pull request #293 from qosobrin/master
Takashi Sawanaka [Sun, 22 Mar 2020 22:50:08 +0000 (07:50 +0900)]
Merge pull request #293 from qosobrin/master

Typographical and encoding corrections to Galician and Spanish Shell Extension translations

4 years agoTypographical and encoding corrections to Galician and Spanish Shell Extension transl...
LMS [Sun, 22 Mar 2020 12:58:07 +0000 (13:58 +0100)]
Typographical and encoding corrections to Galician and Spanish Shell Extension translatations

4 years agoRename PropColors.* to PropMergeColors.*
Takashi Sawanaka [Sun, 22 Mar 2020 06:52:12 +0000 (15:52 +0900)]
Rename PropColors.*  to PropMergeColors.*

4 years agoAdd ColorSchemes folder
Takashi Sawanaka [Sun, 22 Mar 2020 02:07:23 +0000 (11:07 +0900)]
Add ColorSchemes folder

4 years agoUpdate frhed and ShellExtension
Takashi Sawanaka [Sun, 22 Mar 2020 00:56:16 +0000 (09:56 +0900)]
Update frhed and ShellExtension

4 years agoUpdate Slovenian.po
Takashi Sawanaka [Sun, 22 Mar 2020 00:43:41 +0000 (09:43 +0900)]
Update Slovenian.po

4 years agoShellExtension: Bump revision to 1.17.12.0
Takashi Sawanaka [Sun, 22 Mar 2020 00:42:15 +0000 (09:42 +0900)]
ShellExtension: Bump revision to 1.17.12.0

4 years agoMerge pull request #292 from qosobrin/master ShellExtension-1.17.12.0
Takashi Sawanaka [Sun, 22 Mar 2020 00:34:12 +0000 (09:34 +0900)]
Merge pull request #292 from qosobrin/master

Galician and Spanish translations update

4 years agoShell Extension Spanish translation
LMS [Sat, 21 Mar 2020 18:37:44 +0000 (19:37 +0100)]
Shell Extension Spanish translation

4 years agoInnoSetup Spanish translation
LMS [Sat, 21 Mar 2020 18:36:24 +0000 (19:36 +0100)]
InnoSetup Spanish translation

4 years agoShell Extension Galician translation
LMS [Sat, 21 Mar 2020 18:35:43 +0000 (19:35 +0100)]
Shell Extension Galician translation

4 years agoInnoSetup Galician translation
LMS [Sat, 21 Mar 2020 18:35:17 +0000 (19:35 +0100)]
InnoSetup Galician translation

4 years agoFix an issue where EOL differences are highlighted in diff blocks even though "Ignor...
Takashi Sawanaka [Sat, 21 Mar 2020 12:33:20 +0000 (21:33 +0900)]
Fix an issue where EOL differences are highlighted  in diff blocks even though "Ignore carriage return differences" is enabled.

4 years agoInstaller: Add frhed/Languages/sl.po file to installer
Takashi Sawanaka [Sat, 21 Mar 2020 03:17:52 +0000 (12:17 +0900)]
Installer: Add frhed/Languages/sl.po file to installer

4 years agoMerge remote-tracking branch 'origin/master'
Takashi Sawanaka [Sat, 21 Mar 2020 02:07:24 +0000 (11:07 +0900)]
Merge remote-tracking branch 'origin/master'

4 years agoUpdate frhed and ShellExtension
Takashi Sawanaka [Sat, 21 Mar 2020 01:41:56 +0000 (10:41 +0900)]
Update frhed and ShellExtension

4 years agoAttempt to speed up
Takashi Sawanaka [Sat, 21 Mar 2020 01:40:14 +0000 (10:40 +0900)]
Attempt to speed up

4 years agoAttempt to speed up
Takashi Sawanaka [Sat, 21 Mar 2020 01:39:14 +0000 (10:39 +0900)]
Attempt to speed up

4 years agoRegOptionsMgr.cpp: Fix an compilation error in 32-bit build
Takashi Sawanaka [Sat, 21 Mar 2020 01:37:03 +0000 (10:37 +0900)]
RegOptionsMgr.cpp: Fix an compilation error in 32-bit build

4 years agoFix an compilation error in 32-bit build
Takashi Sawanaka [Sat, 21 Mar 2020 01:35:25 +0000 (10:35 +0900)]
Fix an compilation error in 32-bit build

4 years agoImgMergeFrm.cpp: Reduce compilation warnings
Takashi Sawanaka [Sat, 21 Mar 2020 01:30:57 +0000 (10:30 +0900)]
ImgMergeFrm.cpp: Reduce compilation warnings

4 years agoeditor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn...
Takashi Sawanaka [Sat, 21 Mar 2020 01:29:19 +0000 (10:29 +0900)]
editor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn.net ticket #40266)

4 years agoShellExtnesion: Bump revision to 1.17.11.0
Takashi Sawanaka [Sat, 21 Mar 2020 01:27:16 +0000 (10:27 +0900)]
ShellExtnesion: Bump revision to 1.17.11.0

4 years agoMerge pull request #291 from Tichij/master ShellExtension-1.17.11.0
Takashi Sawanaka [Sat, 21 Mar 2020 00:50:07 +0000 (09:50 +0900)]
Merge pull request #291 from Tichij/master

Update of Lithuanian translation

4 years agoUpdate of Lithuanian translation
Tichij [Fri, 20 Mar 2020 12:45:51 +0000 (14:45 +0200)]
Update of Lithuanian translation

4 years agoUpdate of Lithuanian translation
Tichij [Fri, 20 Mar 2020 12:37:26 +0000 (14:37 +0200)]
Update of Lithuanian translation

4 years agoMerge pull request #289 from qosobrin/master
Takashi Sawanaka [Thu, 19 Mar 2020 21:50:05 +0000 (06:50 +0900)]
Merge pull request #289 from qosobrin/master

Minor changes to translations README.md file

4 years agoMinor changes to translations README.md file
LMS [Thu, 19 Mar 2020 18:58:54 +0000 (19:58 +0100)]
Minor changes to translations README.md file

4 years agoRegOptionsMgr.*: Make writing to the registry asynchronous (2)
Takashi Sawanaka [Sat, 14 Mar 2020 23:44:05 +0000 (08:44 +0900)]
RegOptionsMgr.*: Make writing to the registry asynchronous (2)

4 years agoRegOptionsMgr.*: Make writing to the registry asynchronous
Takashi Sawanaka [Sat, 14 Mar 2020 23:17:11 +0000 (08:17 +0900)]
RegOptionsMgr.*: Make writing to the registry asynchronous

4 years agoRevert "SuperComboBox.cpp: performance improvement"
Takashi Sawanaka [Sat, 14 Mar 2020 13:14:34 +0000 (22:14 +0900)]
Revert "SuperComboBox.cpp: performance improvement"

This reverts commit c92f5aaa818cca37a6aae869506f15e984c62ed1.

4 years agoFix the problem that the character width becomes wider than version 2.16.4
Takashi Sawanaka [Sat, 14 Mar 2020 06:42:47 +0000 (15:42 +0900)]
Fix the problem that the character width becomes wider than version 2.16.4

4 years agoResolve keyboard accelerator conflict in SaveClosingDialog
Takashi Sawanaka [Sat, 14 Mar 2020 05:27:48 +0000 (14:27 +0900)]
Resolve keyboard accelerator conflict in SaveClosingDialog

4 years agoGitHub issue #285: Slovenian traslations for WinMerge 2.16.6
Takashi Sawanaka [Sat, 14 Mar 2020 02:30:57 +0000 (11:30 +0900)]
GitHub issue #285: Slovenian traslations for WinMerge 2.16.6

4 years agoRemove unused MyCom.h
Takashi Sawanaka [Sat, 14 Mar 2020 01:33:40 +0000 (10:33 +0900)]
Remove unused MyCom.h

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 14 Mar 2020 01:31:53 +0000 (10:31 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoSuperComboBox.cpp: performance improvement
Takashi Sawanaka [Thu, 12 Mar 2020 23:10:40 +0000 (08:10 +0900)]
SuperComboBox.cpp: performance improvement

4 years agoMove Plugins.html developer doc to README.md
Tim Gerundt [Thu, 12 Mar 2020 22:40:26 +0000 (23:40 +0100)]
Move Plugins.html developer doc to README.md

4 years agoUse README.md files for list of plugin sources
Tim Gerundt [Thu, 12 Mar 2020 21:25:21 +0000 (22:25 +0100)]
Use README.md files for list of plugin sources

4 years agoAdd ShellExtension README.md
Tim Gerundt [Thu, 12 Mar 2020 00:06:13 +0000 (01:06 +0100)]
Add ShellExtension README.md

4 years agoDocs: Remove outdated "Releasing WinMerge" file
Tim Gerundt [Wed, 11 Mar 2020 23:32:56 +0000 (00:32 +0100)]
Docs: Remove outdated "Releasing WinMerge" file

4 years agoManual: Add Arabic to language list
Tim Gerundt [Wed, 11 Mar 2020 23:19:08 +0000 (00:19 +0100)]
Manual: Add Arabic to language list

4 years agoManual: Use GitHub issues links
Tim Gerundt [Wed, 11 Mar 2020 23:18:30 +0000 (00:18 +0100)]
Manual: Use GitHub issues links

4 years agoAdd BuildAll.vs2019x64_vs2017Win32.cmd
Takashi Sawanaka [Mon, 9 Mar 2020 23:08:45 +0000 (08:08 +0900)]
Add BuildAll.vs2019x64_vs2017Win32.cmd

4 years agoFix osdn.net ticket #39913: Displaying of connecting lines of moved lines appear...
Takashi Sawanaka [Sun, 8 Mar 2020 05:09:32 +0000 (14:09 +0900)]
Fix osdn.net ticket #39913: Displaying of connecting lines of moved lines appear strange

4 years agoFix osdn.net ticket #40224: '=' should be included in word separator
Takashi Sawanaka [Sat, 7 Mar 2020 13:51:12 +0000 (22:51 +0900)]
Fix osdn.net ticket #40224: '=' should be included in word separator

4 years agoMerge pull request #280 from marogo2310/patch-1
Takashi Sawanaka [Sat, 7 Mar 2020 13:16:17 +0000 (22:16 +0900)]
Merge pull request #280 from marogo2310/patch-1

Update ShellExtensionPolish.rc

4 years agoUpdate ShellExtensionPolish.rc
marogo2310 [Fri, 6 Mar 2020 22:08:38 +0000 (23:08 +0100)]
Update ShellExtensionPolish.rc

Correct: IDS_RESELECT_FIRST      "Wybierz powtórnie"

4 years agoMove translations instructions to README.md
Tim Gerundt [Thu, 5 Mar 2020 22:35:22 +0000 (23:35 +0100)]
Move translations instructions to README.md

4 years ago Fix osdn.net ticket #40205: Scrolling behavior when dragging images is wrong
Takashi Sawanaka [Sat, 29 Feb 2020 00:25:29 +0000 (09:25 +0900)]
 Fix osdn.net ticket #40205: Scrolling behavior when dragging images is wrong

 Fix osdn.net ticket #40205: Scrolling behavior when dragging images is wrong

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Tue, 25 Feb 2020 23:09:17 +0000 (08:09 +0900)]
Update Contributors.txt

4 years agoUpdate Russian.po
Takashi Sawanaka [Tue, 25 Feb 2020 23:08:22 +0000 (08:08 +0900)]
Update Russian.po

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 25 Feb 2020 23:05:35 +0000 (08:05 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoBump revision to 2.16.7
Takashi Sawanaka [Tue, 25 Feb 2020 22:54:27 +0000 (07:54 +0900)]
Bump revision to 2.16.7

4 years agoMerge pull request #272 from wvxwxvw/patch-2
Takashi Sawanaka [Tue, 25 Feb 2020 22:51:32 +0000 (07:51 +0900)]
Merge pull request #272 from wvxwxvw/patch-2

Update Russian.po

4 years agoMerge pull request #271 from wvxwxvw/patch-1
Takashi Sawanaka [Tue, 25 Feb 2020 22:51:01 +0000 (07:51 +0900)]
Merge pull request #271 from wvxwxvw/patch-1

Update Russian.po

4 years agoUpdate Russian.po
wvxwxvw [Tue, 25 Feb 2020 20:58:41 +0000 (23:58 +0300)]
Update Russian.po

4 years agoUpdate Russian.po
wvxwxvw [Tue, 25 Feb 2020 20:53:56 +0000 (23:53 +0300)]
Update Russian.po

4 years agoMerge pull request #269 from cswartzvi/master
Takashi Sawanaka [Sun, 23 Feb 2020 23:33:27 +0000 (08:33 +0900)]
Merge pull request #269 from cswartzvi/master

Include Excel Addin files (*.xlam)

4 years agoUpdated plugin for Excel Addin files.
Charles W. Swartz VI [Sat, 22 Feb 2020 21:28:10 +0000 (16:28 -0500)]
Updated plugin for Excel Addin files.

4 years agoFix GitHub WinMerge/winimerge issue #6: Support 16-bit images 2.16.6
Takashi Sawanaka [Sat, 22 Feb 2020 11:36:26 +0000 (20:36 +0900)]
Fix GitHub WinMerge/winimerge issue #6: Support 16-bit images

4 years agoUpdate release notes and changelog for 2.16.6 (3)
Takashi Sawanaka [Sat, 22 Feb 2020 11:30:01 +0000 (20:30 +0900)]
Update release notes and changelog for 2.16.6 (3)