OSDN Git Service
Tim Gerundt [Sun, 15 Sep 2019 21:28:33 +0000 (23:28 +0200)]
Update Manual README.md
Takashi Sawanaka [Sun, 15 Sep 2019 03:44:05 +0000 (12:44 +0900)]
Fix GitHub issue #182: WinMerge toolbar appears too small on UHD and should default to the conforming Windows 10 scaling/DPI accessibility setting
Takashi Sawanaka [Sun, 15 Sep 2019 02:12:01 +0000 (11:12 +0900)]
Use xsltproc instead of Saxon 6 to support encodings other than UTF-8
Takashi Sawanaka [Fri, 13 Sep 2019 22:53:18 +0000 (07:53 +0900)]
Fix CI build (2)
Takashi Sawanaka [Thu, 12 Sep 2019 23:11:28 +0000 (08:11 +0900)]
Fix CI build
Takashi Sawanaka [Thu, 12 Sep 2019 23:03:23 +0000 (08:03 +0900)]
Fix GitHub issue #180: Performance using Unpacker
Takashi Sawanaka [Thu, 12 Sep 2019 23:01:35 +0000 (08:01 +0900)]
Update Portuguese.po
Takashi Sawanaka [Thu, 12 Sep 2019 23:00:09 +0000 (08:00 +0900)]
Update Contributors.txt
Hugo Carvalho [Thu, 12 Sep 2019 18:23:58 +0000 (19:23 +0100)]
Update Portuguese.po
Hugo Carvalho [Thu, 12 Sep 2019 18:20:01 +0000 (19:20 +0100)]
Add files via upload
Updated portuguese translation 100%Done
Tim Gerundt [Wed, 11 Sep 2019 03:43:11 +0000 (05:43 +0200)]
Installer: Add Japanese manual
Tim Gerundt [Wed, 11 Sep 2019 03:42:06 +0000 (05:42 +0200)]
Manual: Rename "WinMerge_help.xml" to "Index.xml"
Tim Gerundt [Wed, 11 Sep 2019 03:20:55 +0000 (05:20 +0200)]
Manual: Rename "Shared" folder to "Tools"
Tim Gerundt [Tue, 10 Sep 2019 22:09:18 +0000 (00:09 +0200)]
Manual: Use new build files in global BuildManual.cmd
Tim Gerundt [Tue, 10 Sep 2019 22:03:36 +0000 (00:03 +0200)]
Manual: Drop unused Manual.xsl files
Tim Gerundt [Tue, 10 Sep 2019 22:02:50 +0000 (00:02 +0200)]
Manual: Drop "build" from XSL file names
Tim Gerundt [Tue, 10 Sep 2019 21:12:51 +0000 (23:12 +0200)]
Manual: Drop Windows 9x support from htmlhelp batch files
Tim Gerundt [Tue, 10 Sep 2019 21:06:57 +0000 (23:06 +0200)]
Manual: Move batch files up and use "Shared" folder for the build tools
Tim Gerundt [Sun, 8 Sep 2019 18:26:20 +0000 (20:26 +0200)]
Manual: Delete "build.bat" files
Tim Gerundt [Sun, 8 Sep 2019 18:22:49 +0000 (20:22 +0200)]
Manual: Move README a folder up
Tim Gerundt [Fri, 6 Sep 2019 03:59:54 +0000 (05:59 +0200)]
Manual: Move English Manual to new place
Tim Gerundt [Fri, 6 Sep 2019 03:55:42 +0000 (05:55 +0200)]
Manual: Add build files for JP manual
Tim Gerundt [Thu, 5 Sep 2019 04:05:23 +0000 (06:05 +0200)]
Add Japanese Manual from Takashi Sawanaka
Takashi Sawanaka [Sun, 8 Sep 2019 05:07:19 +0000 (14:07 +0900)]
TimeSizeCompare.cpp: Fix GitHub issue #132: Files marked as different in "Modified Date" compare mode although modification dates are equal (2)
Takashi Sawanaka [Sat, 7 Sep 2019 06:25:30 +0000 (15:25 +0900)]
TimeSizeCompare.cpp: Fix GitHub issue #132: Files marked as different in "Modified Date" compare mode although modification dates are equal
Takashi Sawanaka [Wed, 4 Sep 2019 13:49:45 +0000 (22:49 +0900)]
Fix GitHub issue #176: Windows 10 shell integration not working
Стоян Димитров [Tue, 3 Sep 2019 12:37:09 +0000 (15:37 +0300)]
Fix translations in codepage change dialog
Стоян Димитров [Wed, 28 Aug 2019 07:53:26 +0000 (10:53 +0300)]
Fix translation in quick settings toolbar menu. Fixed general error message.
Takashi Sawanaka [Mon, 2 Sep 2019 15:02:55 +0000 (00:02 +0900)]
Add stoyan to Contributors.txt
Takashi Sawanaka [Sun, 1 Sep 2019 22:40:24 +0000 (07:40 +0900)]
Remove .hgeol, .hgignore, hg_clone.cmd
Takashi Sawanaka [Sun, 1 Sep 2019 11:13:33 +0000 (20:13 +0900)]
Update .gitignore
Takashi Sawanaka [Sun, 1 Sep 2019 11:12:33 +0000 (20:12 +0900)]
Update Bulgarian.po
Takashi Sawanaka [Sun, 1 Sep 2019 10:14:38 +0000 (19:14 +0900)]
Add .gitattributes
Takashi Sawanaka [Sun, 1 Sep 2019 07:28:33 +0000 (16:28 +0900)]
MergeEditView.cpp: Fix an issue where WinMerge couldn't merge deleted word level diff at the beginning of a line when merging selections
Takashi Sawanaka [Sun, 1 Sep 2019 07:12:11 +0000 (16:12 +0900)]
MergeDoc.cpp: Fixes an issue where the command line option /al, /am, or /ar does not move the cursor to the first conflict line
Takashi Sawanaka [Sun, 1 Sep 2019 00:21:03 +0000 (09:21 +0900)]
Fix a crash when merging selections if the last line of the selection is a different line and the other side is a ghost line
Tim Gerundt [Fri, 30 Aug 2019 22:30:20 +0000 (00:30 +0200)]
Tidy and move InnoSetup localization instructions
Tim Gerundt [Fri, 30 Aug 2019 22:08:46 +0000 (00:08 +0200)]
Convert main docs HTML file to Markdown
Tim Gerundt [Fri, 30 Aug 2019 22:00:17 +0000 (00:00 +0200)]
Convert more docs HTML to Markdown
Tim Gerundt [Fri, 30 Aug 2019 21:44:06 +0000 (23:44 +0200)]
Switch Logo readme to Markdown
Tim Gerundt [Wed, 28 Aug 2019 20:29:56 +0000 (22:29 +0200)]
Convert readme-manual.html to Markdown and move to Manual folder
Tim Gerundt [Wed, 28 Aug 2019 19:40:57 +0000 (21:40 +0200)]
Merge branch 'master' of https://github.com/WinMerge/winmerge
Стоян Димитров [Wed, 28 Aug 2019 07:53:26 +0000 (10:53 +0300)]
Fix translation in quick settings toolbar menu. Fixed general error message.
Takashi Sawanaka [Tue, 27 Aug 2019 22:38:49 +0000 (07:38 +0900)]
Fix issue GitHub issue #174: Drop ReadMe.txt from start menu and installation
- Drop ReadMe.txt form start menu
- Remove Archive Support section from ReadMe.txt
Tim Gerundt [Sun, 25 Aug 2019 20:39:03 +0000 (22:39 +0200)]
Add global license file
Tim Gerundt [Sun, 25 Aug 2019 20:39:03 +0000 (22:39 +0200)]
Add global license file
Takashi Sawanaka [Sun, 25 Aug 2019 15:13:15 +0000 (00:13 +0900)]
Add submodules
Takashi Sawanaka [Sun, 25 Aug 2019 03:27:08 +0000 (12:27 +0900)]
WinMerge project moved to GitHub
Tim Gerundt [Tue, 20 Aug 2019 22:09:50 +0000 (00:09 +0200)]
Manual: Drop out-dated Quick Tour
Tim Gerundt [Tue, 20 Aug 2019 22:03:46 +0000 (00:03 +0200)]
Manual: Use variablelist in Command Line page
Tim Gerundt [Tue, 20 Aug 2019 21:26:27 +0000 (23:26 +0200)]
Manual: Drop Project files details from Quick start
Tim Gerundt [Tue, 20 Aug 2019 21:24:12 +0000 (23:24 +0200)]
Manual: Use more sections in Quick start
Takashi Sawanaka [Sun, 18 Aug 2019 12:40:49 +0000 (21:40 +0900)]
EditLib: Expand tabs to spaces
Takashi Sawanaka [Sun, 18 Aug 2019 11:40:44 +0000 (20:40 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (7)
Takashi Sawanaka [Sun, 18 Aug 2019 02:43:57 +0000 (11:43 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (6)
Takashi Sawanaka [Sat, 17 Aug 2019 00:29:58 +0000 (09:29 +0900)]
crystalparser.cpp: Give up now to use ICU in CCrystalParser::WrapLine () for performance regression
Takashi Sawanaka [Fri, 16 Aug 2019 12:49:49 +0000 (21:49 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (5)
Takashi Sawanaka [Fri, 16 Aug 2019 04:45:17 +0000 (13:45 +0900)]
Merge with ICU
Takashi Sawanaka [Fri, 16 Aug 2019 01:21:30 +0000 (10:21 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (4)
--HG--
branch : ICU
Takashi Sawanaka [Thu, 15 Aug 2019 07:20:23 +0000 (16:20 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (3)
--HG--
branch : ICU
Takashi Sawanaka [Thu, 15 Aug 2019 05:21:43 +0000 (14:21 +0900)]
Use https://github.com/termux/wcwidth instead of cl.cam.ac.uk/~mgk25/ucs/wcwidth.c for emoji support
--HG--
branch : ICU
Takashi Sawanaka [Thu, 15 Aug 2019 01:40:14 +0000 (10:40 +0900)]
EditLib: Reduce calls to SaveDC() and RestoreDC() to make drawing faster
--HG--
branch : ICU
Takashi Sawanaka [Thu, 15 Aug 2019 00:13:55 +0000 (09:13 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (2)
--HG--
branch : ICU
Takashi Sawanaka [Wed, 14 Aug 2019 15:21:38 +0000 (00:21 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update
--HG--
branch : ICU
Takashi Sawanaka [Tue, 13 Aug 2019 12:58:13 +0000 (21:58 +0900)]
Fix GitHub issue #171: Suspicious lack of Release() calls in lwdisp.c (2)
Takashi Sawanaka [Tue, 13 Aug 2019 03:15:21 +0000 (12:15 +0900)]
Fix GitHub issue #171: Suspicious lack of Release() calls in lwdisp.c
Takashi Sawanaka [Sun, 11 Aug 2019 10:32:15 +0000 (19:32 +0900)]
GUITests: Add more tests (6)
Takashi Sawanaka [Sat, 10 Aug 2019 09:03:08 +0000 (18:03 +0900)]
Fix GitHub issue #107: [WEBSITE] Change the HTTP to HTTPS
Takashi Sawanaka [Sun, 4 Aug 2019 14:26:54 +0000 (23:26 +0900)]
GUITests: Add more tests (5)
Takashi Sawanaka [Fri, 2 Aug 2019 22:17:24 +0000 (22:17 +0000)]
Merged in default (pull request #56)
Installer: Update German translation
Takashi Sawanaka [Fri, 2 Aug 2019 22:16:50 +0000 (22:16 +0000)]
Merged in default (pull request #55)
Minor improvements of Lithuanian translation
Стоян Димитров [Fri, 2 Aug 2019 10:52:19 +0000 (13:52 +0300)]
Update Bulgarian l10n, application only
Tim Gerundt [Fri, 2 Aug 2019 21:25:02 +0000 (23:25 +0200)]
Installer: Update German translation
Tichij [Fri, 2 Aug 2019 04:40:08 +0000 (07:40 +0300)]
Minor improvements of Lithuanian translation
Takashi Sawanaka [Thu, 1 Aug 2019 22:42:04 +0000 (07:42 +0900)]
Bump revision to 2.16.5
Takashi Sawanaka [Thu, 1 Aug 2019 22:40:22 +0000 (07:40 +0900)]
Update Italian.po
ex [Thu, 1 Aug 2019 17:36:53 +0000 (12:36 -0500)]
Changed symbols in Newer/Older column for better visual clarity
Takashi Sawanaka [Thu, 1 Aug 2019 15:53:26 +0000 (00:53 +0900)]
Installer: Reduce InnoSetup compiler warnings
Takashi Sawanaka [Thu, 1 Aug 2019 15:48:25 +0000 (00:48 +0900)]
GitHub issue #167: Installer - Proposal - Separate Inno Setup strings from WinMerge installer strings (2)
Takashi Sawanaka [Wed, 31 Jul 2019 22:48:29 +0000 (07:48 +0900)]
GitHub issue #167: Installer - Proposal - Separate Inno Setup strings from WinMerge installer strings
- Use .isl files for each language supplied with Inno Setup, if available
Takashi Sawanaka [Tue, 30 Jul 2019 21:29:06 +0000 (06:29 +0900)]
Installer: Update WinMerge*.iss (added Italian Readme) (3)
Takashi Sawanaka [Tue, 30 Jul 2019 17:50:24 +0000 (02:50 +0900)]
ReadMe-Italian.txt: Change the file encoding from UTF-8 to CP1252
NekoKoneko [Tue, 30 Jul 2019 07:32:54 +0000 (10:32 +0300)]
Fixed Russian installer translation
The https://github.com/WinMerge/winmerge-v2/commit/
ee8a2d7e2f0cf74348b2231a231d23e721328a94 commit broke capital letters in Russian installer translation: ASCII codes for capital letters from А to Ю are off by 64. Additionally, the lowercase я became capital letter Я (ASCII code off by 32).
Takashi Sawanaka [Mon, 29 Jul 2019 22:55:54 +0000 (07:55 +0900)]
Merge
Takashi Sawanaka [Mon, 29 Jul 2019 22:53:32 +0000 (07:53 +0900)]
Installer: Update WinMerge*.iss (added Italian Readme) (2)
Takashi Sawanaka [Mon, 29 Jul 2019 22:50:13 +0000 (07:50 +0900)]
Update Contributors.txt
Tim Gerundt [Mon, 29 Jul 2019 20:47:05 +0000 (22:47 +0200)]
Use echo commands in BuildArc.cmd
bovirus [Mon, 29 Jul 2019 15:17:30 +0000 (17:17 +0200)]
Updated Italian GUI language
bovirus [Mon, 29 Jul 2019 15:15:57 +0000 (17:15 +0200)]
Update WinMergeX64.iss (added Italian Readme)
bovirus [Mon, 29 Jul 2019 15:14:41 +0000 (17:14 +0200)]
Update WinMerge.iss (added Readme Italian)
bovirus [Mon, 29 Jul 2019 15:13:28 +0000 (17:13 +0200)]
Update WinMergeX64.is6.is (added Italian Readme)
bovirus [Mon, 29 Jul 2019 15:08:03 +0000 (17:08 +0200)]
Revise shell extension Italian language
bovirus [Mon, 29 Jul 2019 15:06:36 +0000 (17:06 +0200)]
Add Readme (Italian) text file
Takashi Sawanaka [Mon, 29 Jul 2019 14:33:09 +0000 (23:33 +0900)]
Italian.isl: Change the file encoding from UTF-8 to CP1252
bovirus [Mon, 29 Jul 2019 13:17:37 +0000 (15:17 +0200)]
Update Italian Installer language
Please take care that github report the t file is code as ISO8859.
For me should be as UTF-8
Takashi Sawanaka [Sun, 28 Jul 2019 12:42:33 +0000 (21:42 +0900)]
GUITests: Add more tests (5)
Takashi Sawanaka [Sun, 28 Jul 2019 07:02:53 +0000 (16:02 +0900)]
Compare Statistics dialog: The number of diff folders was counted in the number of diff files
Takashi Sawanaka [Sun, 28 Jul 2019 04:17:20 +0000 (13:17 +0900)]
Update release notes and changelog for 2.16.4
Takashi Sawanaka [Sun, 28 Jul 2019 04:15:59 +0000 (13:15 +0900)]
Bump revision to 2.16.4
Takashi Sawanaka [Sat, 27 Jul 2019 11:12:07 +0000 (20:12 +0900)]
FolderCompare: Fix the problem that folders may not be compared correctly when selecting folders and selecting 'View / Refresh Selected' menu item