OSDN Git Service
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: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:41:58 +0000 (07:41 +0900)]
Add support for Color Emoji (WIP) (4)
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: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 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
Takashi Sawanaka [Sun, 10 Nov 2019 00:58:26 +0000 (09:58 +0900)]
Update English.pot #216
Takashi Sawanaka [Sat, 9 Nov 2019 23:49:54 +0000 (08:49 +0900)]
Merge pull request #216 from Mr-Update/patch-5
Update English.pot
Mr-Update [Sat, 9 Nov 2019 21:50:35 +0000 (22:50 +0100)]
Update English.pot
- missing ellipsis added
- superfluous colons removed
- superfluous space removed
- space added after \t-
- Alt+Ctrl uniformly changed to Ctrl+Alt
- \n added for better appearance
Tichij [Mon, 4 Nov 2019 05:22:52 +0000 (07:22 +0200)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Sun, 3 Nov 2019 23:03:11 +0000 (08:03 +0900)]
Merge pull request #215 from Mr-Update/patch-4
Update German.po
Mr-Update [Sun, 3 Nov 2019 21:57:51 +0000 (22:57 +0100)]
Update German.po
german translation completed, typo fix, spelling and grammar corrected
Tichij [Mon, 28 Oct 2019 07:18:55 +0000 (09:18 +0200)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Sun, 27 Oct 2019 05:38:22 +0000 (14:38 +0900)]
Restore build cache entry in appveyor.yml
Takashi Sawanaka [Sun, 27 Oct 2019 05:32:19 +0000 (14:32 +0900)]
Remove build cache temporarily
Takashi Sawanaka [Sun, 27 Oct 2019 05:28:56 +0000 (14:28 +0900)]
Restore appveyor.yml
Takashi Sawanaka [Sun, 27 Oct 2019 05:27:06 +0000 (14:27 +0900)]
Remove build cache temporarily
Takashi Sawanaka [Sun, 27 Oct 2019 04:56:12 +0000 (13:56 +0900)]
Fix issue #211: [Image compare] Zoom-in focuses on top-left corner instead of cursor position Please enter the commit message for your changes. Lines starting
Takashi Sawanaka [Sun, 27 Oct 2019 04:50:21 +0000 (13:50 +0900)]
Update Bulgarian.po
Takashi Sawanaka [Sat, 26 Oct 2019 00:52:20 +0000 (09:52 +0900)]
Manual: Run HTML Help Compiler via SBAppLocale to fix the mojibake problem in the index tab of WinMergeJapanese.chm.
Tichij [Fri, 25 Oct 2019 04:26:33 +0000 (07:26 +0300)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Thu, 24 Oct 2019 22:44:24 +0000 (07:44 +0900)]
Merge pull request #212 from StoyanDimitrov/master
Update Bulgarian translation of the application
StoyanDimitrov [Thu, 24 Oct 2019 10:51:33 +0000 (10:51 +0000)]
Update Bulgarian.po
Typo
Стоян Димитров [Thu, 24 Oct 2019 10:47:46 +0000 (13:47 +0300)]
Update Bulgarian translation
Стоян Димитров [Thu, 24 Oct 2019 10:25:56 +0000 (13:25 +0300)]
Merge remote-tracking branch 'upstream/master'
Tichij [Wed, 16 Oct 2019 04:34:25 +0000 (07:34 +0300)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Tichij [Tue, 15 Oct 2019 10:32:16 +0000 (13:32 +0300)]
Update of Lithuanian translation
Tichij [Sun, 29 Sep 2019 16:20:03 +0000 (19:20 +0300)]
Update winimerge
Tichij [Tue, 15 Oct 2019 10:32:16 +0000 (13:32 +0300)]
Update of Lithuanian translation
Tichij [Tue, 15 Oct 2019 10:30:33 +0000 (13:30 +0300)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Takashi Sawanaka [Mon, 14 Oct 2019 05:05:09 +0000 (14:05 +0900)]
Fix issue #172: 'Compare Non-horizontally' doesn't support 3-way merge
Takashi Sawanaka [Sun, 13 Oct 2019 07:29:25 +0000 (16:29 +0900)]
Replace dialog: Add Find Prev button to Replace dialog (issue #192)
Takashi Sawanaka [Sun, 13 Oct 2019 04:49:31 +0000 (13:49 +0900)]
Fix issue #202: Switching between "Find Next" and "Find Prev" need to click twice
Kizaemon [Fri, 11 Oct 2019 09:36:54 +0000 (18:36 +0900)]
Limit the window flashing count.
After a lengthy comparison operation the window is flashing indicating the finished operation.
Current setting is to flash the window indefinitely, which is a distraction, as it demands to pay attention immediately.
Other applications are usually flash only few times, which is making sense.
Takashi Sawanaka [Thu, 10 Oct 2019 23:07:41 +0000 (08:07 +0900)]
Update translations
Takashi Sawanaka [Thu, 10 Oct 2019 23:01:25 +0000 (08:01 +0900)]
German.isl: Change the file encoding from UTF-8 to CP-1252
Mr-Update [Thu, 10 Oct 2019 21:51:20 +0000 (23:51 +0200)]
Update German.isl
Mr-Update [Thu, 10 Oct 2019 21:15:02 +0000 (23:15 +0200)]
Update German.po
Sorry for #195
Takashi Sawanaka [Wed, 9 Oct 2019 23:09:20 +0000 (08:09 +0900)]
Fix osdn.net issue #39664: Unexpected behavior when moving caret with CTRL+arrow keys
Takashi Sawanaka [Tue, 8 Oct 2019 22:46:34 +0000 (07:46 +0900)]
Fix sf.net ticket 2234: "Run as Administrator" incompatible with "Shell integration" (ver 2.16.4) (2)
Takashi Sawanaka [Tue, 8 Oct 2019 22:42:34 +0000 (07:42 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 8 Oct 2019 22:42:15 +0000 (07:42 +0900)]
Fix sf.net ticket 2234: "Run as Administrator" incompatible with "Shell integration" (ver 2.16.4)
Tim Gerundt [Tue, 8 Oct 2019 20:22:50 +0000 (22:22 +0200)]
Switch "Find" buttons in Find dialog
Hugo Carvalho [Tue, 8 Oct 2019 13:22:17 +0000 (14:22 +0100)]
Update Portuguese.po
Tim Gerundt [Mon, 7 Oct 2019 21:58:45 +0000 (23:58 +0200)]
Add "Ignore codepage differences" to quick options
pgert [Mon, 7 Oct 2019 08:17:09 +0000 (10:17 +0200)]
Update & Improvements of Swedish translation
Mr-Update [Sat, 5 Oct 2019 21:01:10 +0000 (23:01 +0200)]
Revert "Spelling improved"
Mr-Update [Fri, 4 Oct 2019 20:14:32 +0000 (22:14 +0200)]
Spelling improved
anohren [Sat, 5 Oct 2019 18:14:15 +0000 (20:14 +0200)]
Correct Swedish translation
Correct Swedish ordinals (1st, 2nd, 3rd)
Takashi Sawanaka [Tue, 1 Oct 2019 23:15:14 +0000 (08:15 +0900)]
Fix GitHub issue #191: "Recompare as" menu option doesn't follow current choice (2)
Takashi Sawanaka [Tue, 1 Oct 2019 23:01:55 +0000 (08:01 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 1 Oct 2019 23:00:45 +0000 (08:00 +0900)]
Fix GitHub issue #191: "Recompare as" menu option doesn't follow current choice
Tim Gerundt [Tue, 1 Oct 2019 21:24:49 +0000 (23:24 +0200)]
Manual: Tweak HTML version for smaller screens
Tichij [Sun, 29 Sep 2019 16:20:03 +0000 (19:20 +0300)]
Update winimerge
Tim Gerundt [Tue, 24 Sep 2019 04:00:02 +0000 (06:00 +0200)]
Manual: Fix typo in select_unpacker.xml
Tim Gerundt [Tue, 24 Sep 2019 03:52:35 +0000 (05:52 +0200)]
Manual: Change more URLs from HTTP to HTTPS
Tim Gerundt [Sat, 21 Sep 2019 21:06:07 +0000 (23:06 +0200)]
Manual: Add note about important files to README.md
Tim Gerundt [Sat, 21 Sep 2019 20:53:14 +0000 (22:53 +0200)]
Manual: Tidy XSL files
Tim Gerundt [Thu, 19 Sep 2019 04:02:44 +0000 (06:02 +0200)]
Manual: Adds more ENTITIES like &ManualRevision; or &CopyrightYears;
Tim Gerundt [Thu, 19 Sep 2019 03:54:46 +0000 (05:54 +0200)]
Manual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceables.xml) - DON'T SHARE THE FILE
Tim Gerundt [Wed, 18 Sep 2019 22:18:28 +0000 (00:18 +0200)]
Manual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceables.xml)
Tim Gerundt [Wed, 18 Sep 2019 20:31:57 +0000 (22:31 +0200)]
Manual: Share CSS files between manuals