OSDN Git Service
Takashi Sawanaka [Thu, 27 Aug 2020 21:40:18 +0000 (06:40 +0900)]
Merge pull request #419 from qosobrin/master
Galician translation update
qosobrin [Thu, 27 Aug 2020 19:03:13 +0000 (21:03 +0200)]
Galician translation update
LMS [Thu, 27 Aug 2020 18:52:04 +0000 (20:52 +0200)]
Merge pull request #7 from WinMerge/master
Puesta al día del proyecto
Takashi Sawanaka [Thu, 27 Aug 2020 14:42:24 +0000 (23:42 +0900)]
Update manual
Takashi Sawanaka [Thu, 27 Aug 2020 14:39:04 +0000 (23:39 +0900)]
ccrystaltextview: The amount of horizontal scroll movement when receiving the WM_MOUSEHWHEEL message was too large.
Takashi Sawanaka [Thu, 27 Aug 2020 00:11:56 +0000 (09:11 +0900)]
Update manual
Takashi Sawanaka [Tue, 25 Aug 2020 19:22:49 +0000 (04:22 +0900)]
Fix an issue where inline differences aren't highlighted properly under the following conditions:
-Table layout and word-wrap mode
-The inline difference is clipped at the right edge
Takashi Sawanaka [Tue, 25 Aug 2020 19:09:58 +0000 (04:09 +0900)]
Fix the crash under the following conditions:
- Table layout and word-wrap mode
- When pressing the Enter key at the position enclosed by double quotation marks on the first line
Takashi Sawanaka [Tue, 25 Aug 2020 13:14:36 +0000 (22:14 +0900)]
GhostTextView.*: It is quite stressful that the horizontal scroll position is not restored when undoing or rescanning.
Takashi Sawanaka [Tue, 25 Aug 2020 12:43:13 +0000 (21:43 +0900)]
crystaledit/Sample: Fix compilation error
Takashi Sawanaka [Mon, 24 Aug 2020 14:41:23 +0000 (23:41 +0900)]
ccrystaltextview.cpp: Fix the problem that a white vertical rectangle is drawn in the selection area. (2)
Takashi Sawanaka [Mon, 24 Aug 2020 05:31:55 +0000 (14:31 +0900)]
Merge pull request #417 from Tichij/master
Update of Lithuanian translation
Tichij [Mon, 24 Aug 2020 04:46:37 +0000 (07:46 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Mon, 24 Aug 2020 00:23:51 +0000 (09:23 +0900)]
Fix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway (2)
Takashi Sawanaka [Sun, 23 Aug 2020 23:36:26 +0000 (08:36 +0900)]
Fix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway
Takashi Sawanaka [Sun, 23 Aug 2020 23:04:17 +0000 (08:04 +0900)]
Manual/jp: Add missing *.png files
Takashi Sawanaka [Sun, 23 Aug 2020 07:54:32 +0000 (16:54 +0900)]
Installer: Change ChangeLog.txt to ChangeLog.html
Takashi Sawanaka [Sun, 23 Aug 2020 06:42:41 +0000 (15:42 +0900)]
Update Docs/README.md
Takashi Sawanaka [Sun, 23 Aug 2020 06:38:45 +0000 (15:38 +0900)]
- Change ChangeLog.txt and ReleaseNotes.html to Markdown format
- Changes in 2.16.8
Takashi Sawanaka [Sun, 23 Aug 2020 00:48:01 +0000 (09:48 +0900)]
Update frhed to 0.10904.2017.5
Takashi Sawanaka [Fri, 21 Aug 2020 18:05:38 +0000 (03:05 +0900)]
FIXME: LoadImageFromResource() seems to fail when running on Wine 5.0. (2)
Takashi Sawanaka [Fri, 21 Aug 2020 18:02:48 +0000 (03:02 +0900)]
FIXME: LoadImageFromResource() seems to fail when running on Wine 5.0.
Takashi Sawanaka [Fri, 21 Aug 2020 16:37:57 +0000 (01:37 +0900)]
Merge pull request #415 from Mr-Update/patch-1
Lithuanian.po is missing
Mr-Update [Fri, 21 Aug 2020 16:05:04 +0000 (18:05 +0200)]
Update WinMergeX64NonAdmin.iss
Mr-Update [Fri, 21 Aug 2020 16:03:53 +0000 (18:03 +0200)]
Update WinMergeX64.iss
Mr-Update [Fri, 21 Aug 2020 16:03:10 +0000 (18:03 +0200)]
Update WinMergeX64.is6.iss
Mr-Update [Fri, 21 Aug 2020 16:00:57 +0000 (18:00 +0200)]
Update WinMerge.iss
Takashi Sawanaka [Thu, 20 Aug 2020 23:20:49 +0000 (08:20 +0900)]
Merge pull request #414 from Mr-Update/patch-18
Update German.po
Mr-Update [Thu, 20 Aug 2020 20:40:02 +0000 (22:40 +0200)]
Update German.po
Translation improved
Takashi Sawanaka [Thu, 20 Aug 2020 10:40:24 +0000 (19:40 +0900)]
Merge pull request #413 from Tichij/master
Update of Lithuanian translation
Tichij [Thu, 20 Aug 2020 04:37:36 +0000 (07:37 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Wed, 19 Aug 2020 22:50:22 +0000 (07:50 +0900)]
Fix GitHub issue #411: Some improvements
Takashi Sawanaka [Tue, 18 Aug 2020 22:14:59 +0000 (07:14 +0900)]
Merge pull request #412 from Mr-Update/patch-17
Update German.po
Mr-Update [Tue, 18 Aug 2020 20:01:07 +0000 (22:01 +0200)]
Update German.po
Translation improved
Takashi Sawanaka [Mon, 17 Aug 2020 22:12:32 +0000 (07:12 +0900)]
Merge pull request #410 from Mr-Update/patch-16
Update Shortcut_keys.xml
Mr-Update [Mon, 17 Aug 2020 21:18:55 +0000 (23:18 +0200)]
Update Shortcut_keys.xml
Shift+F4 added
Alt+Ctrl uniformly changed to Ctrl+Alt
Shift+Ctrl uniformly changed to Ctrl+Shift
Takashi Sawanaka [Mon, 17 Aug 2020 16:48:26 +0000 (01:48 +0900)]
Update manual
Takashi Sawanaka [Mon, 17 Aug 2020 15:13:48 +0000 (00:13 +0900)]
Update manual
Takashi Sawanaka [Mon, 17 Aug 2020 14:26:08 +0000 (23:26 +0900)]
OptionsInit.cpp: Change the default value for the "Ignore codepage differences" option to false
Takashi Sawanaka [Mon, 17 Aug 2020 14:11:23 +0000 (23:11 +0900)]
Treat files that have matching content but different BOMs as different when the "Ignore codepage differences" option is disabled
Takashi Sawanaka [Mon, 17 Aug 2020 12:40:58 +0000 (21:40 +0900)]
Merge pull request #408 from Tichij/master
Removed mistakenly returned BOM in Lithuanian.po file
Tichij [Mon, 17 Aug 2020 12:27:51 +0000 (15:27 +0300)]
Removed, returned by mistake, BOM in Lithuanian.po file
Takashi Sawanaka [Mon, 17 Aug 2020 09:10:51 +0000 (18:10 +0900)]
Merge pull request #407 from Tichij/master
Update of Lithuanian translation
Tichij [Mon, 17 Aug 2020 05:49:51 +0000 (08:49 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Sun, 16 Aug 2020 14:58:14 +0000 (23:58 +0900)]
OptionsInit.cpp: Change the default value for the "Include unique subfolders contents" option to true
Takashi Sawanaka [Sun, 16 Aug 2020 14:55:50 +0000 (23:55 +0900)]
Update manual
Takashi Sawanaka [Sun, 16 Aug 2020 13:24:37 +0000 (22:24 +0900)]
Fix a bug where the title of the tabs in the file comparison window changed to "untitled left/right" after changing the language.
Takashi Sawanaka [Sun, 16 Aug 2020 12:22:53 +0000 (21:22 +0900)]
Update manual
Takashi Sawanaka [Sun, 16 Aug 2020 12:04:03 +0000 (21:04 +0900)]
MainFrm.cpp: Do a reverse comparison with the current 'Include Subfolders' settings when pressing Control key
Takashi Sawanaka [Sun, 16 Aug 2020 02:40:04 +0000 (11:40 +0900)]
Update manual
Takashi Sawanaka [Sun, 16 Aug 2020 02:39:38 +0000 (11:39 +0900)]
Remove BOM in *.po files
Takashi Sawanaka [Sat, 15 Aug 2020 13:26:31 +0000 (22:26 +0900)]
Fix conflicting mnemonic
Takashi Sawanaka [Sat, 15 Aug 2020 08:57:25 +0000 (17:57 +0900)]
xutils.c: Fix a bug that "Ignore case" does not work.
Takashi Sawanaka [Sat, 15 Aug 2020 07:23:40 +0000 (16:23 +0900)]
Fix GitHub issue #405: Some improvements (2)
Takashi Sawanaka [Sat, 15 Aug 2020 06:58:55 +0000 (15:58 +0900)]
Fix GitHub issue #405: Some improvements
Takashi Sawanaka [Fri, 14 Aug 2020 22:48:37 +0000 (07:48 +0900)]
Merge pull request #406 from Mr-Update/patch-15
Update German.po
Mr-Update [Fri, 14 Aug 2020 20:17:01 +0000 (22:17 +0200)]
Update German.po
Translation improved
Takashi Sawanaka [Fri, 14 Aug 2020 15:09:18 +0000 (00:09 +0900)]
Update BuildInstaller.cmd
Takashi Sawanaka [Fri, 14 Aug 2020 14:13:55 +0000 (23:13 +0900)]
DirActions.h: Display the appropriate message if the file to delete does not already exist.
Takashi Sawanaka [Fri, 14 Aug 2020 13:45:06 +0000 (22:45 +0900)]
Update manual
Takashi Sawanaka [Thu, 13 Aug 2020 14:55:35 +0000 (23:55 +0900)]
Add Help button to PluginsList dialog
Takashi Sawanaka [Wed, 12 Aug 2020 13:33:42 +0000 (22:33 +0900)]
Update manual
Takashi Sawanaka [Wed, 12 Aug 2020 13:27:19 +0000 (22:27 +0900)]
Test solution configuration: Reduce test time (77s -> 68s)
Takashi Sawanaka [Wed, 12 Aug 2020 13:24:39 +0000 (22:24 +0900)]
MergeEditView.cpp: Fix a warning
Takashi Sawanaka [Tue, 11 Aug 2020 12:16:51 +0000 (21:16 +0900)]
Fix GitHub issue #402: More space for some internationalized strings
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"
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
Mr-Update [Sun, 9 Aug 2020 20:39:45 +0000 (22:39 +0200)]
Update German.po
Translation improved.
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
datadiode [Sun, 9 Aug 2020 15:39:08 +0000 (17:39 +0200)]
Remove duplicate filename patterns without relying on WildcardDropList
Takashi Sawanaka [Sun, 9 Aug 2020 14:59:03 +0000 (23:59 +0900)]
Make UI look flatter (6)
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
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
Mr-Update [Sun, 9 Aug 2020 14:24:52 +0000 (16:24 +0200)]
Update German.isl
Translation improved.
Please keep using CP1252.
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
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
Mr-Update [Sun, 9 Aug 2020 13:03:41 +0000 (15:03 +0200)]
Update ReadMe-German.txt
Line break improved.
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.
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…
datadiode [Sun, 9 Aug 2020 09:54:53 +0000 (11:54 +0200)]
WildcardDropList: Avoid the String instance as it could throw std::bad_alloc
Takashi Sawanaka [Sun, 9 Aug 2020 06:50:38 +0000 (15:50 +0900)]
Update winimerge to 1.0.19.0
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.
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
Takashi Sawanaka [Sat, 8 Aug 2020 09:53:46 +0000 (18:53 +0900)]
GUITests: Add InsallerTest.cpp
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)