OSDN Git Service

winmerge-jp/winmerge-jp.git
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

4 years agoInstaller: Reduce InnoSetup compiler warnings
Takashi Sawanaka [Thu, 1 Aug 2019 15:53:26 +0000 (00:53 +0900)]
Installer: Reduce InnoSetup compiler warnings

4 years agoGitHub issue #167: Installer - Proposal - Separate Inno Setup strings from WinMerge...
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)

4 years agoGitHub issue #167: Installer - Proposal - Separate Inno Setup strings from WinMerge...
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

4 years agoInstaller: Update WinMerge*.iss (added Italian Readme) (3)
Takashi Sawanaka [Tue, 30 Jul 2019 21:29:06 +0000 (06:29 +0900)]
Installer: Update WinMerge*.iss (added Italian Readme) (3)

4 years agoReadMe-Italian.txt: Change the file encoding from UTF-8 to CP1252
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

4 years agoFixed Russian installer translation
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).

4 years agoMerge
Takashi Sawanaka [Mon, 29 Jul 2019 22:55:54 +0000 (07:55 +0900)]
Merge

4 years agoInstaller: Update WinMerge*.iss (added Italian Readme) (2)
Takashi Sawanaka [Mon, 29 Jul 2019 22:53:32 +0000 (07:53 +0900)]
Installer: Update WinMerge*.iss (added Italian Readme) (2)

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 29 Jul 2019 22:50:13 +0000 (07:50 +0900)]
Update Contributors.txt

4 years agoUse echo commands in BuildArc.cmd
Tim Gerundt [Mon, 29 Jul 2019 20:47:05 +0000 (22:47 +0200)]
Use echo commands in BuildArc.cmd

4 years agoUpdated Italian GUI language
bovirus [Mon, 29 Jul 2019 15:17:30 +0000 (17:17 +0200)]
Updated Italian GUI language

4 years agoUpdate WinMergeX64.iss (added Italian Readme)
bovirus [Mon, 29 Jul 2019 15:15:57 +0000 (17:15 +0200)]
Update WinMergeX64.iss (added Italian Readme)

4 years agoUpdate WinMerge.iss (added Readme Italian)
bovirus [Mon, 29 Jul 2019 15:14:41 +0000 (17:14 +0200)]
Update WinMerge.iss (added Readme Italian)

4 years agoUpdate WinMergeX64.is6.is (added Italian Readme)
bovirus [Mon, 29 Jul 2019 15:13:28 +0000 (17:13 +0200)]
Update WinMergeX64.is6.is (added Italian Readme)

4 years agoRevise shell extension Italian language
bovirus [Mon, 29 Jul 2019 15:08:03 +0000 (17:08 +0200)]
Revise shell extension Italian language

4 years agoAdd Readme (Italian) text file
bovirus [Mon, 29 Jul 2019 15:06:36 +0000 (17:06 +0200)]
Add Readme (Italian) text file

4 years agoItalian.isl: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Mon, 29 Jul 2019 14:33:09 +0000 (23:33 +0900)]
Italian.isl: Change the file encoding from UTF-8 to CP1252

4 years agoUpdate Italian Installer language
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

4 years agoGUITests: Add more tests (5)
Takashi Sawanaka [Sun, 28 Jul 2019 12:42:33 +0000 (21:42 +0900)]
GUITests: Add more tests (5)

4 years agoCompare Statistics dialog: The number of diff folders was counted in the number of...
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

4 years agoUpdate release notes and changelog for 2.16.4
Takashi Sawanaka [Sun, 28 Jul 2019 04:17:20 +0000 (13:17 +0900)]
Update release notes and changelog for 2.16.4

4 years agoBump revision to 2.16.4
Takashi Sawanaka [Sun, 28 Jul 2019 04:15:59 +0000 (13:15 +0900)]
Bump revision to 2.16.4

4 years agoFolderCompare: Fix the problem that folders may not be compared correctly when select...
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

4 years agoGUITests: Add more tests (4)
Takashi Sawanaka [Sat, 27 Jul 2019 05:20:22 +0000 (14:20 +0900)]
GUITests: Add more tests (4)

4 years agoGUITests: Take a screenshot after selecting a menu item
Takashi Sawanaka [Thu, 25 Jul 2019 23:12:30 +0000 (08:12 +0900)]
GUITests: Take a screenshot after selecting a menu item

4 years agoDrop some unused custom messages from InnoSetup files
Tim Gerundt [Wed, 24 Jul 2019 04:11:07 +0000 (06:11 +0200)]
Drop some unused custom messages from InnoSetup files

4 years agoBackport some InnoSetup translation from InnoSetup itself
Tim Gerundt [Wed, 24 Jul 2019 04:05:13 +0000 (06:05 +0200)]
Backport some InnoSetup translation from InnoSetup itself

4 years agoGUITests: Add more tests (3)
Takashi Sawanaka [Wed, 24 Jul 2019 14:47:53 +0000 (23:47 +0900)]
GUITests: Add more tests (3)

4 years agoBitbucket-jp issue #16: PrediffLineFilter.sct: Fix wrong encoding
Takashi Sawanaka [Tue, 23 Jul 2019 22:29:02 +0000 (07:29 +0900)]
Bitbucket-jp issue #16: PrediffLineFilter.sct: Fix wrong encoding

