OSDN Git Service

winmerge-jp/winmerge-jp.git
23 months agoUpdate Corsican translation in September (#1480)
Patriccollu [Fri, 9 Sep 2022 14:17:40 +0000 (16:17 +0200)]
Update Corsican translation in September (#1480)

23 months agoUpdate Dutch.po (#1474)
Thomas De Rocker [Sun, 4 Sep 2022 22:25:32 +0000 (00:25 +0200)]
Update Dutch.po (#1474)

2 years agoFix an issue where filenames containing "&" are not displayed properly in the MDI...
Jun Tajima [Tue, 23 Aug 2022 14:13:04 +0000 (23:13 +0900)]
Fix an issue where filenames containing "&" are not displayed properly in the MDI tab bar and its tooltips. (#1466)

- Add processing to escape "&" in the MDI tab bar.
- Add TTS_NOPREFIX to the tooltip style.

2 years agoMergeEditView.cpp: Fix "Copy to Right" or "Copy to Left" icons not being enabled...
Takashi Sawanaka [Sun, 21 Aug 2022 12:32:18 +0000 (21:32 +0900)]
MergeEditView.cpp: Fix "Copy to Right" or "Copy to Left" icons not being enabled when selecting lines containing a diff block

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 20 Aug 2022 03:02:15 +0000 (12:02 +0900)]
Update TranslationsStatus

2 years agoUpdate Brazilian.po
Takashi Sawanaka [Sat, 20 Aug 2022 03:01:40 +0000 (12:01 +0900)]
Update Brazilian.po

2 years agoUpdate Brazilian.po (#1463)
Marcello-mco [Sat, 20 Aug 2022 02:53:10 +0000 (23:53 -0300)]
Update Brazilian.po (#1463)

* Update Brazilian.po

My last attempt in completing 100% translation.

* Update Brazilian.po

* Update Brazilian.po

Don't know what happens, I've published the right version.

2 years agoUpdate Slovenian.po (#1461)
Jadran [Thu, 18 Aug 2022 23:59:39 +0000 (01:59 +0200)]
Update Slovenian.po (#1461)

Updated Slovenian translation.
Best Regards,
Jadran

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 17 Aug 2022 16:14:42 +0000 (01:14 +0900)]
Update TranslationsStatus

2 years agoUpdate Brazilian.po
Takashi Sawanaka [Wed, 17 Aug 2022 16:13:12 +0000 (01:13 +0900)]
Update Brazilian.po

2 years agoUpdate Finnish.po. Submitted by VeiKKoM
Takashi Sawanaka [Wed, 17 Aug 2022 16:12:56 +0000 (01:12 +0900)]
Update Finnish.po. Submitted by VeiKKoM

2 years agoUpdate Brazilian.po (#1459)
Marcello-mco [Tue, 16 Aug 2022 15:50:36 +0000 (12:50 -0300)]
Update Brazilian.po (#1459)

Still indicating one translation missing. This time I've downloaded PoEdit and used it to translate. Let's check the result.

2 years agoUpdate of Lithuanian translation (#1457)
Tichij [Tue, 16 Aug 2022 15:48:45 +0000 (18:48 +0300)]
Update of Lithuanian translation (#1457)

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 15 Aug 2022 23:16:00 +0000 (08:16 +0900)]
Update Contributors.txt

2 years agoUpdate Polish.po (#1456)
Mirosław Żylewicz [Mon, 15 Aug 2022 23:08:06 +0000 (01:08 +0200)]
Update Polish.po (#1456)

2 years agoUpdate German.po (#1455)
Mr-Update [Sun, 14 Aug 2022 16:37:04 +0000 (18:37 +0200)]
Update German.po (#1455)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 14 Aug 2022 13:20:12 +0000 (22:20 +0900)]
Update TranslationsStatus

2 years agoUpdate Hungarian.po (#1454)
efi99 [Sun, 14 Aug 2022 13:17:59 +0000 (15:17 +0200)]
Update Hungarian.po (#1454)

2 years agoUpdate Portuguese translation (#1453)
Hugo Carvalho [Sat, 13 Aug 2022 23:56:07 +0000 (00:56 +0100)]
Update Portuguese translation (#1453)

2 years agoOptionsDiffColors.cpp: sort (2)
Takashi Sawanaka [Sat, 13 Aug 2022 15:20:19 +0000 (00:20 +0900)]
OptionsDiffColors.cpp: sort (2)

2 years agoOptionsDiffColors.cpp: sort
Takashi Sawanaka [Sat, 13 Aug 2022 13:41:18 +0000 (22:41 +0900)]
OptionsDiffColors.cpp: sort

2 years agoFix an issue where renaming to a file name or directory name containing "\" or "...
Jun Tajima [Sat, 13 Aug 2022 13:37:47 +0000 (22:37 +0900)]
Fix an issue where renaming to a file name or directory name containing "\" or "/" is not done properly. (#1451)

- Add a process to check whether the specified name is appropriate when renaming in the folder compare window.

2 years agoUnitTests: Fix link error
Takashi Sawanaka [Thu, 11 Aug 2022 01:29:58 +0000 (10:29 +0900)]
UnitTests: Fix link error

2 years agoFilepathEdit.cpp: Fix Select menu item unexpectedly copying path to clipboard
Takashi Sawanaka [Mon, 8 Aug 2022 08:29:14 +0000 (17:29 +0900)]
FilepathEdit.cpp: Fix Select menu item unexpectedly copying path to clipboard

2 years agoSpanish translation update (#1406)
Mauricio Gracia Gutierrez [Sun, 7 Aug 2022 15:56:52 +0000 (10:56 -0500)]
Spanish translation update (#1406)

* Spanish messages, first commit/push

* First version with pending messages to translate

* translate a few more texts

* add more translations

* 92% translated

* 94% translated to Spanish

* A few more translations

2 years agoUpdate Corsican translation in August (#1443)
Patriccollu [Sun, 7 Aug 2022 12:54:05 +0000 (14:54 +0200)]
Update Corsican translation in August (#1443)

2 years agoFilepathEdit.cpp: Fix accelerator key not working in context menu
Takashi Sawanaka [Sun, 7 Aug 2022 06:16:02 +0000 (15:16 +0900)]
FilepathEdit.cpp: Fix accelerator key not working in context menu

2 years agoUpdate Brazilian.po (#1441)
Marcello-mco [Sat, 6 Aug 2022 13:31:09 +0000 (10:31 -0300)]
Update Brazilian.po (#1441)

This one was also outdated.

2 years agoFix issue #1438: Non existing backup directory should be automatically created
Takashi Sawanaka [Sat, 6 Aug 2022 00:20:22 +0000 (09:20 +0900)]
Fix issue #1438: Non existing backup directory should be automatically created

2 years agoUpdate Brazilian.po (#1437)
Marcello-mco [Wed, 3 Aug 2022 00:08:32 +0000 (21:08 -0300)]
Update Brazilian.po (#1437)

I missed one message to translate. Now I think everythig is fine.

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 1 Aug 2022 23:26:17 +0000 (08:26 +0900)]
Update TranslationsStatus

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 1 Aug 2022 23:25:54 +0000 (08:25 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 1 Aug 2022 23:24:52 +0000 (08:24 +0900)]
Update Contributors.txt

2 years agoUpdate Brazilian.po (#1436)
Marcello-mco [Mon, 1 Aug 2022 23:20:13 +0000 (20:20 -0300)]
Update Brazilian.po (#1436)

I've translated de missing pieces.

2 years agoFix issue #1433: Remember zoom level for all files
Takashi Sawanaka [Sun, 31 Jul 2022 15:24:14 +0000 (00:24 +0900)]
Fix issue #1433: Remember zoom level for all files

2 years agoDisable rename operations when in read-only mode in the folder compare window. (...
Jun Tajima [Sun, 31 Jul 2022 12:47:22 +0000 (21:47 +0900)]
Disable rename operations when in read-only mode in the folder compare window. (#1434)

2 years agoUpdate 7-Zip to 22.01 (2)
Takashi Sawanaka [Sat, 30 Jul 2022 01:23:14 +0000 (10:23 +0900)]
Update 7-Zip to 22.01 (2)

2 years agoUpdate 7-Zip to 22.01
Takashi Sawanaka [Sat, 30 Jul 2022 00:58:05 +0000 (09:58 +0900)]
Update 7-Zip to 22.01

2 years agoCreate Midnight.ini (#1430)
Inskipp [Sat, 30 Jul 2022 00:23:33 +0000 (18:23 -0600)]
Create Midnight.ini (#1430)

* Create Dark Mode.ini

Added an additional color scheme that is easy on the eyes.

* Update and rename Dark Mode.ini to Midnight.ini

 Changed The colors of the folder window to better differentiate this scheme from Solarized Dark.

* Update Midnight.ini

I've altered the value of the background for diff items in the folder window to better contrast with the text. I didn't want increase the contrast too high here, as that would defeat the purpose of a dark theme, but I think this is a good compromise between ease of readability and lack of eye strain.

2 years agoUpdate of Lithuanian translation (#1431)
Tichij [Fri, 29 Jul 2022 14:51:55 +0000 (17:51 +0300)]
Update of Lithuanian translation (#1431)

2 years agoUpdate Polish.po (#1427)
Mirosław Żylewicz [Wed, 27 Jul 2022 23:52:57 +0000 (01:52 +0200)]
Update Polish.po (#1427)

2 years agoUpdate Russian.po (#1426)
wvxwxvw [Wed, 27 Jul 2022 22:23:50 +0000 (01:23 +0300)]
Update Russian.po (#1426)

2 years agoUpdate Slovenian.po Submitted by JadranR
Takashi Sawanaka [Wed, 27 Jul 2022 09:35:00 +0000 (18:35 +0900)]
Update Slovenian.po Submitted by JadranR

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 25 Jul 2022 23:39:40 +0000 (08:39 +0900)]
Update TranslationsStatus

2 years agoBump revision to 2.16.22.0
Takashi Sawanaka [Sun, 24 Jul 2022 12:13:31 +0000 (21:13 +0900)]
Bump revision to 2.16.22.0

2 years agoUpdate ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Sun, 24 Jul 2022 12:12:08 +0000 (21:12 +0900)]
Update ChangeLog&ReleaseNotes (4)

2 years agoUpdate French.po (#1418)
slolo2000 [Sat, 23 Jul 2022 13:07:55 +0000 (15:07 +0200)]
Update French.po (#1418)

2 years agoImgMergefrm.cpp: Fix different widths of left and right header bars
Takashi Sawanaka [Sat, 23 Jul 2022 00:07:38 +0000 (09:07 +0900)]
ImgMergefrm.cpp: Fix different widths of left and right header bars

2 years agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sat, 23 Jul 2022 00:01:20 +0000 (09:01 +0900)]
Update ChangeLog&ReleaseNotes (3)

2 years agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Fri, 22 Jul 2022 22:57:43 +0000 (07:57 +0900)]
Update ChangeLog&ReleaseNotes (2)

2 years agoUpdate Portuguese translation (#1416)
Hugo Carvalho [Fri, 22 Jul 2022 14:15:16 +0000 (15:15 +0100)]
Update Portuguese translation (#1416)

2 years agoOptimize snake function (#1411)
stonee-K [Wed, 20 Jul 2022 15:13:48 +0000 (00:13 +0900)]
Optimize snake function (#1411)

2 years agoFix an issue where the folder column is not updated for child items after renaming...
Jun Tajima [Mon, 18 Jul 2022 13:21:40 +0000 (22:21 +0900)]
Fix an issue where the folder column is not updated for child items after renaming a directory in the folder compare window. (#1408)

- Add a process to update the path of child items after renaming a directory.
- This commit also fixes an issue where file comparisons of child items after renaming a directory would result in empty files comparison instead of the intended files comparison.

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 16 Jul 2022 03:53:07 +0000 (12:53 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoFix the status bar no longer shows Elapsed time after folder comparison.
Takashi Sawanaka [Sat, 16 Jul 2022 01:13:35 +0000 (10:13 +0900)]
Fix the status bar no longer shows Elapsed time after folder comparison.

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 12 Jul 2022 15:15:07 +0000 (00:15 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoFix issue #1395: Allow renaming of untitled pages (3)
Takashi Sawanaka [Tue, 12 Jul 2022 15:14:45 +0000 (00:14 +0900)]
Fix issue #1395: Allow renaming of untitled pages (3)

2 years agoGalician translation update (#1400)
LMS [Tue, 12 Jul 2022 00:35:08 +0000 (02:35 +0200)]
Galician translation update (#1400)

2 years agoUpdate German.po (#1399)
Mr-Update [Sun, 10 Jul 2022 23:01:16 +0000 (01:01 +0200)]
Update German.po (#1399)

- Translation completed
- Hotkeys removed because they cannot be used

2 years agoWIP(10)Fix issue #1395: Allow renaming of untitled pages (2)
Takashi Sawanaka [Sun, 10 Jul 2022 14:55:29 +0000 (23:55 +0900)]
WIP(10)Fix issue #1395: Allow renaming of untitled pages (2)

2 years agoUpdate Hungarian.po (#1398)
efi99 [Sun, 10 Jul 2022 12:42:47 +0000 (14:42 +0200)]
Update Hungarian.po (#1398)

2 years agoFix issue #1395: Allow renaming of untitled pages
Takashi Sawanaka [Sun, 10 Jul 2022 05:17:00 +0000 (14:17 +0900)]
Fix issue #1395: Allow renaming of untitled pages

2 years agoUpdate German.po (#1396)
Mr-Update [Wed, 6 Jul 2022 22:59:30 +0000 (00:59 +0200)]
Update German.po (#1396)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 4 Jul 2022 12:12:42 +0000 (21:12 +0900)]
Update TranslationsStatus

2 years agoUpdate Japanese.po
Takashi Sawanaka [Mon, 4 Jul 2022 12:12:07 +0000 (21:12 +0900)]
Update Japanese.po

2 years agoUpdate of Lithuanian translation (#1394)
Tichij [Mon, 4 Jul 2022 12:07:44 +0000 (15:07 +0300)]
Update of Lithuanian translation (#1394)

2 years agoUpdate Hungarian.po (#1393)
efi99 [Mon, 4 Jul 2022 12:06:09 +0000 (14:06 +0200)]
Update Hungarian.po (#1393)

2 years agoFix issue #1386: vertical editing for .h file is quite slow
Takashi Sawanaka [Sun, 3 Jul 2022 13:16:07 +0000 (22:16 +0900)]
Fix issue #1386: vertical editing for .h file is quite slow

2 years agoReduce compiler warnings
Takashi Sawanaka [Sun, 3 Jul 2022 13:15:39 +0000 (22:15 +0900)]
Reduce compiler warnings

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 3 Jul 2022 13:15:08 +0000 (22:15 +0900)]
Update Contributors.txt

2 years agoFix the problem that the comparison result is not displayed correctly when renaming...
Jun Tajima [Sun, 3 Jul 2022 13:04:23 +0000 (22:04 +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 file (directory) with the same name exists. (#1392)

- Rescan the renamed item if the side flag changes due to renaming.
- Delete the item with the same file name as after renaming.

2 years agoKeep hidden items (#1377)
Mauricio Gracia Gutierrez [Sun, 3 Jul 2022 13:03:28 +0000 (08:03 -0500)]
Keep hidden items (#1377)

* When items are hidden add them to a DiffContext list

* no need to keep m_nHiddenItems since we now have a list of the currently hidden items.

* remove two introduced warnings

* .winmerge stores a list of hidden items

* hidde-item in singular (not plural)

* saveHiddenItems inside <path> node

* Fixing indentation to use Eric Allman style

* load the hiddenItems from the .winmerge project file + keep an use the token

* load hidden-items from .winmerge and hidding some test items

* https://github.com/WinMerge/winmerge/pull/1377#issuecomment-1164375545

* Add "Hidden Items" to the project options

* Update ChangeLog.md

* revert ChangeLog.md and README.md, applying requested changes

* rever ChangeLog.md empty space

* https://github.com/WinMerge/winmerge/pull/1377#discussion_r912328299

* update ChangeLog.md

Co-authored-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
2 years agoFix issue #1387: replace text using regular expressions behaves inco… (#1388)
Takashi Sawanaka [Sat, 2 Jul 2022 15:30:31 +0000 (00:30 +0900)]
Fix issue #1387: replace text using regular expressions behaves inco… (#1388)

2 years agoMake wsc files available as plug-in (#1390)
stonee-K [Fri, 1 Jul 2022 14:20:27 +0000 (23:20 +0900)]
Make wsc files available as plug-in (#1390)

2 years ago Fix issue #1380: “Match case” in Search always enabled
Takashi Sawanaka [Mon, 27 Jun 2022 11:56:24 +0000 (20:56 +0900)]
 Fix issue #1380: “Match case” in Search always enabled

2 years agoUpdate 7-Zip to 22.00 (2)
Takashi Sawanaka [Sat, 25 Jun 2022 00:55:41 +0000 (09:55 +0900)]
Update 7-Zip to 22.00 (2)

2 years agoUpdate 7-Zip to 22.00
Takashi Sawanaka [Sat, 25 Jun 2022 00:23:13 +0000 (09:23 +0900)]
Update 7-Zip to 22.00

2 years agoFix typo in SuperComboBox.cpp (#1379)
Ikko Ashimine [Thu, 23 Jun 2022 23:04:49 +0000 (08:04 +0900)]
Fix typo in SuperComboBox.cpp (#1379)

alway -> always

2 years agoDisable the Replace button if text is selected, as it cannot solve the strange behavi...
Takashi Sawanaka [Tue, 21 Jun 2022 13:19:01 +0000 (22:19 +0900)]
Disable the Replace button if text is selected, as it cannot solve the strange behavior such as crashes when the Replace button is pressed while text is selected.

2 years agoFix issue #1376: "Replace All" doesn't work when Replace in "Selection" and the new...
Takashi Sawanaka [Tue, 21 Jun 2022 13:16:51 +0000 (22:16 +0900)]
Fix issue #1376: "Replace All" doesn't work when Replace in "Selection" and the new string contains the old string.

2 years agoUpdate Bulgarian.po (#1375)
StoyanDimitrov [Mon, 20 Jun 2022 22:20:55 +0000 (22:20 +0000)]
Update Bulgarian.po (#1375)

2 years ago * Disable Shift + Numeric Key (#1374)
stonee-K [Mon, 20 Jun 2022 13:38:51 +0000 (22:38 +0900)]
 * Disable Shift + Numeric Key (#1374)

* Enable CTRL-X, CTRL-C, CTRL-V, CTRL-Z
 * Allow pasting when the clipboard string is numeric

2 years agoFix an issue where paths with different case are not displayed correctly in the folde...
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:48 +0000 (21:14 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (2)

2 years agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:05 +0000 (21:14 +0900)]
Update ChangeLog&ReleaseNotes (2)

2 years agoFix an issue where paths with different case are not displayed correctly in the folde...
Jun Tajima [Sun, 19 Jun 2022 12:07:47 +0000 (21:07 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (#1372)

2 years agoBump revision to 2.16.21
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:59 +0000 (23:11 +0900)]
Bump revision to 2.16.21

2 years agoUpdate ALL.*.sln
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:24 +0000 (23:11 +0900)]
Update ALL.*.sln

2 years agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 18 Jun 2022 04:21:52 +0000 (13:21 +0900)]
Update ChangeLog&ReleaseNotes

2 years agoBinary Compare: Allow the "Split Vertically" menu item to be unchecked.
Takashi Sawanaka [Thu, 16 Jun 2022 15:35:20 +0000 (00:35 +0900)]
Binary Compare: Allow the "Split Vertically" menu item to be unchecked.

2 years agoImage Compare, Webpage Compare: Fix an issue where the pane was split vertically...
Takashi Sawanaka [Wed, 15 Jun 2022 14:06:30 +0000 (23:06 +0900)]
Image Compare, Webpage Compare: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.

2 years agoFix issue #1367: Tab behaviour on comparisons of files vs folders
Takashi Sawanaka [Tue, 14 Jun 2022 12:30:23 +0000 (21:30 +0900)]
Fix issue #1367: Tab behaviour on comparisons of files vs folders

2 years agoFix issue #1363: Crash on command line compare
Takashi Sawanaka [Tue, 7 Jun 2022 13:14:47 +0000 (22:14 +0900)]
Fix issue #1363: Crash on command line compare

2 years agoFix issue #1192: [Bug Report] WinMerge does not recognize Win 11
Takashi Sawanaka [Tue, 7 Jun 2022 12:30:36 +0000 (21:30 +0900)]
Fix issue #1192: [Bug Report] WinMerge does not recognize Win 11

2 years agoFix issue #1362: Line difference coloring in “Word-level” mode does not work correctl...
Takashi Sawanaka [Tue, 7 Jun 2022 11:34:35 +0000 (20:34 +0900)]
Fix issue #1362: Line difference coloring in “Word-level” mode does not work correctly for Cyrillic-based languages

2 years agoInitialize variables defined at "diff.h" (#1360)
stonee-K [Mon, 6 Jun 2022 12:24:22 +0000 (21:24 +0900)]
Initialize variables defined at "diff.h" (#1360)

2 years agoMake the file name refreshed to detect case changes when running "Refresh Selected...
Jun Tajima [Sat, 4 Jun 2022 22:56:26 +0000 (07:56 +0900)]
Make the file name refreshed to detect case changes when running "Refresh Selected". (#1358)

2 years agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:59 +0000 (07:11 +0900)]
Update TranslationsStatus

2 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:28 +0000 (07:11 +0900)]
Update Contributors.txt

2 years agoUpdated Italian translation (#1355)
Simone Saviolo [Wed, 1 Jun 2022 22:10:20 +0000 (00:10 +0200)]
Updated Italian translation (#1355)

2 years agoFix issue #1354: Syntax highlighting: SQL comments
Takashi Sawanaka [Tue, 31 May 2022 11:15:45 +0000 (20:15 +0900)]
Fix issue #1354: Syntax highlighting: SQL comments