OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoFix the problem that the comparison result is not displayed correctly when renaming...
Jun Tajima [Sun, 13 Mar 2022 15:44:06 +0000 (00:44 +0900)]
Fix the problem that the comparison result is not displayed correctly when renaming a file (directory) that exists on only one side to a name where the directory (file) with the same name exists. (#1246)

- Change to judge that a directory or file exists only if the type (directory or file) of renamed item matches the original diffItem type in the diffItem update process.

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 9 Mar 2022 23:29:11 +0000 (08:29 +0900)]
Update TranslationsStatus

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 9 Mar 2022 23:28:39 +0000 (08:28 +0900)]
Update Contributors.txt

2 years agoUpdate Brazilian.po
Takashi Sawanaka [Wed, 9 Mar 2022 23:28:17 +0000 (08:28 +0900)]
Update Brazilian.po

2 years agoUpdates to all catalan translations. (#1237)
Josep Maria Antolín Segura [Wed, 9 Mar 2022 23:24:51 +0000 (00:24 +0100)]
Updates to all catalan translations. (#1237)

2 years agoFixes #1234, #1235 Copy & Advance skips differences when moved block detection is on
Takashi Sawanaka [Tue, 8 Mar 2022 12:27:21 +0000 (21:27 +0900)]
Fixes #1234, #1235  Copy & Advance skips differences when moved block detection is on

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Fri, 4 Mar 2022 23:37:24 +0000 (08:37 +0900)]
Update TranslationsStatus

2 years agoOne last Update Merge.rc incorporated (#1232)
Mr-Update [Fri, 4 Mar 2022 22:47:10 +0000 (23:47 +0100)]
One last Update Merge.rc incorporated (#1232)

2 years agoSome more Update Merge.rc incorporated (#1231)
Mr-Update [Fri, 4 Mar 2022 22:46:12 +0000 (23:46 +0100)]
Some more Update Merge.rc incorporated (#1231)

* Update Bulgarian.po

* Update ChineseSimplified.po

* Update ChineseTraditional.po

* Update French.po

* Update Galician.po

* Update Italian.po

* Update Serbian.po

2 years agoUpdate German.po (#1228)
Mr-Update [Fri, 4 Mar 2022 22:45:38 +0000 (23:45 +0100)]
Update German.po (#1228)

Translation completed

2 years agoUpdate Merge.rc incorporated (#1227)
Mr-Update [Fri, 4 Mar 2022 22:45:01 +0000 (23:45 +0100)]
Update Merge.rc incorporated (#1227)

* Update Arabic.po

* Update Basque.po

* Update Brazilian.po

* Update Catalan.po

* Update Croatian.po

* Update Czech.po

* Update Danish.po

* Update Dutch.po

* Update Finnish.po

* Update Greek.po

* Update Czech.po

* Update Danish.po

* Update Norwegian.po

* Update Swedish.po

2 years agoUpdate Merge.rc (#1219) (5)
Takashi Sawanaka [Fri, 4 Mar 2022 12:55:10 +0000 (21:55 +0900)]
Update Merge.rc (#1219) (5)

2 years agoUpdate of Lithuanian translation (#1224)
Tichij [Fri, 4 Mar 2022 12:14:08 +0000 (14:14 +0200)]
Update of Lithuanian translation (#1224)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 3 Mar 2022 23:43:18 +0000 (08:43 +0900)]
Update TranslationsStatus

2 years agoUpdate Merge.rc (#1219) (4)
Takashi Sawanaka [Thu, 3 Mar 2022 23:40:15 +0000 (08:40 +0900)]
Update Merge.rc (#1219) (4)

2 years agoUpdate Corsican translation for 3 recent commits (#1221)
Patriccollu [Thu, 3 Mar 2022 22:58:03 +0000 (23:58 +0100)]
Update Corsican translation for 3 recent commits (#1221)

* Update Corsican translation for 3 recent commits

* Update Corsican translation for 3 recent commits (2)

2 years agoUpdate Portuguese translation (#1222)
Hugo Carvalho [Thu, 3 Mar 2022 22:53:17 +0000 (22:53 +0000)]
Update Portuguese translation (#1222)

2 years agoUpdate Hungarian.po (#1220)
efi99 [Thu, 3 Mar 2022 14:58:19 +0000 (15:58 +0100)]
Update Hungarian.po (#1220)

2 years agoUpdate Merge.rc (#1219) (3)
Takashi Sawanaka [Thu, 3 Mar 2022 14:14:13 +0000 (23:14 +0900)]
Update Merge.rc (#1219) (3)

2 years agoUpdate Merge.rc (#1219) (2)
Takashi Sawanaka [Wed, 2 Mar 2022 23:44:13 +0000 (08:44 +0900)]
Update Merge.rc (#1219) (2)

2 years agoUpdate Merge.rc (#1219)
Mr-Update [Wed, 2 Mar 2022 23:19:59 +0000 (00:19 +0100)]
Update Merge.rc (#1219)

- Typos corrected
- Hotkeys added

2 years agoFixes #1218: Different exit procedure required for small vs. large files
Takashi Sawanaka [Wed, 2 Mar 2022 13:29:24 +0000 (22:29 +0900)]
Fixes #1218: Different exit procedure required for small vs. large files

2 years agoFixes #1212: Some improvements
Takashi Sawanaka [Sun, 27 Feb 2022 01:31:29 +0000 (10:31 +0900)]
Fixes #1212: Some improvements

2 years agoUpdate French translation (#1211)
slolo2000 [Sat, 26 Feb 2022 12:20:19 +0000 (13:20 +0100)]
Update French translation (#1211)

2 years agoFix inline difference selection by F4 key not working well in various cases
Takashi Sawanaka [Sat, 26 Feb 2022 06:37:31 +0000 (15:37 +0900)]
Fix inline difference selection by F4 key not working well in various cases

2 years agoUpdate winimerge to 1.0.33. fixes #1176: Folder compare with jpg images crashes
Takashi Sawanaka [Sat, 26 Feb 2022 01:19:33 +0000 (10:19 +0900)]
Update winimerge to 1.0.33. fixes #1176: Folder compare with jpg images crashes

2 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 26 Feb 2022 01:17:48 +0000 (10:17 +0900)]
Update .gitignore

2 years agoFixes #1209: Match similar lines breaks with Ignore whitespace change
Takashi Sawanaka [Fri, 25 Feb 2022 22:44:03 +0000 (07:44 +0900)]
Fixes #1209: Match similar lines breaks with Ignore whitespace change

2 years agoMergeDocDiffSync.cpp: Add PrintWordDiffList() function for debugging
Takashi Sawanaka [Fri, 25 Feb 2022 00:16:43 +0000 (09:16 +0900)]
MergeDocDiffSync.cpp: Add PrintWordDiffList() function for debugging

2 years agoFix issue #1210: Help text is truncated
Takashi Sawanaka [Thu, 24 Feb 2022 12:42:25 +0000 (21:42 +0900)]
Fix issue #1210: Help text is truncated

2 years agoFilters enhancement (#1179)
Takashi Sawanaka [Wed, 23 Feb 2022 01:36:07 +0000 (10:36 +0900)]
Filters enhancement (#1179)

2 years agoUpdate German.po (#1208)
Mr-Update [Tue, 22 Feb 2022 23:11:57 +0000 (00:11 +0100)]
Update German.po (#1208)

Translation completed

2 years agoFix an issue where the Assertion failed dialog would be displayed at the next folder...
Takashi Sawanaka [Tue, 22 Feb 2022 15:15:40 +0000 (00:15 +0900)]
Fix an issue where the Assertion failed dialog would be displayed at the next folder comparison if WinMerge was closed by pressing the close button during a folder comparison.

2 years agoImageCompare.cpp: Call FreeLibrary() in the destructor. (2)
Takashi Sawanaka [Mon, 21 Feb 2022 23:54:01 +0000 (08:54 +0900)]
ImageCompare.cpp: Call FreeLibrary() in the destructor. (2)

2 years agoImageCompare.cpp: Call FreeLibrary() in the destructor.
Takashi Sawanaka [Mon, 21 Feb 2022 23:36:07 +0000 (08:36 +0900)]
ImageCompare.cpp: Call FreeLibrary() in the destructor.

2 years agoUpdate Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Mon, 21 Feb 2022 22:54:10 +0000 (07:54 +0900)]
Update Slovenian.po. Submitted by JadranR

2 years ago- "All Right" → "Copy All to Right" (2)
Takashi Sawanaka [Sun, 20 Feb 2022 10:42:07 +0000 (19:42 +0900)]
- "All Right" → "Copy All to Right" (2)
- "All Left" → "Copy All to Left"

2 years ago- "All Right" → "Copy All to Right"
Takashi Sawanaka [Sun, 20 Feb 2022 04:10:30 +0000 (13:10 +0900)]
- "All Right" → "Copy All to Right"
- "All Copy" → "Copy All to Copy"

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

2 years agoUpdate Corsican translation for commit c79933b (#1205)
Patriccollu [Sat, 19 Feb 2022 22:58:17 +0000 (23:58 +0100)]
Update Corsican translation for commit c79933b (#1205)

2 years agoUpdate ChineseTraditional.po (#1204)
SiderealArt [Sat, 19 Feb 2022 22:57:50 +0000 (06:57 +0800)]
Update ChineseTraditional.po (#1204)

2 years agoUpdate Hungarian.po (#1203)
efi99 [Sat, 19 Feb 2022 11:51:05 +0000 (12:51 +0100)]
Update Hungarian.po (#1203)

2 years agoUpdate of Lithuanian translation (#1202)
Tichij [Sat, 19 Feb 2022 09:21:54 +0000 (11:21 +0200)]
Update of Lithuanian translation (#1202)

2 years agoUpdate Translations
Takashi Sawanaka [Sat, 19 Feb 2022 00:20:34 +0000 (09:20 +0900)]
Update Translations

2 years agoImprove vertical alignment string (#1200) (2)
Takashi Sawanaka [Fri, 18 Feb 2022 23:42:23 +0000 (08:42 +0900)]
Improve vertical alignment string (#1200) (2)

2 years agoTweak translations status (#1201)
Tim Gerundt [Fri, 18 Feb 2022 23:33:26 +0000 (00:33 +0100)]
Tweak translations status (#1201)

* GetTranslationsStatus: Use floor() instead round()

* GetTranslationsStatus: Last translation was sometimes ignored

* GetTranslationsStatus: Create by default only markdown status

With  `GetTranslationsStatus.py --format xml html md` it is possible to change the format.

2 years agoImprove vertical alignment string (#1200)
Gitoffthelawn [Fri, 18 Feb 2022 23:32:16 +0000 (15:32 -0800)]
Improve vertical alignment string (#1200)

I experienced the same issue as in: https://github.com/WinMerge/winmerge/issues/1008

Both that user and I were misled by the "Match similar lines" string.  In English, it's confusing within the context of a comparison application because "match" is also a comparison term.

As such, I improved it to be "Align similar items".

2 years agoUpdate of Lithuanian translation (#1197)
Tichij [Fri, 18 Feb 2022 11:39:46 +0000 (13:39 +0200)]
Update of Lithuanian translation (#1197)

2 years agoUpdating the Slovak translation file (#1196)
jozefM [Thu, 17 Feb 2022 14:58:02 +0000 (15:58 +0100)]
Updating the Slovak translation file (#1196)

2 years agoDirView.cpp: Fix the problem that the status bar displays "0 items selected" even...
Takashi Sawanaka [Thu, 17 Feb 2022 13:43:27 +0000 (22:43 +0900)]
DirView.cpp: Fix the problem that the status bar displays "0 items selected" even though multiple items are selected.

2 years agoFix CodeQL Analysis error
Takashi Sawanaka [Wed, 16 Feb 2022 00:01:28 +0000 (09:01 +0900)]
Fix CodeQL Analysis error

(cherry picked from commit 859a1a3b692c717a594450c9978ea1536696109b)

2 years agoManual.vcxproj: copy *.chm file to Build/(x86|x64|ARM|ARM64)/(Release|Debug)/Docs...
Takashi Sawanaka [Tue, 15 Feb 2022 13:15:50 +0000 (22:15 +0900)]
Manual.vcxproj: copy *.chm file to Build/(x86|x64|ARM|ARM64)/(Release|Debug)/Docs/ on build

2 years agoSelectPluginDlg.cpp: Fix the problem that the plugin arguments are deleted by clickin...
Takashi Sawanaka [Mon, 14 Feb 2022 12:40:11 +0000 (21:40 +0900)]
SelectPluginDlg.cpp: Fix the problem that the plugin arguments are deleted by clicking the "Add pipe" button after entering them.

2 years agoUpdate Dutch.po
Takashi Sawanaka [Mon, 14 Feb 2022 12:36:46 +0000 (21:36 +0900)]
Update Dutch.po

2 years agoFix an issue where comparison results are not displayed correctly when "Refresh Selec...
Jun Tajima [Sat, 12 Feb 2022 12:03:29 +0000 (21:03 +0900)]
Fix an issue where comparison results are not displayed correctly when "Refresh Selected" is performed by selecting an item that has a directory and file with the same name. (#1189)

- Change to judge that a directory or file exists only if the rescanned item type (directory or file) matches the original diffItem type in the diffItem update process.

2 years agoCorsican.isl and ReadMe-Corsican.txt: Chane the file encoding from UTF-8 to CP-1252
Takashi Sawanaka [Fri, 11 Feb 2022 00:07:52 +0000 (09:07 +0900)]
Corsican.isl and ReadMe-Corsican.txt: Chane the file encoding from UTF-8 to CP-1252

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)