OSDN Git Service
Takashi Sawanaka [Sun, 24 Mar 2019 11:59:09 +0000 (20:59 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:59 +0000 (16:31 +0900)]
editlib/Sample: Add Ctrl+H shortcut key
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:26 +0000 (16:31 +0900)]
Merge.rc: tweak CEditReplaceDlg
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Mar 2019 07:29:49 +0000 (16:29 +0900)]
editlib: Make CEditReplaceDlg modeless dialog
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 12:33:22 +0000 (21:33 +0900)]
Fix sf.net ticket #2113: Edit > Replace > All, Undo: should undo all
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 12:14:30 +0000 (21:14 +0900)]
editlib: syntax highlighting not work in Sample project
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 11:38:51 +0000 (20:38 +0900)]
editlib: Use secure string functions
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 11:11:41 +0000 (20:11 +0900)]
editlib: crystaledit component should not depend on WinMerge sources.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 07:25:52 +0000 (16:25 +0900)]
Cppcheck: Variable 'm_tvalue' is assigned in constructor body. Consider performing initialization in initialization list.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 07:23:47 +0000 (16:23 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 06:12:10 +0000 (15:12 +0900)]
Cppcheck: The scope of the variable '...' can be reduced
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 05:42:57 +0000 (14:42 +0900)]
Cppcheck: The condition 'pszChars[nPrevI]!='\\' || pszChars[nPrevI]=='\\' && *::CharPrev(pszChars,pszChars+nPrevI)=='\\'' is equivalent to 'pszChars[nPrevI]!='\\' || *::CharPrev(pszChars,pszChars+nPrevI)=='\\''.
--HG--
branch : stable
Takashi Sawanaka [Sat, 23 Mar 2019 03:56:01 +0000 (12:56 +0900)]
Update Japanese translation
--HG--
branch : stable
Takashi Sawanaka [Fri, 22 Mar 2019 23:23:22 +0000 (08:23 +0900)]
Fix bitbucket issue #147: Gibberish language during installation (Greek)
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 15:27:17 +0000 (00:27 +0900)]
ShellExtension: Add Build*.cmd
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 15:20:49 +0000 (00:20 +0900)]
ShellExtension: Bump revision to 1.17.6.0
--HG--
branch : stable
Takashi Sawanaka [Thu, 21 Mar 2019 12:47:38 +0000 (21:47 +0900)]
editlib: Add unit test project
--HG--
branch : stable
Tichij [Mon, 18 Mar 2019 13:27:14 +0000 (15:27 +0200)]
Updated Lithuanian.po
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 13:39:49 +0000 (22:39 +0900)]
MergeStatusBar.cpp: Fix rare crash when maximizing MDI child window
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 13:12:03 +0000 (22:12 +0900)]
Merge7z: Add BuildArc.cmd
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Mar 2019 12:29:04 +0000 (21:29 +0900)]
Merge7z: Remvoe version number from DLL file name (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:18:44 +0000 (08:18 +0900)]
Upgrade to 7-Zip 19.00 (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:16:44 +0000 (08:16 +0900)]
Merge7z: Add BuidBin.*.cmd
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:15:03 +0000 (08:15 +0900)]
editlib: Add Lua syntax highlighting (3)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:09:36 +0000 (08:09 +0900)]
Upgrade to 7-Zip 19.00
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 23:08:51 +0000 (08:08 +0900)]
Merge7z: Remvoe version number from DLL file name
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 14:03:23 +0000 (23:03 +0900)]
Bump revision to 2.16.0+-jp-12
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Mar 2019 14:01:10 +0000 (23:01 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 11:10:30 +0000 (20:10 +0900)]
Bump revsion to 2.16.0+-jp-11
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 11:08:47 +0000 (20:08 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Thu, 14 Mar 2019 07:46:28 +0000 (16:46 +0900)]
Fix sf.net ticket #2163: Save As: default directory should be file's original directory
--HG--
branch : stable
Vladmiro Galante [Thu, 14 Mar 2019 06:59:34 +0000 (06:59 +0000)]
Italian.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 13:28:43 +0000 (22:28 +0900)]
editlib: Add Lua syntax highlighting
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Mar 2019 03:32:59 +0000 (12:32 +0900)]
FolderCompare: Display folder size
* * *
editlib: Remove CCrystalTextView dependency from line parsers
* * *
editlib: Remove CCrystalTextView dependency from line parsers (2)
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 07:15:16 +0000 (16:15 +0900)]
MDITabBar.cpp: Improve icon display at 120DPI
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 04:20:59 +0000 (13:20 +0900)]
When updating English.pot file, if there is no change other than POT-Creation-Date, restore English.pot file.
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 04:14:40 +0000 (13:14 +0900)]
Remove BuildMergelangDll.bat
--HG--
branch : stable
Takashi Sawanaka [Sat, 16 Mar 2019 00:23:03 +0000 (09:23 +0900)]
OptionsInit.cpp: sf.net Patch #2954 Set default language to System Language ID
--HG--
branch : stable
Takashi Sawanaka [Thu, 14 Mar 2019 04:53:37 +0000 (13:53 +0900)]
word level diff dit not work if the text contains NUL characters
--HG--
branch : stable
Takashi Sawanaka [Thu, 14 Mar 2019 01:22:41 +0000 (10:22 +0900)]
Add Testing/Data/LastLineEOL/2-3CRLF.txt
--HG--
branch : stable
Takashi Sawanaka [Wed, 13 Mar 2019 23:52:36 +0000 (08:52 +0900)]
Fix crash when failed to load file
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 22:30:48 +0000 (07:30 +0900)]
Add Domènec to Contributers.txt
--HG--
branch : stable
Domènec [Tue, 12 Mar 2019 17:19:29 +0000 (17:19 +0000)]
Catalan.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 14:44:07 +0000 (23:44 +0900)]
Fix sf.net ticket #2217 Compare results refresh incorrectly after deletions
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 14:22:24 +0000 (23:22 +0900)]
DiffItem.cpp: Fix infinite loop when deleting the first item and rescanning
--HG--
branch : stable
Takashi Sawanaka [Tue, 12 Mar 2019 13:14:44 +0000 (22:14 +0900)]
DiffItem.cpp: DIFFITEM destructor should not remove its siblings
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 13:13:14 +0000 (22:13 +0900)]
Bump revision to 2.16.0+-jp-10
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:11:39 +0000 (22:11 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:11:27 +0000 (22:11 +0900)]
UploadToBitbucket.cmd
--HG--
branch : jp
Takashi Sawanaka [Sun, 10 Mar 2019 13:06:34 +0000 (22:06 +0900)]
DirItem.cpp: Reuse TFile instance
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 04:05:41 +0000 (13:05 +0900)]
Delete bForceUTF8 argument that no longer makes sense
(At present, the content of the text buffer is always output to the file with UCS2-LE)
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 03:29:45 +0000 (12:29 +0900)]
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane includes ghost lines
--HG--
branch : stable
Takashi Sawanaka [Sun, 10 Mar 2019 01:54:30 +0000 (10:54 +0900)]
Remove IF_IS_TRUE_ALL macro
--HG--
branch : stable
Takashi Sawanaka [Sat, 9 Mar 2019 17:00:01 +0000 (02:00 +0900)]
Reduce compilation time (2)
--HG--
branch : stable
Takashi Sawanaka [Sat, 9 Mar 2019 13:51:15 +0000 (22:51 +0900)]
Reduce compilation time
--HG--
branch : stable
Takashi Sawanaka [Sat, 2 Mar 2019 23:12:02 +0000 (08:12 +0900)]
Merge.cpp: Use ATTACH_PARENT_PROCESS instead of -1
--HG--
branch : stable
Takashi Sawanaka [Sat, 2 Mar 2019 15:54:10 +0000 (00:54 +0900)]
Merge.cpp: Output the message of message box to parent console if '/noninteractive ' command line option is specified,
--HG--
branch : stable
Takashi Sawanaka [Thu, 28 Feb 2019 21:25:10 +0000 (06:25 +0900)]
Added tag 2.16.0+-jp-9 for changeset
542aca55dee3
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:31:32 +0000 (23:31 +0900)]
Bump revision to 2.16.0+-jp-9
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:29:10 +0000 (23:29 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 24 Feb 2019 14:09:54 +0000 (23:09 +0900)]
Update release notes and changelog for 2.16.1
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 10:49:03 +0000 (19:49 +0900)]
Reduce unnecessary drawing
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 07:41:35 +0000 (16:41 +0900)]
Use COptionsMgr instead of GetProfile*() and WriteProfile*()
--HG--
branch : stable
Takashi Sawanaka [Sun, 24 Feb 2019 07:15:17 +0000 (16:15 +0900)]
Update Contributors.txt
--HG--
branch : stable
Yanko Yankov [Wed, 20 Feb 2019 22:28:56 +0000 (22:28 +0000)]
Bulgarian.po edited online with Bitbucket
--HG--
branch : stable
Takashi Sawanaka [Mon, 18 Feb 2019 22:42:53 +0000 (07:42 +0900)]
Fix sf.net ticket #2215: Cancelation of selection range with reverse indent
(Revert the commit "Improve handling of last lines in files (4) (
b3d10de90b11)" partially)
--HG--
branch : stable
Takashi Sawanaka [Sun, 17 Feb 2019 12:05:26 +0000 (21:05 +0900)]
Bump revision to 2.16.0+-jp-8
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Feb 2019 12:03:44 +0000 (21:03 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 17 Feb 2019 11:57:06 +0000 (20:57 +0900)]
'Automatically scroll to first difference' option did not work since
0db5699a19e7
--HG--
branch : stable
Takashi Sawanaka [Tue, 29 Jan 2019 15:06:49 +0000 (00:06 +0900)]
Added tag 2.16.0+-jp-7 for changeset
3b9d8019a04f
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:12:58 +0000 (08:12 +0900)]
Bump revision to 2.16.0+-jp-7
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:11:48 +0000 (08:11 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:11:33 +0000 (08:11 +0900)]
ManualJapanese/Filters.xml: Fix sf.net issue #2211: end of line documentation
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:10:03 +0000 (08:10 +0900)]
Update Japanese.po
--HG--
branch : jp
Takashi Sawanaka [Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)]
MergeDoc.cpp: Recover lost compatibility
--HG--
branch : stable
Takashi Sawanaka [Sun, 27 Jan 2019 22:59:31 +0000 (07:59 +0900)]
Test.cpp: Do not change the registry values while testing
--HG--
branch : stable
Takashi Sawanaka [Sat, 26 Jan 2019 15:27:39 +0000 (00:27 +0900)]
Fix bitbucket issue #138: Unique files are not shown
When comparing empty file and nonexistent file, `DIFFCODE::SAME` flag is set to the variable `code`, so change the flag to `DIFFCODE::DIFF`
--HG--
branch : stable
Timon34 [Fri, 25 Jan 2019 10:13:44 +0000 (10:13 +0000)]
Russian.po edited online with Bitbucket
Made a huge number of fixes in previous translation, fixes typos, ...
--HG--
branch : stable
Timon34 [Thu, 24 Jan 2019 06:20:51 +0000 (06:20 +0000)]
Russian.isl edited online with Bitbucket
Made some fixes + translated Localization Components section
--HG--
branch : stable
Takashi Sawanaka [Wed, 23 Jan 2019 16:13:11 +0000 (01:13 +0900)]
appveyor.yml: enable the eol extension
--HG--
branch : stable
Timon34 [Wed, 23 Jan 2019 12:12:25 +0000 (12:12 +0000)]
Russian.po edited online with Bitbucket
Again made many fixes and new translations
--HG--
branch : stable
datadiode [Wed, 23 Jan 2019 11:20:40 +0000 (12:20 +0100)]
MergeEditSplitterView: Don't claim input focus upon mouse click / Fix an apparent afx_msg vs. virtual confusion / Mark overrides as such
--HG--
branch : stable
datadiode [Wed, 23 Jan 2019 09:44:23 +0000 (10:44 +0100)]
Clarification as per https://github.com/WinMerge/winmerge-v2/issues/41
--HG--
branch : stable
Takashi Sawanaka [Tue, 22 Jan 2019 23:12:24 +0000 (08:12 +0900)]
MergeDoc.cpp: If the command line option /x is specified and the files are identical, EOL status on the status bar
--HG--
branch : stable
Tichij [Tue, 22 Jan 2019 11:05:12 +0000 (13:05 +0200)]
Changed EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows Notepad.
--HG--
branch : stable
Tichij [Tue, 12 Feb 2019 11:11:23 +0000 (13:11 +0200)]
Minor improvements of Lithuanian translation
--HG--
branch : stable
Timon34 [Tue, 5 Feb 2019 18:33:45 +0000 (18:33 +0000)]
Russian.po edited online with Bitbucket
Fixed 1 typo, improved 2 strings translation, changed translators list
--HG--
branch : stable
Takashi Sawanaka [Sun, 3 Feb 2019 10:40:00 +0000 (19:40 +0900)]
MergeStatusBar.cpp: Reduce unnecessary drawing
--HG--
branch : stable
Takashi Sawanaka [Sun, 3 Feb 2019 05:43:54 +0000 (14:43 +0900)]
TempFile.cpp: Use Poco::File::remove() instead of SHFileOperation()
SHFileOperation() is slow.
--HG--
branch : stable
Takashi Sawanaka [Sun, 3 Feb 2019 02:57:27 +0000 (11:57 +0900)]
Update .hgignore
--HG--
branch : stable
Takashi Sawanaka [Sun, 3 Feb 2019 02:57:04 +0000 (11:57 +0900)]
Fix sf.net ticket #2213: Left and Right files swap after losing focus v2.16.0.0
--HG--
branch : stable
Takashi Sawanaka [Sun, 3 Feb 2019 02:56:02 +0000 (11:56 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY (2)
(Anti-virus software makes creating the handle of registry key slow)
--HG--
branch : stable
Takashi Sawanaka [Fri, 1 Feb 2019 15:39:51 +0000 (00:39 +0900)]
Remove unused variables
--HG--
branch : stable
Takashi Sawanaka [Fri, 1 Feb 2019 15:36:57 +0000 (00:36 +0900)]
Remove WMPROFILE
--HG--
branch : stable
Takashi Sawanaka [Fri, 1 Feb 2019 15:32:14 +0000 (00:32 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY
(Anti-virus software makes creating the handle of registry key slow)
--HG--
branch : stable
Takashi Sawanaka [Fri, 1 Feb 2019 15:29:48 +0000 (00:29 +0900)]
ShellExtension: Change the encoding of *.rc and *.po files to UTF-8
--HG--
branch : stable
Timon34 [Thu, 31 Jan 2019 17:05:45 +0000 (17:05 +0000)]
Russian.po edited online with Bitbucket
Compared https://bitbucket.org/winmerge/winmerge/src/
b3087026c3d70d6919418e1bd6ed9825f320db72/Translations/ShellExtension/Russian.po and https://bitbucket.org/winmerge/winmerge/raw/
5b8ae66a0a1f748b0377807ed6183d60327cebb8/ShellExtension/Languages/ShellExtensionRussian.rc translations.
Made final version. Many thanks to Yury Lebedev https://bitbucket.org/yuryleb/
Not quite sure that fixed these 2 strings, think they remain from previous translation.
Found where problems with CP come from:
Takashi Sawanaka
3798cd9 Russian.po: Change the file encoding from UTF-8 to CP-1251 2019-01-16
https://bitbucket.org/winmerge/winmerge/src/
3798cd9cba3d3984b6271d904dd7b9ded58ffce8/Translations/ShellExtension/Russian.po
Do not know how it worked before, but because of 'Change the file encoding from UTF-8 to CP-1251', everything became unreadable. Probably, this edit should be rolled back.
--HG--
branch : stable
Timon34 [Thu, 31 Jan 2019 06:21:52 +0000 (06:21 +0000)]
Russian.po edited online with Bitbucket
Translated maximum what was possible at the moment. This is final verified version. Again made many fixes meticulously checking with the program interface. By the way, found several sections that are not present in the language file - 'Edit - Options- Compare - Binary - Frhed Settings' - View Settings + Binary mode + Character set. They should be added because they are rather difficult for ordinary people to understand.
--HG--
branch : stable
Timon34 [Wed, 30 Jan 2019 10:06:55 +0000 (10:06 +0000)]
Russian.po edited online with Bitbucket
Made about 25 fixes and new translations
--HG--
branch : stable
Timon34 [Mon, 28 Jan 2019 10:51:55 +0000 (10:51 +0000)]
Russian.po edited online with Bitbucket
Made several strings translation
--HG--
branch : stable