OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoUpdate Corsican translations and change encoding (#1188)
Patriccollu [Thu, 10 Feb 2022 23:24:40 +0000 (00:24 +0100)]
Update Corsican translations and change encoding (#1188)

* Update Corsican translation and change encoding

* Update Corsican translation and change encoding to UTF-8

2 years agoUpdate Dutch.po (#1187)
Thomas De Rocker [Thu, 10 Feb 2022 23:17:55 +0000 (00:17 +0100)]
Update Dutch.po (#1187)

Update Dutch translation to latest version

2 years agoFix issue #1185: Wrong links for ShellExtension on Translations page
Takashi Sawanaka [Thu, 10 Feb 2022 12:47:50 +0000 (21:47 +0900)]
Fix issue  #1185: Wrong links for ShellExtension on Translations page

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 5 Feb 2022 23:02:16 +0000 (08:02 +0900)]
Update TranslationsStatus

2 years agoUpdate COntributors.txt
Takashi Sawanaka [Sat, 5 Feb 2022 23:02:01 +0000 (08:02 +0900)]
Update COntributors.txt

2 years agoUpdate Korean.po (#1181)
GiHeong Ro [Sat, 5 Feb 2022 22:58:47 +0000 (07:58 +0900)]
Update Korean.po (#1181)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 3 Feb 2022 00:29:08 +0000 (09:29 +0900)]
Update TranslationsStatus

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 3 Feb 2022 00:28:25 +0000 (09:28 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoFolder Compare: Fix a problem where the results of a multi-page image file comparison...
Takashi Sawanaka [Wed, 2 Feb 2022 23:36:11 +0000 (08:36 +0900)]
Folder Compare: Fix a problem where the results of a multi-page image file comparison would be considered the same if some pages were different but the last page was the same.

2 years agoUpdate Portuguese.po (#1178)
Hugo Carvalho [Wed, 2 Feb 2022 23:13:21 +0000 (23:13 +0000)]
Update Portuguese.po (#1178)

2 years agoFileFilterHelper.cpp: Fix mixed EOL style
Takashi Sawanaka [Tue, 1 Feb 2022 23:21:37 +0000 (08:21 +0900)]
FileFilterHelper.cpp: Fix mixed EOL style

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 30 Jan 2022 23:06:39 +0000 (08:06 +0900)]
Update TranslationsStatus

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 30 Jan 2022 23:05:08 +0000 (08:05 +0900)]
Update Contributors.txt

2 years agoUpdate Ukrainian.po (#1172)
Vlad [Sun, 30 Jan 2022 22:57:36 +0000 (00:57 +0200)]
Update Ukrainian.po (#1172)

2 years agoChange the file naming method of the file compare report to avoid duplication of...
Jun Tajima [Sun, 30 Jan 2022 13:15:16 +0000 (22:15 +0900)]
Change the file naming method of the file compare report to avoid duplication of the file compare report file name linked from the folder compare report. (#1171)

- Add the row number in the folder comparison report to the head of the file name in the file comparison report.

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 30 Jan 2022 12:55:39 +0000 (21:55 +0900)]
Update TranslationsStatus

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 30 Jan 2022 12:53:27 +0000 (21:53 +0900)]
Update Contributors.txt

2 years agoUpdate Norwegian.po (#1170)
FTno [Sun, 30 Jan 2022 12:50:30 +0000 (13:50 +0100)]
Update Norwegian.po (#1170)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 29 Jan 2022 14:53:40 +0000 (23:53 +0900)]
Update TranslationsStatus

2 years agoFix crash when comparing files in Google drive (2)
Takashi Sawanaka [Sat, 29 Jan 2022 14:51:37 +0000 (23:51 +0900)]
Fix crash when comparing files in Google drive (2)

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Fri, 28 Jan 2022 13:45:57 +0000 (22:45 +0900)]
Update Contributors.txt

2 years agoUpdate Japanese.po (#1165)
Rukoto Luther [Fri, 28 Jan 2022 13:33:00 +0000 (22:33 +0900)]
Update Japanese.po (#1165)

2 years agoUpdate Russian.po (#1164)
wvxwxvw [Thu, 27 Jan 2022 22:52:31 +0000 (01:52 +0300)]
Update Russian.po (#1164)

2 years agoUpdate Slovenian.po (#1163)
Jadran [Thu, 27 Jan 2022 22:20:15 +0000 (23:20 +0100)]
Update Slovenian.po (#1163)

Please, send Me link for download last Beta version of WinMerge.

2 years agoBump revision to 2.16.18
Takashi Sawanaka [Thu, 27 Jan 2022 11:19:57 +0000 (20:19 +0900)]
Bump revision to 2.16.18

2 years agoUpdate manual
Takashi Sawanaka [Wed, 26 Jan 2022 14:49:05 +0000 (23:49 +0900)]
Update manual

2 years agoReadMe-Romanian.txt: Change the file encoding from UTF-8 to CP-1250
Takashi Sawanaka [Wed, 26 Jan 2022 13:43:33 +0000 (22:43 +0900)]
ReadMe-Romanian.txt: Change the file encoding from UTF-8 to CP-1250

2 years agoFix issue #960: [Feature Request] Lengthen title of File Compare window or add tip (3)
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)

2 years agoFix crash when comparing files in Google drive
Takashi Sawanaka [Wed, 26 Jan 2022 12:04:28 +0000 (21:04 +0900)]
Fix crash when comparing files in Google drive

2 years agoClipboardHistory.cpp: Use C++/WinRT only with Visual Studio 2022 or higher
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

2 years agoFIx issue #1160: WinMerge crashes with specific regex search
Takashi Sawanaka [Tue, 25 Jan 2022 23:10:09 +0000 (08:10 +0900)]
FIx issue #1160: WinMerge crashes with specific regex search

2 years agoMainFrm.cpp: Make it so that the parent window cannot be operated while the font...
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.

2 years agoManual: Update copyright year and revision
Takashi Sawanaka [Mon, 24 Jan 2022 22:52:12 +0000 (07:52 +0900)]
Manual: Update copyright year and revision

2 years agoFix issue #1111: Winmerge hangs when i try to compare files. (3)
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)

2 years agoUpdate ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Mon, 24 Jan 2022 12:19:52 +0000 (21:19 +0900)]
Update ChangeLog&ReleaseNotes (4)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 24 Jan 2022 12:19:37 +0000 (21:19 +0900)]
Update TranslationsStatus

2 years agoUpdate French.po (#1157)
slolo2000 [Mon, 24 Jan 2022 12:06:18 +0000 (13:06 +0100)]
Update French.po (#1157)

- Update missing translations

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 24 Jan 2022 00:29:02 +0000 (09:29 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoFix compilation error on VS2017
Takashi Sawanaka [Mon, 24 Jan 2022 00:28:53 +0000 (09:28 +0900)]
Fix compilation error on VS2017

2 years agoappveyor.yml: Update Build worker image to Visual Studio 2022
Takashi Sawanaka [Mon, 24 Jan 2022 00:15:48 +0000 (09:15 +0900)]
appveyor.yml: Update Build worker image to Visual Studio 2022

2 years agoUpdate German.po (#1155)
Mr-Update [Sun, 23 Jan 2022 22:07:30 +0000 (23:07 +0100)]
Update German.po (#1155)

Translation completed

2 years agoUpdate Corsican translation for commit 026281c (#1154)
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

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 23 Jan 2022 13:40:35 +0000 (22:40 +0900)]
Update TranslationsStatus

2 years agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sun, 23 Jan 2022 13:40:18 +0000 (22:40 +0900)]
Update ChangeLog&ReleaseNotes (3)

2 years agoUpdated sl.po 23.01.2022 (#1153)
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.

2 years agoUpdate Hungarian.po (#1150)
efi99 [Sun, 23 Jan 2022 11:17:28 +0000 (12:17 +0100)]
Update Hungarian.po (#1150)

2 years agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 23 Jan 2022 10:24:43 +0000 (19:24 +0900)]
Update ChangeLog&ReleaseNotes (2)

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sun, 23 Jan 2022 09:44:38 +0000 (18:44 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoClipboard Compare (3)
Takashi Sawanaka [Sun, 23 Jan 2022 01:28:55 +0000 (10:28 +0900)]
Clipboard Compare (3)

2 years agoClipboard Compare (2)
Takashi Sawanaka [Sun, 23 Jan 2022 01:23:05 +0000 (10:23 +0900)]
Clipboard Compare (2)

2 years agoClipboard Compare (#1147)
Takashi Sawanaka [Sun, 23 Jan 2022 00:56:16 +0000 (09:56 +0900)]
Clipboard Compare (#1147)

2 years agoUpdate Portuguese.po (#1149)
Hugo Carvalho [Sun, 23 Jan 2022 00:08:28 +0000 (00:08 +0000)]
Update Portuguese.po (#1149)

2 years agoUpdate Slovenian.po (#1148)
Jadran [Sat, 22 Jan 2022 22:53:26 +0000 (23:53 +0100)]
Update Slovenian.po (#1148)

Hi,
Slovenian updated here.

2 years agoUpdate ALL.*.sln
Takashi Sawanaka [Sat, 22 Jan 2022 22:47:18 +0000 (07:47 +0900)]
Update ALL.*.sln

2 years agoUpdate of Lithuanian translation (#1144)
Tichij [Thu, 20 Jan 2022 11:47:05 +0000 (13:47 +0200)]
Update of Lithuanian translation (#1144)

2 years agoUpdate German.po (#1143)
Mr-Update [Wed, 19 Jan 2022 22:38:52 +0000 (23:38 +0100)]
Update German.po (#1143)

2 years agoUpdate Corsican translation for commit d213624 (#1142)
Patriccollu [Wed, 19 Jan 2022 22:38:23 +0000 (23:38 +0100)]
Update Corsican translation for commit d213624 (#1142)

2 years agoUpdate Hungarian.po (#1141)
efi99 [Wed, 19 Jan 2022 14:33:45 +0000 (15:33 +0100)]
Update Hungarian.po (#1141)

2 years agoFix for https://github.com/WinMerge/winmerge/discussions/1139 (#1140) (2)
Takashi Sawanaka [Wed, 19 Jan 2022 11:54:51 +0000 (20:54 +0900)]
Fix for https://github.com/WinMerge/winmerge/discussions/1139 (#1140) (2)

2 years agoFix for https://github.com/WinMerge/winmerge/discussions/1139 (#1140)
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

2 years agoUpdate Corsican translation for commit 0e8066d (#1137)
Patriccollu [Sun, 16 Jan 2022 23:03:00 +0000 (00:03 +0100)]
Update Corsican translation for commit 0e8066d (#1137)

2 years agoUpdate Hungarian.po (#1136)
efi99 [Sun, 16 Jan 2022 11:18:32 +0000 (12:18 +0100)]
Update Hungarian.po (#1136)

2 years agoFix issue #960: [Feature Request] Lengthen title of File Compare window or add tip (2)
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)

2 years agoFix issue #960: [Feature Request] Lengthen title of File Compare window or add tip
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

2 years agoUpdate Chinese(Simplified) translation: (#1134)
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

2 years agoUpdate Portuguese translation (#1133)
Hugo Carvalho [Sat, 15 Jan 2022 22:11:02 +0000 (22:11 +0000)]
Update Portuguese translation (#1133)

2 years agoCodepage dialog: Check the checkbox corresponding to the double-clicked pane in Affec...
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,

2 years agoFix an issue where the number of differences in the status bar was not cleared after...
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

2 years agoCppcheck: The function '...' overrides a function in a base class but is not marked...
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.

2 years agoCppcheck: CWE: 398 Parameter '...' can be declared with const
Takashi Sawanaka [Sat, 15 Jan 2022 00:30:21 +0000 (09:30 +0900)]
Cppcheck: CWE: 398 Parameter '...' can be declared with const

2 years agoCppcheck: CWE: 571 Condition '...' is always true
Takashi Sawanaka [Sat, 15 Jan 2022 00:19:59 +0000 (09:19 +0900)]
Cppcheck: CWE: 571 Condition '...' is always true

2 years agoCppcheck: CWE: 570 Condition '...' is always false
Takashi Sawanaka [Sat, 15 Jan 2022 00:14:24 +0000 (09:14 +0900)]
Cppcheck: CWE: 570 Condition '...' is always false

2 years agoCppcheck: CWE: 704 The conversion from const char* as returned by c_str() to std...
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.

2 years agoAdd separator to Recompare As menu
Takashi Sawanaka [Fri, 14 Jan 2022 23:24:30 +0000 (08:24 +0900)]
Add separator to Recompare As menu

2 years agoUpdate Solution/Project files
Takashi Sawanaka [Fri, 14 Jan 2022 23:22:08 +0000 (08:22 +0900)]
Update Solution/Project files

2 years agoUpgrade Apache Tika to 2.2.1
Takashi Sawanaka [Thu, 13 Jan 2022 14:25:40 +0000 (23:25 +0900)]
Upgrade Apache Tika to 2.2.1

2 years agohttp ⇒ https
Takashi Sawanaka [Thu, 13 Jan 2022 12:57:40 +0000 (21:57 +0900)]
http ⇒ https

2 years agoDirView.cpp:
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

2 years agoRemove all lines containing cvs/svn "$Id$" keyword
Takashi Sawanaka [Wed, 12 Jan 2022 14:12:52 +0000 (23:12 +0900)]
Remove all lines containing cvs/svn "$Id$" keyword

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 12 Jan 2022 13:35:48 +0000 (22:35 +0900)]
Update TranslationsStatus

2 years agoAdd ReadMe-Arabic.txt, ReadMe-Czech.txt, ReadMe-Danish.txt, ReadMe-Hungarian.txt...
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

2 years agogithub.com/winmerge ⇒ github.com/WinMerge
Takashi Sawanaka [Wed, 12 Jan 2022 12:47:22 +0000 (21:47 +0900)]
github.com/winmerge ⇒ github.com/WinMerge

2 years agoFix issue #1127: Incorrect link to "Quick Start" guide at WM installation end
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

2 years agoUpdate of Lithuanian translation (#1124)
Tichij [Tue, 11 Jan 2022 09:24:22 +0000 (11:24 +0200)]
Update of Lithuanian translation (#1124)

2 years agoUpdate Dutch.po (#1123)
Thomas De Rocker [Tue, 11 Jan 2022 00:28:48 +0000 (01:28 +0100)]
Update Dutch.po (#1123)

2 years agoUpdate French.po (#1122)
slolo2000 [Sun, 9 Jan 2022 13:25:05 +0000 (14:25 +0100)]
Update French.po (#1122)

- Update missing translation

2 years agoUpdate French.po (#1121)
slolo2000 [Sun, 9 Jan 2022 13:15:04 +0000 (14:15 +0100)]
Update French.po (#1121)

- Update missing translations

2 years agoFix an issue where WinMerge sometimes crashes when executing "Refresh Selected" in...
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.

2 years agoFix issue #1111: Winmerge hangs when i try to compare files. (2)
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)

2 years agoInstaller: Add replacesameversion flag to 7z.dll
Takashi Sawanaka [Fri, 7 Jan 2022 13:07:58 +0000 (22:07 +0900)]
Installer: Add replacesameversion flag to 7z.dll

2 years agoInstaller: Re-enabled the process of installing ShellExtension for Windows 11.
Takashi Sawanaka [Fri, 7 Jan 2022 12:42:26 +0000 (21:42 +0900)]
Installer: Re-enabled the process of installing ShellExtension for Windows 11.

2 years agoUpdate Corsican translation for plugin descriptions (#1119)
Patriccollu [Thu, 6 Jan 2022 22:53:19 +0000 (23:53 +0100)]
Update Corsican translation for plugin descriptions (#1119)

2 years agoFix DownloadDeps.cmd
Takashi Sawanaka [Thu, 6 Jan 2022 14:49:04 +0000 (23:49 +0900)]
Fix DownloadDeps.cmd

2 years agoFix typo in DirScan.cpp (#1118)
Ikko Ashimine [Thu, 6 Jan 2022 14:44:59 +0000 (23:44 +0900)]
Fix typo in DirScan.cpp (#1118)

Propogate -> Propagate

2 years agoUpdate 7-Zip to 21.07
Takashi Sawanaka [Thu, 6 Jan 2022 13:11:21 +0000 (22:11 +0900)]
Update 7-Zip to 21.07

2 years agoFIx issue #1116: Colors -> Differences -> Word Difference : Text color ignored
Takashi Sawanaka [Thu, 6 Jan 2022 12:40:33 +0000 (21:40 +0900)]
FIx issue #1116: Colors -> Differences -> Word Difference : Text color ignored

2 years agoSubeditList.cpp: Fix comments
Takashi Sawanaka [Thu, 6 Jan 2022 12:38:58 +0000 (21:38 +0900)]
SubeditList.cpp: Fix comments

2 years agoMessage Boxes category in the Options dialog: prevent the text displayed in the combo...
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.

2 years agoFix issue #483: Sorting on Comparison Result being done incorectly (2)
Takashi Sawanaka [Wed, 5 Jan 2022 23:39:21 +0000 (08:39 +0900)]
Fix issue #483: Sorting on Comparison Result being done incorectly (2)

2 years agoUpdate German.po (#1117)
Mr-Update [Wed, 5 Jan 2022 22:57:38 +0000 (23:57 +0100)]
Update German.po (#1117)

Translation completed