OSDN Git Service

winmerge-jp/winmerge-jp.git
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)

12 months agoUpdate ChangeLogJapanese&ReleaseNotesJapanese
Takashi Sawanaka [Thu, 27 Apr 2023 23:56:27 +0000 (08:56 +0900)]
Update ChangeLogJapanese&ReleaseNotesJapanese

12 months agoUpdate Korean.po (#1821)
VenusGirl❤ [Thu, 27 Apr 2023 12:29:04 +0000 (21:29 +0900)]
Update Korean.po (#1821)

12 months agoMerge commit '9d9b7b98a65a9ada85a569dc53829d8261fe3510' into jp 2.16.30+jp-1
Takashi Sawanaka [Thu, 27 Apr 2023 12:26:58 +0000 (21:26 +0900)]
Merge commit '9d9b7b98a65a9ada85a569dc53829d8261fe3510' into jp

# Conflicts:
# SetVersion.cmd
# Version.h

12 months agoUpdate Korean.po (#1820)
VenusGirl❤ [Thu, 27 Apr 2023 03:20:42 +0000 (12:20 +0900)]
Update Korean.po (#1820)

12 months agoBump revision to 2.16.30
Takashi Sawanaka [Wed, 26 Apr 2023 12:49:52 +0000 (21:49 +0900)]
Bump revision to 2.16.30

12 months agoUpdate manual
Takashi Sawanaka [Wed, 26 Apr 2023 12:48:20 +0000 (21:48 +0900)]
Update manual

12 months agoFix ConfigText.cpp
Takashi Sawanaka [Wed, 26 Apr 2023 12:48:07 +0000 (21:48 +0900)]
Fix ConfigText.cpp

12 months agoMerge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Tue, 25 Apr 2023 12:20:22 +0000 (21:20 +0900)]
Merge remote-tracking branch 'upstream/master' into jp

12 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Mon, 24 Apr 2023 13:44:49 +0000 (22:44 +0900)]
Update ChangeLog&ReleaseNotes (3)

12 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Mon, 24 Apr 2023 13:36:44 +0000 (22:36 +0900)]
Update ChangeLog&ReleaseNotes (2)

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 24 Apr 2023 12:13:30 +0000 (21:13 +0900)]
Update TranslationsStatus

12 months agoUpdate Lithuanian.po (#1817)
Tichij [Mon, 24 Apr 2023 12:06:30 +0000 (15:06 +0300)]
Update Lithuanian.po (#1817)

Update of Lithuanian translation

12 months agoRevert "To reduce the size of the executable file, convert the image "ToolbarEnabled8...
Takashi Sawanaka [Sun, 23 Apr 2023 14:44:36 +0000 (23:44 +0900)]
Revert "To reduce the size of the executable file, convert the image "ToolbarEnabled8bit.bmp" to a 1-bit bitmap image, as it is not actually displayed."

This reverts commit a630c53b7fa46c087b6f71c5a0ca35e6c1862257.

12 months agoTo reduce the size of the executable file, convert the image "ToolbarEnabled8bit...
Takashi Sawanaka [Sun, 23 Apr 2023 14:36:17 +0000 (23:36 +0900)]
To reduce the size of the executable file, convert the image "ToolbarEnabled8bit.bmp" to a 1-bit bitmap image, as it is not actually displayed.

12 months agoRegisterDragDrop is now called at idle to reduce startup time since it is slow.
Takashi Sawanaka [Sun, 23 Apr 2023 14:34:24 +0000 (23:34 +0900)]
RegisterDragDrop is now called at idle to reduce startup time since it is slow.

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 23 Apr 2023 05:56:57 +0000 (14:56 +0900)]
Update TranslationsStatus

12 months agoReduce the executable file size. This is especially effective in the x86 version.
Takashi Sawanaka [Sun, 23 Apr 2023 05:56:23 +0000 (14:56 +0900)]
Reduce the executable file size. This is especially effective in the x86 version.

12 months agoUpdate Polish.po (#1815)
Mirosław Żylewicz [Sun, 23 Apr 2023 01:49:20 +0000 (03:49 +0200)]
Update Polish.po (#1815)

12 months agoFix problem of not moving to conflicted line after auto-merge
Takashi Sawanaka [Sat, 22 Apr 2023 12:31:22 +0000 (21:31 +0900)]
Fix problem of not moving to conflicted line after auto-merge

12 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Sat, 22 Apr 2023 09:33:18 +0000 (18:33 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (4)

12 months agoUpdate ShellExtension/Russion.po
Takashi Sawanaka [Sat, 22 Apr 2023 05:54:35 +0000 (14:54 +0900)]
Update ShellExtension/Russion.po

12 months agoFix the issue of missing part of the date in the Brazilian line in TranslationsStatus.md.
Takashi Sawanaka [Sat, 22 Apr 2023 05:51:52 +0000 (14:51 +0900)]
Fix the issue of missing part of the date in the Brazilian line in TranslationsStatus.md.

12 months agoFix the problem that the plug-in setting window cannot be opened on 32-bit OS
Takashi Sawanaka [Sat, 22 Apr 2023 04:09:03 +0000 (13:09 +0900)]
Fix the problem that the plug-in setting window cannot be opened on 32-bit OS

12 months agoFix the problem that the /fr option is ignored when specifying the command line optio...
Takashi Sawanaka [Sat, 22 Apr 2023 03:26:16 +0000 (12:26 +0900)]
Fix the problem that the /fr option is ignored when specifying the command line option /new

12 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 22 Apr 2023 00:43:33 +0000 (09:43 +0900)]
Update ChangeLog&ReleaseNotes

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Thu, 20 Apr 2023 22:41:33 +0000 (07:41 +0900)]
Update TranslationsStatus

12 months agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Thu, 20 Apr 2023 22:40:45 +0000 (07:40 +0900)]
Update Slovenian translation. Submitted by JadranR

12 months agoUpdate winimerge to 1.0.38.0
Takashi Sawanaka [Wed, 19 Apr 2023 23:44:27 +0000 (08:44 +0900)]
Update winimerge to 1.0.38.0

12 months agoFix an issue where the changed Color distance threshold value reverts to 0 the next...
Takashi Sawanaka [Wed, 19 Apr 2023 14:57:41 +0000 (23:57 +0900)]
Fix an issue where the changed Color distance threshold value reverts to 0 the next time WinMerge is started

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 18 Apr 2023 13:55:06 +0000 (22:55 +0900)]
Update TranslationsStatus

