OSDN Git Service
Takashi Sawanaka [Sat, 4 Feb 2023 23:19:48 +0000 (08:19 +0900)]
Webpage Compare: Fix missing file path in header bar
Takashi Sawanaka [Sat, 4 Feb 2023 14:25:57 +0000 (23:25 +0900)]
Fix issue #1696: 3-way compare does not properly align identical lines when resolving conflicts, and show false highlights
Takashi Sawanaka [Sat, 4 Feb 2023 01:24:17 +0000 (10:24 +0900)]
- Fix issue winmerge/frhed#13
- Update frhed to 0.10904.2017.12
Takashi Sawanaka [Sat, 28 Jan 2023 23:58:00 +0000 (08:58 +0900)]
Change file encoding from UTF-8 to CP-949 (#1694)
VenusGirl❤ [Sat, 28 Jan 2023 23:41:01 +0000 (08:41 +0900)]
Update Korean.isl (#1694)
* Update Korean.isl
* Update Korean.isl
Takashi Sawanaka [Fri, 27 Jan 2023 15:36:15 +0000 (00:36 +0900)]
Fix an issue where specifying a file and the PreviewMarkdown plugin in the Select Files or Folders window would not open the file in the Webpage Compare window.
Takashi Sawanaka [Fri, 27 Jan 2023 13:09:55 +0000 (22:09 +0900)]
Change file encoding from UTF-8 to CP-949 due to installer limitations (#1692, #1693)
VenusGirl❤ [Fri, 27 Jan 2023 12:50:18 +0000 (21:50 +0900)]
Update Korean.isl (#1693)
VenusGirl❤ [Fri, 27 Jan 2023 12:49:26 +0000 (21:49 +0900)]
Update ReadMe-Korean.txt (#1692)
Takashi Sawanaka [Thu, 26 Jan 2023 22:47:30 +0000 (07:47 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Thu, 26 Jan 2023 22:46:39 +0000 (07:46 +0900)]
Update Contributors.txt
VenusGirl❤ [Thu, 26 Jan 2023 22:44:09 +0000 (07:44 +0900)]
Update Korean.po (#1690)
VenusGirl❤ [Thu, 26 Jan 2023 22:43:39 +0000 (07:43 +0900)]
Update Korean.po (#1689)
Takashi Sawanaka [Thu, 26 Jan 2023 12:48:02 +0000 (21:48 +0900)]
Bump revision to 2.16.26
Takashi Sawanaka [Wed, 25 Jan 2023 14:42:35 +0000 (23:42 +0900)]
Show/hide the directory with the following menu items in the folder compare window. (2)
- "View" > "3-way Compare" > "Show Left Only Different Items"
- "View" > "3-way Compare" > "Show Middle Only Different Items"
- "View" > "3-way Compare" > "Show Right Only Different Items"
Takashi Sawanaka [Wed, 25 Jan 2023 14:26:43 +0000 (23:26 +0900)]
Update ALL.vs*.sln
Takashi Sawanaka [Mon, 23 Jan 2023 14:39:47 +0000 (23:39 +0900)]
Indent the plugin name displayed in the list part of the Plugin Name combo box in the Select Plugin dialog window.
Takashi Sawanaka [Sun, 22 Jan 2023 11:04:09 +0000 (20:04 +0900)]
Update ChangeLog&ReleaseNotes (5)
Takashi Sawanaka [Sun, 22 Jan 2023 11:03:32 +0000 (20:03 +0900)]
Folder compare: Fixed issue where the Open menu item in file path bar of folder comparison window was disabled.
Jun Tajima [Sun, 22 Jan 2023 10:45:06 +0000 (19:45 +0900)]
Show/hide the directory with the following menu items in the folder compare window. (#1683)
- "View" > "3-way Compare" > "Show Left Only Different Items"
- "View" > "3-way Compare" > "Show Middle Only Different Items"
- "View" > "3-way Compare" > "Show Right Only Different Items"
Takashi Sawanaka [Sun, 22 Jan 2023 04:18:34 +0000 (13:18 +0900)]
Implement #1662: Request: highlight the file after opening its parent folder
Takashi Sawanaka [Sun, 22 Jan 2023 03:29:48 +0000 (12:29 +0900)]
Add Plugins/Commands/DownloadFiles.bat (3)
Takashi Sawanaka [Sun, 22 Jan 2023 01:54:40 +0000 (10:54 +0900)]
Add Plugins/Commands/DownloadFiles.bat (2)
Takashi Sawanaka [Sun, 22 Jan 2023 01:44:49 +0000 (10:44 +0900)]
Add Plugins/Commands/DownloadFiles.bat
Takashi Sawanaka [Sun, 22 Jan 2023 00:38:54 +0000 (09:38 +0900)]
Add -UseBasicParsing option to Invoke-WebRequest
Takashi Sawanaka [Sat, 21 Jan 2023 23:29:02 +0000 (08:29 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sat, 21 Jan 2023 23:28:16 +0000 (08:28 +0900)]
Update ChangeLog&ReleaseNotes (4
)
pgert [Sat, 21 Jan 2023 22:26:29 +0000 (22:26 +0000)]
Minor Updates & Improvements to Swedish Translation (#1682)
Takashi Sawanaka [Sat, 21 Jan 2023 15:34:16 +0000 (00:34 +0900)]
Installer: Add java.bat to installers
Takashi Sawanaka [Sat, 21 Jan 2023 14:31:34 +0000 (23:31 +0900)]
- Update Apache Tika to 2.6.0
- Download and use OpenJDK 19.0.2 if Java is not installed when using the ApacheTika plugin or PreviewPlantUML plugin
Takashi Sawanaka [Sat, 21 Jan 2023 02:20:05 +0000 (11:20 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sat, 21 Jan 2023 02:14:06 +0000 (11:14 +0900)]
Update ChineseSimplified.po
YFdyh000 [Sat, 21 Jan 2023 02:07:53 +0000 (10:07 +0800)]
Update Chinese (Simplified) translations (#1681)
Takashi Sawanaka [Sat, 21 Jan 2023 02:02:27 +0000 (11:02 +0900)]
Webpage compare: To avoid crashes, force the Unpacker plugin to continue even if it fails.
Takashi Sawanaka [Sat, 21 Jan 2023 01:38:23 +0000 (10:38 +0900)]
Webpage compare: Avoid converting paths to "file:///..." when comparing local files
Takashi Sawanaka [Sat, 21 Jan 2023 01:23:05 +0000 (10:23 +0900)]
FilepathEdit.cpp: Fix buffer overrun (2)
Takashi Sawanaka [Sat, 21 Jan 2023 01:22:04 +0000 (10:22 +0900)]
Update Russian.po
slolo2000 [Fri, 20 Jan 2023 14:21:41 +0000 (15:21 +0100)]
Update French.po (#1679)
YIN, Gang [Tue, 17 Jan 2023 14:52:43 +0000 (22:52 +0800)]
update translations in image comparation UI (#1677)
wvxwxvw [Tue, 17 Jan 2023 14:52:01 +0000 (17:52 +0300)]
Update Russian.po (#1676)
Patriccollu [Mon, 16 Jan 2023 22:17:05 +0000 (23:17 +0100)]
Update Corsican translation for 2.16.26 (#1674)
Tichij [Mon, 16 Jan 2023 14:22:21 +0000 (16:22 +0200)]
Update of Lithuanian translation (#1673)
Mr-Update [Sun, 15 Jan 2023 22:31:50 +0000 (23:31 +0100)]
Update German.po (#1671)
Marcello-mco [Sun, 15 Jan 2023 15:31:13 +0000 (12:31 -0300)]
Update Brazilian.po (#1670)
I don't know what happened, I had submitted this change request yesterday, and it had been approved, but now it's back to the unaltered version. Resubmitting.
Takashi Sawanaka [Sun, 15 Jan 2023 14:23:15 +0000 (23:23 +0900)]
Update WinWebDiff to 1.0.5
Takashi Sawanaka [Sun, 15 Jan 2023 14:17:29 +0000 (23:17 +0900)]
Update TranslationsStatus
Hugo Carvalho [Sun, 15 Jan 2023 14:13:50 +0000 (14:13 +0000)]
Update Portuguese translation (#1669)
Takashi Sawanaka [Sun, 15 Jan 2023 06:26:38 +0000 (15:26 +0900)]
Reduce startup time
Takashi Sawanaka [Sun, 15 Jan 2023 01:35:16 +0000 (10:35 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 15 Jan 2023 01:32:46 +0000 (10:32 +0900)]
Reduce executable size
Marcello-mco [Sat, 14 Jan 2023 22:41:06 +0000 (19:41 -0300)]
Update Brazilian.po (#1668)
Update to mirror changes at "Add PreviewPlantUML plugin (#1666)"
Takashi Sawanaka [Sat, 14 Jan 2023 15:02:15 +0000 (00:02 +0900)]
Reduce executable size
Takashi Sawanaka [Sat, 14 Jan 2023 13:40:42 +0000 (22:40 +0900)]
CompareMSExcelFiles plugin: Add "Compare worksheets as HTML" option
Takashi Sawanaka [Sat, 14 Jan 2023 13:39:51 +0000 (22:39 +0900)]
FilepathEdit.cpp: Fix buffer overrun
Takashi Sawanaka [Sat, 14 Jan 2023 11:11:22 +0000 (20:11 +0900)]
Update Slovenian.po. Submitted by JadranR (#1666)
YIN, Gang [Sat, 14 Jan 2023 11:09:00 +0000 (19:09 +0800)]
sync zh-cn translation from English.pot (#1667)
* sync zh-cn translation from English.pot
* sync zh-cn translation from English.pot
Takashi Sawanaka [Sat, 14 Jan 2023 04:48:13 +0000 (13:48 +0900)]
Add PreviewPlantUML plugin (#1666)
YIN, Gang [Wed, 11 Jan 2023 23:10:40 +0000 (07:10 +0800)]
sync zh-cn translation from English.pot (#1665)
efi99 [Wed, 11 Jan 2023 14:32:01 +0000 (15:32 +0100)]
Update Hungarian.po (#1664)
pgert [Wed, 11 Jan 2023 14:25:59 +0000 (14:25 +0000)]
Improvements of Swedish Translation (#1663)
Mr-Update [Tue, 10 Jan 2023 15:29:43 +0000 (16:29 +0100)]
Update German.po (#1660)
Takashi Sawanaka [Mon, 9 Jan 2023 12:01:16 +0000 (21:01 +0900)]
Add PreviewMarkdown plugin (#1641) (3)
Takashi Sawanaka [Mon, 9 Jan 2023 10:48:56 +0000 (19:48 +0900)]
Binary Compare: Fix issue with the Open menu item in the File path bar being disabled.
Takashi Sawanaka [Mon, 9 Jan 2023 09:51:03 +0000 (18:51 +0900)]
Add PreviewMarkdown plugin (#1641) (2)
Takashi Sawanaka [Mon, 9 Jan 2023 09:50:09 +0000 (18:50 +0900)]
Update ChangeLog&ReleaseNotes
Tichij [Mon, 9 Jan 2023 09:46:38 +0000 (11:46 +0200)]
Update of Lithuanian translation (#1657)
Marcellomco [Sun, 8 Jan 2023 23:53:25 +0000 (20:53 -0300)]
Update Brazilian.po (#1656)
Adding changes as included in #1641 - Add PreviewMarkdown plugin.
pgert [Sun, 8 Jan 2023 23:52:38 +0000 (23:52 +0000)]
Minor Update & Improvements of Swedish Translation (#1655)
Takashi Sawanaka [Sun, 8 Jan 2023 14:16:02 +0000 (23:16 +0900)]
Add PreviewMarkdown plugin (#1641)
* Add PreviewMarkdown plugin (1)
* Add PreviewMarkdown plugin (2)
* Add PreviewMarkdown plugin (3)
* Add PreviewMarkdown plugin (4)
* Add PreviewMarkdown plugin (5)
* Add PreviewMarkdown plugin (6)
* Add PreviewMarkdown plugin (7)
* Add PreviewMarkdown plugin (8)
Takashi Sawanaka [Sat, 7 Jan 2023 23:55:46 +0000 (08:55 +0900)]
#1651: Feature request: Allow pasting when editing caption of pages
Takashi Sawanaka [Sat, 7 Jan 2023 13:05:15 +0000 (22:05 +0900)]
Fix issue #1646, #1644: Filtering qualified files (2)
Jun Tajima [Sat, 7 Jan 2023 12:53:06 +0000 (21:53 +0900)]
Add processing to indicate that two directories are identical in the "Comparison result" column when they are identical in a 3-way folder comparison. (#1649)
- Set the DIFFCODE::DIFF flag to directory items that don't have one or two directories when "Include unique subfolders contents" is on.
(This process is also performed for 2-way folder comparisons.)
- Set the 3-way compare flag for directory items.
Takashi Sawanaka [Thu, 5 Jan 2023 23:26:29 +0000 (08:26 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Thu, 5 Jan 2023 23:25:44 +0000 (08:25 +0900)]
Update Slovenian.po. Subbmitted by JadranR
Mirosław Żylewicz [Wed, 4 Jan 2023 23:31:57 +0000 (00:31 +0100)]
Update Polish.po (#1648)
Takashi Sawanaka [Tue, 3 Jan 2023 23:21:33 +0000 (08:21 +0900)]
Disable DirWatcher unit tests
Takashi Sawanaka [Tue, 3 Jan 2023 11:27:46 +0000 (20:27 +0900)]
Fix issue #1646, #1644: Filtering qualified files
Jun Tajima [Tue, 3 Jan 2023 10:59:41 +0000 (19:59 +0900)]
Modify the "Options (Compare > Folder)" dialog. (#1645)
- Disable "Include unique subfolders contents" when "Include Subfolders" is Off.
(Because "Include unique subfolders contents" is only used when "Include Subfolders" is on.)
- Swap the order of "Include unique subfolders contents" and "Include Subfolders".
Takashi Sawanaka [Sun, 1 Jan 2023 11:54:42 +0000 (20:54 +0900)]
Fix osdn.net ticket #46407: Text selection is very slow when most lines have differences
Takashi Sawanaka [Sun, 1 Jan 2023 10:31:23 +0000 (19:31 +0900)]
Update copyright year
slolo2000 [Thu, 29 Dec 2022 12:14:58 +0000 (13:14 +0100)]
Update French.po (#1640)
Takashi Sawanaka [Wed, 28 Dec 2022 12:00:59 +0000 (21:00 +0900)]
Fix issue #1638: Filters aren't saved anywhere
Takashi Sawanaka [Tue, 27 Dec 2022 14:44:54 +0000 (23:44 +0900)]
Fix an issue that could cause one pane of the generated report to be narrower than the other if the lengths of the left and right paths are significantly different.
YIN, Gang [Tue, 27 Dec 2022 12:28:23 +0000 (20:28 +0800)]
update zh-cn translations (#1635)
* unify the translations of Filter
* update zh-cn translations
Takashi Sawanaka [Mon, 26 Dec 2022 22:42:17 +0000 (07:42 +0900)]
Bump revision to 2.16.25
Takashi Sawanaka [Mon, 26 Dec 2022 22:40:35 +0000 (07:40 +0900)]
Update ChangeLog&ReleaseNotes (6)
Takashi Sawanaka [Mon, 26 Dec 2022 22:40:09 +0000 (07:40 +0900)]
Update TranslationsStatus
Mr-Update [Mon, 26 Dec 2022 22:35:28 +0000 (23:35 +0100)]
Update German.po (#1633)
Tichij [Mon, 26 Dec 2022 14:21:21 +0000 (16:21 +0200)]
Update of Lithuanian translation (#1632)
efi99 [Mon, 26 Dec 2022 14:20:25 +0000 (15:20 +0100)]
Update Hungarian.po (#1631)
Takashi Sawanaka [Sun, 25 Dec 2022 23:12:36 +0000 (08:12 +0900)]
Update ChangeLog&ReleaseNotes (5)
Takashi Sawanaka [Sun, 25 Dec 2022 23:12:11 +0000 (08:12 +0900)]
Update TranslationsStatus
Marcello-mco [Sun, 25 Dec 2022 23:03:07 +0000 (20:03 -0300)]
[xml] Update brazilian.po (#1630)
Translation for " Add auto-reload modified files option (#1611)"
Patriccollu [Sun, 25 Dec 2022 23:01:26 +0000 (00:01 +0100)]
Update Corsican translation for 2.16.25 (2nd) (#1629)
Takashi Sawanaka [Sun, 25 Dec 2022 12:31:39 +0000 (21:31 +0900)]
Update ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Sun, 25 Dec 2022 12:23:16 +0000 (21:23 +0900)]
Add auto-reload modified files option (#1611)
* Add DirWatcher.*
* WIP (2)
* WIP(2)
* WIP(3)
* WIP(4)
Takashi Sawanaka [Sat, 24 Dec 2022 14:01:13 +0000 (23:01 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sat, 24 Dec 2022 13:57:55 +0000 (22:57 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Patriccollu [Sat, 24 Dec 2022 13:57:07 +0000 (14:57 +0100)]
Update Corsican translation for 2.16.25 (#1628)
Takashi Sawanaka [Sat, 24 Dec 2022 05:07:52 +0000 (14:07 +0900)]
Update ChangeLog&ReleaseNotes (2)