OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoBinary compare window: Fix the problem that only one pane is zoomed in/out in Ctrl...
Takashi Sawanaka [Thu, 22 Apr 2021 12:06:26 +0000 (21:06 +0900)]
Binary compare window: Fix the problem that only one pane is zoomed in/out in Ctrl+Mouse Wheel

3 years agoMergeEditView.cpp: Fix an issue where font size restoration with Ctrl + 0 did not...
Takashi Sawanaka [Wed, 21 Apr 2021 14:17:41 +0000 (23:17 +0900)]
MergeEditView.cpp: Fix an issue where font size restoration with Ctrl + 0 did not work properly in Hi-DPI environment

3 years agoMergeStatusBar.cpp: Fix an issue where the position of each pane in the status bar...
Takashi Sawanaka [Wed, 21 Apr 2021 13:50:40 +0000 (22:50 +0900)]
MergeStatusBar.cpp: Fix an issue where the position of each pane in the status bar was not calculated correctly when the width of the panes was reduced.

3 years agorefactor
Takashi Sawanaka [Wed, 21 Apr 2021 13:45:47 +0000 (22:45 +0900)]
refactor

3 years agorefactor
Takashi Sawanaka [Tue, 20 Apr 2021 14:09:24 +0000 (23:09 +0900)]
refactor

3 years ago"with External Editor" -> "With External Editor"
Takashi Sawanaka [Tue, 20 Apr 2021 14:07:55 +0000 (23:07 +0900)]
"with External Editor" -> "With External Editor"

3 years agoAdd "Open Parent Folder" menu item to the file compare window's context menu
Takashi Sawanaka [Tue, 20 Apr 2021 12:40:52 +0000 (21:40 +0900)]
Add "Open Parent Folder" menu item to the file compare window's context menu

3 years agoFix GitHub issue #739: Copy confirmation dialog has overlapped Yes/No Button
Takashi Sawanaka [Mon, 19 Apr 2021 12:22:22 +0000 (21:22 +0900)]
Fix GitHub issue #739: Copy confirmation dialog has overlapped Yes/No Button

