OSDN Git Service
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
Takashi Sawanaka [Sat, 27 Jul 2019 05:20:22 +0000 (14:20 +0900)]
GUITests: Add more tests (4)
Takashi Sawanaka [Thu, 25 Jul 2019 23:12:30 +0000 (08:12 +0900)]
GUITests: Take a screenshot after selecting a menu item
Tim Gerundt [Wed, 24 Jul 2019 04:11:07 +0000 (06:11 +0200)]
Drop some unused custom messages from InnoSetup files
Tim Gerundt [Wed, 24 Jul 2019 04:05:13 +0000 (06:05 +0200)]
Backport some InnoSetup translation from InnoSetup itself
Takashi Sawanaka [Wed, 24 Jul 2019 14:47:53 +0000 (23:47 +0900)]
GUITests: Add more tests (3)
Takashi Sawanaka [Tue, 23 Jul 2019 22:29:02 +0000 (07:29 +0900)]
Bitbucket-jp issue #16: PrediffLineFilter.sct: Fix wrong encoding
Takashi Sawanaka [Mon, 22 Jul 2019 23:17:05 +0000 (08:17 +0900)]
GUITests: Add more tests (2)
Takashi Sawanaka [Mon, 22 Jul 2019 13:55:40 +0000 (22:55 +0900)]
GUITests: Add more tests
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.
Takashi Sawanaka [Sun, 21 Jul 2019 22:31:10 +0000 (07:31 +0900)]
Add GUITests project
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
Takashi Sawanaka [Wed, 17 Jul 2019 22:29:50 +0000 (07:29 +0900)]
BuildManual.cmd: Remove unneccessary mkdir command call
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
Takashi Sawanaka [Sun, 14 Jul 2019 14:12:36 +0000 (23:12 +0900)]
Update translation
Takashi Sawanaka [Sun, 14 Jul 2019 08:50:54 +0000 (17:50 +0900)]
Installer: Remove ExeName and WinMergeExeName function
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
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
Takashi Sawanaka [Fri, 12 Jul 2019 21:47:26 +0000 (06:47 +0900)]
Merge
Takashi Sawanaka [Fri, 12 Jul 2019 21:45:50 +0000 (06:45 +0900)]
Update Contributors.txt
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
Michele Locati [Fri, 12 Jul 2019 14:39:07 +0000 (14:39 +0000)]
Update Italian translation
--HG--
branch : Michele-Locati/update-italian-translation-
1562942301965
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
Takashi Sawanaka [Tue, 9 Jul 2019 22:54:48 +0000 (07:54 +0900)]
Remove #ifdef _UNICODE (2)
Takashi Sawanaka [Mon, 8 Jul 2019 22:55:37 +0000 (07:55 +0900)]
Remove #ifdef _UNICODE
Takashi Sawanaka [Mon, 8 Jul 2019 22:47:14 +0000 (07:47 +0900)]
AboutDlg: Remove "Unicode" string from about-info (2)
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.
Takashi Sawanaka [Mon, 8 Jul 2019 22:37:02 +0000 (07:37 +0900)]
AboutDlg: Remove "Unicode" string from about-info
Takashi Sawanaka [Sun, 7 Jul 2019 12:14:21 +0000 (21:14 +0900)]
Display WinMerge logo beautifully on HiDPI screen
datadiode [Sat, 6 Jul 2019 12:25:45 +0000 (14:25 +0200)]
Avoid an exception in GuessCodepageEncoding() when filepath equals "NUL"
datadiode [Sat, 6 Jul 2019 12:18:44 +0000 (14:18 +0200)]
Consolidate FolderCmp (3)
Have the folder compare threads create a reusable FolderCmp instance in advance rather than repeatedly create dedicated ones for every single file comparison.
Takashi Sawanaka [Sat, 6 Jul 2019 10:49:56 +0000 (19:49 +0900)]
Editlib: Fix auto-indent not work when EOL-style is not CRLF
datadiode [Sat, 6 Jul 2019 06:19:25 +0000 (08:19 +0200)]
Consolidate FolderCmp (2)
Store pointer to CDiffContext as a member in FolderCmp.
Next planned step is to have the folder compare threads create a reusable FolderCmp instance in advance rather than repeatedly create dedicated ones for every single file comparison.
Takashi Sawanaka [Thu, 4 Jul 2019 23:17:55 +0000 (08:17 +0900)]
Reduce the size of the executable file (3)
Takashi Sawanaka [Wed, 3 Jul 2019 22:44:48 +0000 (07:44 +0900)]
Manual: Update Locales.xml
Takashi Sawanaka [Wed, 3 Jul 2019 11:56:33 +0000 (20:56 +0900)]
Fix GitHub issue #159: file compare : right-click doesn't select the diff under the mouse
Takashi Sawanaka [Tue, 2 Jul 2019 23:09:30 +0000 (08:09 +0900)]
xutils.c: Under the following conditions
- Select diff algorithm other than 'default'
- Enable 'Ignore carriage return differences' (XDF_IGNORE_CR_AT_EOL)
- 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.
Takashi Sawanaka [Tue, 2 Jul 2019 12:00:20 +0000 (12:00 +0000)]
Merged in Timon34/russianpo-edited-online-with-bitbucket-f-
1562068444598 (pull request #51)
Russian.po edited online with Bitbucket
Timon34 [Tue, 2 Jul 2019 11:55:19 +0000 (11:55 +0000)]
Russian.po edited online with Bitbucket
Fixed and made new translations introduced in WinMerge 2.16.3
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-f-
1562068444598
datadiode [Sun, 30 Jun 2019 16:25:07 +0000 (18:25 +0200)]
Consolidate FolderCmp (1)
Wondering why we create additional FolderCmp instances inside FolderCmp::prepAndCompareFiles(), from which we only use the m_diffFileData member, leads me to this proposal to convert them to DiffFileData. This is intended as a first step towards some more invasive rework to reduce code duplication and possibly other sorts of mess.
Takashi Sawanaka [Sun, 30 Jun 2019 12:26:48 +0000 (21:26 +0900)]
Merge.*.vcproj: minor optimization
Takashi Sawanaka [Sun, 30 Jun 2019 11:04:19 +0000 (20:04 +0900)]
Change VS Configuration name 'Unicode(Debug|Release)' to 'Debug|Release'
Takashi Sawanaka [Sun, 30 Jun 2019 06:34:04 +0000 (15:34 +0900)]
Remove MergeLang.vs2015.*
Takashi Sawanaka [Sun, 30 Jun 2019 04:57:42 +0000 (13:57 +0900)]
Cppcheck: Local variable '...' shadows outer function
Takashi Sawanaka [Sun, 30 Jun 2019 04:44:04 +0000 (13:44 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sun, 30 Jun 2019 04:08:30 +0000 (13:08 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Takashi Sawanaka [Sun, 30 Jun 2019 03:43:05 +0000 (12:43 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Sun, 30 Jun 2019 03:10:33 +0000 (12:10 +0900)]
Variable '...' in assigned in constructor body. Consider performing initialization in initialization list.
Takashi Sawanaka [Sun, 30 Jun 2019 02:40:07 +0000 (11:40 +0900)]
Cppcheck: The scope of the variable '...' can be reduced
Takashi Sawanaka [Sun, 30 Jun 2019 02:17:42 +0000 (11:17 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 30 Jun 2019 02:03:55 +0000 (11:03 +0900)]
Cppcheck: The statement 'if (m_base!=nullptr) m_base=nullptr' is logically equivalent to 'm_base=nullptr'.
datadiode [Sat, 29 Jun 2019 08:49:26 +0000 (10:49 +0200)]
Favor PathContext::GetSize() over PathContext::size()
As a side effect, this fixes a few warnings and saves a few typecasts which presumably existed to fix a few warnings.
datadiode [Sat, 29 Jun 2019 05:41:33 +0000 (07:41 +0200)]
coretools.cpp: linelen() should not truncate lines with embedded NULs
The issue with such truncated lines is that line filters are blind for any text to the right of an embedded NUL.
Takashi Sawanaka [Sat, 29 Jun 2019 01:51:31 +0000 (10:51 +0900)]
Manual: Add 'Diff algorithm' and 'Enable indent heuristic' entry
Takashi Sawanaka [Fri, 28 Jun 2019 12:42:22 +0000 (21:42 +0900)]
ReleaseNotes.html: Remove lines unintentionally added
Takashi Sawanaka [Fri, 28 Jun 2019 12:36:44 +0000 (21:36 +0900)]
Fix Bitbucket issue #166: ChangeLog.txt
Takashi Sawanaka [Thu, 27 Jun 2019 23:15:54 +0000 (08:15 +0900)]
OptionsDirColors.cpp: The color of the filtered item and the color of the missing item were reversed from the color of the previous version
Takashi Sawanaka [Thu, 27 Jun 2019 12:16:01 +0000 (21:16 +0900)]
Update release notes and changelog for 2.16.3 (4)
Takashi Sawanaka [Thu, 27 Jun 2019 11:50:10 +0000 (20:50 +0900)]
Update release notes and changelog for 2.16.3 (3)
Tichij [Thu, 27 Jun 2019 05:31:31 +0000 (08:31 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Wed, 26 Jun 2019 15:06:24 +0000 (00:06 +0900)]
OptionsDirColors.cpp: Change default color of identical items to white
Takashi Sawanaka [Wed, 26 Jun 2019 14:39:21 +0000 (23:39 +0900)]
Update release notes and changelog for 2.16.3
Takashi Sawanaka [Tue, 25 Jun 2019 22:54:25 +0000 (07:54 +0900)]
Update translations
Takashi Sawanaka [Tue, 25 Jun 2019 21:38:10 +0000 (06:38 +0900)]
Merge
Takashi Sawanaka [Tue, 25 Jun 2019 21:36:56 +0000 (21:36 +0000)]
Merged in gerundt/winmerge/OwnDirColors (pull request #49)
Use own colors settings for folder compare
Tim Gerundt [Tue, 25 Jun 2019 19:19:46 +0000 (21:19 +0200)]
Use own colors settings for folder compare - Add manual entry
--HG--
branch : OwnDirColors
Takashi Sawanaka [Tue, 25 Jun 2019 14:09:08 +0000 (23:09 +0900)]
xutils.c: Reduce compilation warnings
Takashi Sawanaka [Tue, 25 Jun 2019 13:11:19 +0000 (22:11 +0900)]
Reduce the size of the executable file (2)
Takashi Sawanaka [Mon, 24 Jun 2019 23:14:54 +0000 (08:14 +0900)]
xdiff_gnudiff_compat.cpp: Fix an assertion failure when comparing files without EOL on the last line
Takashi Sawanaka [Mon, 24 Jun 2019 22:51:21 +0000 (07:51 +0900)]
xdiff_gnudiff_compat.cpp: Initialize `ignore` in `struct change`