OSDN Git Service
Takashi Sawanaka [Sat, 30 Mar 2019 00:18:55 +0000 (00:18 +0000)]
Merged in gerundt/winmerge (pull request #35)
Some tweaks for the manual
Tim Gerundt [Fri, 29 Mar 2019 22:03:42 +0000 (23:03 +0100)]
Manual: No plans for cross-platform support
Tim Gerundt [Fri, 29 Mar 2019 21:47:48 +0000 (22:47 +0100)]
Add image to "Comparing binary files" page
Tim Gerundt [Fri, 29 Mar 2019 21:47:25 +0000 (22:47 +0100)]
Add first content to "Comparing image files" page
Takashi Sawanaka [Tue, 26 Mar 2019 22:14:22 +0000 (07:14 +0900)]
Update Contributors.txt
MaysWind [Tue, 26 Mar 2019 17:49:14 +0000 (01:49 +0800)]
update Simplified Chinese translation
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:59 +0000 (16:31 +0900)]
editlib/Sample: Add Ctrl+H shortcut key
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:26 +0000 (16:31 +0900)]
Merge.rc: tweak CEditReplaceDlg
Takashi Sawanaka [Sun, 24 Mar 2019 07:29:49 +0000 (16:29 +0900)]
editlib: Make CEditReplaceDlg modeless dialog
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
Takashi Sawanaka [Sat, 23 Mar 2019 12:14:30 +0000 (21:14 +0900)]
editlib: syntax highlighting not work in Sample project
Takashi Sawanaka [Sat, 23 Mar 2019 11:38:51 +0000 (20:38 +0900)]
editlib: Use secure string functions
Takashi Sawanaka [Sat, 23 Mar 2019 11:11:41 +0000 (20:11 +0900)]
editlib: crystaledit component should not depend on WinMerge sources.
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.
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.
Takashi Sawanaka [Sat, 23 Mar 2019 06:12:10 +0000 (15:12 +0900)]
Cppcheck: The scope of the variable '...' can be reduced
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)=='\\''.
Takashi Sawanaka [Sat, 23 Mar 2019 03:56:01 +0000 (12:56 +0900)]
Update Japanese translation
Takashi Sawanaka [Fri, 22 Mar 2019 23:23:22 +0000 (08:23 +0900)]
Fix bitbucket issue #147: Gibberish language during installation (Greek)
Takashi Sawanaka [Thu, 21 Mar 2019 15:27:17 +0000 (00:27 +0900)]
ShellExtension: Add Build*.cmd
Takashi Sawanaka [Thu, 21 Mar 2019 15:20:49 +0000 (00:20 +0900)]
ShellExtension: Bump revision to 1.17.6.0
Takashi Sawanaka [Thu, 21 Mar 2019 12:47:38 +0000 (21:47 +0900)]
editlib: Add unit test project
Tim Gerundt [Wed, 20 Mar 2019 20:34:51 +0000 (21:34 +0100)]
Manual: Fix "Dependency" from CompareMS*Files.sct plugins
Tim Gerundt [Wed, 20 Mar 2019 20:27:50 +0000 (21:27 +0100)]
Manual: Fix some links
Takashi Sawanaka [Mon, 18 Mar 2019 13:46:10 +0000 (13:46 +0000)]
Merged in Tichij/winmerge (pull request #33)
Updated Lithuanian.po
Takashi Sawanaka [Mon, 18 Mar 2019 13:39:49 +0000 (22:39 +0900)]
MergeStatusBar.cpp: Fix rare crash when maximizing MDI child window
Tichij [Mon, 18 Mar 2019 13:27:14 +0000 (15:27 +0200)]
Updated Lithuanian.po
Takashi Sawanaka [Mon, 18 Mar 2019 13:12:03 +0000 (22:12 +0900)]
Merge7z: Add BuildArc.cmd
Takashi Sawanaka [Mon, 18 Mar 2019 12:29:04 +0000 (21:29 +0900)]
Merge7z: Remvoe version number from DLL file name (2)
Takashi Sawanaka [Sun, 17 Mar 2019 23:18:44 +0000 (08:18 +0900)]
Upgrade to 7-Zip 19.00 (2)
Takashi Sawanaka [Sun, 17 Mar 2019 23:16:44 +0000 (08:16 +0900)]
Merge7z: Add BuidBin.*.cmd
Takashi Sawanaka [Sun, 17 Mar 2019 23:15:03 +0000 (08:15 +0900)]
editlib: Add Lua syntax highlighting (3)
Takashi Sawanaka [Sun, 17 Mar 2019 23:09:36 +0000 (08:09 +0900)]
Upgrade to 7-Zip 19.00
Takashi Sawanaka [Sun, 17 Mar 2019 23:08:51 +0000 (08:08 +0900)]
Merge7z: Remvoe version number from DLL file name
Takashi Sawanaka [Sun, 17 Mar 2019 13:28:43 +0000 (22:28 +0900)]
editlib: Add Lua syntax highlighting
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)
Takashi Sawanaka [Sat, 16 Mar 2019 07:15:16 +0000 (16:15 +0900)]
MDITabBar.cpp: Improve icon display at 120DPI
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.
Takashi Sawanaka [Sat, 16 Mar 2019 04:14:40 +0000 (13:14 +0900)]
Remove BuildMergelangDll.bat
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
Takashi Sawanaka [Thu, 14 Mar 2019 12:41:30 +0000 (12:41 +0000)]
Merged in Vladi69/winmerge-2/Vladi69/italianpo-edited-online-with-bitbucket-
1552546743421 (pull request #32)
Italian.po edited online with Bitbucket
Approved-by: Vladmiro Galante <vladimirogalante@yahoo.it>
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
Vladmiro Galante [Thu, 14 Mar 2019 06:59:34 +0000 (06:59 +0000)]
Italian.po edited online with Bitbucket
--HG--
branch : Vladi69/italianpo-edited-online-with-bitbucket-
1552546743421
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
Takashi Sawanaka [Thu, 14 Mar 2019 01:22:41 +0000 (10:22 +0900)]
Add Testing/Data/LastLineEOL/2-3CRLF.txt
Takashi Sawanaka [Wed, 13 Mar 2019 23:52:36 +0000 (08:52 +0900)]
Fix crash when failed to load file
Takashi Sawanaka [Tue, 12 Mar 2019 22:30:48 +0000 (07:30 +0900)]
Add Domènec to Contributers.txt
Takashi Sawanaka [Tue, 12 Mar 2019 22:24:35 +0000 (22:24 +0000)]
Merged in Domenec72/winmerge/Domenec72/catalanpo-edited-online-with-bitbucket-
1552411107927 (pull request #29)
Catalan.po edited online with Bitbucket
Domènec [Tue, 12 Mar 2019 17:19:29 +0000 (17:19 +0000)]
Catalan.po edited online with Bitbucket
--HG--
branch : Domenec72/catalanpo-edited-online-with-bitbucket-
1552411107927
Takashi Sawanaka [Tue, 12 Mar 2019 14:44:07 +0000 (23:44 +0900)]
Fix sf.net ticket #2217 Compare results refresh incorrectly after deletions
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
Takashi Sawanaka [Tue, 12 Mar 2019 13:14:44 +0000 (22:14 +0900)]
DiffItem.cpp: DIFFITEM destructor should not remove its siblings
Tim Gerundt [Mon, 11 Mar 2019 05:01:31 +0000 (06:01 +0100)]
Manual: Small tweaks for "Install" page (Compatibility and Shell Integration)
Takashi Sawanaka [Sun, 10 Mar 2019 13:06:34 +0000 (22:06 +0900)]
DirItem.cpp: Reuse TFile instance
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)
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
Takashi Sawanaka [Sun, 10 Mar 2019 01:54:30 +0000 (10:54 +0900)]
Remove IF_IS_TRUE_ALL macro
Takashi Sawanaka [Sat, 9 Mar 2019 17:00:01 +0000 (02:00 +0900)]
Reduce compilation time (2)
Takashi Sawanaka [Sat, 9 Mar 2019 13:51:15 +0000 (22:51 +0900)]
Reduce compilation time
Tim Gerundt [Fri, 8 Mar 2019 23:04:57 +0000 (00:04 +0100)]
Manual: Don't use admonitions images
Tim Gerundt [Fri, 8 Mar 2019 21:55:12 +0000 (22:55 +0100)]
Manual: Use fonts and navigation like in the new website
Takashi Sawanaka [Sat, 2 Mar 2019 23:12:02 +0000 (08:12 +0900)]
Merge.cpp: Use ATTACH_PARENT_PROCESS instead of -1
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,
Takashi Sawanaka [Sun, 24 Feb 2019 14:21:53 +0000 (23:21 +0900)]
Added tag 2.16.1 for changeset
42d99f4c9b2e
Takashi Sawanaka [Sun, 24 Feb 2019 14:09:54 +0000 (23:09 +0900)]
Update release notes and changelog for 2.16.1
Takashi Sawanaka [Sun, 24 Feb 2019 10:49:03 +0000 (19:49 +0900)]
Reduce unnecessary drawing
Takashi Sawanaka [Sun, 24 Feb 2019 07:41:35 +0000 (16:41 +0900)]
Use COptionsMgr instead of GetProfile*() and WriteProfile*()
Takashi Sawanaka [Sun, 24 Feb 2019 07:15:17 +0000 (16:15 +0900)]
Update Contributors.txt
Takashi Sawanaka [Thu, 21 Feb 2019 15:53:06 +0000 (15:53 +0000)]
Merged in YankoNik/winmerge/YankoNik/bulgarianpo-edited-online-with-bitbucket-
1550701708352 (pull request #28)
Bulgarian.po edited online with Bitbucket
Yanko Yankov [Wed, 20 Feb 2019 22:28:56 +0000 (22:28 +0000)]
Bulgarian.po edited online with Bitbucket
--HG--
branch : YankoNik/bulgarianpo-edited-online-with-bitbucket-
1550701708352
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)
Takashi Sawanaka [Sun, 17 Feb 2019 11:57:06 +0000 (20:57 +0900)]
'Automatically scroll to first difference' option did not work since
0db5699a19e7
Tichij [Tue, 12 Feb 2019 11:11:23 +0000 (13:11 +0200)]
Minor improvements of Lithuanian translation
Takashi Sawanaka [Tue, 5 Feb 2019 22:28:13 +0000 (22:28 +0000)]
Merged in Timon34/winmerge-16/Timon34/russianpo-edited-online-with-bitbucket-f-
1549391570392 (pull request #26)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
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 : Timon34/russianpo-edited-online-with-bitbucket-f-
1549391570392
Takashi Sawanaka [Sun, 3 Feb 2019 10:40:00 +0000 (19:40 +0900)]
MergeStatusBar.cpp: Reduce unnecessary drawing
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.
Takashi Sawanaka [Sun, 3 Feb 2019 02:57:27 +0000 (11:57 +0900)]
Update .hgignore
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
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)
Takashi Sawanaka [Fri, 1 Feb 2019 15:39:51 +0000 (00:39 +0900)]
Remove unused variables
Takashi Sawanaka [Fri, 1 Feb 2019 15:36:57 +0000 (00:36 +0900)]
Remove WMPROFILE
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)
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
Takashi Sawanaka [Fri, 1 Feb 2019 13:03:45 +0000 (22:03 +0900)]
Merge ... Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815
Takashi Sawanaka [Fri, 1 Feb 2019 12:53:10 +0000 (12:53 +0000)]
Merged in Timon34/winmerge-15/Timon34/russianpo-edited-online-with-bitbucket--
1548954256878 (pull request #25)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815
Takashi Sawanaka [Fri, 1 Feb 2019 12:52:22 +0000 (12:52 +0000)]
Merged in Timon34/winmerge-14/Timon34/russianpo-edited-online-with-bitbucket-t-
1548915674714 (pull request #24)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
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 : Timon34/russianpo-edited-online-with-bitbucket--
1548954256878
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 : Timon34/russianpo-edited-online-with-bitbucket-t-
1548915674714
Takashi Sawanaka [Wed, 30 Jan 2019 10:46:31 +0000 (10:46 +0000)]
Merged in Timon34/winmerge-13/Timon34/russianpo-edited-online-with-bitbucket-m-
1548842749050 (pull request #23)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Wed, 30 Jan 2019 10:12:38 +0000 (19:12 +0900)]
Merge
Takashi Sawanaka [Wed, 30 Jan 2019 10:11:12 +0000 (19:11 +0900)]
Fix Bitbucket issue #140: Click doesn't trigger document to scroll in Location pane under circumstance
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 : Timon34/russianpo-edited-online-with-bitbucket-m-
1548842749050
Takashi Sawanaka [Mon, 28 Jan 2019 21:00:48 +0000 (21:00 +0000)]
Merged in Timon34/winmerge-12/Timon34/russianpo-edited-online-with-bitbucket-m-
1548672659808 (pull request #22)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Mon, 28 Jan 2019 10:51:55 +0000 (10:51 +0000)]
Russian.po edited online with Bitbucket
Made several strings translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548672659808
Takashi Sawanaka [Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)]
MergeDoc.cpp: Recover lost compatibility
Takashi Sawanaka [Sun, 27 Jan 2019 22:59:31 +0000 (07:59 +0900)]
Test.cpp: Do not change the registry values while testing
Takashi Sawanaka [Sat, 26 Jan 2019 15:32:38 +0000 (00:32 +0900)]
Merge
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`
Takashi Sawanaka [Fri, 25 Jan 2019 22:00:55 +0000 (22:00 +0000)]
Merged in Timon34/winmerge-11/Timon34/russianpo-edited-online-with-bitbucket-m-
1548411157417 (pull request #21)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>