OSDN Git Service

winmerge-jp/winmerge-jp.git
4 years agoCorrect Swedish translation
anohren [Sat, 5 Oct 2019 18:14:15 +0000 (20:14 +0200)]
Correct Swedish translation

Correct Swedish ordinals (1st, 2nd, 3rd)

4 years agoFix GitHub issue #191: "Recompare as" menu option doesn't follow current choice (2)
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)

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 1 Oct 2019 23:01:55 +0000 (08:01 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoFix GitHub issue #191: "Recompare as" menu option doesn't follow current choice
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

4 years agoManual: Tweak HTML version for smaller screens
Tim Gerundt [Tue, 1 Oct 2019 21:24:49 +0000 (23:24 +0200)]
Manual: Tweak HTML version for smaller screens

4 years agoManual: Fix typo in select_unpacker.xml
Tim Gerundt [Tue, 24 Sep 2019 04:00:02 +0000 (06:00 +0200)]
Manual: Fix typo in select_unpacker.xml

4 years agoManual: Change more URLs from HTTP to HTTPS
Tim Gerundt [Tue, 24 Sep 2019 03:52:35 +0000 (05:52 +0200)]
Manual: Change more URLs from HTTP to HTTPS

4 years agoManual: Add note about important files to README.md
Tim Gerundt [Sat, 21 Sep 2019 21:06:07 +0000 (23:06 +0200)]
Manual: Add note about important files to README.md

4 years agoManual: Tidy XSL files
Tim Gerundt [Sat, 21 Sep 2019 20:53:14 +0000 (22:53 +0200)]
Manual: Tidy XSL files

4 years agoManual: Adds more ENTITIES like &ManualRevision; or &CopyrightYears;
Tim Gerundt [Thu, 19 Sep 2019 04:02:44 +0000 (06:02 +0200)]
Manual: Adds more ENTITIES like &ManualRevision; or &CopyrightYears;

4 years agoManual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceable...
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

4 years agoManual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceable...
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)

4 years agoManual: Share CSS files between manuals
Tim Gerundt [Wed, 18 Sep 2019 20:31:57 +0000 (22:31 +0200)]
Manual: Share CSS files between manuals

