OSDN Git Service
Takashi Sawanaka [Tue, 27 Sep 2022 00:05:53 +0000 (09:05 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Tue, 27 Sep 2022 00:05:41 +0000 (09:05 +0900)]
Update ChangeLogJapanese
Takashi Sawanaka [Mon, 26 Sep 2022 23:24:45 +0000 (08:24 +0900)]
Change the fileencoding from UTF-8 to CP-1252
Mr-Update [Mon, 26 Sep 2022 23:19:54 +0000 (01:19 +0200)]
Update German.isl (#1498)
Translation improved.
Please keep using ISO 8859-1.
Takashi Sawanaka [Mon, 26 Sep 2022 13:45:42 +0000 (22:45 +0900)]
Update sevenzip and winwebdiff
Takashi Sawanaka [Sun, 25 Sep 2022 14:26:18 +0000 (23:26 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
# Conflicts:
# SetVersion.cmd
# Translations/WinMerge/Finnish.po
# Version.h
Takashi Sawanaka [Sun, 25 Sep 2022 14:00:03 +0000 (23:00 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sun, 25 Sep 2022 13:15:02 +0000 (22:15 +0900)]
Bump revision to 2.16.23
Takashi Sawanaka [Sun, 25 Sep 2022 13:13:46 +0000 (22:13 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sun, 25 Sep 2022 11:02:03 +0000 (20:02 +0900)]
update winimerge to 1.0.35
Takashi Sawanaka [Sun, 25 Sep 2022 09:46:48 +0000 (18:46 +0900)]
Update winwebdiff
Takashi Sawanaka [Sun, 25 Sep 2022 09:46:18 +0000 (18:46 +0900)]
Update freeimage
Takashi Sawanaka [Sun, 25 Sep 2022 03:08:18 +0000 (12:08 +0900)]
[EXPERIMENTAL] Webpage Compare: Highlight differences (#1357)
Takashi Sawanaka [Fri, 23 Sep 2022 11:49:44 +0000 (20:49 +0900)]
Update ChangeLog&ReleaseNotes
Jun Tajima [Fri, 23 Sep 2022 11:15:53 +0000 (20:15 +0900)]
Fix an issue where compare flags may not update properly when doing a "Left to Right" or "Right to Left" copy in 2-way folder comparison. (#1495)
Takashi Sawanaka [Thu, 22 Sep 2022 14:53:39 +0000 (23:53 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Thu, 22 Sep 2022 14:53:22 +0000 (23:53 +0900)]
Update Contributors.txt
Takashi Sawanaka [Thu, 22 Sep 2022 14:52:08 +0000 (23:52 +0900)]
CrystalEdit/parsers/SQL: Added more keywords (#1493) (2) sort keywords
baka0815 [Thu, 22 Sep 2022 14:49:24 +0000 (16:49 +0200)]
CrystalEdit/parsers/SQL: Added more keywords (#1493)
Added some more keywords and datatypes.
slolo2000 [Wed, 21 Sep 2022 14:05:17 +0000 (16:05 +0200)]
Update French.po (#1491)
Takashi Sawanaka [Thu, 15 Sep 2022 13:25:50 +0000 (22:25 +0900)]
Reduce compiler warnings
Takashi Sawanaka [Thu, 15 Sep 2022 12:41:44 +0000 (21:41 +0900)]
PR #1481 (7)
Takashi Sawanaka [Wed, 14 Sep 2022 23:32:37 +0000 (08:32 +0900)]
Update TranslationsStatus
Hugo Carvalho [Wed, 14 Sep 2022 23:29:20 +0000 (00:29 +0100)]
Update Portuguese translation (#1490)
For commit:
3f585b068697b6407bdc2523d8de6b7214bea906
Takashi Sawanaka [Wed, 14 Sep 2022 23:28:37 +0000 (08:28 +0900)]
Update Japanese translation
Takashi Sawanaka [Wed, 14 Sep 2022 23:28:17 +0000 (08:28 +0900)]
Update Slovenian translation. Submitted by JadranR
Marcello-mco [Wed, 14 Sep 2022 13:23:27 +0000 (10:23 -0300)]
Update Brazilian.po (#1486)
Correcting missing translation line.
Takashi Sawanaka [Wed, 14 Sep 2022 13:22:00 +0000 (22:22 +0900)]
PR #1481 (6)
revert part of PR #1481
Takashi Sawanaka [Tue, 13 Sep 2022 14:19:14 +0000 (23:19 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Tue, 13 Sep 2022 14:18:22 +0000 (23:18 +0900)]
PR #1481 (5)
Tichij [Tue, 13 Sep 2022 14:17:31 +0000 (17:17 +0300)]
Update of Lithuanian translation (#1485)
Mr-Update [Mon, 12 Sep 2022 22:46:18 +0000 (00:46 +0200)]
Update German.po (#1484)
Takashi Sawanaka [Mon, 12 Sep 2022 15:04:36 +0000 (00:04 +0900)]
PR #1481 (4)
Takashi Sawanaka [Mon, 12 Sep 2022 14:55:58 +0000 (23:55 +0900)]
PR #1481 (3)
Takashi Sawanaka [Mon, 12 Sep 2022 14:53:53 +0000 (23:53 +0900)]
PR #1481 (2)
Srdzank [Mon, 12 Sep 2022 14:49:35 +0000 (16:49 +0200)]
The feature will allow the user to right-click the selected lines and add them to Line Filter, so that those lines added to the Line Filter will be ignore if found in any file. (#1481)
Takashi Sawanaka [Sat, 10 Sep 2022 09:49:33 +0000 (18:49 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sat, 10 Sep 2022 09:44:42 +0000 (18:44 +0900)]
TableCompare: Fix the problem that the inline difference is not displayed even if the caret is moved to the position of the inline difference that is hidden due to the narrow column width.
Patriccollu [Fri, 9 Sep 2022 14:17:40 +0000 (16:17 +0200)]
Update Corsican translation in September (#1480)
Thomas De Rocker [Sun, 4 Sep 2022 22:25:32 +0000 (00:25 +0200)]
Update Dutch.po (#1474)
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.
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
Takashi Sawanaka [Sat, 20 Aug 2022 03:02:15 +0000 (12:02 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sat, 20 Aug 2022 03:01:40 +0000 (12:01 +0900)]
Update Brazilian.po
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.
Jadran [Thu, 18 Aug 2022 23:59:39 +0000 (01:59 +0200)]
Update Slovenian.po (#1461)
Updated Slovenian translation.
Best Regards,
Jadran
Takashi Sawanaka [Wed, 17 Aug 2022 16:14:42 +0000 (01:14 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 17 Aug 2022 16:13:12 +0000 (01:13 +0900)]
Update Brazilian.po
Takashi Sawanaka [Wed, 17 Aug 2022 16:12:56 +0000 (01:12 +0900)]
Update Finnish.po. Submitted by VeiKKoM
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.
Tichij [Tue, 16 Aug 2022 15:48:45 +0000 (18:48 +0300)]
Update of Lithuanian translation (#1457)
Takashi Sawanaka [Mon, 15 Aug 2022 23:16:00 +0000 (08:16 +0900)]
Update Contributors.txt
Mirosław Żylewicz [Mon, 15 Aug 2022 23:08:06 +0000 (01:08 +0200)]
Update Polish.po (#1456)
Mr-Update [Sun, 14 Aug 2022 16:37:04 +0000 (18:37 +0200)]
Update German.po (#1455)
Takashi Sawanaka [Sun, 14 Aug 2022 13:20:12 +0000 (22:20 +0900)]
Update TranslationsStatus
efi99 [Sun, 14 Aug 2022 13:17:59 +0000 (15:17 +0200)]
Update Hungarian.po (#1454)
Hugo Carvalho [Sat, 13 Aug 2022 23:56:07 +0000 (00:56 +0100)]
Update Portuguese translation (#1453)
Takashi Sawanaka [Sat, 13 Aug 2022 15:20:19 +0000 (00:20 +0900)]
OptionsDiffColors.cpp: sort (2)
Takashi Sawanaka [Sat, 13 Aug 2022 13:41:18 +0000 (22:41 +0900)]
OptionsDiffColors.cpp: sort
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.
Takashi Sawanaka [Thu, 11 Aug 2022 01:29:58 +0000 (10:29 +0900)]
UnitTests: Fix link error
Takashi Sawanaka [Mon, 8 Aug 2022 08:29:14 +0000 (17:29 +0900)]
FilepathEdit.cpp: Fix Select menu item unexpectedly copying path to clipboard
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
Patriccollu [Sun, 7 Aug 2022 12:54:05 +0000 (14:54 +0200)]
Update Corsican translation in August (#1443)
Takashi Sawanaka [Sun, 7 Aug 2022 06:16:02 +0000 (15:16 +0900)]
FilepathEdit.cpp: Fix accelerator key not working in context menu
Marcello-mco [Sat, 6 Aug 2022 13:31:09 +0000 (10:31 -0300)]
Update Brazilian.po (#1441)
This one was also outdated.
Takashi Sawanaka [Sat, 6 Aug 2022 00:20:22 +0000 (09:20 +0900)]
Fix issue #1438: Non existing backup directory should be automatically created
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.
Takashi Sawanaka [Mon, 1 Aug 2022 23:26:17 +0000 (08:26 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 1 Aug 2022 23:25:54 +0000 (08:25 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 1 Aug 2022 23:24:52 +0000 (08:24 +0900)]
Update Contributors.txt
Marcello-mco [Mon, 1 Aug 2022 23:20:13 +0000 (20:20 -0300)]
Update Brazilian.po (#1436)
I've translated de missing pieces.
Takashi Sawanaka [Sun, 31 Jul 2022 15:24:14 +0000 (00:24 +0900)]
Fix issue #1433: Remember zoom level for all files
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)
Takashi Sawanaka [Sat, 30 Jul 2022 01:23:14 +0000 (10:23 +0900)]
Update 7-Zip to 22.01 (2)
Takashi Sawanaka [Sat, 30 Jul 2022 00:58:05 +0000 (09:58 +0900)]
Update 7-Zip to 22.01
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.
Tichij [Fri, 29 Jul 2022 14:51:55 +0000 (17:51 +0300)]
Update of Lithuanian translation (#1431)
Mirosław Żylewicz [Wed, 27 Jul 2022 23:52:57 +0000 (01:52 +0200)]
Update Polish.po (#1427)
wvxwxvw [Wed, 27 Jul 2022 22:23:50 +0000 (01:23 +0300)]
Update Russian.po (#1426)
Takashi Sawanaka [Wed, 27 Jul 2022 09:35:00 +0000 (18:35 +0900)]
Update Slovenian.po Submitted by JadranR
Takashi Sawanaka [Tue, 26 Jul 2022 14:42:21 +0000 (23:42 +0900)]
Update ChangeLogJapanese&ReleaseNotesJapanese
Takashi Sawanaka [Tue, 26 Jul 2022 13:56:43 +0000 (22:56 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Mon, 25 Jul 2022 23:39:40 +0000 (08:39 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sun, 24 Jul 2022 12:45:13 +0000 (21:45 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
# Conflicts:
# SetVersion.cmd
# Version.h
Takashi Sawanaka [Sun, 24 Jul 2022 12:13:31 +0000 (21:13 +0900)]
Bump revision to 2.16.22.0
Takashi Sawanaka [Sun, 24 Jul 2022 12:12:08 +0000 (21:12 +0900)]
Update ChangeLog&ReleaseNotes (4)
slolo2000 [Sat, 23 Jul 2022 13:07:55 +0000 (15:07 +0200)]
Update French.po (#1418)
Takashi Sawanaka [Sat, 23 Jul 2022 00:07:38 +0000 (09:07 +0900)]
ImgMergefrm.cpp: Fix different widths of left and right header bars
Takashi Sawanaka [Sat, 23 Jul 2022 00:01:20 +0000 (09:01 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Fri, 22 Jul 2022 22:57:43 +0000 (07:57 +0900)]
Update ChangeLog&ReleaseNotes (2)
Hugo Carvalho [Fri, 22 Jul 2022 14:15:16 +0000 (15:15 +0100)]
Update Portuguese translation (#1416)
stonee-K [Wed, 20 Jul 2022 15:13:48 +0000 (00:13 +0900)]
Optimize snake function (#1411)
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.
Takashi Sawanaka [Sat, 16 Jul 2022 03:53:07 +0000 (12:53 +0900)]
Update ChangeLog&ReleaseNotes
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.
Takashi Sawanaka [Tue, 12 Jul 2022 15:15:07 +0000 (00:15 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 12 Jul 2022 15:14:45 +0000 (00:14 +0900)]
Fix issue #1395: Allow renaming of untitled pages (3)
LMS [Tue, 12 Jul 2022 00:35:08 +0000 (02:35 +0200)]
Galician translation update (#1400)
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