OSDN Git Service
Takashi Sawanaka [Fri, 7 Aug 2020 22:00:23 +0000 (07:00 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
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
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…
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
Takashi Sawanaka [Wed, 5 Aug 2020 23:38:27 +0000 (08:38 +0900)]
Merge.rc: tweak
Takashi Sawanaka [Wed, 5 Aug 2020 15:08:50 +0000 (00:08 +0900)]
Update Galician.po
Takashi Sawanaka [Wed, 5 Aug 2020 15:04:37 +0000 (00:04 +0900)]
Merge pull request #393 from qosobrin/master
Galician translation update
Takashi Sawanaka [Wed, 5 Aug 2020 15:04:15 +0000 (00:04 +0900)]
Remove unsued resource IDs
qosobrin [Wed, 5 Aug 2020 14:58:29 +0000 (16:58 +0200)]
Galician translation update
LMS [Wed, 5 Aug 2020 14:44:58 +0000 (16:44 +0200)]
Merge pull request #6 from WinMerge/master
Puesta al día
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
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
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.)
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)
Takashi Sawanaka [Wed, 5 Aug 2020 00:20:55 +0000 (09:20 +0900)]
Build*.cmd: exit early if build fails,
Takashi Sawanaka [Tue, 4 Aug 2020 23:49:27 +0000 (08:49 +0900)]
Make Options dialog resizable (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)
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…
datadiode [Tue, 4 Aug 2020 21:36:59 +0000 (23:36 +0200)]
Allow choosing image filename patterns from a multi-selection dropdown list
Takashi Sawanaka [Tue, 4 Aug 2020 18:09:26 +0000 (03:09 +0900)]
Merge pull request #390 from Tichij/master
Update of Lithuanian translation
Tichij [Tue, 4 Aug 2020 12:44:57 +0000 (15:44 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Tue, 4 Aug 2020 10:56:14 +0000 (19:56 +0900)]
Fix GitHub issue #378: Windows XP x64 Edition
Takashi Sawanaka [Tue, 4 Aug 2020 10:17:12 +0000 (19:17 +0900)]
Merge.rc: Remove Categories label in Options dialog (2)
Takashi Sawanaka [Tue, 4 Aug 2020 00:03:08 +0000 (09:03 +0900)]
Installer: Add installer for per-user installation (2)
Takashi Sawanaka [Mon, 3 Aug 2020 14:56:17 +0000 (23:56 +0900)]
Merge.rc: Remove Categories label in Options dialog
Takashi Sawanaka [Mon, 3 Aug 2020 12:41:18 +0000 (21:41 +0900)]
Make Options dialog resizable
Takashi Sawanaka [Sun, 2 Aug 2020 13:02:31 +0000 (22:02 +0900)]
Installer: Add installer for per-user installation
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.
Takashi Sawanaka [Sun, 2 Aug 2020 10:22:42 +0000 (19:22 +0900)]
Fix GitHub issue #314: Several issues regarding i18n (2)
Takashi Sawanaka [Sun, 2 Aug 2020 10:14:09 +0000 (19:14 +0900)]
Fix GitHub issue #314: Several issues regarding i18n
Takashi Sawanaka [Sun, 2 Aug 2020 10:13:17 +0000 (19:13 +0900)]
GUITest: Add --exepath option
Takashi Sawanaka [Sat, 1 Aug 2020 22:05:03 +0000 (07:05 +0900)]
Installer: Add ReadMe-German.txt
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
Mr-Update [Sat, 1 Aug 2020 21:10:48 +0000 (23:10 +0200)]
Create ReadMe-German.txt
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
Mr-Update [Fri, 31 Jul 2020 21:25:54 +0000 (23:25 +0200)]
Update German.po
German translation completed
Takashi Sawanaka [Wed, 29 Jul 2020 12:05:29 +0000 (21:05 +0900)]
CreateRelease.cmd: Use BuildAll.vs2019x64_vs2017Win32.cmd
Takashi Sawanaka [Wed, 29 Jul 2020 12:02:55 +0000 (21:02 +0900)]
Update Russian.po
Takashi Sawanaka [Tue, 28 Jul 2020 13:59:33 +0000 (22:59 +0900)]
Merge pull request #387 from wvxwxvw/patch-4
Update Russian.po
wvxwxvw [Tue, 28 Jul 2020 12:12:44 +0000 (15:12 +0300)]
Update Russian.po
Takashi Sawanaka [Tue, 28 Jul 2020 09:55:11 +0000 (18:55 +0900)]
Update translations
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
Takashi Sawanaka [Tue, 28 Jul 2020 09:40:30 +0000 (18:40 +0900)]
Merge branch 'master' into master
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
Takashi Sawanaka [Mon, 27 Jul 2020 10:55:52 +0000 (19:55 +0900)]
Merge pull request #385 from Tichij/master
Update of Lithuanian translation
Tichij [Mon, 27 Jul 2020 10:24:37 +0000 (13:24 +0300)]
Update of Lithuanian translation
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
Takashi Sawanaka [Sun, 26 Jul 2020 21:38:27 +0000 (06:38 +0900)]
Merge pull request #383 from igorruckert/patch-2
Update Brazilian.po
Simon Liddicott [Sun, 26 Jul 2020 21:10:50 +0000 (22:10 +0100)]
Update JP manual for IgnoreComments change
Simon Liddicott [Sun, 26 Jul 2020 21:09:09 +0000 (22:09 +0100)]
Update manual for ignore comments module change
Igor Rückert [Sun, 26 Jul 2020 20:21:02 +0000 (17:21 -0300)]
Update Brazilian.po
Takashi Sawanaka [Sun, 26 Jul 2020 07:29:27 +0000 (16:29 +0900)]
[CT]SVFilePatternsExperimental -> [CT]SVFilePatterns
Takashi Sawanaka [Sun, 26 Jul 2020 06:01:47 +0000 (15:01 +0900)]
Update release notes and changelog for 2.16.7
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
Takashi Sawanaka [Sun, 26 Jul 2020 01:41:36 +0000 (10:41 +0900)]
MergePlugins: Update IgnoreCommentsC.dll
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
Simon Liddicott [Sun, 26 Jul 2020 01:18:03 +0000 (02:18 +0100)]
Add support for C# and TypeScript
Takashi Sawanaka [Sat, 25 Jul 2020 11:12:16 +0000 (20:12 +0900)]
ccrystaltextview.cpp: tweak
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
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.
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.
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.
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.
Takashi Sawanaka [Wed, 22 Jul 2020 10:42:36 +0000 (19:42 +0900)]
Update ChineseSimplified.po
Takashi Sawanaka [Wed, 22 Jul 2020 10:42:11 +0000 (19:42 +0900)]
GitHub issue #285: Slovenian traslations for WinMerge 2.16.6
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.
Takashi Sawanaka [Mon, 20 Jul 2020 10:05:48 +0000 (19:05 +0900)]
ShellExtension: Bump revision to 1.17.13.0
Takashi Sawanaka [Fri, 17 Jul 2020 23:38:16 +0000 (08:38 +0900)]
Update Contributors.txt
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
Takashi Sawanaka [Fri, 17 Jul 2020 23:30:23 +0000 (08:30 +0900)]
Merge pull request #376 from yfdyh000/patch-1
Update DirViewColItems.cpp
YFdyh000 [Thu, 16 Jul 2020 10:54:22 +0000 (18:54 +0800)]
Update Chinese (Simplified) translations
YFdyh000 [Fri, 17 Jul 2020 15:22:23 +0000 (23:22 +0800)]
Update DirViewColItems.cpp
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
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.
Takashi Sawanaka [Thu, 9 Jul 2020 11:19:09 +0000 (20:19 +0900)]
Merge.rc: Fix typo
Takashi Sawanaka [Thu, 2 Jul 2020 23:02:40 +0000 (08:02 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files (2)
Takashi Sawanaka [Thu, 2 Jul 2020 11:28:27 +0000 (20:28 +0900)]
crystaledit: Replace Text In Selection did not work properly
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.
Takashi Sawanaka [Thu, 2 Jul 2020 10:16:24 +0000 (19:16 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files
Takashi Sawanaka [Tue, 30 Jun 2020 11:52:55 +0000 (20:52 +0900)]
crystaledit: rename m_bColumnSelection to m_bRectangularSelection
Takashi Sawanaka [Sun, 28 Jun 2020 00:13:30 +0000 (09:13 +0900)]
Merge pull request #366 from tjmprm77/feature/disable_menu_items_for_directories
Change to disable some menu items that should not be executed for directories, when directories are selected in the folder compare window.
Jun Tajima [Sat, 27 Jun 2020 16:52:26 +0000 (01:52 +0900)]
Change to disable some menu items that should not be executed for directories, when directories are selected in the folder compare window.
Target menu items are the following:
- Context menu
- "Compare As" > "XML"
- "Compare As" > "Binary"
- "Compare As" > "Image"
- Menu Bar
- "Plugins" > "Edit with Unpacker..."
Also, as a precaution, change to do not perform processing when the above menu items are selected with selecting directories.
(Note that in normal case we cannot select these menu items because they are disabled.)
Takashi Sawanaka [Sat, 27 Jun 2020 13:43:20 +0000 (22:43 +0900)]
Fix GitHub issue #362: opening same file (2)
Takashi Sawanaka [Sat, 27 Jun 2020 13:03:23 +0000 (22:03 +0900)]
crystaledit: fix indentation
Takashi Sawanaka [Sat, 27 Jun 2020 04:05:09 +0000 (13:05 +0900)]
crystaledit: Use custom word break rules
Takashi Sawanaka [Fri, 26 Jun 2020 13:09:48 +0000 (22:09 +0900)]
Merge pull request #365 from b0/csharp-filter
added bin and obj directories to C# filter
Marko Matic [Fri, 26 Jun 2020 07:17:59 +0000 (09:17 +0200)]
added bin and obj directories to C# filter
Takashi Sawanaka [Wed, 24 Jun 2020 13:25:06 +0000 (22:25 +0900)]
crystaledit: Move TextDefinition and TextType to CrystalLineParser namespace
Takashi Sawanaka [Mon, 22 Jun 2020 13:40:56 +0000 (22:40 +0900)]
crystaledit/Sample: Add 'View Whitespace' menu item
Takashi Sawanaka [Mon, 22 Jun 2020 13:07:51 +0000 (22:07 +0900)]
crystaledit/Sample: Remove unused resources
Takashi Sawanaka [Mon, 22 Jun 2020 13:02:07 +0000 (22:02 +0900)]
Update Brazilian.po
Takashi Sawanaka [Mon, 22 Jun 2020 12:18:45 +0000 (21:18 +0900)]
Fix osdn.net #40488: C language block comments are not highlighted correctly (2)
Takashi Sawanaka [Wed, 17 Jun 2020 13:42:33 +0000 (22:42 +0900)]
Fix osdn.net #40488: C language block comments are not highlighted correctly
TODO: fix csharp.cpp later.
Takashi Sawanaka [Wed, 17 Jun 2020 12:50:47 +0000 (21:50 +0900)]
osdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus (2)
Takashi Sawanaka [Wed, 17 Jun 2020 12:47:32 +0000 (21:47 +0900)]
osdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus
Takashi Sawanaka [Tue, 16 Jun 2020 12:17:10 +0000 (21:17 +0900)]
Fix osdn.net ticket #40487: When the file is opened from OpenDlg, garbage remains under the following conditions
- MDI Child Windows are not maximized
- 'Close "Select Files or Folders" Dialog on clicking OK button' option is enabled
Takashi Sawanaka [Sun, 14 Jun 2020 06:34:17 +0000 (15:34 +0900)]
Fix GitHub issue #362: opening same file
Takashi Sawanaka [Wed, 10 Jun 2020 12:39:40 +0000 (21:39 +0900)]
Fix an issue where the cursor would move to the beginning of a file when reloading a file that was modified by an external application.
Takashi Sawanaka [Wed, 10 Jun 2020 11:35:39 +0000 (20:35 +0900)]
Fix osdn.net ticket #40476: HTML5 encoding (<meta charset="..." >) is ignored.
Takashi Sawanaka [Tue, 9 Jun 2020 11:40:03 +0000 (20:40 +0900)]
Fix osdn.net ticket #40472: Error when comparing images in the CompareMSExcelFiles.sct plugin