3 years agoUpdate of Lithuanian translation (#738)
Tichij [Mon, 19 Apr 2021 12:19:23 +0000 (15:19 +0300)]
Update of Lithuanian translation (#738)

3 years agoGalician translation update (#737)
LMS [Sun, 18 Apr 2021 22:24:54 +0000 (00:24 +0200)]
Galician translation update (#737)

* Update Galician.po

* Update Galician.po

* Update Galician.po

Galician translation update and corrections

* Galician translation update

* Galician translation update

3 years agoSubstitutionFiltersList.cpp: Fix an issue where strings matching a regular expression...
Takashi Sawanaka [Sun, 18 Apr 2021 15:10:06 +0000 (00:10 +0900)]
SubstitutionFiltersList.cpp: Fix an issue where strings matching a regular expression in a multi-line diff block would not be replaced correctly if the substitution filters' regular expression contained ^.

3 years agocrystaledit: Use structured bindings
Takashi Sawanaka [Sun, 18 Apr 2021 13:21:32 +0000 (22:21 +0900)]
crystaledit: Use structured bindings

3 years agoImplement GitHub #135: [Feature Request] Selection Count on Status Bar
Takashi Sawanaka [Sun, 18 Apr 2021 06:53:46 +0000 (15:53 +0900)]
Implement GitHub #135: [Feature Request] Selection Count on Status Bar

3 years agoUpdate DownloadDeps.cmd
Takashi Sawanaka [Sun, 18 Apr 2021 06:29:10 +0000 (15:29 +0900)]
Update DownloadDeps.cmd

3 years agocrystaledit: Make the characters that represent spaces and tabs lighter than other...
Takashi Sawanaka [Sat, 17 Apr 2021 10:32:35 +0000 (19:32 +0900)]
crystaledit: Make the characters that represent spaces and tabs lighter than other characters when the "View Whitespace" menu item is enabled

3 years agoUpdate translations
Takashi Sawanaka [Wed, 14 Apr 2021 22:57:57 +0000 (07:57 +0900)]
Update translations

3 years agoBrazilian.isl: The encoding of the isl file must match the LanguageCodePage (1252...
Takashi Sawanaka [Wed, 14 Apr 2021 22:57:28 +0000 (07:57 +0900)]
Brazilian.isl: The encoding of the isl file must match the LanguageCodePage (1252) in the [LangOptions] section.

3 years agoUpdate Brazilian.isl (#729)
Felipe [Wed, 14 Apr 2021 22:47:46 +0000 (19:47 -0300)]
Update Brazilian.isl (#729)

3 years agoUpdate Brazilian.po (#728)
Felipe [Wed, 14 Apr 2021 22:47:06 +0000 (19:47 -0300)]
Update Brazilian.po (#728)

Updated the translation here because the .po/.pot files found here are reported as corrupted by poedit https://winmerge.org/translations/?lang=en

3 years agoUpdate Portuguese.po (#725)
Hugo Carvalho [Sat, 10 Apr 2021 18:19:17 +0000 (19:19 +0100)]
Update Portuguese.po (#725)

* Update Portuguese

* Add files via upload

Co-authored-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
3 years agoUpdate PHP syntax highlighting keyword list. (#724)
Jun Tajima [Sat, 10 Apr 2021 18:11:31 +0000 (03:11 +0900)]
Update PHP syntax highlighting keyword list. (#724)

- Added some keywords
- Modify the list grouping as described in the PHP documentation. (https://www.php.net/manual/en/reserved.php)

3 years agoFix GitHub issue #721: FR: Add a shortcut key go to next file (2)
Takashi Sawanaka [Sat, 10 Apr 2021 07:20:04 +0000 (16:20 +0900)]
Fix GitHub issue #721: FR: Add a shortcut key go to next file (2)

3 years agoMinor update of Swedish translation (#723)
pgert [Sat, 10 Apr 2021 07:08:07 +0000 (09:08 +0200)]
Minor update of Swedish translation (#723)

3 years agoFix GitHub issue #721: FR: Add a shortcut key go to next file
Takashi Sawanaka [Sat, 10 Apr 2021 07:07:36 +0000 (16:07 +0900)]
Fix GitHub issue #721: FR: Add a shortcut key go to next file

3 years agoDelete the last blank line in the .po file.
Takashi Sawanaka [Sat, 10 Apr 2021 04:59:55 +0000 (13:59 +0900)]
Delete the last blank line in the .po file.

3 years agoUpdate translations
Takashi Sawanaka [Sat, 10 Apr 2021 04:19:09 +0000 (13:19 +0900)]
Update translations

3 years agoGUI textstrings: grammatical corrections (#722)
pgert [Sat, 10 Apr 2021 04:12:21 +0000 (06:12 +0200)]
GUI textstrings: grammatical corrections (#722)

3 years agoFix compilation warnings
Takashi Sawanaka [Sat, 10 Apr 2021 03:28:57 +0000 (12:28 +0900)]
Fix compilation warnings

3 years agoFix that the Next File or Previous File button on the toolbar did not work if the...
Takashi Sawanaka [Sat, 10 Apr 2021 00:24:56 +0000 (09:24 +0900)]
Fix that the Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Thu, 8 Apr 2021 14:17:06 +0000 (23:17 +0900)]
Update TranslationsStatus.*

3 years agoUpdate & Improvements of Swedish translation (#720)
pgert [Thu, 8 Apr 2021 14:11:47 +0000 (16:11 +0200)]
Update & Improvements of Swedish translation (#720)

3 years agoAdd ARM64 support (4)
Takashi Sawanaka [Thu, 8 Apr 2021 12:35:59 +0000 (21:35 +0900)]
Add ARM64 support (4)

3 years agoAdd C# 6.0 reserved words to style list (#719)
Rodrigo Cesar [Tue, 6 Apr 2021 23:52:37 +0000 (20:52 -0300)]
Add C# 6.0  reserved words to style list (#719)

3 years agoOpenView.cpp: Make the archive files comparable as binary files.
Takashi Sawanaka [Mon, 5 Apr 2021 13:10:58 +0000 (22:10 +0900)]
OpenView.cpp: Make the archive files comparable as binary files.

3 years agoUpdate German.po (#718)
Mr-Update [Mon, 5 Apr 2021 00:05:17 +0000 (02:05 +0200)]
Update German.po (#718)

3 years agostringdiffs.cpp: If the word-by-word diff process takes too long, interrupt it.
Takashi Sawanaka [Sun, 4 Apr 2021 14:27:00 +0000 (23:27 +0900)]
stringdiffs.cpp: If the word-by-word diff process takes too long, interrupt it.

3 years agoMerge7z: Bump revision to 1900.5 (2)
Takashi Sawanaka [Sun, 4 Apr 2021 13:16:53 +0000 (22:16 +0900)]
Merge7z: Bump revision to 1900.5 (2)

3 years agoMerge7z: Bump revision to 1900.5 Merge7z1900.5
Takashi Sawanaka [Sun, 4 Apr 2021 13:13:39 +0000 (22:13 +0900)]
Merge7z: Bump revision to 1900.5

3 years agoFix a rare crash when decompressing a compressed file
Takashi Sawanaka [Sun, 4 Apr 2021 13:01:34 +0000 (22:01 +0900)]
Fix a rare crash when decompressing a compressed file

3 years agoAdd ARM64 support (3)
Takashi Sawanaka [Sun, 4 Apr 2021 02:13:18 +0000 (11:13 +0900)]
Add ARM64 support (3)

3 years agoUpdate DownloadDeps.cmd
Takashi Sawanaka [Sat, 3 Apr 2021 14:21:21 +0000 (23:21 +0900)]
Update DownloadDeps.cmd

3 years agoAdd ARM64 support (2)
Takashi Sawanaka [Sat, 3 Apr 2021 12:33:50 +0000 (21:33 +0900)]
Add ARM64 support (2)

3 years agoUpdate TranslationsStatus.* Merge7z1900.4 ShellExtension-1.17.14.0
Takashi Sawanaka [Sat, 3 Apr 2021 07:48:45 +0000 (16:48 +0900)]
Update TranslationsStatus.*

3 years agoAdd ARM64 support
Takashi Sawanaka [Sat, 3 Apr 2021 07:48:26 +0000 (16:48 +0900)]
Add ARM64 support

3 years agoFix osdn.net #41901: Comparison result is not updated by Swap operation in 3-way...
Takashi Sawanaka [Fri, 2 Apr 2021 14:04:09 +0000 (23:04 +0900)]
Fix osdn.net #41901: Comparison result is not updated by Swap operation in 3-way folder comparison

3 years agoGalician translation update (#714)
LMS [Thu, 1 Apr 2021 13:12:57 +0000 (15:12 +0200)]
Galician translation update (#714)

* Update Galician.po

* Update Galician.po

* Update Galician.po

Galician translation update and corrections

* Galician translation update

3 years agoUpdate of Lithuanian translation (#713)
Tichij [Thu, 1 Apr 2021 13:12:34 +0000 (16:12 +0300)]
Update of Lithuanian translation (#713)

3 years agoThe message "Do you want to move to the first/last file?" was not translatable.
Takashi Sawanaka [Wed, 31 Mar 2021 12:57:57 +0000 (21:57 +0900)]
The message "Do you want to move to the first/last file?"  was not translatable.

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 31 Mar 2021 12:55:52 +0000 (21:55 +0900)]
Update Contributors.txt

3 years agoUpdate Hungarian.po (#712)
efi99 [Wed, 31 Mar 2021 12:44:36 +0000 (14:44 +0200)]
Update Hungarian.po (#712)

3 years agoUpdate Brazilian.po (#711)
Gabriel Camargo Fukushima [Wed, 31 Mar 2021 12:43:59 +0000 (09:43 -0300)]
Update Brazilian.po (#711)

Added a few translations were missing

3 years agoUpdate translations
Takashi Sawanaka [Tue, 30 Mar 2021 13:37:13 +0000 (22:37 +0900)]
Update translations

3 years agoUpdated Korean translation (#709)
teamzamong [Tue, 30 Mar 2021 13:30:53 +0000 (22:30 +0900)]
Updated Korean translation (#709)

* Updated Korean translation

* Minor edits

Co-authored-by: teamzamong <teamzamong@gmail.com>
3 years agoPolishing of Lithuanian translation (#708)
Tichij [Mon, 29 Mar 2021 14:36:48 +0000 (17:36 +0300)]
Polishing of Lithuanian translation (#708)

3 years agoUpdate Russian.po (#707)
wvxwxvw [Mon, 29 Mar 2021 00:11:20 +0000 (03:11 +0300)]
Update Russian.po (#707)

3 years agoUpdate Dutch.po (#706)
Thomas De Rocker [Sun, 28 Mar 2021 15:25:44 +0000 (17:25 +0200)]
Update Dutch.po (#706)

3 years agoUpdate ChangeLog&ReleaseNotes v2.16.11
Takashi Sawanaka [Sun, 28 Mar 2021 04:45:05 +0000 (13:45 +0900)]
Update ChangeLog&ReleaseNotes

3 years agoBuildArc.cmd: Add pdb files
Takashi Sawanaka [Sun, 28 Mar 2021 04:36:17 +0000 (13:36 +0900)]
BuildArc.cmd: Add pdb files

3 years agoFix failed test
Takashi Sawanaka [Sun, 28 Mar 2021 03:52:10 +0000 (12:52 +0900)]
Fix failed test

3 years agoAdd drop-down menu to save icon on toolbar
Takashi Sawanaka [Sun, 28 Mar 2021 02:50:55 +0000 (11:50 +0900)]
Add drop-down menu to save icon on toolbar

3 years agoFolderCompare: Fix an issue where the codepage specified in the Codepage dialog does...
Takashi Sawanaka [Sun, 28 Mar 2021 02:24:59 +0000 (11:24 +0900)]
FolderCompare: Fix an issue where the codepage specified in the Codepage dialog does not affect the file to be opened. Related to #698

3 years agoPlugins.*: Reduce the number of calls to the CreateDispatchBySource function to speed...
Takashi Sawanaka [Thu, 25 Mar 2021 00:17:14 +0000 (09:17 +0900)]
Plugins.*: Reduce the number of calls to the CreateDispatchBySource function to speed up startup.

3 years agoAdd Testing/Data/Conflict
Takashi Sawanaka [Wed, 24 Mar 2021 13:48:25 +0000 (22:48 +0900)]
Add Testing/Data/Conflict

3 years agoRefactor
Takashi Sawanaka [Mon, 22 Mar 2021 14:33:45 +0000 (23:33 +0900)]
Refactor

3 years agoFix GitHub issue #690: Plugins.cpp function SearchScriptForMethodName can be improved
Takashi Sawanaka [Mon, 22 Mar 2021 14:27:43 +0000 (23:27 +0900)]
Fix GitHub issue #690: Plugins.cpp function SearchScriptForMethodName can be improved

3 years agoRegOptionsMgr.*: Reduce the number of calls to RegQueryValueEx()
Takashi Sawanaka [Sat, 20 Mar 2021 15:56:24 +0000 (00:56 +0900)]
RegOptionsMgr.*: Reduce the number of calls to RegQueryValueEx()

3 years agoRename IDD_PROP_ARCHIVE to IDD_PROPPAGE_ARCHIVE (2)
Takashi Sawanaka [Sat, 20 Mar 2021 03:04:27 +0000 (12:04 +0900)]
Rename IDD_PROP_ARCHIVE to IDD_PROPPAGE_ARCHIVE (2)

3 years agoMDITabBar.cpp: Make the border of the active tab a little darker
Takashi Sawanaka [Thu, 18 Mar 2021 16:17:33 +0000 (01:17 +0900)]
MDITabBar.cpp: Make the border of the active tab a little darker

3 years agoFix an issue where the comment filter might not work properly if the file is non...
Takashi Sawanaka [Wed, 17 Mar 2021 13:15:13 +0000 (22:15 +0900)]
Fix an issue where the comment filter might not work properly if the file is non-UTF-8 and the comment contains non-ascii characters.

3 years agoDisable loading of the language resource DLL for faster startup.
Takashi Sawanaka [Tue, 16 Mar 2021 15:55:19 +0000 (00:55 +0900)]
Disable loading of the language resource DLL for faster startup.

3 years agoUpdated hungarian translation (#685) (2)
Takashi Sawanaka [Mon, 15 Mar 2021 15:34:34 +0000 (00:34 +0900)]
Updated hungarian translation (#685) (2)

3 years agoUpdated hungarian translation (#685)
efi99 [Mon, 15 Mar 2021 14:57:26 +0000 (15:57 +0100)]
Updated hungarian translation (#685)

Updated hungarian translation to v2.16.10

3 years agoUpdate Hungarian.po (#683)
efi99 [Mon, 15 Mar 2021 14:56:20 +0000 (15:56 +0100)]
Update Hungarian.po (#683)

3 years agoUpdate Hungarian.isl (#682)
efi99 [Mon, 15 Mar 2021 14:55:57 +0000 (15:55 +0100)]
Update Hungarian.isl (#682)

3 years agoRename IDD_PROP_ARCHIVE to IDD_PROPPAGE_ARCHIVE
Takashi Sawanaka [Mon, 15 Mar 2021 00:29:41 +0000 (09:29 +0900)]
Rename IDD_PROP_ARCHIVE to IDD_PROPPAGE_ARCHIVE

3 years agoRemove unused resource IDs
Takashi Sawanaka [Mon, 15 Mar 2021 00:15:22 +0000 (09:15 +0900)]
Remove unused resource IDs

3 years agoRemove an unused string resource
Takashi Sawanaka [Sun, 14 Mar 2021 14:53:52 +0000 (23:53 +0900)]
Remove an unused string resource

3 years agoUpdate resource.h
Takashi Sawanaka [Sun, 14 Mar 2021 14:38:52 +0000 (23:38 +0900)]
Update resource.h

3 years agoMake it possible to specify the file type in the "Select Files or Folders" window.
Takashi Sawanaka [Sun, 14 Mar 2021 07:46:01 +0000 (16:46 +0900)]
Make it possible to specify the file type in the "Select Files or Folders" window.

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Sun, 14 Mar 2021 07:43:24 +0000 (16:43 +0900)]
Update TranslationsStatus.*

3 years agoGalician translation update and corrections (#677)
LMS [Sat, 13 Mar 2021 13:27:33 +0000 (14:27 +0100)]
Galician translation update and corrections (#677)

* Update Galician.po

* Update Galician.po

* Update Galician.po

Galician translation update and corrections

3 years agoUpdate Portuguese (#674)
Hugo Carvalho [Thu, 11 Mar 2021 22:42:59 +0000 (22:42 +0000)]
Update Portuguese (#674)

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Thu, 11 Mar 2021 15:44:00 +0000 (00:44 +0900)]
Update TranslationsStatus.*

3 years agoAdd BOM checkbox to the LoadSaveCodepage dialog
Takashi Sawanaka [Thu, 11 Mar 2021 15:43:21 +0000 (00:43 +0900)]
Add BOM checkbox to the LoadSaveCodepage dialog

3 years agoUpdate Polish.po (#673)
Mirosław Żylewicz [Thu, 11 Mar 2021 15:21:54 +0000 (16:21 +0100)]
Update Polish.po (#673)

3 years agoFix osdn.net ticket #41721: Image Compare: The image on the right does not open if...
Takashi Sawanaka [Wed, 10 Mar 2021 00:13:37 +0000 (09:13 +0900)]
Fix osdn.net ticket #41721: Image Compare: The image on the right does not open if the file exists only on the right

3 years agoFix a build error
Takashi Sawanaka [Sun, 7 Mar 2021 15:23:57 +0000 (00:23 +0900)]
Fix a build error

3 years agoFix xdiff.vcxitems.filters
Takashi Sawanaka [Sun, 7 Mar 2021 15:00:31 +0000 (00:00 +0900)]
Fix xdiff.vcxitems.filters

3 years agoAdd gtest.vcxitems, CompareEngines.vcxitems and diffutils.vcxitems
Takashi Sawanaka [Sun, 7 Mar 2021 14:58:25 +0000 (23:58 +0900)]
Add gtest.vcxitems, CompareEngines.vcxitems and diffutils.vcxitems

3 years agoAdd xdiff.vcxitems
Takashi Sawanaka [Sun, 7 Mar 2021 13:17:10 +0000 (22:17 +0900)]
Add xdiff.vcxitems

3 years agoAdd Manual.vcxproj*
Takashi Sawanaka [Sun, 7 Mar 2021 12:50:42 +0000 (21:50 +0900)]
Add Manual.vcxproj*

3 years agoAdd editlib.vcxitems
Takashi Sawanaka [Sat, 6 Mar 2021 15:38:04 +0000 (00:38 +0900)]
Add editlib.vcxitems

3 years agoReduce the number of #include <Windows.h> and <tchar.h>.
Takashi Sawanaka [Sat, 6 Mar 2021 14:01:49 +0000 (23:01 +0900)]
Reduce the number of #include <Windows.h> and <tchar.h>.

3 years agoMove FileFlags class to FileFlags.(cpp|h) files
Takashi Sawanaka [Sat, 6 Mar 2021 13:59:38 +0000 (22:59 +0900)]
Move FileFlags class to FileFlags.(cpp|h) files

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Tue, 2 Mar 2021 15:50:25 +0000 (00:50 +0900)]
Update TranslationsStatus.*

3 years agoFix osdn.net ticket #41682: Merge7z.dll is not updated by overwriting installation
Takashi Sawanaka [Tue, 2 Mar 2021 15:49:53 +0000 (00:49 +0900)]
Fix osdn.net ticket #41682: Merge7z.dll is not updated by overwriting installation

3 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Tue, 2 Mar 2021 15:19:48 +0000 (00:19 +0900)]
Update Slovenian translation. Submitted by JadranR

3 years agoUpdate French.po (#659)
slolo2000 [Tue, 2 Mar 2021 15:18:42 +0000 (16:18 +0100)]
Update French.po (#659)

Translation of:
msgid "Original File"
msgstr "Fichier original"

3 years agoFix osdn.net ticket #41668: When the 'Ignore change/all' and the 'Ignore blank lines...
Takashi Sawanaka [Mon, 1 Mar 2021 14:02:05 +0000 (23:02 +0900)]
Fix osdn.net ticket #41668: When the 'Ignore change/all' and the 'Ignore blank lines' options are enabled, non-blank lines may be ignored.

3 years agoUpdate of Lithuanian translation (#653)
Tichij [Mon, 1 Mar 2021 12:17:41 +0000 (14:17 +0200)]
Update of Lithuanian translation (#653)