OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoFix memory leaks (#596)
hlop [Mon, 1 Feb 2021 23:35:19 +0000 (02:35 +0300)]
Fix memory leaks (#596)

Allocated array should be deallocated with `delete []` Deallocating it with `delete` can cause memory leaks.

3 years agoUpdate translations
Takashi Sawanaka [Mon, 1 Feb 2021 14:10:15 +0000 (23:10 +0900)]
Update translations

3 years agoMake all OK strings same case (#593)
StoyanDimitrov [Mon, 1 Feb 2021 13:41:57 +0000 (13:41 +0000)]
Make all OK strings same case (#593)

Some translation tools are not happy about existence of both "&OK" and "&Ok". Besides that it let's reuse!

3 years agoUnify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (5)
Takashi Sawanaka [Sun, 31 Jan 2021 14:34:53 +0000 (23:34 +0900)]
Unify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (5)

3 years agoUnify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (4)
Takashi Sawanaka [Sun, 31 Jan 2021 14:32:32 +0000 (23:32 +0900)]
Unify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (4)

3 years agoFix GitHub issue #589: Installer issue with Polish diacratics characters
Takashi Sawanaka [Sun, 31 Jan 2021 13:12:00 +0000 (22:12 +0900)]
Fix GitHub issue #589: Installer issue with Polish diacratics characters

3 years agoUnify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (3)
Takashi Sawanaka [Sun, 31 Jan 2021 12:57:32 +0000 (21:57 +0900)]
Unify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (3)

3 years agoUpdate Russian.po (#588)
wvxwxvw [Sun, 31 Jan 2021 12:26:17 +0000 (15:26 +0300)]
Update Russian.po (#588)

3 years agoUnify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (2)
Takashi Sawanaka [Sun, 31 Jan 2021 08:24:20 +0000 (17:24 +0900)]
Unify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj* (2)

3 years agoUnify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj*
Takashi Sawanaka [Sun, 31 Jan 2021 07:23:08 +0000 (16:23 +0900)]
Unify *.vs2017.vcxproj* and *.vs2019.vcxproj* into *.vcxproj*

3 years agoGalician translation update (#587)
LMS [Sun, 31 Jan 2021 01:57:58 +0000 (02:57 +0100)]
Galician translation update (#587)

* Galician translation update

* Corrections to the Galician translation

3 years agoosdn.net#41355: If -b or -w is also specified, -B now considers lines to be empty...
Takashi Sawanaka [Sat, 30 Jan 2021 15:19:44 +0000 (00:19 +0900)]
osdn.net#41355: If -b or -w is also specified, -B now considers lines to be empty if they contain only white space

3 years agoUpdate Slovenian translation. Submited by JadranR
Takashi Sawanaka [Sat, 30 Jan 2021 13:33:16 +0000 (22:33 +0900)]
Update Slovenian translation. Submited by JadranR

3 years agoBump revision to 2.16.11
Takashi Sawanaka [Sat, 30 Jan 2021 13:25:32 +0000 (22:25 +0900)]
Bump revision to 2.16.11

3 years agoBump revision to 2.16.10 v2.16.10
Takashi Sawanaka [Fri, 29 Jan 2021 22:40:37 +0000 (07:40 +0900)]
Bump revision to 2.16.10

3 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Fri, 29 Jan 2021 22:36:32 +0000 (07:36 +0900)]
Update ChangeLog&ReleaseNotes

3 years agoUpdate TranslationsStatus*
Takashi Sawanaka [Fri, 29 Jan 2021 22:36:21 +0000 (07:36 +0900)]
Update TranslationsStatus*

3 years agoCrystaledit: autoit.cpp: Sort s_apszAutoItKeywordList
Takashi Sawanaka [Fri, 29 Jan 2021 22:30:48 +0000 (07:30 +0900)]
Crystaledit: autoit.cpp: Sort s_apszAutoItKeywordList

3 years agoUpdate German.po (#585)
Mr-Update [Fri, 29 Jan 2021 22:26:59 +0000 (23:26 +0100)]
Update German.po (#585)

Translation completed

3 years agos_apszAutoItKeywordList[] - actual list (#584)
Michał Lipok [Fri, 29 Jan 2021 22:26:35 +0000 (23:26 +0100)]
s_apszAutoItKeywordList[] - actual list (#584)

3 years agoCrystalEdit: Implement AutoIt syntax hilighting
Takashi Sawanaka [Fri, 29 Jan 2021 15:37:48 +0000 (00:37 +0900)]
CrystalEdit: Implement AutoIt syntax hilighting

3 years agoUpdate of Lithuanian translation (#581)
Tichij [Fri, 29 Jan 2021 14:28:37 +0000 (16:28 +0200)]
Update of Lithuanian translation (#581)

3 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Fri, 29 Jan 2021 00:25:49 +0000 (09:25 +0900)]
Update ChangeLog&ReleaseNotes

3 years agoUpdate TranslationsStatus*
Takashi Sawanaka [Fri, 29 Jan 2021 00:18:43 +0000 (09:18 +0900)]
Update TranslationsStatus*

3 years agoUpdate manual
Takashi Sawanaka [Fri, 29 Jan 2021 00:18:23 +0000 (09:18 +0900)]
Update manual

3 years agoDutch.isl: Change the file encoding from utf-8 to CP-1252
Takashi Sawanaka [Thu, 28 Jan 2021 23:41:20 +0000 (08:41 +0900)]
Dutch.isl: Change the file encoding from utf-8 to CP-1252

3 years agoUpdate Dutch.isl (#580)
Thomas De Rocker [Thu, 28 Jan 2021 23:17:50 +0000 (00:17 +0100)]
Update Dutch.isl (#580)

3 years agoUpdate Dutch.po (#579)
Thomas De Rocker [Thu, 28 Jan 2021 23:17:12 +0000 (00:17 +0100)]
Update Dutch.po (#579)

3 years agoUpdate Dutch.po (#578)
Thomas De Rocker [Thu, 28 Jan 2021 23:16:56 +0000 (00:16 +0100)]
Update Dutch.po (#578)

3 years agoA new feature "Ignored Substitutions" (10)
Takashi Sawanaka [Thu, 28 Jan 2021 00:06:07 +0000 (09:06 +0900)]
A new feature "Ignored Substitutions"  (10)

3 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Wed, 27 Jan 2021 23:32:38 +0000 (08:32 +0900)]
Update Slovenian translation. Submitted by JadranR

3 years agoFix an issue where the Diff pane might not display the Diff lines correctly when...
Takashi Sawanaka [Wed, 27 Jan 2021 16:36:44 +0000 (01:36 +0900)]
Fix an issue where the Diff pane might not display the Diff lines correctly when moving to the next Diff.

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 27 Jan 2021 15:45:53 +0000 (00:45 +0900)]
Update Contributors.txt

3 years agoRename "Ignored Substitutions" to "Substitution Filters"
Takashi Sawanaka [Wed, 27 Jan 2021 15:42:20 +0000 (00:42 +0900)]
Rename "Ignored Substitutions" to "Substitution Filters"

3 years agoManual: Filefilers->File Filters, Linefilters -> Line Filters
Takashi Sawanaka [Tue, 26 Jan 2021 23:37:51 +0000 (08:37 +0900)]
Manual: Filefilers->File Filters, Linefilters -> Line Filters

3 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Tue, 26 Jan 2021 15:55:49 +0000 (00:55 +0900)]
Update ChangeLog&ReleaseNotes

3 years agoA new feature "Ignored Substitutions" (9)
Takashi Sawanaka [Tue, 26 Jan 2021 15:33:05 +0000 (00:33 +0900)]
A new feature "Ignored Substitutions"  (9)

3 years agoUpdate winimerge&freeimage
Takashi Sawanaka [Tue, 26 Jan 2021 15:04:42 +0000 (00:04 +0900)]
Update winimerge&freeimage

3 years agoFix GitHub issue #574: BUG: Doesn't respect "Don't ask this question again" checkbox...
Takashi Sawanaka [Tue, 26 Jan 2021 12:48:19 +0000 (21:48 +0900)]
Fix GitHub issue #574: BUG: Doesn't respect "Don't ask this question again" checkbox when comparing large files

3 years agoA new feature "Ignored Substitutions" (8)
Takashi Sawanaka [Tue, 26 Jan 2021 12:00:32 +0000 (21:00 +0900)]
A new feature "Ignored Substitutions"  (8)

3 years agoToolbarEnabled8bit.bmp: Fix broken palette
Takashi Sawanaka [Tue, 26 Jan 2021 11:16:45 +0000 (20:16 +0900)]
ToolbarEnabled8bit.bmp: Fix broken palette

3 years agoMerge.rc: Add the strings that needs to be translated to the resource file
Takashi Sawanaka [Tue, 26 Jan 2021 07:20:27 +0000 (16:20 +0900)]
Merge.rc: Add the strings that needs to be translated to the resource file

3 years agoA new feature "Ignored Substitutions" (7)
Takashi Sawanaka [Tue, 26 Jan 2021 07:10:47 +0000 (16:10 +0900)]
A new feature "Ignored Substitutions"  (7)

3 years agoUpdate Japanese translation
Takashi Sawanaka [Tue, 26 Jan 2021 05:52:54 +0000 (14:52 +0900)]
Update Japanese translation

3 years agoA new feature "Ignored Substitutions" (6)
Takashi Sawanaka [Tue, 26 Jan 2021 05:52:38 +0000 (14:52 +0900)]
A new feature "Ignored Substitutions"  (6)

3 years agoA new feature "Ignored Substitutions" (5)
Takashi Sawanaka [Tue, 26 Jan 2021 05:19:04 +0000 (14:19 +0900)]
A new feature "Ignored Substitutions"  (5)

3 years agoA new feature "Ignored Substitutions" (4)
Takashi Sawanaka [Tue, 26 Jan 2021 04:56:22 +0000 (13:56 +0900)]
A new feature "Ignored Substitutions"  (4)

3 years agoA new feature "Ignored Substitutions" (3)
Takashi Sawanaka [Tue, 26 Jan 2021 03:27:13 +0000 (12:27 +0900)]
A new feature "Ignored Substitutions"  (3)

3 years agoA new feature "Ignored Substitutions" (2) (#560)
Takashi Sawanaka [Tue, 26 Jan 2021 03:19:20 +0000 (12:19 +0900)]
A new feature "Ignored Substitutions"  (2) (#560)

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Sat, 23 Jan 2021 23:03:54 +0000 (08:03 +0900)]
Update TranslationsStatus.*

3 years agoUpdate Galician.po
Takashi Sawanaka [Sat, 23 Jan 2021 23:03:13 +0000 (08:03 +0900)]
Update Galician.po

3 years agoFix GitHub issue #572: Wrong translation (portuguese)
Takashi Sawanaka [Sat, 23 Jan 2021 23:02:53 +0000 (08:02 +0900)]
Fix GitHub issue #572: Wrong translation (portuguese)

3 years agoChange the order of the icons on the toolbar
Takashi Sawanaka [Sat, 23 Jan 2021 05:19:31 +0000 (14:19 +0900)]
Change the order of the icons on the toolbar

3 years agoMainFrm.cpp: Fix an issue where items are not displayed in the Recent Files or Folder...
Takashi Sawanaka [Sat, 23 Jan 2021 02:08:32 +0000 (11:08 +0900)]
MainFrm.cpp: Fix an issue where items are not displayed in the Recent Files or Folders menu. (2)

3 years agoGalician translation update (#570)
LMS [Sat, 23 Jan 2021 02:03:55 +0000 (03:03 +0100)]
Galician translation update (#570)

3 years agoUpdate winimerge
Takashi Sawanaka [Fri, 22 Jan 2021 00:00:58 +0000 (09:00 +0900)]
Update winimerge

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Tue, 19 Jan 2021 13:29:48 +0000 (22:29 +0900)]
Update TranslationsStatus.*

3 years agoUpdate Slovenian.po. Submitted by JadranR (GitHub #565)
Takashi Sawanaka [Tue, 19 Jan 2021 13:29:31 +0000 (22:29 +0900)]
Update Slovenian.po. Submitted by  JadranR (GitHub #565)

3 years agoUpdate of Lithuanian translation (#564)
Tichij [Tue, 19 Jan 2021 13:21:24 +0000 (15:21 +0200)]
Update of Lithuanian translation (#564)

* Update of Lithuanian translation

* Update of Lithuanian translation

3 years agoDirView.cpp: Fix crash when hitting Next File icon repeatedly
Takashi Sawanaka [Mon, 18 Jan 2021 23:46:07 +0000 (08:46 +0900)]
DirView.cpp: Fix crash when hitting Next File icon repeatedly

3 years agoUpdate German.po (#563)
Mr-Update [Mon, 18 Jan 2021 23:23:40 +0000 (00:23 +0100)]
Update German.po (#563)

3 years agoUpdate translations
Takashi Sawanaka [Mon, 18 Jan 2021 13:23:21 +0000 (22:23 +0900)]
Update translations

3 years agoUpdate of Lithuanian translation (#562)
Tichij [Mon, 18 Jan 2021 13:14:09 +0000 (15:14 +0200)]
Update of Lithuanian translation (#562)

3 years agoFeature Request: Move To Next File option while comparing files #475 - Navigating...
ranjwarrior [Sun, 17 Jan 2021 23:38:37 +0000 (17:38 -0600)]
Feature Request: Move To Next File option while comparing files #475 - Navigating between files in file comparison mode. WIll attempt to move to first/next/prev/last files only, ignoring/skipping directories. (#561)

3 years agoRun GetTranslationsStatus.py when English.pot is updated.
Takashi Sawanaka [Sun, 17 Jan 2021 06:11:24 +0000 (15:11 +0900)]
Run GetTranslationsStatus.py when English.pot is updated.

3 years agoFolderCompare: Fix compilation errors
Takashi Sawanaka [Sun, 17 Jan 2021 01:28:34 +0000 (10:28 +0900)]
FolderCompare: Fix compilation errors

3 years agoUpdate ALL.vs2017.sln
Takashi Sawanaka [Sun, 17 Jan 2021 00:30:44 +0000 (09:30 +0900)]
Update ALL.vs2017.sln

3 years agocrystaledit/Sample: Fix a compilation error
Takashi Sawanaka [Sun, 17 Jan 2021 00:29:10 +0000 (09:29 +0900)]
crystaledit/Sample: Fix a compilation error

3 years agoAdd icudata.*.vcxproj*
Takashi Sawanaka [Sun, 17 Jan 2021 00:28:41 +0000 (09:28 +0900)]
Add icudata.*.vcxproj*

3 years agoUpdate frhed
Takashi Sawanaka [Sat, 16 Jan 2021 23:29:56 +0000 (08:29 +0900)]
Update frhed

3 years agoImage compare: Add "Compare Extracted Text From Image" menu item
Takashi Sawanaka [Sat, 16 Jan 2021 14:06:05 +0000 (23:06 +0900)]
Image compare: Add "Compare Extracted Text From Image" menu item

3 years agoFix GitHub issue #559: Some more files should be added to the .gitignore file (2)
Takashi Sawanaka [Sat, 16 Jan 2021 11:33:28 +0000 (20:33 +0900)]
Fix GitHub issue #559: Some more files should be added to the .gitignore file (2)

3 years agoFix GitHub issue #558: Link warnings when building VCPP plugin DisplayXMLFiles with...
Takashi Sawanaka [Fri, 15 Jan 2021 11:31:51 +0000 (20:31 +0900)]
Fix GitHub issue #558: Link warnings when building VCPP plugin DisplayXMLFiles with Visual Studio 2019 16.7.7

3 years agoFix GitHub issue #559: Some more files should be added to the .gitignore file
Takashi Sawanaka [Fri, 15 Jan 2021 11:20:19 +0000 (20:20 +0900)]
Fix GitHub issue #559: Some more files should be added to the .gitignore file

3 years agoFix mail addresses in TranslationsStatus.md
Tim Gerundt [Thu, 14 Jan 2021 04:55:13 +0000 (05:55 +0100)]
Fix mail addresses in TranslationsStatus.md

3 years agoUpdate README.md
Takashi Sawanaka [Wed, 13 Jan 2021 22:55:07 +0000 (07:55 +0900)]
Update README.md

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Wed, 13 Jan 2021 22:50:28 +0000 (07:50 +0900)]
Update TranslationsStatus.*

3 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Wed, 13 Jan 2021 22:47:43 +0000 (07:47 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

3 years agoAdd ALL.vs2017.sln
Takashi Sawanaka [Wed, 13 Jan 2021 22:47:16 +0000 (07:47 +0900)]
Add ALL.vs2017.sln

3 years agoUpdate English.pot
Takashi Sawanaka [Wed, 13 Jan 2021 22:46:35 +0000 (07:46 +0900)]
Update English.pot

3 years agoMerge pull request #556 from gerundt/translations-status
Takashi Sawanaka [Wed, 13 Jan 2021 22:29:34 +0000 (07:29 +0900)]
Merge pull request #556 from gerundt/translations-status

Some tweaks for translations status

3 years agoFix GitHub issue #554, #555: Link error when building VCPP plugin DisplayXMLFiles...
Takashi Sawanaka [Wed, 13 Jan 2021 13:44:10 +0000 (22:44 +0900)]
Fix GitHub issue #554, #555: Link error when building VCPP plugin DisplayXMLFiles with Visual Studio 2019 16.7.7

3 years agoUpdate Slovenian translation. Submitted by Jadran Rudec
Takashi Sawanaka [Wed, 13 Jan 2021 13:05:30 +0000 (22:05 +0900)]
Update Slovenian translation. Submitted by Jadran Rudec

3 years agoFix GitHub issue #551: Substiturions vs. Substitutions
Takashi Sawanaka [Tue, 12 Jan 2021 22:58:46 +0000 (07:58 +0900)]
Fix GitHub issue #551: Substiturions vs. Substitutions

3 years agoAdd percentage value to translations status output
Tim Gerundt [Tue, 12 Jan 2021 04:51:22 +0000 (05:51 +0100)]
Add percentage value to translations status output

3 years agoFix a compilation error
Takashi Sawanaka [Mon, 11 Jan 2021 23:59:02 +0000 (08:59 +0900)]
Fix a compilation error

3 years agoMerge pull request #549 from EugeneLaptev/master
Takashi Sawanaka [Mon, 11 Jan 2021 23:53:34 +0000 (08:53 +0900)]
Merge pull request #549 from EugeneLaptev/master

Fixed mistakes in Ignored Substitutions

3 years agoFixed the problem I introduced by a merge - a duplicated function body. Sorry, no...
EugeneSumo [Mon, 11 Jan 2021 16:36:25 +0000 (16:36 +0000)]
Fixed the problem I introduced by a merge - a duplicated function body. Sorry, no experince with git(Hub)

3 years agoMerge branch 'master' into master
EugeneLaptev [Mon, 11 Jan 2021 16:28:55 +0000 (16:28 +0000)]
Merge branch 'master' into master

3 years agoFixed Ignored Substitutions (IS) failing when the changed strings had commonalities...
EugeneSumo [Mon, 11 Jan 2021 15:35:45 +0000 (15:35 +0000)]
Fixed Ignored Substitutions (IS) failing when the changed strings had commonalities. Fixed IS handling change blocks consisting of several changes. Fixed a mistake in breaking down the IS tokens.

3 years agoFixed Ignored Substitutions failing to ignore changes where the changed strings had...
EugeneSumo [Mon, 11 Jan 2021 11:37:05 +0000 (11:37 +0000)]
Fixed Ignored Substitutions failing to ignore changes where the changed strings had commonalities. Fixed a mistake in breaking down the IS tokens.

3 years agoMerge remote-tracking branch 'origin/stable'
Takashi Sawanaka [Sun, 10 Jan 2021 22:46:36 +0000 (07:46 +0900)]
Merge remote-tracking branch 'origin/stable'

3 years agoGUITest: Find the latest installer and use it for testing.
Takashi Sawanaka [Sun, 10 Jan 2021 22:45:54 +0000 (07:45 +0900)]
GUITest: Find the latest installer and use it for testing.

3 years agoUpdate German.po (#548)
Mr-Update [Sun, 10 Jan 2021 22:30:48 +0000 (23:30 +0100)]
Update German.po (#548)

- Translation completed
- Hotkeys revised

3 years agoUpdate German.po (#548)
Mr-Update [Sun, 10 Jan 2021 22:30:48 +0000 (23:30 +0100)]
Update German.po (#548)

- Translation completed
- Hotkeys revised

3 years agoMerge remote-tracking branch 'origin/stable'
Takashi Sawanaka [Sun, 10 Jan 2021 12:31:59 +0000 (21:31 +0900)]
Merge remote-tracking branch 'origin/stable'

3 years agoUpdate changelog&releasenotes
Takashi Sawanaka [Sun, 10 Jan 2021 12:31:19 +0000 (21:31 +0900)]
Update changelog&releasenotes

3 years agoMerge branch 'stable' of c:\dev\winmerge-stable
Takashi Sawanaka [Sun, 10 Jan 2021 06:51:51 +0000 (15:51 +0900)]
Merge branch 'stable' of c:\dev\winmerge-stable

# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot

3 years agoFix issue #354: Installation - Internal error: Failed to expand shell folder constant...
Takashi Sawanaka [Sun, 10 Jan 2021 06:50:38 +0000 (15:50 +0900)]
Fix issue #354: Installation - Internal error: Failed to expand shell folder constant "userdesktop" (2)

3 years agoInstaller: Stop adding "WinMerge on the Web" to the start menu as Norton Internet...
Takashi Sawanaka [Sun, 10 Jan 2021 06:12:39 +0000 (15:12 +0900)]
Installer: Stop adding "WinMerge on the Web" to the start menu as Norton Internet Security complains.

(cherry picked from commit 78e28784fe3faec2808758f7c2e3d74edac4aed0)