12 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Tue, 18 Apr 2023 13:54:31 +0000 (22:54 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (3)

12 months agoUpdate Hungarian.po (#1809)
efi99 [Tue, 18 Apr 2023 00:26:27 +0000 (02:26 +0200)]
Update Hungarian.po (#1809)

12 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Tue, 18 Apr 2023 00:21:14 +0000 (09:21 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog (2)

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 17 Apr 2023 15:10:41 +0000 (00:10 +0900)]
Update TranslationsStatus

12 months agoFix an issue where plugin settings were not exported when exporting from the Options...
Takashi Sawanaka [Mon, 17 Apr 2023 15:10:20 +0000 (00:10 +0900)]
Fix an issue where plugin settings were not exported when exporting from the Options dialog

12 months agoupdate zh-cn translation (#1808)
YIN, Gang [Mon, 17 Apr 2023 13:06:41 +0000 (21:06 +0800)]
update zh-cn translation (#1808)

* update zh-cn translation

* update last commit

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 16 Apr 2023 23:06:46 +0000 (08:06 +0900)]
Update TranslationsStatus

12 months agoUpdate German.po (#1807)
Mr-Update [Sun, 16 Apr 2023 23:05:43 +0000 (01:05 +0200)]
Update German.po (#1807)

12 months agoUpdate Brazilian.po (#1806)
Marcellomco [Sun, 16 Apr 2023 23:04:46 +0000 (20:04 -0300)]
Update Brazilian.po (#1806)

Translation for 'Make the plugin settings dialog translatable and enable saving settin...'

12 months agoAllow UTF-8 without BOM for the file filters
Takashi Sawanaka [Sun, 16 Apr 2023 12:10:25 +0000 (21:10 +0900)]
Allow UTF-8 without BOM for the file filters

12 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sun, 16 Apr 2023 11:00:00 +0000 (20:00 +0900)]
Update TranslationsStatus

12 months agoMake the plugin settings dialog translatable and enable saving settings to an INI...
Takashi Sawanaka [Sun, 16 Apr 2023 10:58:05 +0000 (19:58 +0900)]
Make the plugin settings dialog translatable and enable saving settings to an INI file (#1783)

12 months agoAdd "Plugin Settings" button to the "Select Plugin" window
Takashi Sawanaka [Sun, 16 Apr 2023 01:11:53 +0000 (10:11 +0900)]
Add "Plugin Settings" button to the "Select Plugin" window