OSDN Git Service

winmerge-jp/winmerge-jp.git
10 months agoUpdate 7-Zip to 23.01 2.16.30+jp-4
Takashi Sawanaka [Tue, 27 Jun 2023 22:43:03 +0000 (07:43 +0900)]
Update 7-Zip to 23.01

10 months agoUpdate ChangeLogJapanase
Takashi Sawanaka [Sun, 25 Jun 2023 13:00:06 +0000 (22:00 +0900)]
Update ChangeLogJapanase

10 months agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 25 Jun 2023 11:36:10 +0000 (20:36 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Version.h

10 months agoCompare folders recursively if "Include subfolders" is checked in the Options dialog...
Takashi Sawanaka [Sun, 25 Jun 2023 09:48:58 +0000 (18:48 +0900)]
Compare folders recursively if "Include subfolders" is checked in the Options dialog even if the /r command line option is not specified. (#1914)

Also, add the command line option /r- for non-recursive folder comparison.

10 months agoUpdate 7-Zip to 23.01 (#1913)
Takashi Sawanaka [Sun, 25 Jun 2023 09:45:48 +0000 (18:45 +0900)]
Update 7-Zip to 23.01 (#1913)

10 months agoUpdate Korean.po (#1908)
VenusGirl❤ [Tue, 20 Jun 2023 22:13:30 +0000 (07:13 +0900)]
Update Korean.po (#1908)

10 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Tue, 20 Jun 2023 12:13:45 +0000 (21:13 +0900)]
Update ChangeLog&ReleaseNotes (2)

10 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 20 Jun 2023 12:10:42 +0000 (21:10 +0900)]
Update TranslationsStatus

10 months agoupdate zh-cn translation (#1906)
YIN, Gang [Tue, 20 Jun 2023 12:08:12 +0000 (20:08 +0800)]
update zh-cn translation (#1906)

10 months agoUpdate German.po (#1907)
Mr-Update [Tue, 20 Jun 2023 12:07:41 +0000 (14:07 +0200)]
Update German.po (#1907)

10 months agoBump revision to 2.16.31
Takashi Sawanaka [Mon, 19 Jun 2023 23:07:46 +0000 (08:07 +0900)]
Bump revision to 2.16.31

10 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Mon, 19 Jun 2023 13:14:19 +0000 (22:14 +0900)]
Update ChangeLog&ReleaseNotes

10 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 19 Jun 2023 13:08:34 +0000 (22:08 +0900)]
Update TranslationsStatus

10 months agoUpdate Hungarian.po (#1905)
efi99 [Mon, 19 Jun 2023 12:30:41 +0000 (14:30 +0200)]
Update Hungarian.po (#1905)

10 months agoUpdate of Lithuanian translation (#1904)
Tichij [Mon, 19 Jun 2023 12:30:06 +0000 (15:30 +0300)]
Update of Lithuanian translation (#1904)

10 months agoUpdate Brazilian.po (#1903)
Marcellomco [Mon, 19 Jun 2023 12:29:25 +0000 (09:29 -0300)]
Update Brazilian.po (#1903)

Added translation for "Update GNU patch to 2.7.6-1"

10 months agoUpdate GNU patch to 2.7.6-1 (#1897)
Takashi Sawanaka [Sun, 18 Jun 2023 23:23:18 +0000 (08:23 +0900)]
Update GNU patch to 2.7.6-1 (#1897)

10 months agoPlugins: Do not use the eval function in the *.sct file, as the NANO-Antivirus scan...
Takashi Sawanaka [Sun, 18 Jun 2023 11:16:36 +0000 (20:16 +0900)]
Plugins: Do not use the eval function in the *.sct file, as the NANO-Antivirus scan engine will detect it as Trojan.Script.Vbs-heuristic.druvzi.

10 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 15 Jun 2023 11:40:49 +0000 (20:40 +0900)]
Update TranslationsStatus

10 months agoUpdate DirCmpReport.cpp #1892 (2)
Takashi Sawanaka [Thu, 15 Jun 2023 11:40:09 +0000 (20:40 +0900)]
Update DirCmpReport.cpp #1892 (2)

10 months agoModify the "Go to" dialog. (#1896)
Jun Tajima [Sun, 11 Jun 2023 13:51:56 +0000 (22:51 +0900)]
Modify the "Go to" dialog. (#1896)

- Show the acceptable range for the selected "File" and "Go to what".
- Disable the "Go to" button if the input form does not contain a value within the acceptable range.
- Disable the "Difference" radio button when the files have no differences (i.e. identical files).

10 months agoUpdate Portuguese.po (#1895)
Hugo Carvalho [Fri, 9 Jun 2023 22:10:19 +0000 (23:10 +0100)]
Update Portuguese.po (#1895)

10 months agoUpdate French.po (#1894)
slolo2000 [Thu, 8 Jun 2023 16:07:57 +0000 (18:07 +0200)]
Update French.po (#1894)

10 months agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 7 Jun 2023 13:28:24 +0000 (22:28 +0900)]
Update Contributors.txt

10 months agorefactor
Takashi Sawanaka [Wed, 7 Jun 2023 13:27:50 +0000 (22:27 +0900)]
refactor

10 months agoUpdate DirCmpReport.cpp (#1892)
Mavaddat Javid [Wed, 7 Jun 2023 13:24:12 +0000 (09:24 -0400)]
Update DirCmpReport.cpp (#1892)

Make the HTML report header sticky so it stays in place when scrolling down.

10 months agorefactor
Takashi Sawanaka [Sun, 4 Jun 2023 06:09:15 +0000 (15:09 +0900)]
refactor

10 months agoFix issue #1882: Bug in ignore whitespace ?
Takashi Sawanaka [Sat, 3 Jun 2023 11:51:07 +0000 (20:51 +0900)]
Fix issue #1882: Bug in ignore whitespace ?

10 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 3 Jun 2023 11:49:58 +0000 (20:49 +0900)]
Update TranslationsStatus

10 months agoUpdate of Lithuanian translation (#1889)
Tichij [Fri, 2 Jun 2023 09:55:16 +0000 (12:55 +0300)]
Update of Lithuanian translation (#1889)

10 months agoUpdate TranslationsStatus
Takashi Sawanaka [Wed, 31 May 2023 13:29:42 +0000 (22:29 +0900)]
Update TranslationsStatus

10 months agoUpdate Slovenian.po. Submitted by JadranR (issue #1261)
Takashi Sawanaka [Wed, 31 May 2023 13:28:36 +0000 (22:28 +0900)]
Update Slovenian.po. Submitted by JadranR  (issue #1261)

10 months agoupdate zh-cn translation (#1885)
YIN, Gang [Wed, 31 May 2023 13:25:52 +0000 (21:25 +0800)]
update zh-cn translation (#1885)

10 months agoUpdate Polish.po (#1884)
Mirosław Żylewicz [Tue, 30 May 2023 22:44:19 +0000 (00:44 +0200)]
Update Polish.po (#1884)

10 months agoUpdate Hungarian.po (#1878)
efi99 [Mon, 29 May 2023 22:39:15 +0000 (00:39 +0200)]
Update Hungarian.po (#1878)

11 months agoUpdate Contributors.txt & TranslationsStatus
Takashi Sawanaka [Mon, 29 May 2023 10:04:45 +0000 (19:04 +0900)]
Update Contributors.txt & TranslationsStatus

11 months agoUpdate Korean.po (#1877)
VenusGirl❤ [Mon, 29 May 2023 09:54:47 +0000 (18:54 +0900)]
Update Korean.po (#1877)

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 28 May 2023 23:32:13 +0000 (08:32 +0900)]
Update TranslationsStatus

11 months ago[XML] Update Brazilian.po (#1876)
Marcellomco [Sun, 28 May 2023 23:09:42 +0000 (20:09 -0300)]
[XML] Update Brazilian.po (#1876)

Added translation for #1873: Make the following plugin error messages translatable.

11 months agoUpdate German.po (#1875)
Mr-Update [Sun, 28 May 2023 23:08:48 +0000 (01:08 +0200)]
Update German.po (#1875)

11 months agoBump revision to 2.16.30+-jp-3 2.16.30+jp-3
Takashi Sawanaka [Sun, 28 May 2023 09:26:13 +0000 (18:26 +0900)]
Bump revision to 2.16.30+-jp-3

11 months agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 28 May 2023 09:21:47 +0000 (18:21 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

11 months agoAdd -show-dialog and -show-compare-as-menu command line options (6)
Takashi Sawanaka [Sun, 28 May 2023 09:19:40 +0000 (18:19 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (6)

11 months agoBump revision to 2.16.30+-jp-2 2.16.30+jp-2
Takashi Sawanaka [Sun, 28 May 2023 04:28:34 +0000 (13:28 +0900)]
Bump revision to 2.16.30+-jp-2

11 months agoUpdate ChangeLogJapanese
Takashi Sawanaka [Sun, 28 May 2023 04:20:31 +0000 (13:20 +0900)]
Update ChangeLogJapanese

11 months agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sat, 27 May 2023 23:54:12 +0000 (08:54 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

11 months agoUpdate ChangeLog (2)
Takashi Sawanaka [Sat, 27 May 2023 23:52:49 +0000 (08:52 +0900)]
Update ChangeLog (2)

11 months agoMake the following plugin error messages translatable. (#1873)
Jun Tajima [Sat, 27 May 2023 23:30:22 +0000 (08:30 +0900)]
Make the following plugin error messages translatable. (#1873)

- "Plugin not found or invalid: %1"
- "'%s' is not PACK_UNPACK plugin"
- "'%s' is not PREDIFF plugin"
- "An error occurred while prediffing the file '%s' with the plugin '%s'. The prediffing is not applied any more."

11 months agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sat, 27 May 2023 11:09:44 +0000 (20:09 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Translations/WinMerge/Galician.po

11 months agoUpdate ChangeLog
Takashi Sawanaka [Sat, 27 May 2023 09:50:19 +0000 (18:50 +0900)]
Update ChangeLog

11 months agoUpdate jq to version 1.6 (#1871)
Takashi Sawanaka [Sat, 27 May 2023 09:43:26 +0000 (18:43 +0900)]
Update jq to version 1.6 (#1871)

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 25 May 2023 12:34:36 +0000 (21:34 +0900)]
Update TranslationsStatus

11 months agoUpdate Polish.po (#1870)
Mirosław Żylewicz [Wed, 24 May 2023 23:19:32 +0000 (01:19 +0200)]
Update Polish.po (#1870)

11 months agoUpdate Polish.po (#1869)
Mirosław Żylewicz [Wed, 24 May 2023 23:19:05 +0000 (01:19 +0200)]
Update Polish.po (#1869)

11 months agoFix issue #1861: Some Substitution filter doesn't work (2)
Takashi Sawanaka [Tue, 23 May 2023 12:14:03 +0000 (21:14 +0900)]
Fix issue #1861: Some Substitution filter doesn't work (2)

11 months agoFix issue #1861: Some Substitution filter doesn't work
Takashi Sawanaka [Tue, 23 May 2023 12:12:23 +0000 (21:12 +0900)]
Fix issue #1861: Some Substitution filter doesn't work

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 21 May 2023 23:48:26 +0000 (08:48 +0900)]
Update TranslationsStatus

11 months agoFix issue #1862: wrong Russian translation in Replace dialog (CTRL+H)
Takashi Sawanaka [Sun, 21 May 2023 23:47:26 +0000 (08:47 +0900)]
Fix issue #1862: wrong Russian translation in Replace dialog (CTRL+H)

11 months agoFix issue #1838: End of line diff is a bit wanky (#1849)
Takashi Sawanaka [Sat, 20 May 2023 01:53:59 +0000 (10:53 +0900)]
Fix issue #1838: End of line diff is a bit wanky (#1849)

11 months agoFix issue #1852: Silent install blocked
Takashi Sawanaka [Mon, 15 May 2023 14:05:52 +0000 (23:05 +0900)]
Fix issue #1852: Silent install blocked

11 months agoUpdate German.po (#1850)
Mr-Update [Sun, 14 May 2023 13:23:20 +0000 (15:23 +0200)]
Update German.po (#1850)

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 14 May 2023 10:58:36 +0000 (19:58 +0900)]
Update TranslationsStatus

11 months agoUpdate Lithuanian.po (#1847)
Tichij [Sat, 13 May 2023 10:39:22 +0000 (13:39 +0300)]
Update Lithuanian.po (#1847)

11 months agoupdate zh-cn translation (#1846)
YIN, Gang [Sat, 13 May 2023 10:37:45 +0000 (18:37 +0800)]
update zh-cn translation (#1846)

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Fri, 12 May 2023 15:10:24 +0000 (00:10 +0900)]
Update TranslationsStatus

11 months agoHungarian.isl: Change the file encoding from UTF-8 to CP-1250
Takashi Sawanaka [Fri, 12 May 2023 15:09:48 +0000 (00:09 +0900)]
Hungarian.isl: Change the file encoding from UTF-8 to CP-1250

11 months agoUpdate Hungarian.isl (#1845)
Bogesz [Fri, 12 May 2023 15:04:05 +0000 (17:04 +0200)]
Update Hungarian.isl (#1845)

Fixed typo

11 months agoUpdate portuguese translation (#1843)
Hugo Carvalho [Thu, 11 May 2023 23:30:30 +0000 (00:30 +0100)]
Update portuguese translation (#1843)

11 months agoUpdate French.po (#1842)
slolo2000 [Wed, 10 May 2023 19:29:19 +0000 (21:29 +0200)]
Update French.po (#1842)

11 months agoUpdate French.po (#1841)
slolo2000 [Wed, 10 May 2023 19:28:17 +0000 (21:28 +0200)]
Update French.po (#1841)

11 months agoFix issue #1840: Display problem with Item totals :
Takashi Sawanaka [Mon, 8 May 2023 00:17:46 +0000 (09:17 +0900)]
Fix issue #1840: Display problem with Item totals :

11 months agoUpdate Hungarian.po (#1839)
efi99 [Sun, 7 May 2023 13:45:52 +0000 (15:45 +0200)]
Update Hungarian.po (#1839)

11 months agoAdd tasks to Jump List (#1828) (2)
Takashi Sawanaka [Sat, 6 May 2023 23:42:31 +0000 (08:42 +0900)]
Add tasks to Jump List (#1828) (2)

11 months agoUpdate Brazilian.po (#1837)
Marcellomco [Sat, 6 May 2023 04:38:14 +0000 (01:38 -0300)]
Update Brazilian.po (#1837)

Added translation for "Add tasks to Jump List (#1828)"

11 months agoAdd tasks to Jump List (#1828)
Takashi Sawanaka [Sat, 6 May 2023 00:52:16 +0000 (09:52 +0900)]
Add tasks to Jump List (#1828)

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 4 May 2023 03:20:24 +0000 (12:20 +0900)]
Update TranslationsStatus

11 months agoUpdate Galician.po and Spanish.po
Takashi Sawanaka [Thu, 4 May 2023 03:19:32 +0000 (12:19 +0900)]
Update Galician.po and Spanish.po

11 months agoupdate zh-cn translation (#1835)
YIN, Gang [Thu, 4 May 2023 03:01:13 +0000 (11:01 +0800)]
update zh-cn translation (#1835)

11 months agoUpdate Spanish.po (#1834)
Juan [Wed, 3 May 2023 23:39:13 +0000 (01:39 +0200)]
Update Spanish.po (#1834)

New revision and update to WinMerge 2.16.30.0

11 months agoUpdate Galician.po (#1833)
Juan [Wed, 3 May 2023 23:38:16 +0000 (01:38 +0200)]
Update Galician.po (#1833)

New revision and update to WinMerge 2.16.30.0

11 months agoUpdate Hungarian.po (#1832)
efi99 [Wed, 3 May 2023 04:12:05 +0000 (06:12 +0200)]
Update Hungarian.po (#1832)

11 months agoFix an issue where Explorer's Compare As menu did not work correctly if WinMerge...
Takashi Sawanaka [Tue, 2 May 2023 13:07:33 +0000 (22:07 +0900)]
Fix an issue where Explorer's Compare As menu did not work correctly if WinMerge was already running when Single instance mode was enabled.

11 months agoUse the SetRedraw method to speed up additions to the list.
Takashi Sawanaka [Tue, 2 May 2023 12:53:09 +0000 (21:53 +0900)]
Use the SetRedraw method to speed up additions to the list.

11 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 2 May 2023 12:07:25 +0000 (21:07 +0900)]
Update TranslationsStatus

11 months agoUpdate Dutch.po
Takashi Sawanaka [Tue, 2 May 2023 12:06:23 +0000 (21:06 +0900)]
Update Dutch.po

11 months agoUpdate Dutch.po (#1831)
Thomas De Rocker [Tue, 2 May 2023 11:57:11 +0000 (13:57 +0200)]
Update Dutch.po (#1831)

Update Dutch translations

11 months agoUpdate Brazilian.po (#1829)
Marcellomco [Mon, 1 May 2023 23:15:57 +0000 (20:15 -0300)]
Update Brazilian.po (#1829)

Add translation for "Confirm copy all in file merge"

11 months agoConfirm copy all in file merge (#1827) (2)
Takashi Sawanaka [Mon, 1 May 2023 13:51:03 +0000 (22:51 +0900)]
Confirm copy all in file merge (#1827) (2)

11 months agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 1 May 2023 13:23:20 +0000 (22:23 +0900)]
Update Contributors.txt

11 months agoConfirm copy all in file merge (#1827)
wilfzim [Mon, 1 May 2023 13:14:43 +0000 (15:14 +0200)]
Confirm copy all in file merge (#1827)

* warning message before copying all differences to other file

* make translation work

11 months agoFix input range check processing in "Go to" dialog. (#1826)
Jun Tajima [Sun, 30 Apr 2023 08:35:55 +0000 (17:35 +0900)]
Fix input range check processing in "Go to" dialog. (#1826)

Fix the following issues:
- When "Go to what" is "Line", specifying a line greater than the number of lines in the selected pane when opening the dialog navigates to the wrong line.
  (Navigate to a line equal to the number of lines in the pane selected when the dialog was opened.)
- When "Go to what" is "Difference" in debug build, if a number larger than the number of comparison differences is specified, a debug error occurs in the CMergeEditView::SelectDiff() check process.

11 months agoReduce compiler warnings
Takashi Sawanaka [Sat, 29 Apr 2023 14:24:34 +0000 (23:24 +0900)]
Reduce compiler warnings

11 months agoUpdate Contributors.txt
Takashi Sawanaka [Sat, 29 Apr 2023 14:23:24 +0000 (23:23 +0900)]
Update Contributors.txt

12 months agoUpdate Bulgarian.po
Takashi Sawanaka [Sat, 29 Apr 2023 06:26:54 +0000 (15:26 +0900)]
Update Bulgarian.po

12 months agoUpdate Russian.po
Takashi Sawanaka [Sat, 29 Apr 2023 06:26:27 +0000 (15:26 +0900)]
Update Russian.po

12 months agoUpdate to winimerge to 1.0.39
Takashi Sawanaka [Sat, 29 Apr 2023 02:24:27 +0000 (11:24 +0900)]
Update to winimerge to 1.0.39

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 29 Apr 2023 02:24:00 +0000 (11:24 +0900)]
Update TranslationsStatus

12 months agoUpdate Russian.po (#1825)
wvxwxvw [Fri, 28 Apr 2023 22:59:08 +0000 (01:59 +0300)]
Update Russian.po (#1825)

12 months agoUpdate Russian.po (#1824)
wvxwxvw [Fri, 28 Apr 2023 22:58:28 +0000 (01:58 +0300)]
Update Russian.po (#1824)

12 months agoUpdate Bulgarian.po (#1822)
StoyanDimitrov [Fri, 28 Apr 2023 00:03:54 +0000 (00:03 +0000)]
Update Bulgarian.po (#1822)