OSDN Git Service
Takashi Sawanaka [Wed, 26 Jan 2022 13:01:07 +0000 (22:01 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Wed, 26 Jan 2022 12:05:00 +0000 (21:05 +0900)]
Fix issue #960: [Feature Request] Lengthen title of File Compare window or add tip (3)
Takashi Sawanaka [Wed, 26 Jan 2022 12:04:28 +0000 (21:04 +0900)]
Fix crash when comparing files in Google drive
Takashi Sawanaka [Wed, 26 Jan 2022 00:06:15 +0000 (09:06 +0900)]
ClipboardHistory.cpp: Use C++/WinRT only with Visual Studio 2022 or higher
Takashi Sawanaka [Tue, 25 Jan 2022 23:10:09 +0000 (08:10 +0900)]
FIx issue #1160: WinMerge crashes with specific regex search
Takashi Sawanaka [Tue, 25 Jan 2022 13:58:13 +0000 (22:58 +0900)]
Update ChangeLogJapanese&ReleaseNotesJapanese
Takashi Sawanaka [Tue, 25 Jan 2022 12:18:05 +0000 (21:18 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Tue, 25 Jan 2022 12:03:49 +0000 (21:03 +0900)]
MainFrm.cpp: Make it so that the parent window cannot be operated while the font selection dialog displayed from the View→Select Font menu item is displayed.
Takashi Sawanaka [Mon, 24 Jan 2022 22:52:12 +0000 (07:52 +0900)]
Manual: Update copyright year and revision
Takashi Sawanaka [Mon, 24 Jan 2022 14:53:33 +0000 (23:53 +0900)]
Fix issue #1111: Winmerge hangs when i try to compare files. (3)
Takashi Sawanaka [Mon, 24 Jan 2022 12:58:06 +0000 (21:58 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
# Conflicts:
# Src/Merge.rc
# Translations/WinMerge/Arabic.po
# Translations/WinMerge/Basque.po
# Translations/WinMerge/Brazilian.po
# Translations/WinMerge/Bulgarian.po
# Translations/WinMerge/Catalan.po
# Translations/WinMerge/Corsican.po
# Translations/WinMerge/Croatian.po
# Translations/WinMerge/Czech.po
# Translations/WinMerge/Danish.po
# Translations/WinMerge/Dutch.po
# Translations/WinMerge/English.pot
# Translations/WinMerge/Finnish.po
# Translations/WinMerge/French.po
# Translations/WinMerge/Galician.po
# Translations/WinMerge/German.po
# Translations/WinMerge/Greek.po
# Translations/WinMerge/Hungarian.po
# Translations/WinMerge/Italian.po
# Translations/WinMerge/Japanese.po
# Translations/WinMerge/Korean.po
# Translations/WinMerge/Lithuanian.po
# Translations/WinMerge/Norwegian.po
# Translations/WinMerge/Persian.po
# Translations/WinMerge/Polish.po
# Translations/WinMerge/Portuguese.po
# Translations/WinMerge/Romanian.po
# Translations/WinMerge/Russian.po
# Translations/WinMerge/Serbian.po
# Translations/WinMerge/Sinhala.po
# Translations/WinMerge/Slovak.po
# Translations/WinMerge/Slovenian.po
# Translations/WinMerge/Spanish.po
# Translations/WinMerge/Swedish.po
# Translations/WinMerge/Turkish.po
# Translations/WinMerge/Ukrainian.po
Takashi Sawanaka [Mon, 24 Jan 2022 12:19:52 +0000 (21:19 +0900)]
Update ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Mon, 24 Jan 2022 12:19:37 +0000 (21:19 +0900)]
Update TranslationsStatus
slolo2000 [Mon, 24 Jan 2022 12:06:18 +0000 (13:06 +0100)]
Update French.po (#1157)
- Update missing translations
Takashi Sawanaka [Mon, 24 Jan 2022 00:29:02 +0000 (09:29 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 24 Jan 2022 00:28:53 +0000 (09:28 +0900)]
Fix compilation error on VS2017
Takashi Sawanaka [Mon, 24 Jan 2022 00:15:48 +0000 (09:15 +0900)]
appveyor.yml: Update Build worker image to Visual Studio 2022
Mr-Update [Sun, 23 Jan 2022 22:07:30 +0000 (23:07 +0100)]
Update German.po (#1155)
Translation completed
Patriccollu [Sun, 23 Jan 2022 22:06:53 +0000 (23:06 +0100)]
Update Corsican translation for commit
026281c (#1154)
* Update Corsican translation for commit
026281c
* Update Corsican translation for commit
026281c
Takashi Sawanaka [Sun, 23 Jan 2022 13:40:35 +0000 (22:40 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sun, 23 Jan 2022 13:40:18 +0000 (22:40 +0900)]
Update ChangeLog&ReleaseNotes (3)
Jadran [Sun, 23 Jan 2022 12:43:10 +0000 (13:43 +0100)]
Updated sl.po 23.01.2022 (#1153)
Updated Slovenian translation per 23.01.2022.
efi99 [Sun, 23 Jan 2022 11:17:28 +0000 (12:17 +0100)]
Update Hungarian.po (#1150)
Takashi Sawanaka [Sun, 23 Jan 2022 10:24:43 +0000 (19:24 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 23 Jan 2022 09:44:38 +0000 (18:44 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 23 Jan 2022 01:28:55 +0000 (10:28 +0900)]
Clipboard Compare (3)
Takashi Sawanaka [Sun, 23 Jan 2022 01:23:05 +0000 (10:23 +0900)]
Clipboard Compare (2)
Takashi Sawanaka [Sun, 23 Jan 2022 00:56:16 +0000 (09:56 +0900)]
Clipboard Compare (#1147)
Hugo Carvalho [Sun, 23 Jan 2022 00:08:28 +0000 (00:08 +0000)]
Update Portuguese.po (#1149)
Jadran [Sat, 22 Jan 2022 22:53:26 +0000 (23:53 +0100)]
Update Slovenian.po (#1148)
Hi,
Slovenian updated here.
Takashi Sawanaka [Sat, 22 Jan 2022 22:47:18 +0000 (07:47 +0900)]
Update ALL.*.sln
Tichij [Thu, 20 Jan 2022 11:47:05 +0000 (13:47 +0200)]
Update of Lithuanian translation (#1144)
Mr-Update [Wed, 19 Jan 2022 22:38:52 +0000 (23:38 +0100)]
Update German.po (#1143)
Patriccollu [Wed, 19 Jan 2022 22:38:23 +0000 (23:38 +0100)]
Update Corsican translation for commit
d213624 (#1142)
efi99 [Wed, 19 Jan 2022 14:33:45 +0000 (15:33 +0100)]
Update Hungarian.po (#1141)
Takashi Sawanaka [Wed, 19 Jan 2022 11:54:51 +0000 (20:54 +0900)]
Fix for https://github.com/WinMerge/winmerge/discussions/1139 (#1140) (2)
Gitoffthelawn [Wed, 19 Jan 2022 11:46:42 +0000 (03:46 -0800)]
Fix for https://github.com/WinMerge/winmerge/discussions/1139 (#1140)
Fix for https://github.com/WinMerge/winmerge/discussions/1139
Patriccollu [Sun, 16 Jan 2022 23:03:00 +0000 (00:03 +0100)]
Update Corsican translation for commit
0e8066d (#1137)
efi99 [Sun, 16 Jan 2022 11:18:32 +0000 (12:18 +0100)]
Update Hungarian.po (#1136)
Takashi Sawanaka [Sun, 16 Jan 2022 02:03:22 +0000 (11:03 +0900)]
Fix issue #960: [Feature Request] Lengthen title of File Compare window or add tip (2)
Takashi Sawanaka [Sun, 16 Jan 2022 00:32:11 +0000 (09:32 +0900)]
Fix issue #960: [Feature Request] Lengthen title of File Compare window or add tip
CharlesMengCA [Sat, 15 Jan 2022 22:11:36 +0000 (17:11 -0500)]
Update Chinese(Simplified) translation: (#1134)
WinMerge\ChineseSimplified.po
ShellExtension\ChineseSimplified.po
InnoSetup\Chinese_Simplified.isl
Hugo Carvalho [Sat, 15 Jan 2022 22:11:02 +0000 (22:11 +0000)]
Update Portuguese translation (#1133)
Takashi Sawanaka [Sat, 15 Jan 2022 12:58:12 +0000 (21:58 +0900)]
Codepage dialog: Check the checkbox corresponding to the double-clicked pane in Affects in the Codepage dialog when double-clicking on encoding in the status bar,
Takashi Sawanaka [Sat, 15 Jan 2022 01:28:12 +0000 (10:28 +0900)]
Fix an issue where the number of differences in the status bar was not cleared after closing the File compare window
Takashi Sawanaka [Sat, 15 Jan 2022 00:33:29 +0000 (09:33 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sat, 15 Jan 2022 00:30:21 +0000 (09:30 +0900)]
Cppcheck: CWE: 398 Parameter '...' can be declared with const
Takashi Sawanaka [Sat, 15 Jan 2022 00:19:59 +0000 (09:19 +0900)]
Cppcheck: CWE: 571 Condition '...' is always true
Takashi Sawanaka [Sat, 15 Jan 2022 00:14:24 +0000 (09:14 +0900)]
Cppcheck: CWE: 570 Condition '...' is always false
Takashi Sawanaka [Fri, 14 Jan 2022 23:58:33 +0000 (08:58 +0900)]
Cppcheck: CWE: 704 The conversion from const char* as returned by c_str() to std::string creates an unnecessary string copy. Solve that by directly passing the string.
Takashi Sawanaka [Fri, 14 Jan 2022 23:24:30 +0000 (08:24 +0900)]
Add separator to Recompare As menu
Takashi Sawanaka [Fri, 14 Jan 2022 23:22:08 +0000 (08:22 +0900)]
Update Solution/Project files
Takashi Sawanaka [Thu, 13 Jan 2022 14:25:40 +0000 (23:25 +0900)]
Upgrade Apache Tika to 2.2.1
Takashi Sawanaka [Thu, 13 Jan 2022 12:57:40 +0000 (21:57 +0900)]
http ⇒ https
Takashi Sawanaka [Thu, 13 Jan 2022 12:56:43 +0000 (21:56 +0900)]
DirView.cpp:
- Fix the parent folder icon not being displayed.
- Fix the problem that the sort order is different from version 2.16.16 or earlier
Takashi Sawanaka [Wed, 12 Jan 2022 14:12:52 +0000 (23:12 +0900)]
Remove all lines containing cvs/svn "$Id$" keyword
Takashi Sawanaka [Wed, 12 Jan 2022 13:35:48 +0000 (22:35 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 12 Jan 2022 13:35:30 +0000 (22:35 +0900)]
Add ReadMe-Arabic.txt, ReadMe-Czech.txt, ReadMe-Danish.txt, ReadMe-Hungarian.txt ReadMe-Korean.txt ReadMe-Norwegian.txt ReadMe-Persian.txt, ReadMe-Polish.txt, ReadMe-Russian.txt and ReadMe-Sinhala.txt
Takashi Sawanaka [Wed, 12 Jan 2022 12:47:22 +0000 (21:47 +0900)]
github.com/winmerge ⇒ github.com/WinMerge
Takashi Sawanaka [Tue, 11 Jan 2022 13:49:56 +0000 (22:49 +0900)]
Fix issue #1127: Incorrect link to "Quick Start" guide at WM installation end
Tichij [Tue, 11 Jan 2022 09:24:22 +0000 (11:24 +0200)]
Update of Lithuanian translation (#1124)
Thomas De Rocker [Tue, 11 Jan 2022 00:28:48 +0000 (01:28 +0100)]
Update Dutch.po (#1123)
slolo2000 [Sun, 9 Jan 2022 13:25:05 +0000 (14:25 +0100)]
Update French.po (#1122)
- Update missing translation
slolo2000 [Sun, 9 Jan 2022 13:15:04 +0000 (14:15 +0100)]
Update French.po (#1121)
- Update missing translations
Jun Tajima [Sun, 9 Jan 2022 11:34:00 +0000 (20:34 +0900)]
Fix an issue where WinMerge sometimes crashes when executing "Refresh Selected" in the folder compare window. (#1120)
- Change to perform UI update process after the process that may delete DiffItems is completed.
- DirScan_UpdateMarkedItems() is now executed in the collect thread.
- The compare thread is now processed after the collection thread is completed if "Refresh Selected" is executed.
- Add some assertions.
Takashi Sawanaka [Sat, 8 Jan 2022 08:29:08 +0000 (17:29 +0900)]
Fix issue #1111: Winmerge hangs when i try to compare files. (2)
Takashi Sawanaka [Fri, 7 Jan 2022 13:07:58 +0000 (22:07 +0900)]
Installer: Add replacesameversion flag to 7z.dll
Takashi Sawanaka [Fri, 7 Jan 2022 12:42:26 +0000 (21:42 +0900)]
Installer: Re-enabled the process of installing ShellExtension for Windows 11.
Patriccollu [Thu, 6 Jan 2022 22:53:19 +0000 (23:53 +0100)]
Update Corsican translation for plugin descriptions (#1119)
Takashi Sawanaka [Thu, 6 Jan 2022 14:49:04 +0000 (23:49 +0900)]
Fix DownloadDeps.cmd
Ikko Ashimine [Thu, 6 Jan 2022 14:44:59 +0000 (23:44 +0900)]
Fix typo in DirScan.cpp (#1118)
Propogate -> Propagate
Takashi Sawanaka [Thu, 6 Jan 2022 13:11:21 +0000 (22:11 +0900)]
Update 7-Zip to 21.07
Takashi Sawanaka [Thu, 6 Jan 2022 12:40:33 +0000 (21:40 +0900)]
FIx issue #1116: Colors -> Differences -> Word Difference : Text color ignored
Takashi Sawanaka [Thu, 6 Jan 2022 12:38:58 +0000 (21:38 +0900)]
SubeditList.cpp: Fix comments
Takashi Sawanaka [Thu, 6 Jan 2022 11:50:09 +0000 (20:50 +0900)]
Message Boxes category in the Options dialog: prevent the text displayed in the combo box from overlapping with the text in the background list view.
Takashi Sawanaka [Wed, 5 Jan 2022 23:39:21 +0000 (08:39 +0900)]
Fix issue #483: Sorting on Comparison Result being done incorectly (2)
Mr-Update [Wed, 5 Jan 2022 22:57:38 +0000 (23:57 +0100)]
Update German.po (#1117)
Translation completed
efi99 [Wed, 5 Jan 2022 22:56:33 +0000 (23:56 +0100)]
Update Hungarian.po (#1115)
Takashi Sawanaka [Wed, 5 Jan 2022 12:32:38 +0000 (21:32 +0900)]
Make plugin descriptions translatable
Takashi Sawanaka [Tue, 4 Jan 2022 11:07:58 +0000 (20:07 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Tue, 4 Jan 2022 11:07:15 +0000 (20:07 +0900)]
Update copyright year
Takashi Sawanaka [Mon, 3 Jan 2022 12:43:30 +0000 (21:43 +0900)]
Update Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Sat, 1 Jan 2022 02:06:03 +0000 (11:06 +0900)]
Fix issue #1111: Winmerge hangs when i try to compare files.
CharlesMengCA [Sat, 1 Jan 2022 00:18:45 +0000 (19:18 -0500)]
Update ChineseSimplified.po for better wording and consistency (#1112)
Mr-Update [Sat, 1 Jan 2022 00:01:51 +0000 (01:01 +0100)]
Update German.po (#1110)
Translation completed
Takashi Sawanaka [Fri, 31 Dec 2021 09:39:38 +0000 (18:39 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Fri, 31 Dec 2021 09:35:14 +0000 (18:35 +0900)]
Update ChineseSimplified.po. Submitted by CharlesMengCA (#1109)
Hugo Carvalho [Thu, 30 Dec 2021 23:18:54 +0000 (23:18 +0000)]
Update portuguese translation (#1106)
Takashi Sawanaka [Mon, 27 Dec 2021 12:23:50 +0000 (21:23 +0900)]
Fix code scanning alerts: Inconsistent nullness check
Takashi Sawanaka [Mon, 27 Dec 2021 12:01:29 +0000 (21:01 +0900)]
Update translations
Takashi Sawanaka [Mon, 27 Dec 2021 11:16:07 +0000 (20:16 +0900)]
Update ChangeLogJapanese*.*
Takashi Sawanaka [Sun, 26 Dec 2021 00:58:21 +0000 (09:58 +0900)]
Fix code scanning alerts: Inconsistent nullness check
Takashi Sawanaka [Sat, 25 Dec 2021 00:47:17 +0000 (09:47 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
# Conflicts:
# BuildArc.cmd
# SetVersion.cmd
# Translations/WinMerge/ChineseTraditional.po
# Translations/WinMerge/Slovenian.po
# Version.h
Patriccollu [Fri, 24 Dec 2021 23:14:08 +0000 (00:14 +0100)]
Update Corsican translation for 2 commits on Dec. 23rd (#1103)
efi99 [Fri, 24 Dec 2021 15:23:03 +0000 (16:23 +0100)]
Patch 15 hungarian lang (#1102)
* Update Hungarian.po
* Update Hungarian.po
Takashi Sawanaka [Fri, 24 Dec 2021 13:04:37 +0000 (22:04 +0900)]
Fix a problem that 'Encountered an improper argument' error occurs when a pane split by Window→Split menu item is unsplit by drag operation.
Takashi Sawanaka [Thu, 23 Dec 2021 13:13:33 +0000 (22:13 +0900)]
Merge.rc:
- Rename "Quick compare limit (MB)" to "Threshold for switching to quick compare (MB)"
- Rename "Binary compare limit (MB)" to "Threshold for switching to binary compare (MB)"
related to #318, #1092 and #1100
Takashi Sawanaka [Thu, 23 Dec 2021 12:50:27 +0000 (21:50 +0900)]
3-pane compare window: Allow copying from left to right or vice versa, not just to adjacent panes
Takashi Sawanaka [Thu, 23 Dec 2021 00:07:19 +0000 (09:07 +0900)]
Fix issse #1100: "Quick compare limit" and "Binary compare limit" settings don't have the expected (and documented) purpose
Takashi Sawanaka [Wed, 22 Dec 2021 23:13:41 +0000 (08:13 +0900)]
Fix issse #1101: wm 2.16.16.0 crashes with file attached