OSDN Git Service
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
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
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>
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 : Timon34/russianpo-edited-online-with-bitbucket-m-
1548411157417
Takashi Sawanaka [Thu, 24 Jan 2019 21:36:09 +0000 (21:36 +0000)]
Merged in Timon34/winmerge-10/Timon34/russianisl-edited-online-with-bitbucket--
1548310814350 (pull request #20)
Russian.isl edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
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 : Timon34/russianisl-edited-online-with-bitbucket--
1548310814350
Takashi Sawanaka [Wed, 23 Jan 2019 16:13:11 +0000 (01:13 +0900)]
appveyor.yml: enable the eol extension
Takashi Sawanaka [Wed, 23 Jan 2019 15:19:36 +0000 (15:19 +0000)]
Merged in Timon34/winmerge-9/Timon34/russianpo-edited-online-with-bitbucket-a-
1548245477913 (pull request #19)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
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
datadiode [Wed, 23 Jan 2019 09:44:23 +0000 (10:44 +0100)]
Clarification as per https://github.com/WinMerge/winmerge-v2/issues/41
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 : Timon34/russianpo-edited-online-with-bitbucket-a-
1548245477913
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
Takashi Sawanaka [Tue, 22 Jan 2019 21:19:02 +0000 (21:19 +0000)]
Merged in Timon34/winmerge-8/Timon34/russianpo-edited-online-with-bitbucket-m-
1548159521632 (pull request #18)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Tue, 22 Jan 2019 12:19:51 +0000 (12:19 +0000)]
Russian.po edited online with Bitbucket
Made many fixes and new translations
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548159521632
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.
Takashi Sawanaka [Mon, 21 Jan 2019 14:54:10 +0000 (23:54 +0900)]
Fix sf.net issue #2211: end of line documentation
Takashi Sawanaka [Sun, 20 Jan 2019 14:08:10 +0000 (23:08 +0900)]
Add Timon34 to Contributers.txt
Takashi Sawanaka [Sun, 20 Jan 2019 11:38:50 +0000 (20:38 +0900)]
Delay calling InitialUpdateFrame() to reduce unnecessary drawing
Takashi Sawanaka [Sun, 20 Jan 2019 02:08:06 +0000 (11:08 +0900)]
ccrystaltextview.cpp: Ctrl+F3 key did not work correctly
Takashi Sawanaka [Sat, 19 Jan 2019 13:25:03 +0000 (22:25 +0900)]
Russian.po: Correct the position of double quotation mark
Takashi Sawanaka [Sat, 19 Jan 2019 13:19:21 +0000 (22:19 +0900)]
MergeLang.vs*.vcxproj: Revert incorrectly changed OutDir
Takashi Sawanaka [Sat, 19 Jan 2019 05:17:30 +0000 (14:17 +0900)]
Fix Bitbucket issue #137: Shell Integration "Enable Advanced Menu" disabled when instaling 32-bit WinMerge on 64-bit Windows
Takashi Sawanaka [Sat, 19 Jan 2019 02:02:38 +0000 (11:02 +0900)]
Fix for https://github.com/GreyMerlin/winmerge-v2/commit/
7823411ed17d2364c026075096f093c8b24c13b0#commitcomment-
31951237
GreyMerlin [Fri, 18 Jan 2019 00:06:00 +0000 (16:06 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (3)
* Improve comments, especially related to the doubly linked list structure of DIFFITEM siblings.
* see commit comment at
https://github.com/WinMerge/winmerge-v2/commit/
c30b5e126a1e2679db8071ea043f39655fa68630#commitcomment-
31972299
Takashi Sawanaka [Thu, 17 Jan 2019 14:20:22 +0000 (14:20 +0000)]
Merged in Timon34/winmerge-7/Timon34/russianisl-edited-online-with-bitbucket--
1547702605774 (pull request #16)
Russian.isl edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Thu, 17 Jan 2019 05:23:56 +0000 (05:23 +0000)]
Russian.isl edited online with Bitbucket
Improved InnoSetup Russian translation
--HG--
branch : Timon34/russianisl-edited-online-with-bitbucket--
1547702605774
Takashi Sawanaka [Wed, 16 Jan 2019 22:39:42 +0000 (22:39 +0000)]
Merged in Timon34/winmerge-6/Timon34/russianpo-edited-online-with-bitbucket-
1547658577332 (pull request #15)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Wed, 16 Jan 2019 17:12:46 +0000 (17:12 +0000)]
Russian.po edited online with Bitbucket
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-
1547658577332
Takashi Sawanaka [Wed, 16 Jan 2019 14:54:24 +0000 (23:54 +0900)]
Merge
Takashi Sawanaka [Wed, 16 Jan 2019 14:53:20 +0000 (23:53 +0900)]
Russian.po: Change the file encoding from UTF-8 to CP-1251
Takashi Sawanaka [Wed, 16 Jan 2019 14:48:40 +0000 (23:48 +0900)]
Merged in Timon34/winmerge-4/Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815 (pull request #13)
Takashi Sawanaka [Wed, 16 Jan 2019 14:43:14 +0000 (14:43 +0000)]
Merged in Timon34/winmerge-5/Timon34/russianpo-edited-online-with-bitbucket-w-
1547639137731 (pull request #14)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Wed, 16 Jan 2019 14:40:56 +0000 (14:40 +0000)]
Merged in Timon34/winmerge-3/Timon34/russianpo-edited-online-with-bitbucket-m-
1547615905093 (pull request #12)
Russian.po edited online with Bitbucket
Takashi Sawanaka [Wed, 16 Jan 2019 14:40:05 +0000 (14:40 +0000)]
Merged in Timon34/winmerge-2/Timon34/russianpo-edited-online-with-bitbucket-m-
1547615062676 (pull request #11)
Russian.po edited online with Bitbucket
Takashi Sawanaka [Wed, 16 Jan 2019 14:35:48 +0000 (23:35 +0900)]
Merge