OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoFix GitHub issue #402: More space for some internationalized strings
Takashi Sawanaka [Tue, 11 Aug 2020 12:16:51 +0000 (21:16 +0900)]
Fix GitHub issue #402: More space for some internationalized strings

3 years agoFix issue #354: Installation - Internal error: Failed to expand shell folder constant...
Takashi Sawanaka [Mon, 10 Aug 2020 01:09:15 +0000 (10:09 +0900)]
Fix issue #354: Installation - Internal error: Failed to expand shell folder constant "userdesktop"

3 years agoMerge pull request #401 from Mr-Update/patch-14
Takashi Sawanaka [Sun, 9 Aug 2020 22:51:58 +0000 (07:51 +0900)]
Merge pull request #401 from Mr-Update/patch-14

Update German.po

3 years agoUpdate German.po
Mr-Update [Sun, 9 Aug 2020 20:39:45 +0000 (22:39 +0200)]
Update German.po

Translation improved.

3 years agoMerge pull request #400 from datadiode/WildcardRemoveDuplicatePatterns
Takashi Sawanaka [Sun, 9 Aug 2020 15:59:10 +0000 (00:59 +0900)]
Merge pull request #400 from datadiode/WildcardRemoveDuplicatePatterns

Remove duplicate filename patterns without relying on WildcardDropList

3 years agoRemove duplicate filename patterns without relying on WildcardDropList
datadiode [Sun, 9 Aug 2020 15:39:08 +0000 (17:39 +0200)]
Remove duplicate filename patterns without relying on WildcardDropList

3 years agoMake UI look flatter (6)
Takashi Sawanaka [Sun, 9 Aug 2020 14:59:03 +0000 (23:59 +0900)]
Make UI look flatter (6)

3 years agoGerman.isl: Change the file encoding from utf-8 to cp-1252 #399
Takashi Sawanaka [Sun, 9 Aug 2020 14:40:50 +0000 (23:40 +0900)]
German.isl: Change the file encoding from utf-8 to cp-1252 #399

3 years agoMerge pull request #399 from Mr-Update/patch-13
Takashi Sawanaka [Sun, 9 Aug 2020 14:38:25 +0000 (23:38 +0900)]
Merge pull request #399 from Mr-Update/patch-13

Update German.isl

3 years agoUpdate German.isl
Mr-Update [Sun, 9 Aug 2020 14:24:52 +0000 (16:24 +0200)]
Update German.isl

Translation improved.
Please keep using CP1252.

3 years agoReadMe-German.txt: Change the file encoding from utf-8 to cp-1252 #398
Takashi Sawanaka [Sun, 9 Aug 2020 13:16:52 +0000 (22:16 +0900)]
ReadMe-German.txt: Change the file encoding from utf-8 to cp-1252 #398

3 years agoMerge pull request #398 from Mr-Update/patch-12
Takashi Sawanaka [Sun, 9 Aug 2020 13:13:30 +0000 (22:13 +0900)]
Merge pull request #398 from Mr-Update/patch-12

Update ReadMe-German.txt

3 years agoUpdate ReadMe-German.txt
Mr-Update [Sun, 9 Aug 2020 13:03:41 +0000 (15:03 +0200)]
Update ReadMe-German.txt

Line break improved.

3 years agoccrystaltextview.cpp: Fix the problem that a white vertical rectangle is drawn in...
Takashi Sawanaka [Sun, 9 Aug 2020 12:54:47 +0000 (21:54 +0900)]
ccrystaltextview.cpp: Fix the problem that a white vertical rectangle is drawn in the selection area.

3 years agoMerge pull request #397 from datadiode/WildcardDropList_avoid_heap_allocations
Takashi Sawanaka [Sun, 9 Aug 2020 10:21:23 +0000 (19:21 +0900)]
Merge pull request #397 from datadiode/WildcardDropList_avoid_heap_allocations

WildcardDropList: Avoid the String instance as it could throw std::ba…

3 years agoWildcardDropList: Avoid the String instance as it could throw std::bad_alloc
datadiode [Sun, 9 Aug 2020 09:54:53 +0000 (11:54 +0200)]
WildcardDropList: Avoid the String instance as it could throw std::bad_alloc