4 years agoGUITests: Add more tests (2)
Takashi Sawanaka [Mon, 22 Jul 2019 23:17:05 +0000 (08:17 +0900)]
GUITests: Add more tests (2)

4 years agoGUITests: Add more tests
Takashi Sawanaka [Mon, 22 Jul 2019 13:55:40 +0000 (22:55 +0900)]
GUITests: Add more tests

4 years agoMerge.rc: Remove the "Edit with Unpacker ..." menu item in the MainFrame menu that...
Takashi Sawanaka [Mon, 22 Jul 2019 13:17:12 +0000 (22:17 +0900)]
Merge.rc: Remove the "Edit with Unpacker ..." menu item in the MainFrame menu that can not be clicked.

4 years agoAdd GUITests project
Takashi Sawanaka [Sun, 21 Jul 2019 22:31:10 +0000 (07:31 +0900)]
Add GUITests project

4 years agoFix an issue where the Window/Close All menu item is not enabled when only the Open...
Takashi Sawanaka [Sun, 21 Jul 2019 10:24:00 +0000 (19:24 +0900)]
Fix an issue where the Window/Close All menu item is not enabled when only the Open dialog window is open

5 years agoBuildManual.cmd: Remove unneccessary mkdir command call
Takashi Sawanaka [Wed, 17 Jul 2019 22:29:50 +0000 (07:29 +0900)]
BuildManual.cmd: Remove unneccessary mkdir command call

5 years agoManual/build/build*.bat: Make the batch file executable outside of the Manual/build...
Takashi Sawanaka [Mon, 15 Jul 2019 22:53:02 +0000 (07:53 +0900)]
Manual/build/build*.bat: Make the batch file executable outside of the Manual/build directory

5 years agoUpdate translation
Takashi Sawanaka [Sun, 14 Jul 2019 14:12:36 +0000 (23:12 +0900)]
Update translation

5 years agoInstaller: Remove ExeName and WinMergeExeName function
Takashi Sawanaka [Sun, 14 Jul 2019 08:50:54 +0000 (17:50 +0900)]
Installer: Remove ExeName and WinMergeExeName function

5 years agoInstaller: Avoid requiring a restart of Explorer If the version of ShellExtension...
Takashi Sawanaka [Sat, 13 Jul 2019 07:50:34 +0000 (16:50 +0900)]
Installer: Avoid requiring a restart of Explorer If the version of ShellExtension has not changed

5 years agoContributors.txt: Replace 'at' in the email address with @
Takashi Sawanaka [Sat, 13 Jul 2019 02:16:44 +0000 (11:16 +0900)]
Contributors.txt: Replace 'at' in the email address with @
https://bitbucket.org/winmerge/winmerge/commits/39d00e08f6afc13ab18f79c01f8b33df10579973#comment-7697152

5 years agoMerge
Takashi Sawanaka [Fri, 12 Jul 2019 21:47:26 +0000 (06:47 +0900)]
Merge

5 years agoUpdate Contributors.txt
Takashi Sawanaka [Fri, 12 Jul 2019 21:45:50 +0000 (06:45 +0900)]
Update Contributors.txt

5 years agoMerged in Michele-Locati/update-italian-translation-1562942301965 (pull request #52)
Takashi Sawanaka [Fri, 12 Jul 2019 21:41:56 +0000 (21:41 +0000)]
Merged in Michele-Locati/update-italian-translation-1562942301965 (pull request #52)

Update Italian translation

5 years agoUpdate Italian translation
Michele Locati [Fri, 12 Jul 2019 14:39:07 +0000 (14:39 +0000)]
Update Italian translation

--HG--
branch : Michele-Locati/update-italian-translation-1562942301965

5 years agoFix bitbucket-jp issue #15:Generating HTML Folder Compare report including File Compa...
Takashi Sawanaka [Thu, 11 Jul 2019 12:57:09 +0000 (21:57 +0900)]
Fix bitbucket-jp issue #15:Generating HTML Folder Compare report including File Compare report does not complete

5 years agoRemove #ifdef _UNICODE (2)
Takashi Sawanaka [Tue, 9 Jul 2019 22:54:48 +0000 (07:54 +0900)]
Remove #ifdef _UNICODE (2)

5 years agoRemove #ifdef _UNICODE
Takashi Sawanaka [Mon, 8 Jul 2019 22:55:37 +0000 (07:55 +0900)]
Remove #ifdef _UNICODE

5 years agoAboutDlg: Remove "Unicode" string from about-info (2)
Takashi Sawanaka [Mon, 8 Jul 2019 22:47:14 +0000 (07:47 +0900)]
AboutDlg: Remove "Unicode" string from about-info (2)

5 years agoxutils.c: Under the following conditions
Takashi Sawanaka [Mon, 8 Jul 2019 22:42:47 +0000 (07:42 +0900)]
xutils.c: Under the following conditions
- Select diff algorithm other than 'default'
- Enable 'Ignore changes' or 'Ignore all' in 'Whitespace' group (XDF_IGNORE_WHITESPACE_CHANGE or XDF_IGNORE_WHITESPACE)
- EOL on the last line of the file does not exist on the other side but has the same content
libxdiff assumes that the last line is not different. However, it is not compatible with WinMerge. So I correct as there is a difference.