OSDN Git Service

winmerge-jp/winmerge-jp.git
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)

3 years agoThe newly built WinMerge32BitPluginProxy.exe has been reported to be problematic...
Takashi Sawanaka [Sun, 28 Feb 2021 15:22:10 +0000 (00:22 +0900)]
The newly built WinMerge32BitPluginProxy.exe has been reported to be problematic by VirusTotal.com's seven virus scanning engines, so restore it. (I think it false positive)

3 years agoUpdate Japanese translation
Takashi Sawanaka [Sun, 28 Feb 2021 12:49:01 +0000 (21:49 +0900)]
Update Japanese translation

3 years agoSeparate JSON and JavaScript Syntax Highlighter for future.
Takashi Sawanaka [Sun, 28 Feb 2021 12:26:29 +0000 (21:26 +0900)]
Separate JSON and JavaScript Syntax Highlighter for future.

3 years agoChange the registry key name so that the tab width etc. can be set for each file...
Takashi Sawanaka [Sun, 28 Feb 2021 12:10:49 +0000 (21:10 +0900)]
Change the registry key name so that the tab width etc. can be set for each file type in the future.

3 years agoUpdate Japanese translation
Takashi Sawanaka [Sun, 28 Feb 2021 11:55:50 +0000 (20:55 +0900)]
Update Japanese translation

3 years agoRevert a part of commit c74a9c3
Takashi Sawanaka [Sun, 28 Feb 2021 09:55:00 +0000 (18:55 +0900)]
Revert a part of commit c74a9c3

3 years agoAdd /self-compare command line option
Takashi Sawanaka [Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)]
Add /self-compare command line option