3 years agoUpdate winimerge to 1.0.19.0
Takashi Sawanaka [Sun, 9 Aug 2020 06:50:38 +0000 (15:50 +0900)]
Update winimerge to 1.0.19.0

3 years ago- Use wildcard drop list combobox in Table, Binary and PluginList dialog
Takashi Sawanaka [Sun, 9 Aug 2020 05:37:16 +0000 (14:37 +0900)]
- Use wildcard drop list combobox in Table, Binary and PluginList dialog
- WildcardDropList.cpp: Fix an issue where all items in a drop list were selected if the text box was empty.

3 years ago- Fix the problem that pressing the F4 key did not always move to the next word diff.
Takashi Sawanaka [Sun, 9 Aug 2020 04:08:34 +0000 (13:08 +0900)]
- Fix the problem that pressing the F4 key did not always move to the next word diff.
- Move to the word diff at the beginning of the next diff block when pressing F4 on a line that has no differences, .
- Extend F4 key movement range from a diff block to the whole file

3 years agoGUITests: Add InsallerTest.cpp
Takashi Sawanaka [Sat, 8 Aug 2020 09:53:46 +0000 (18:53 +0900)]
GUITests: Add InsallerTest.cpp

3 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Fri, 7 Aug 2020 22:00:23 +0000 (07:00 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

3 years agoReadMe-German.txt: Change the file encoding from utf-8 to cp-1252 #389
Takashi Sawanaka [Fri, 7 Aug 2020 21:56:39 +0000 (06:56 +0900)]
ReadMe-German.txt: Change the file encoding from utf-8 to cp-1252 #389

3 years agoMerge pull request #394 from datadiode/proposal_to_deal_with_outdated_list_of_develop...
Takashi Sawanaka [Fri, 7 Aug 2020 12:58:46 +0000 (21:58 +0900)]
Merge pull request #394 from datadiode/proposal_to_deal_with_outdated_list_of_developers_in_aboutbox

Replace outdated list of developers in AboutBox with ascii-art gnu fr…

3 years agoReplace outdated list of developers in AboutBox with ascii-art gnu from FSF
datadiode [Fri, 7 Aug 2020 10:38:05 +0000 (12:38 +0200)]
Replace outdated list of developers in AboutBox with ascii-art gnu from FSF

3 years agoMerge.rc: tweak
Takashi Sawanaka [Wed, 5 Aug 2020 23:38:27 +0000 (08:38 +0900)]
Merge.rc: tweak

3 years agoUpdate Galician.po
Takashi Sawanaka [Wed, 5 Aug 2020 15:08:50 +0000 (00:08 +0900)]
Update Galician.po

3 years agoMerge pull request #393 from qosobrin/master
Takashi Sawanaka [Wed, 5 Aug 2020 15:04:37 +0000 (00:04 +0900)]
Merge pull request #393 from qosobrin/master

Galician translation update

3 years agoRemove unsued resource IDs
Takashi Sawanaka [Wed, 5 Aug 2020 15:04:15 +0000 (00:04 +0900)]
Remove unsued resource IDs

3 years agoGalician translation update
qosobrin [Wed, 5 Aug 2020 14:58:29 +0000 (16:58 +0200)]
Galician translation update

3 years agoMerge pull request #6 from WinMerge/master
LMS [Wed, 5 Aug 2020 14:44:58 +0000 (16:44 +0200)]
Merge pull request #6 from WinMerge/master

Puesta al día

3 years agoRework the fix for Github issue #316: GUI glitches/bugs #2 (2) for High-DPI screen
Takashi Sawanaka [Wed, 5 Aug 2020 14:34:59 +0000 (23:34 +0900)]
Rework the fix for Github issue #316: GUI glitches/bugs #2 (2) for High-DPI screen

3 years agoMerge pull request #392 from datadiode/fixfix_for_issue_316
Takashi Sawanaka [Wed, 5 Aug 2020 14:02:10 +0000 (23:02 +0900)]
Merge pull request #392 from datadiode/fixfix_for_issue_316

Rework the fix for Github issue #316: GUI glitches/bugs #2

3 years agoRework the fix for Github issue #316: GUI glitches/bugs #2
datadiode [Wed, 5 Aug 2020 13:47:20 +0000 (15:47 +0200)]
Rework the fix for Github issue #316: GUI glitches/bugs #2
(Not really relevant, but gets rid of some minor occasional flicker, and might be technically preferable from a pedantic perspective.)

3 years agoAllow choosing image filename patterns from a multi-selection dropdown list (3)
Takashi Sawanaka [Wed, 5 Aug 2020 12:36:25 +0000 (21:36 +0900)]
Allow choosing image filename patterns from a multi-selection dropdown list (3)

3 years agoBuild*.cmd: exit early if build fails,
Takashi Sawanaka [Wed, 5 Aug 2020 00:20:55 +0000 (09:20 +0900)]
Build*.cmd: exit early if build fails,

3 years agoMake Options dialog resizable (2)
Takashi Sawanaka [Tue, 4 Aug 2020 23:49:27 +0000 (08:49 +0900)]
Make Options dialog resizable (2)

3 years agoAllow choosing image filename patterns from a multi-selection dropdown list (2)
Takashi Sawanaka [Tue, 4 Aug 2020 22:58:39 +0000 (07:58 +0900)]
Allow choosing image filename patterns from a multi-selection dropdown list (2)

3 years agoMerge pull request #391 from datadiode/WildcardDropList
Takashi Sawanaka [Tue, 4 Aug 2020 22:42:42 +0000 (07:42 +0900)]
Merge pull request #391 from datadiode/WildcardDropList

Allow choosing image filename patterns from a multi-selection dropdow…

3 years agoAllow choosing image filename patterns from a multi-selection dropdown list
datadiode [Tue, 4 Aug 2020 21:36:59 +0000 (23:36 +0200)]
Allow choosing image filename patterns from a multi-selection dropdown list

3 years agoMerge pull request #390 from Tichij/master
Takashi Sawanaka [Tue, 4 Aug 2020 18:09:26 +0000 (03:09 +0900)]
Merge pull request #390 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Tue, 4 Aug 2020 12:44:57 +0000 (15:44 +0300)]
Update of Lithuanian translation

3 years agoFix GitHub issue #378: Windows XP x64 Edition
Takashi Sawanaka [Tue, 4 Aug 2020 10:56:14 +0000 (19:56 +0900)]
Fix GitHub issue #378: Windows XP x64 Edition

3 years agoMerge.rc: Remove Categories label in Options dialog (2)
Takashi Sawanaka [Tue, 4 Aug 2020 10:17:12 +0000 (19:17 +0900)]
Merge.rc: Remove Categories label in Options dialog (2)

3 years agoInstaller: Add installer for per-user installation (2)
Takashi Sawanaka [Tue, 4 Aug 2020 00:03:08 +0000 (09:03 +0900)]
Installer: Add installer for per-user installation (2)

3 years agoMerge.rc: Remove Categories label in Options dialog
Takashi Sawanaka [Mon, 3 Aug 2020 14:56:17 +0000 (23:56 +0900)]
Merge.rc: Remove Categories label in Options dialog

3 years agoMake Options dialog resizable
Takashi Sawanaka [Mon, 3 Aug 2020 12:41:18 +0000 (21:41 +0900)]
Make Options dialog resizable

4 years agoInstaller: Add installer for per-user installation
Takashi Sawanaka [Sun, 2 Aug 2020 13:02:31 +0000 (22:02 +0900)]
Installer: Add installer for per-user installation

4 years agoFix "," in 123,456 not being considered as a word break.
Takashi Sawanaka [Sun, 2 Aug 2020 10:54:45 +0000 (19:54 +0900)]
Fix "," in 123,456 not being considered as a word break.
This behavior is very annoying when dealing with CSV files.

4 years agoFix GitHub issue #314: Several issues regarding i18n (2)
Takashi Sawanaka [Sun, 2 Aug 2020 10:22:42 +0000 (19:22 +0900)]
Fix GitHub issue #314: Several issues regarding i18n (2)

4 years agoFix GitHub issue #314: Several issues regarding i18n
Takashi Sawanaka [Sun, 2 Aug 2020 10:14:09 +0000 (19:14 +0900)]
Fix GitHub issue #314: Several issues regarding i18n

4 years agoGUITest: Add --exepath option
Takashi Sawanaka [Sun, 2 Aug 2020 10:13:17 +0000 (19:13 +0900)]
GUITest: Add --exepath option

4 years agoInstaller: Add ReadMe-German.txt
Takashi Sawanaka [Sat, 1 Aug 2020 22:05:03 +0000 (07:05 +0900)]
Installer: Add ReadMe-German.txt

4 years agoMerge pull request #389 from Mr-Update/patch-11
Takashi Sawanaka [Sat, 1 Aug 2020 21:56:41 +0000 (06:56 +0900)]
Merge pull request #389 from Mr-Update/patch-11

Create ReadMe-German.txt

4 years agoCreate ReadMe-German.txt
Mr-Update [Sat, 1 Aug 2020 21:10:48 +0000 (23:10 +0200)]
Create ReadMe-German.txt

4 years agoMerge pull request #388 from Mr-Update/patch-10
Takashi Sawanaka [Fri, 31 Jul 2020 21:44:25 +0000 (06:44 +0900)]
Merge pull request #388 from Mr-Update/patch-10

Update German.po

4 years agoUpdate German.po
Mr-Update [Fri, 31 Jul 2020 21:25:54 +0000 (23:25 +0200)]
Update German.po

German translation completed

4 years agoCreateRelease.cmd: Use BuildAll.vs2019x64_vs2017Win32.cmd
Takashi Sawanaka [Wed, 29 Jul 2020 12:05:29 +0000 (21:05 +0900)]
CreateRelease.cmd: Use BuildAll.vs2019x64_vs2017Win32.cmd

4 years agoUpdate Russian.po
Takashi Sawanaka [Wed, 29 Jul 2020 12:02:55 +0000 (21:02 +0900)]
Update Russian.po

4 years agoMerge pull request #387 from wvxwxvw/patch-4
Takashi Sawanaka [Tue, 28 Jul 2020 13:59:33 +0000 (22:59 +0900)]
Merge pull request #387 from wvxwxvw/patch-4

Update Russian.po

4 years agoUpdate Russian.po
wvxwxvw [Tue, 28 Jul 2020 12:12:44 +0000 (15:12 +0300)]
Update Russian.po

4 years agoUpdate translations
Takashi Sawanaka [Tue, 28 Jul 2020 09:55:11 +0000 (18:55 +0900)]
Update translations

4 years agoMerge pull request #386 from kayazeren/master
Takashi Sawanaka [Tue, 28 Jul 2020 09:41:53 +0000 (18:41 +0900)]
Merge pull request #386 from kayazeren/master

Turkish translation update 2.16.7

4 years agoMerge branch 'master' into master
Takashi Sawanaka [Tue, 28 Jul 2020 09:40:30 +0000 (18:40 +0900)]
Merge branch 'master' into master

4 years agoTurkish translation update 2.16.7
Kaya Zeren [Tue, 28 Jul 2020 05:55:54 +0000 (08:55 +0300)]
Turkish translation update 2.16.7

Turkish translation update 2.16.7

4 years agoMerge pull request #385 from Tichij/master
Takashi Sawanaka [Mon, 27 Jul 2020 10:55:52 +0000 (19:55 +0900)]
Merge pull request #385 from Tichij/master

Update of Lithuanian translation

4 years agoUpdate of Lithuanian translation
Tichij [Mon, 27 Jul 2020 10:24:37 +0000 (13:24 +0300)]
Update of Lithuanian translation

4 years agoMerge pull request #384 from silid/master
Takashi Sawanaka [Sun, 26 Jul 2020 21:38:54 +0000 (06:38 +0900)]
Merge pull request #384 from silid/master

Update manual for IgnoreCommentsC change

4 years agoMerge pull request #383 from igorruckert/patch-2
Takashi Sawanaka [Sun, 26 Jul 2020 21:38:27 +0000 (06:38 +0900)]
Merge pull request #383 from igorruckert/patch-2

Update Brazilian.po

4 years agoUpdate JP manual for IgnoreComments change
Simon Liddicott [Sun, 26 Jul 2020 21:10:50 +0000 (22:10 +0100)]
Update JP manual for IgnoreComments change

4 years agoUpdate manual for ignore comments module change
Simon Liddicott [Sun, 26 Jul 2020 21:09:09 +0000 (22:09 +0100)]
Update manual for ignore comments module change

4 years agoUpdate Brazilian.po
Igor Rückert [Sun, 26 Jul 2020 20:21:02 +0000 (17:21 -0300)]
Update Brazilian.po

4 years ago[CT]SVFilePatternsExperimental -> [CT]SVFilePatterns 2.16.7
Takashi Sawanaka [Sun, 26 Jul 2020 07:29:27 +0000 (16:29 +0900)]
[CT]SVFilePatternsExperimental -> [CT]SVFilePatterns

4 years agoUpdate release notes and changelog for 2.16.7
Takashi Sawanaka [Sun, 26 Jul 2020 06:01:47 +0000 (15:01 +0900)]
Update release notes and changelog for 2.16.7

4 years agoMade it possible to display the contents of CSV and TSV files like spreadsheet softwa...
Takashi Sawanaka [Sun, 26 Jul 2020 01:45:08 +0000 (10:45 +0900)]
Made it possible to display the contents of CSV and TSV files like spreadsheet software (#372)

Made it possible to display the contents of CSV and TSV files like spreadsheet software

4 years agoMergePlugins: Update IgnoreCommentsC.dll
Takashi Sawanaka [Sun, 26 Jul 2020 01:41:36 +0000 (10:41 +0900)]
MergePlugins: Update IgnoreCommentsC.dll

4 years agoMerge pull request #382 from silid/silid-ignorecomments-csharp
Takashi Sawanaka [Sun, 26 Jul 2020 01:34:55 +0000 (10:34 +0900)]
Merge pull request #382 from silid/silid-ignorecomments-csharp

Add support for C# and TypeScript

4 years agoAdd support for C# and TypeScript
Simon Liddicott [Sun, 26 Jul 2020 01:18:03 +0000 (02:18 +0100)]
Add support for C# and TypeScript

4 years agoccrystaltextview.cpp: tweak
Takashi Sawanaka [Sat, 25 Jul 2020 11:12:16 +0000 (20:12 +0900)]
ccrystaltextview.cpp: tweak

4 years agoTest.cpp: Prevent the message box from displaying and stopping the test
Takashi Sawanaka [Sat, 25 Jul 2020 10:49:17 +0000 (19:49 +0900)]
Test.cpp: Prevent the message box from displaying and stopping the test

4 years agoMerge pull request #381 from tjmprm77/feature/compare_as_binary_image_for_3items
Takashi Sawanaka [Fri, 24 Jul 2020 22:58:46 +0000 (07:58 +0900)]
Merge pull request #381 from tjmprm77/feature/compare_as_binary_image_for_3items

Fix the problem that not 3 panes but 2 panes file compare window displays when executing "Compare As" > "Binary" or "Compare As" > "Image" in the context menu in the folder compare window with selecting 3 items.

4 years agoFix the problem that not 3 panes but 2 panes file compare window displays when execut...
Jun Tajima [Fri, 24 Jul 2020 18:08:58 +0000 (03:08 +0900)]
Fix the problem that not 3 panes but 2 panes file compare window displays when executing "Compare As" > "Binary" or "Compare As" > "Image" in the context menu in the folder compare window with selecting 3 items.

4 years agoBuildInstaller.cmd: Since the installer created with Inno Setup 6.0.x is judged as...
Takashi Sawanaka [Fri, 24 Jul 2020 04:42:04 +0000 (13:42 +0900)]
BuildInstaller.cmd: Since the installer created with Inno Setup 6.0.x is judged as malware by multiple virus scan engines, create the installer with Inno Setup 5.x.

4 years agoBuildAll.*.cmd: Fix an issue where the command prompt window closes when the UnitTest...
Takashi Sawanaka [Fri, 24 Jul 2020 04:39:29 +0000 (13:39 +0900)]
BuildAll.*.cmd: Fix an issue where the command prompt window closes when the UnitTest fails.

4 years agoUpdate ChineseSimplified.po
Takashi Sawanaka [Wed, 22 Jul 2020 10:42:36 +0000 (19:42 +0900)]
Update ChineseSimplified.po

4 years agoGitHub issue #285: Slovenian traslations for WinMerge 2.16.6
Takashi Sawanaka [Wed, 22 Jul 2020 10:42:11 +0000 (19:42 +0900)]
GitHub issue #285: Slovenian traslations for WinMerge 2.16.6

4 years agoRevert "Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag... ShellExtension-1.17.13.0
Takashi Sawanaka [Mon, 20 Jul 2020 10:14:21 +0000 (19:14 +0900)]
Revert "Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag/drop"

This reverts commit cd4a235b828622038786709e247715b931f0b13e.

4 years agoShellExtension: Bump revision to 1.17.13.0
Takashi Sawanaka [Mon, 20 Jul 2020 10:05:48 +0000 (19:05 +0900)]
ShellExtension: Bump revision to 1.17.13.0

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Fri, 17 Jul 2020 23:38:16 +0000 (08:38 +0900)]
Update Contributors.txt

4 years agoMerge pull request #377 from yfdyh000/zh-CN
Takashi Sawanaka [Fri, 17 Jul 2020 23:30:37 +0000 (08:30 +0900)]
Merge pull request #377 from yfdyh000/zh-CN

Update Chinese (Simplified) translations

4 years agoMerge pull request #376 from yfdyh000/patch-1
Takashi Sawanaka [Fri, 17 Jul 2020 23:30:23 +0000 (08:30 +0900)]
Merge pull request #376 from yfdyh000/patch-1

Update DirViewColItems.cpp

4 years agoUpdate Chinese (Simplified) translations
YFdyh000 [Thu, 16 Jul 2020 10:54:22 +0000 (18:54 +0800)]
Update Chinese (Simplified) translations

4 years agoUpdate DirViewColItems.cpp
YFdyh000 [Fri, 17 Jul 2020 15:22:23 +0000 (23:22 +0800)]
Update DirViewColItems.cpp

4 years agoCompareMSExcelFiles.sct: Change the extension of the file that outputs the sheet...
Takashi Sawanaka [Thu, 9 Jul 2020 12:36:32 +0000 (21:36 +0900)]
CompareMSExcelFiles.sct: Change the extension of the file that outputs the sheet cell values ​​from .txt to .tsv

4 years agoCompareMSExcelFiles.sct: Enclose the value in double quotation marks If a cell value...
Takashi Sawanaka [Thu, 9 Jul 2020 11:48:04 +0000 (20:48 +0900)]
CompareMSExcelFiles.sct: Enclose the value in double quotation marks If a cell value contains line breaks or double quotation marks.

4 years agoMerge.rc: Fix typo
Takashi Sawanaka [Thu, 9 Jul 2020 11:19:09 +0000 (20:19 +0900)]
Merge.rc: Fix typo

4 years agoFix GitHub issue #367: Crash when comparing encrypted 7z files (2)
Takashi Sawanaka [Thu, 2 Jul 2020 23:02:40 +0000 (08:02 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files (2)

4 years agocrystaledit: Replace Text In Selection did not work properly
Takashi Sawanaka [Thu, 2 Jul 2020 11:28:27 +0000 (20:28 +0900)]
crystaledit: Replace Text In Selection did not work properly

4 years agoFix GitHub issue #368: Find dialog sometimes remembers old text to start a new find...
Takashi Sawanaka [Thu, 2 Jul 2020 11:02:59 +0000 (20:02 +0900)]
Fix GitHub issue #368: Find dialog sometimes remembers old text to start a new find instead of the new text.

4 years agoFix GitHub issue #367: Crash when comparing encrypted 7z files Merge7z1900.2
Takashi Sawanaka [Thu, 2 Jul 2020 10:16:24 +0000 (19:16 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files

4 years agocrystaledit: rename m_bColumnSelection to m_bRectangularSelection
Takashi Sawanaka [Tue, 30 Jun 2020 11:52:55 +0000 (20:52 +0900)]
crystaledit: rename m_bColumnSelection to m_bRectangularSelection