OSDN Git Service
Takashi Sawanaka [Sun, 29 Dec 2019 05:29:00 +0000 (14:29 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Sun, 29 Dec 2019 05:26:19 +0000 (14:26 +0900)]
Fix issue osdn#39851: Non-moved lines are treated as moved lines
Takashi Sawanaka [Sun, 29 Dec 2019 02:23:18 +0000 (11:23 +0900)]
Merge pull request #245 from Mr-Update/patch-7
Update German.po
Mr-Update [Sat, 28 Dec 2019 22:02:17 +0000 (23:02 +0100)]
Update German.po
Double hotkeys in all menus, context menus and options corrected
Takashi Sawanaka [Sat, 28 Dec 2019 02:44:25 +0000 (11:44 +0900)]
Merge pull request #242 from datadiode/foldercmp-reduce-code-duplication
Consolidate FolderCmp (5)
datadiode [Fri, 27 Dec 2019 18:04:58 +0000 (19:04 +0100)]
Consolidate FolderCmp (5)
Reduce code duplication.
Don't repeat initialization steps which are (supposedly) meant to be one-time.
Takashi Sawanaka [Thu, 26 Dec 2019 22:45:20 +0000 (07:45 +0900)]
Merge pull request #240 from datadiode/master
Consolidate FolderCmp (4)
datadiode [Thu, 26 Dec 2019 10:24:14 +0000 (11:24 +0100)]
Consolidate FolderCmp (4)
Remove some obsolete error handling for legacy non-standard operator new.
datadiode [Thu, 26 Dec 2019 09:27:43 +0000 (10:27 +0100)]
CMDIClient: Intercepting WM_MDINEXT seems unnecessary and causes an extra redraw
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:40 +0000 (07:54 +0900)]
Update Contributors.txt
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:17 +0000 (07:54 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Mon, 23 Dec 2019 22:48:58 +0000 (07:48 +0900)]
Merge pull request #239 from Mr-Update/patch-6
Update German.po
Mr-Update [Mon, 23 Dec 2019 22:03:11 +0000 (23:03 +0100)]
Update German.po
German translation completed
Takashi Sawanaka [Sun, 22 Dec 2019 10:38:29 +0000 (19:38 +0900)]
Make UI look flatter (4)
Takashi Sawanaka [Sun, 22 Dec 2019 05:34:12 +0000 (14:34 +0900)]
crystaledit: use U+21b2(Downwards Arrow with Tip Leftwards) as CRLF when the rendering mode is not GDI
Takashi Sawanaka [Sun, 22 Dec 2019 04:05:57 +0000 (13:05 +0900)]
Cppcheck: Member variable 'CGhostTextView::...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 22 Dec 2019 02:56:41 +0000 (11:56 +0900)]
Cppcheck: Class 'Heksedit' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).
Takashi Sawanaka [Sun, 22 Dec 2019 02:45:58 +0000 (11:45 +0900)]
Cppcheck: Member variable 'COpenDoc::m_infoHandler' is not initialized in the constructor.
Takashi Sawanaka [Sun, 22 Dec 2019 02:20:09 +0000 (11:20 +0900)]
Cppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'UINT {aka unsigned int}'.
Takashi Sawanaka [Sun, 22 Dec 2019 01:58:14 +0000 (10:58 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list
Takashi Sawanaka [Sun, 22 Dec 2019 01:15:23 +0000 (10:15 +0900)]
Warning C26495 Variable '...' is uninitialized. Always initialize a member variable (type.6).
Takashi Sawanaka [Sun, 22 Dec 2019 00:34:03 +0000 (09:34 +0900)]
Update boost to 1.72.0
Takashi Sawanaka [Sat, 21 Dec 2019 22:10:32 +0000 (07:10 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 21 Dec 2019 22:07:36 +0000 (07:07 +0900)]
Fix issue where active pane is not restored correctly (2)
Takashi Sawanaka [Sat, 21 Dec 2019 13:33:16 +0000 (22:33 +0900)]
Fix issue where active pane is not restored correctly
Takashi Sawanaka [Sat, 21 Dec 2019 12:31:35 +0000 (21:31 +0900)]
MergeEditFrm.cpp: Fix crash when closing the File Compare Window under the following conditions:
- View -> Split Vertically menu item is unchecked
- The second pane is focused
Takashi Sawanaka [Sat, 21 Dec 2019 06:56:44 +0000 (15:56 +0900)]
Make UI look flatter (3)
Takashi Sawanaka [Sat, 21 Dec 2019 06:44:36 +0000 (15:44 +0900)]
ccrystalrendererdirectwrite.cpp: tweak
Takashi Sawanaka [Sat, 21 Dec 2019 03:46:56 +0000 (12:46 +0900)]
Make UI look flatter (2)
Takashi Sawanaka [Sun, 15 Dec 2019 05:43:14 +0000 (14:43 +0900)]
Make UI look more flat
Takashi Sawanaka [Sat, 14 Dec 2019 08:55:33 +0000 (17:55 +0900)]
Merge.cpp: CMergeApp::GetProfile*():
Call COptionsMgr::AddOption () instead of CRegOptionsMgr::InitOption() to avoid writing to the registry
Takashi Sawanaka [Thu, 12 Dec 2019 22:40:43 +0000 (07:40 +0900)]
Merge pull request #236 from StoyanDimitrov/master
Update Bulgarian translation
Стоян Димитров [Thu, 12 Dec 2019 12:12:48 +0000 (14:12 +0200)]
Misc translations
Стоян Димитров [Thu, 12 Dec 2019 10:28:18 +0000 (12:28 +0200)]
Fix wrong translation.
Стоян Димитров [Thu, 12 Dec 2019 08:35:22 +0000 (10:35 +0200)]
Update Bulgarian translation
Takashi Sawanaka [Wed, 11 Dec 2019 21:46:52 +0000 (06:46 +0900)]
Merge pull request #234 from Lippe35/master
Add Portuguese Portugal
Lippe35 [Wed, 11 Dec 2019 00:48:07 +0000 (00:48 +0000)]
Add Portuguese Portugal
Takashi Sawanaka [Tue, 10 Dec 2019 21:49:50 +0000 (06:49 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 10 Dec 2019 21:49:26 +0000 (06:49 +0900)]
Merge pull request #233 from Tichij/master
Update of Lithuanian translation
Takashi Sawanaka [Tue, 10 Dec 2019 21:45:28 +0000 (06:45 +0900)]
Add resource strings
Takashi Sawanaka [Tue, 10 Dec 2019 21:41:05 +0000 (06:41 +0900)]
Fix an issue where the operation of changing the selection on a line with differences is significantly slow (2)
Tichij [Tue, 10 Dec 2019 14:10:32 +0000 (16:10 +0200)]
Update of Lithuanian translation
Takashi Sawanaka [Mon, 9 Dec 2019 13:52:47 +0000 (22:52 +0900)]
Update release notes and changelog for 2.16.5 (2)
Takashi Sawanaka [Sun, 8 Dec 2019 07:56:54 +0000 (16:56 +0900)]
DirView: Fix a crash when clicking Next Difference button after unchecking Show Different Items menu item
Takashi Sawanaka [Sun, 8 Dec 2019 07:41:49 +0000 (16:41 +0900)]
Fix an issue where the operation of changing the selection on a line with differences is significantly slow
Takashi Sawanaka [Sun, 8 Dec 2019 03:09:05 +0000 (12:09 +0900)]
PropEditor.cpp: Since WinMerge of 32bit version does not use DirectWrite, disable the Rendering mode combo box.
Takashi Sawanaka [Sat, 7 Dec 2019 09:26:14 +0000 (18:26 +0900)]
ccrystaltextview.*, ccrystaleditview.*: small optimization
Takashi Sawanaka [Sat, 7 Dec 2019 07:23:22 +0000 (16:23 +0900)]
BCMenu.cpp: small optimization
Takashi Sawanaka [Sat, 7 Dec 2019 07:06:06 +0000 (16:06 +0900)]
Update release notes and changelog for 2.16.5
Takashi Sawanaka [Fri, 6 Dec 2019 23:26:32 +0000 (08:26 +0900)]
ProjectFile.h: Fix a warning
Takashi Sawanaka [Sun, 1 Dec 2019 13:42:58 +0000 (22:42 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 1 Dec 2019 13:41:39 +0000 (22:41 +0900)]
Add support for Color Emoji (WIP) (5)
Takashi Sawanaka [Sun, 1 Dec 2019 13:24:54 +0000 (22:24 +0900)]
Fix issue #229: Program is crashed!
Takashi Sawanaka [Sat, 30 Nov 2019 22:49:51 +0000 (07:49 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sat, 30 Nov 2019 22:41:58 +0000 (07:41 +0900)]
Add support for Color Emoji (WIP) (4)
Takashi Sawanaka [Sat, 30 Nov 2019 09:22:10 +0000 (18:22 +0900)]
Delete unnecessary files
Takashi Sawanaka [Sat, 30 Nov 2019 09:19:51 +0000 (18:19 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sat, 30 Nov 2019 07:28:21 +0000 (16:28 +0900)]
Add support for Color Emoji (WIP) (3)
Takashi Sawanaka [Sat, 30 Nov 2019 00:47:39 +0000 (09:47 +0900)]
Update Merge.*.vcxproj.filters
Takashi Sawanaka [Sat, 30 Nov 2019 00:42:45 +0000 (09:42 +0900)]
Update Finnish translation. Submitted by Veikko Muurikainen
Takashi Sawanaka [Thu, 28 Nov 2019 21:44:43 +0000 (06:44 +0900)]
Bump revision to 2.16.4+-jp-9
Takashi Sawanaka [Thu, 28 Nov 2019 21:42:41 +0000 (06:42 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Thu, 28 Nov 2019 21:41:14 +0000 (06:41 +0900)]
Add support for Color Emoji (WIP) (2)
Takashi Sawanaka [Mon, 25 Nov 2019 22:35:04 +0000 (07:35 +0900)]
Merge pull request #228 from mayswind/master
update Simplified Chinese translation
MaysWind [Mon, 25 Nov 2019 12:52:50 +0000 (20:52 +0800)]
update Simplified Chinese translation
Takashi Sawanaka [Sun, 24 Nov 2019 23:13:01 +0000 (08:13 +0900)]
Bump revision to 2.16.4+-jp-8
Takashi Sawanaka [Sun, 24 Nov 2019 22:59:02 +0000 (07:59 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
# Conflicts:
# Translations/WinMerge/Polish.po
Takashi Sawanaka [Sun, 24 Nov 2019 22:43:43 +0000 (07:43 +0900)]
Add support for Color Emoji (WIP)
Add support for Color Emoji (WIP)
Takashi Sawanaka [Sat, 23 Nov 2019 13:11:49 +0000 (22:11 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (10)
Fixed an issue where Halfwidth Katakana Voiced Sound Mark(U+FF9E) and Halfwidth Katakana Semi-Voiced Sound Mark(U+FF9F) were not treated as one character
Takashi Sawanaka [Sat, 23 Nov 2019 00:53:49 +0000 (09:53 +0900)]
Fix osdn issue #39771: an identifier before an apostrophe is not highlighted.
Takashi Sawanaka [Tue, 19 Nov 2019 14:04:05 +0000 (23:04 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (9)
(cherry picked from commit
c2853eeb37211ade982adabf8df86d7340da7322)
Takashi Sawanaka [Fri, 22 Nov 2019 21:45:16 +0000 (06:45 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Thu, 21 Nov 2019 22:53:10 +0000 (07:53 +0900)]
Merge pull request #225 from Tichij/master
Update of Lithuanian.po. Superfluous space removed
Takashi Sawanaka [Thu, 21 Nov 2019 22:48:54 +0000 (07:48 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Tichij [Thu, 21 Nov 2019 06:34:08 +0000 (08:34 +0200)]
Update of Lithuanian.po. Superfluous space removed
Takashi Sawanaka [Wed, 20 Nov 2019 22:49:57 +0000 (07:49 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Tue, 19 Nov 2019 22:57:55 +0000 (07:57 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Sun, 17 Nov 2019 07:01:14 +0000 (16:01 +0900)]
Fix broken unit tests
(cherry picked from commit
4a3d9dc5448bcc1d95c1e071f0896f134d6c87cc)
Takashi Sawanaka [Mon, 18 Nov 2019 23:04:33 +0000 (08:04 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Sun, 17 Nov 2019 23:12:43 +0000 (08:12 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (9) Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Sun, 17 Nov 2019 23:04:18 +0000 (08:04 +0900)]
Merge pull request #223 from miroslaw-zylewicz/patch-3
Update Polish.po
Mirosław Żylewicz [Sun, 17 Nov 2019 12:09:46 +0000 (13:09 +0100)]
Update Polish.po
Takashi Sawanaka [Thu, 14 Nov 2019 22:56:56 +0000 (07:56 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Wed, 13 Nov 2019 22:57:05 +0000 (07:57 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Tue, 12 Nov 2019 23:20:25 +0000 (08:20 +0900)]
Update English.pot #216
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Tue, 12 Nov 2019 23:15:45 +0000 (08:15 +0900)]
Update English.pot & UpdatePoFilesFromPotFile.vbs #221
Takashi Sawanaka [Tue, 12 Nov 2019 22:39:33 +0000 (07:39 +0900)]
Merge pull request #221 from Tichij/master
Update English.pot & UpdatePoFilesFromPotFile.vbs
Tichij [Tue, 12 Nov 2019 12:44:26 +0000 (14:44 +0200)]
Update English.pot & UpdatePoFilesFromPotFile.vbs
Takashi Sawanaka [Mon, 11 Nov 2019 22:47:51 +0000 (07:47 +0900)]
Update Contributors.txt
Takashi Sawanaka [Mon, 11 Nov 2019 22:45:13 +0000 (07:45 +0900)]
Update English.pot #216
Takashi Sawanaka [Mon, 11 Nov 2019 22:24:24 +0000 (07:24 +0900)]
Merge pull request #220 from miroslaw-zylewicz/patch-2
Update Polish.po
Takashi Sawanaka [Mon, 11 Nov 2019 22:24:14 +0000 (07:24 +0900)]
Merge pull request #219 from miroslaw-zylewicz/master
Add files via upload
Takashi Sawanaka [Mon, 11 Nov 2019 22:23:56 +0000 (07:23 +0900)]
Merge pull request #218 from miroslaw-zylewicz/patch-1
Update Polish.po
Takashi Sawanaka [Mon, 11 Nov 2019 22:23:33 +0000 (07:23 +0900)]
Merge pull request #217 from Tichij/master
Update of Lithuanian translation
Mirosław Żylewicz [Mon, 11 Nov 2019 15:02:16 +0000 (16:02 +0100)]
Update Polish.po
Mirosław Żylewicz [Mon, 11 Nov 2019 14:42:13 +0000 (15:42 +0100)]
Add files via upload
Mirosław Żylewicz [Mon, 11 Nov 2019 13:42:11 +0000 (14:42 +0100)]
Update Polish.po
Typo in a sentence / new translation
Tichij [Mon, 11 Nov 2019 10:41:16 +0000 (12:41 +0200)]
Update of Lithuanian translation
Tichij [Mon, 11 Nov 2019 05:55:08 +0000 (07:55 +0200)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Sun, 10 Nov 2019 23:17:06 +0000 (08:17 +0900)]
Update English.pot #216