3 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 27 Feb 2021 23:45:55 +0000 (08:45 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

3 years agoUpdate German.po (#651)
Mr-Update [Sat, 27 Feb 2021 23:38:35 +0000 (00:38 +0100)]
Update German.po (#651)

Translation completed and improved

3 years agoGalician translation update (#650)
LMS [Sat, 27 Feb 2021 23:38:09 +0000 (00:38 +0100)]
Galician translation update (#650)

* Update Galician.po

* Update Galician.po

3 years agorefactor
Takashi Sawanaka [Sat, 27 Feb 2021 13:45:30 +0000 (22:45 +0900)]
refactor

3 years agoFileTextStats.h: Reduce memory footprint
Takashi Sawanaka [Sat, 27 Feb 2021 13:44:27 +0000 (22:44 +0900)]
FileTextStats.h: Reduce memory footprint

3 years agoUpdate French.po (#649)
slolo2000 [Sat, 27 Feb 2021 09:04:05 +0000 (10:04 +0100)]
Update French.po (#649)

Translation of missing sentences

3 years agoAdd "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642) (3)
Takashi Sawanaka [Sat, 27 Feb 2021 06:26:52 +0000 (15:26 +0900)]
Add "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642) (3)

3 years agoFix an issue where custom colors are not saved. (#648)
Jun Tajima [Sat, 27 Feb 2021 04:06:06 +0000 (13:06 +0900)]
Fix an issue where custom colors are not saved. (#648)

- Options::CustomColors::Save() now saves custom color settings without deleting them even when the color is white.

3 years agoMerge7z: Bump revision to 1900.3 (2)
Takashi Sawanaka [Sat, 27 Feb 2021 02:36:26 +0000 (11:36 +0900)]
Merge7z: Bump revision to 1900.3 (2)

3 years agoFix GitHub issue #645: Program crash if you close a tab with the folder from where...
Takashi Sawanaka [Sat, 27 Feb 2021 02:35:31 +0000 (11:35 +0900)]
Fix GitHub issue #645: Program crash if you close a tab with the folder from where you opened current file

3 years agoMerge7z: Bump revision to 1900.3 Merge7z1900.3
Takashi Sawanaka [Sat, 27 Feb 2021 02:27:07 +0000 (11:27 +0900)]
Merge7z: Bump revision to 1900.3

3 years agoFix GitHub issue #644: Rar5 support
Takashi Sawanaka [Sat, 27 Feb 2021 02:18:41 +0000 (11:18 +0900)]
Fix GitHub issue #644: Rar5 support

3 years agoAdd "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642) (2)
Takashi Sawanaka [Sun, 21 Feb 2021 23:45:41 +0000 (08:45 +0900)]
Add "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642) (2)
- Fix a compilation error
- Update contributors.txt

3 years agoAdd "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642)
elsonwei [Sun, 21 Feb 2021 23:36:19 +0000 (07:36 +0800)]
Add "Copy Selected Line(s) to/from Left/Right" feature ( #463) (#642)

3 years agoUpdate French.po (#637)
slolo2000 [Thu, 18 Feb 2021 23:53:19 +0000 (00:53 +0100)]
Update French.po (#637)

Translate sentence added with "Fix GitHub issue #622": Single instance mode does not work when launch…

3 years agoUpdate README.md
Takashi Sawanaka [Wed, 17 Feb 2021 15:27:03 +0000 (00:27 +0900)]
Update README.md

3 years agoUpdate of Lithuanian translation (#634)
Tichij [Mon, 15 Feb 2021 12:50:45 +0000 (14:50 +0200)]
Update of Lithuanian translation (#634)

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Mon, 15 Feb 2021 00:58:58 +0000 (09:58 +0900)]
Update TranslationsStatus.*

3 years agoUpdate Slovenian translation. Submited by JadranR
Takashi Sawanaka [Mon, 15 Feb 2021 00:58:45 +0000 (09:58 +0900)]
Update Slovenian translation. Submited by JadranR

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 14 Feb 2021 12:39:25 +0000 (21:39 +0900)]
Update Contributors.txt

3 years agoUpdate Brazilian.po (#633)
Jota [Sun, 14 Feb 2021 12:33:41 +0000 (09:33 -0300)]
Update Brazilian.po (#633)

* Update Brazilian.po

* Update Brazilian.po

3 years agoUpdate German.po (#632)
Mr-Update [Sun, 14 Feb 2021 12:33:05 +0000 (13:33 +0100)]
Update German.po (#632)

3 years agoGalician translation update (#631)
LMS [Sun, 14 Feb 2021 12:29:54 +0000 (13:29 +0100)]
Galician translation update (#631)

3 years agoUpdate README.md
Takashi Sawanaka [Sat, 13 Feb 2021 16:07:58 +0000 (01:07 +0900)]
Update README.md

3 years agoOpenView.cpp: The current contents are now saved in the project file when the Save...
Takashi Sawanaka [Sat, 13 Feb 2021 14:35:57 +0000 (23:35 +0900)]
OpenView.cpp: The current contents are now saved in the project file when the Save button is pressed in the Select Files or Folders window.

3 years agoFix GitHub issue #622: Single instance mode does not work when launched from Visual...
Takashi Sawanaka [Sat, 13 Feb 2021 12:54:31 +0000 (21:54 +0900)]
Fix GitHub issue #622: Single instance mode does not work when launched from Visual Studio 2019 (2)
- Add /sw command line option

3 years agoCrystalEdit/Sample: Fix compilation errors
Takashi Sawanaka [Sat, 13 Feb 2021 12:24:36 +0000 (21:24 +0900)]
CrystalEdit/Sample: Fix compilation errors

3 years agoFix GitHub issue #622: Single instance mode does not work when launched from Visual...
Takashi Sawanaka [Fri, 12 Feb 2021 14:52:32 +0000 (23:52 +0900)]
Fix GitHub issue #622: Single instance mode does not work when launched from Visual Studio 2019
- Add /s:2 command line option

3 years agoMerge.rc: Fix Compare/General page
Takashi Sawanaka [Fri, 12 Feb 2021 14:49:07 +0000 (23:49 +0900)]
Merge.rc: Fix Compare/General page

3 years agoAdd a feature to set up default highlighting by a file extension (#627)
Jun Tajima [Fri, 12 Feb 2021 13:58:46 +0000 (22:58 +0900)]
Add a feature to set up default highlighting by a file extension (#627)

* Add a feature to set up default highlighting by a file extension (1)

Merge WinMerge2011 WildcardDropList shown below.
https://github.com/datadiode/winmerge2011/blob/ab7e14774593e170065ae1346c9f3b53ebec685b/Src/WildcardDropList.cpp
https://github.com/datadiode/winmerge2011/blob/17a2c0e85495b4cae7658446379ff54952c48a6c/Src/WildcardDropList.h

* Add a feature to set up default highlighting by a file extension (2)

- Add features to SubeditList.
  - Specify read-only columns.
  - Add Wildcard drop list as an editing style.
  - Specify the character limit. (Currently valid only when the editing style is Wildcard drop list.)
- Tweak Wildcard drop list.
  - Deselect the string and move the caret to the end of the string when opening the drop list.
  - Apply the input string when the drop list is closed by mouse operation after inputting the extension from the keyboard.

* Add a feature to set up default highlighting by a file extension (3)

- Change the CrystalLineParser::TextDefinition extension delimiter from comma to semicolon.
  (That's because Wilcard drop list requires a semicolon as the delimiter.)
- Change CrystalLineParser::GetTextType(const TCHAR* pszExt) to check if the extension matches the text type "Plain" at the end.
  (The file type extension setting UI does not include the text type "Plain".
  So, when assigning the extension originally assigned to "Plain" such as "txt" to another file type, the check for that file type must be done before "Plain".)

* Add a feature to set up default highlighting by a file extension (4)

- Add a sheet to the options dialog to set default highlighting by file extension. (Editor > Syntax)
- Add processing to reload syntax highlighting setup when option setting is completed.

3 years agoUpdate Bulgarian.po (#625)
StoyanDimitrov [Thu, 11 Feb 2021 23:42:30 +0000 (23:42 +0000)]
Update Bulgarian.po (#625)

General translations

3 years agoFix an issue where the syntax highlighting scheme is not applied to the split second...
Jun Tajima [Thu, 11 Feb 2021 23:41:50 +0000 (08:41 +0900)]
Fix an issue where the syntax highlighting scheme is not applied to the split second File pane and the Diff pane when changing it. (#624)

- Register the syntax highlighting scheme in the second split File pane and the Diff pane, when it is changed.

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Wed, 10 Feb 2021 14:24:24 +0000 (23:24 +0900)]
Update TranslationsStatus.*

3 years agoUpdate French.po (#619)
slolo2000 [Wed, 10 Feb 2021 14:20:34 +0000 (15:20 +0100)]
Update French.po (#619)

French.po file translated to 100%

3 years agoExpression is always true (#613)
hlop [Tue, 9 Feb 2021 00:04:33 +0000 (03:04 +0300)]
Expression is always true (#613)

since spaces is unsigned it is never lower than 0, so this check is unnecessary and can be removed

3 years agoFix GitHub issue #611: Plugins project DisplayXMLFiles.vcxproj contains "Unicode...
Takashi Sawanaka [Mon, 8 Feb 2021 23:55:55 +0000 (08:55 +0900)]
Fix GitHub issue #611: Plugins project DisplayXMLFiles.vcxproj contains "Unicode Release MinSize" configuration but was removed

3 years agoFix GitHub #610: Syntax Higlighment - Why WinMerge search for keywords/directives...
Takashi Sawanaka [Sun, 7 Feb 2021 22:35:56 +0000 (07:35 +0900)]
Fix GitHub #610: Syntax Higlighment - Why WinMerge search for keywords/directives inside of strings ?

3 years agoFix sf.net #2237: The position selected by clicking while holding down the shift...
Takashi Sawanaka [Sun, 7 Feb 2021 05:03:47 +0000 (14:03 +0900)]
Fix sf.net #2237: The position selected by clicking while holding down the shift key is incorrect.

3 years agoMove Testing/Fileformats folder to Testing/Data/ folder
Takashi Sawanaka [Sun, 7 Feb 2021 02:05:57 +0000 (11:05 +0900)]
Move Testing/Fileformats folder to Testing/Data/ folder

3 years agoRemove unused files in Tools folder
Takashi Sawanaka [Sun, 7 Feb 2021 01:54:17 +0000 (10:54 +0900)]
Remove unused files in Tools folder