4 years agoManual: Share XSL files between manuals - Forgot to add two files :(
Tim Gerundt [Wed, 18 Sep 2019 20:30:42 +0000 (22:30 +0200)]
Manual: Share XSL files between manuals - Forgot to add two files :(

4 years agoManual: Share XSL files between manuals
Tim Gerundt [Wed, 18 Sep 2019 20:19:39 +0000 (22:19 +0200)]
Manual: Share XSL files between manuals

4 years agoUpdate of Lithuanian translation
Tichij [Mon, 23 Sep 2019 11:32:52 +0000 (14:32 +0300)]
Update of Lithuanian translation

4 years agoUpdate BuildArc.cmd
Takashi Sawanaka [Mon, 23 Sep 2019 04:31:38 +0000 (13:31 +0900)]
Update BuildArc.cmd

4 years agoMerge.rc: fine tune positions
Takashi Sawanaka [Mon, 23 Sep 2019 03:38:08 +0000 (12:38 +0900)]
Merge.rc: fine tune positions

4 years agoFix GitHub issue #188: Image compare breaks when zoomed too much with large pictures
Takashi Sawanaka [Mon, 23 Sep 2019 03:01:09 +0000 (12:01 +0900)]
Fix GitHub issue #188: Image compare breaks when zoomed too much with large pictures

4 years agoImplement sf.net ticket #1243: Make unpacker extensions configurable
Takashi Sawanaka [Sun, 22 Sep 2019 01:53:24 +0000 (10:53 +0900)]
Implement sf.net ticket #1243: Make unpacker extensions configurable

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
Takashi Sawanaka [Fri, 20 Sep 2019 23:41:36 +0000 (08:41 +0900)]
Improve UNICODE character support using icu.dll usable from Windows 10 Creators Update (8)

4 years agoSome fixes in French translation
vlakoff [Tue, 17 Sep 2019 01:16:09 +0000 (03:16 +0200)]
Some fixes in French translation

4 years agoFix new manual path in other readme's
Tim Gerundt [Sun, 15 Sep 2019 21:35:44 +0000 (23:35 +0200)]
Fix new manual path in other readme's

4 years agoUpdate Manual README.md
Tim Gerundt [Sun, 15 Sep 2019 21:28:33 +0000 (23:28 +0200)]
Update Manual README.md

4 years agoFix GitHub issue #182: WinMerge toolbar appears too small on UHD and should default...
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

4 years agoUse xsltproc instead of Saxon 6 to support encodings other than UTF-8
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

4 years agoFix CI build (2) winmerge_manual_another_build_tools_v2
Takashi Sawanaka [Fri, 13 Sep 2019 22:53:18 +0000 (07:53 +0900)]
Fix CI build (2)

4 years agoFix CI build
Takashi Sawanaka [Thu, 12 Sep 2019 23:11:28 +0000 (08:11 +0900)]
Fix CI build

4 years agoFix GitHub issue #180: Performance using Unpacker
Takashi Sawanaka [Thu, 12 Sep 2019 23:03:23 +0000 (08:03 +0900)]
Fix GitHub issue #180: Performance using Unpacker

4 years agoUpdate Portuguese.po
Takashi Sawanaka [Thu, 12 Sep 2019 23:01:35 +0000 (08:01 +0900)]
Update Portuguese.po

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Thu, 12 Sep 2019 23:00:09 +0000 (08:00 +0900)]
Update Contributors.txt

4 years agoUpdate Portuguese.po
Hugo Carvalho [Thu, 12 Sep 2019 18:23:58 +0000 (19:23 +0100)]
Update Portuguese.po

4 years agoAdd files via upload
Hugo Carvalho [Thu, 12 Sep 2019 18:20:01 +0000 (19:20 +0100)]
Add files via upload

Updated portuguese translation 100%Done

4 years agoInstaller: Add Japanese manual
Tim Gerundt [Wed, 11 Sep 2019 03:43:11 +0000 (05:43 +0200)]
Installer: Add Japanese manual

4 years agoManual: Rename "WinMerge_help.xml" to "Index.xml"
Tim Gerundt [Wed, 11 Sep 2019 03:42:06 +0000 (05:42 +0200)]
Manual: Rename "WinMerge_help.xml" to "Index.xml"

4 years agoManual: Rename "Shared" folder to "Tools"
Tim Gerundt [Wed, 11 Sep 2019 03:20:55 +0000 (05:20 +0200)]
Manual: Rename "Shared" folder to "Tools"

4 years agoManual: Use new build files in global BuildManual.cmd
Tim Gerundt [Tue, 10 Sep 2019 22:09:18 +0000 (00:09 +0200)]
Manual: Use new build files in global BuildManual.cmd

4 years agoManual: Drop unused Manual.xsl files
Tim Gerundt [Tue, 10 Sep 2019 22:03:36 +0000 (00:03 +0200)]
Manual: Drop unused Manual.xsl files

4 years agoManual: Drop "build" from XSL file names
Tim Gerundt [Tue, 10 Sep 2019 22:02:50 +0000 (00:02 +0200)]
Manual: Drop "build" from XSL file names

4 years agoManual: Drop Windows 9x support from htmlhelp batch files
Tim Gerundt [Tue, 10 Sep 2019 21:12:51 +0000 (23:12 +0200)]
Manual: Drop Windows 9x support from htmlhelp batch files

4 years agoManual: Move batch files up and use "Shared" folder for the build tools
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

4 years agoManual: Delete "build.bat" files
Tim Gerundt [Sun, 8 Sep 2019 18:26:20 +0000 (20:26 +0200)]
Manual: Delete "build.bat" files

4 years agoManual: Move README a folder up
Tim Gerundt [Sun, 8 Sep 2019 18:22:49 +0000 (20:22 +0200)]
Manual: Move README a folder up

4 years agoManual: Move English Manual to new place
Tim Gerundt [Fri, 6 Sep 2019 03:59:54 +0000 (05:59 +0200)]
Manual: Move English Manual to new place

4 years agoManual: Add build files for JP manual
Tim Gerundt [Fri, 6 Sep 2019 03:55:42 +0000 (05:55 +0200)]
Manual: Add build files for JP manual

4 years agoAdd Japanese Manual from Takashi Sawanaka
Tim Gerundt [Thu, 5 Sep 2019 04:05:23 +0000 (06:05 +0200)]
Add Japanese Manual from Takashi Sawanaka

4 years agoTimeSizeCompare.cpp: Fix GitHub issue #132: Files marked as different in "Modified...
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)

4 years agoTimeSizeCompare.cpp: Fix GitHub issue #132: Files marked as different in "Modified...
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

4 years agoFix GitHub issue #176: Windows 10 shell integration not working
Takashi Sawanaka [Wed, 4 Sep 2019 13:49:45 +0000 (22:49 +0900)]
Fix GitHub issue #176: Windows 10 shell integration not working

4 years agoFix translations in codepage change dialog
Стоян Димитров [Tue, 3 Sep 2019 12:37:09 +0000 (15:37 +0300)]
Fix translations in codepage change dialog

4 years agoFix translation in quick settings toolbar menu. Fixed general error message.
Стоян Димитров [Wed, 28 Aug 2019 07:53:26 +0000 (10:53 +0300)]
Fix translation in quick settings toolbar menu. Fixed general error message.

4 years agoAdd stoyan to Contributors.txt
Takashi Sawanaka [Mon, 2 Sep 2019 15:02:55 +0000 (00:02 +0900)]
Add stoyan to Contributors.txt

4 years agoRemove .hgeol, .hgignore, hg_clone.cmd
Takashi Sawanaka [Sun, 1 Sep 2019 22:40:24 +0000 (07:40 +0900)]
Remove .hgeol, .hgignore, hg_clone.cmd

4 years agoUpdate .gitignore
Takashi Sawanaka [Sun, 1 Sep 2019 11:13:33 +0000 (20:13 +0900)]
Update .gitignore

4 years agoUpdate Bulgarian.po
Takashi Sawanaka [Sun, 1 Sep 2019 11:12:33 +0000 (20:12 +0900)]
Update Bulgarian.po

4 years agoAdd .gitattributes
Takashi Sawanaka [Sun, 1 Sep 2019 10:14:38 +0000 (19:14 +0900)]
Add .gitattributes

4 years agoMergeEditView.cpp: Fix an issue where WinMerge couldn't merge deleted word level...
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

4 years agoMergeDoc.cpp: Fixes an issue where the command line option /al, /am, or /ar does...
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

4 years agoFix a crash when merging selections if the last line of the selection is a different...
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

4 years agoTidy and move InnoSetup localization instructions
Tim Gerundt [Fri, 30 Aug 2019 22:30:20 +0000 (00:30 +0200)]
Tidy and move InnoSetup localization instructions

4 years agoConvert main docs HTML file to Markdown
Tim Gerundt [Fri, 30 Aug 2019 22:08:46 +0000 (00:08 +0200)]
Convert main docs HTML file to Markdown

4 years agoConvert more docs HTML to Markdown
Tim Gerundt [Fri, 30 Aug 2019 22:00:17 +0000 (00:00 +0200)]
Convert more docs HTML to Markdown

4 years agoSwitch Logo readme to Markdown
Tim Gerundt [Fri, 30 Aug 2019 21:44:06 +0000 (23:44 +0200)]
Switch Logo readme to Markdown

4 years agoConvert readme-manual.html to Markdown and move to Manual folder
Tim Gerundt [Wed, 28 Aug 2019 20:29:56 +0000 (22:29 +0200)]
Convert readme-manual.html to Markdown and move to Manual folder

4 years agoMerge branch 'master' of https://github.com/WinMerge/winmerge
Tim Gerundt [Wed, 28 Aug 2019 19:40:57 +0000 (21:40 +0200)]
Merge branch 'master' of https://github.com/WinMerge/winmerge

4 years agoFix translation in quick settings toolbar menu. Fixed general error message.
Стоян Димитров [Wed, 28 Aug 2019 07:53:26 +0000 (10:53 +0300)]
Fix translation in quick settings toolbar menu. Fixed general error message.

4 years agoFix issue GitHub issue #174: Drop ReadMe.txt from start menu and installation
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

4 years agoAdd global license file
Tim Gerundt [Sun, 25 Aug 2019 20:39:03 +0000 (22:39 +0200)]
Add global license file

4 years agoAdd global license file
Tim Gerundt [Sun, 25 Aug 2019 20:39:03 +0000 (22:39 +0200)]
Add global license file

4 years agoAdd submodules
Takashi Sawanaka [Sun, 25 Aug 2019 15:13:15 +0000 (00:13 +0900)]
Add submodules

4 years agoWinMerge project moved to GitHub
Takashi Sawanaka [Sun, 25 Aug 2019 03:27:08 +0000 (12:27 +0900)]
WinMerge project moved to GitHub

4 years agoManual: Drop out-dated Quick Tour Merge7z1900.1 ShellExtension1.17.9.0 winmerge_manual_build_tools_v1
Tim Gerundt [Tue, 20 Aug 2019 22:09:50 +0000 (00:09 +0200)]
Manual: Drop out-dated Quick Tour

4 years agoManual: Use variablelist in Command Line page
Tim Gerundt [Tue, 20 Aug 2019 22:03:46 +0000 (00:03 +0200)]
Manual: Use variablelist in Command Line page

4 years agoManual: Drop Project files details from Quick start
Tim Gerundt [Tue, 20 Aug 2019 21:26:27 +0000 (23:26 +0200)]
Manual: Drop Project files details from Quick start

4 years agoManual: Use more sections in Quick start
Tim Gerundt [Tue, 20 Aug 2019 21:24:12 +0000 (23:24 +0200)]
Manual: Use more sections in Quick start

4 years agoEditLib: Expand tabs to spaces
Takashi Sawanaka [Sun, 18 Aug 2019 12:40:49 +0000 (21:40 +0900)]
EditLib: Expand tabs to spaces

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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)

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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)

4 years agocrystalparser.cpp: Give up now to use ICU in CCrystalParser::WrapLine () for performa...
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

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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)

4 years agoMerge with ICU
Takashi Sawanaka [Fri, 16 Aug 2019 04:45:17 +0000 (13:45 +0900)]
Merge with ICU

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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

4 years agoUse https://github.com/termux/wcwidth instead of http://www.cl.cam.ac.uk/~mgk25/ucs...
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

4 years agoEditLib: Reduce calls to SaveDC() and RestoreDC() to make drawing faster
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

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Updat...
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

4 years agoImprove UNICODE character support using icu.dll usable from Windows 10 Creators Update
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

4 years agoFix GitHub issue #171: Suspicious lack of Release() calls in lwdisp.c (2)
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)

4 years agoFix GitHub issue #171: Suspicious lack of Release() calls in lwdisp.c
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

4 years agoGUITests: Add more tests (6)
Takashi Sawanaka [Sun, 11 Aug 2019 10:32:15 +0000 (19:32 +0900)]
GUITests: Add more tests (6)

4 years agoFix GitHub issue #107: [WEBSITE] Change the HTTP to HTTPS
Takashi Sawanaka [Sat, 10 Aug 2019 09:03:08 +0000 (18:03 +0900)]
Fix GitHub issue #107: [WEBSITE] Change the HTTP to HTTPS

4 years agoGUITests: Add more tests (5)
Takashi Sawanaka [Sun, 4 Aug 2019 14:26:54 +0000 (23:26 +0900)]
GUITests: Add more tests (5)

4 years agoMerged in default (pull request #56)
Takashi Sawanaka [Fri, 2 Aug 2019 22:17:24 +0000 (22:17 +0000)]
Merged in default (pull request #56)

Installer: Update German translation

4 years agoMerged in default (pull request #55)
Takashi Sawanaka [Fri, 2 Aug 2019 22:16:50 +0000 (22:16 +0000)]
Merged in default (pull request #55)

Minor improvements of Lithuanian translation

4 years agoUpdate Bulgarian l10n, application only
Стоян Димитров [Fri, 2 Aug 2019 10:52:19 +0000 (13:52 +0300)]
Update Bulgarian l10n, application only

4 years agoInstaller: Update German translation
Tim Gerundt [Fri, 2 Aug 2019 21:25:02 +0000 (23:25 +0200)]
Installer: Update German translation

4 years agoMinor improvements of Lithuanian translation
Tichij [Fri, 2 Aug 2019 04:40:08 +0000 (07:40 +0300)]
Minor improvements of Lithuanian translation

4 years agoBump revision to 2.16.5
Takashi Sawanaka [Thu, 1 Aug 2019 22:42:04 +0000 (07:42 +0900)]
Bump revision to 2.16.5

4 years agoUpdate Italian.po
Takashi Sawanaka [Thu, 1 Aug 2019 22:40:22 +0000 (07:40 +0900)]
Update Italian.po

4 years agoChanged symbols in Newer/Older column for better visual clarity
ex [Thu, 1 Aug 2019 17:36:53 +0000 (12:36 -0500)]
Changed symbols in Newer/Older column for better visual clarity