OSDN Git Service
Takashi Sawanaka [Tue, 6 Mar 2018 15:00:34 +0000 (00:00 +0900)]
PatchDlg.*: Fix the issue that File1/File2 fields don't remember manual input (sf.net#1949)
Takashi Sawanaka [Sat, 3 Mar 2018 13:57:57 +0000 (22:57 +0900)]
Added tag 2.15.3 for changeset
82b36418c467
Takashi Sawanaka [Sat, 3 Mar 2018 13:02:51 +0000 (22:02 +0900)]
Merge
Takashi Sawanaka [Sat, 3 Mar 2018 12:56:41 +0000 (21:56 +0900)]
Update release notes and changelog for 2.15.3
Takashi Sawanaka [Sat, 3 Mar 2018 12:53:42 +0000 (21:53 +0900)]
DownloadDeps.cmd: Update ShellExtension version
Takashi Sawanaka [Thu, 1 Mar 2018 21:41:17 +0000 (06:41 +0900)]
Merge pull request #78 from Lippe35/master
Improvements Portuguese
Lippe35 [Thu, 1 Mar 2018 14:54:52 +0000 (14:54 +0000)]
Improvements Portuguese
Takashi Sawanaka [Wed, 28 Feb 2018 20:49:30 +0000 (05:49 +0900)]
Merge pull request #77 from Lippe35/master
Add missing translation and corrections Portuguese
Lippe35 [Wed, 28 Feb 2018 15:23:34 +0000 (15:23 +0000)]
Add missing translation and corrections Portuguese
Takashi Sawanaka [Wed, 28 Feb 2018 13:31:19 +0000 (22:31 +0900)]
DirView.cpp: Remove trailing garbage from a dragged text (2) fixes github#75
Takashi Sawanaka [Sun, 25 Feb 2018 05:39:19 +0000 (14:39 +0900)]
Manual: Fix the issue "sf.net#2165 Manual "Using Filters" Line Filter Example"
Takashi Sawanaka [Sun, 25 Feb 2018 05:00:58 +0000 (14:00 +0900)]
Polish.po: Update Polish translation (sf.net#2177)
Takashi Sawanaka [Sat, 24 Feb 2018 12:07:50 +0000 (21:07 +0900)]
Merge pull request #76 from Lippe35/master
Corrections and improvements Portuguese
Lippe35 [Sat, 24 Feb 2018 07:39:58 +0000 (07:39 +0000)]
Corrections and improvements Portuguese
Takashi Sawanaka [Sat, 24 Feb 2018 04:59:48 +0000 (13:59 +0900)]
Contributors.txt: Change the file encoding to UTF-8
Takashi Sawanaka [Sat, 24 Feb 2018 04:59:04 +0000 (13:59 +0900)]
Translations/WinMerge/*.po: Change the file encoding to UTF-8
Takashi Sawanaka [Fri, 23 Feb 2018 13:29:30 +0000 (22:29 +0900)]
Merge
Takashi Sawanaka [Fri, 23 Feb 2018 13:09:49 +0000 (22:09 +0900)]
Merge pull request #74 from Lippe35/master
Corrections Portuguese
Lippe35 [Fri, 23 Feb 2018 03:51:16 +0000 (03:51 +0000)]
Corrections Portuguese
Takashi Sawanaka [Thu, 22 Feb 2018 12:35:06 +0000 (21:35 +0900)]
Fix to show text that contains & on message box, correctly. sf.net#2067 (2)
Takashi Sawanaka [Tue, 20 Feb 2018 21:36:49 +0000 (06:36 +0900)]
Merge pull request #73 from Lippe35/master
Improvements and corrections Portuguese
Lippe35 [Tue, 20 Feb 2018 14:31:37 +0000 (14:31 +0000)]
Improvements and corrections Portuguese
Takashi Sawanaka [Tue, 20 Feb 2018 13:23:48 +0000 (22:23 +0900)]
Merge pull request #72 from Lippe35/master
Revert "Fix Portuguese"
Lippe35 [Tue, 20 Feb 2018 05:55:28 +0000 (05:55 +0000)]
More corrections Portuguese
Lippe35 [Tue, 20 Feb 2018 05:23:57 +0000 (05:23 +0000)]
Add and Correction Portuguese
Lippe35 [Tue, 20 Feb 2018 05:09:18 +0000 (05:09 +0000)]
Correction Portuguese
Lippe35 [Tue, 20 Feb 2018 04:51:46 +0000 (04:51 +0000)]
Revert "Fix Portuguese"
This reverts commit
6cc226cf092fcbbb5d3c515922a3461c85d7fa71.
Takashi Sawanaka [Mon, 19 Feb 2018 21:45:04 +0000 (06:45 +0900)]
Merge pull request #71 from Lippe35/patch-1
Fix Portuguese
Lippe35 [Mon, 19 Feb 2018 21:41:10 +0000 (21:41 +0000)]
Fix Portuguese
Takashi Sawanaka [Mon, 19 Feb 2018 21:34:26 +0000 (06:34 +0900)]
Merge
Takashi Sawanaka [Mon, 19 Feb 2018 21:29:36 +0000 (06:29 +0900)]
Merge pull request #70 from Lippe35/master
Improvements Portuguese
Lippe35 [Mon, 19 Feb 2018 14:21:50 +0000 (14:21 +0000)]
Improvements Portuguese
Takashi Sawanaka [Sun, 18 Feb 2018 16:26:41 +0000 (01:26 +0900)]
Bump revision to 2.15.3
Takashi Sawanaka [Sun, 18 Feb 2018 16:25:35 +0000 (01:25 +0900)]
Installer: Use replacesameversion flag to overwrite jp branch's frhed and winimerge
Takashi Sawanaka [Sun, 18 Feb 2018 16:18:03 +0000 (01:18 +0900)]
ShellExtension: Bump revision to 1.17.1.0
Takashi Sawanaka [Sun, 18 Feb 2018 15:35:10 +0000 (00:35 +0900)]
Fix to show text that contains & on message box, correctly. sf.net#2067
Takashi Sawanaka [Sun, 18 Feb 2018 11:57:52 +0000 (20:57 +0900)]
MergeDoc.cpp: Fix wrong if condition. sf.net#2202
Takashi Sawanaka [Sun, 18 Feb 2018 11:18:11 +0000 (20:18 +0900)]
ccrystaltextview.cpp: Fix infinite loop when replacing ^ sf.net#2094
Takashi Sawanaka [Sun, 18 Feb 2018 10:54:11 +0000 (19:54 +0900)]
ccrystaltextview.cpp: Fix reverse search to search last line correctly
Takashi Sawanaka [Fri, 16 Feb 2018 13:24:37 +0000 (22:24 +0900)]
Merge pull request #69 from Lippe35/master
Add and corrections Portuguese
Lippe35 [Fri, 16 Feb 2018 13:10:05 +0000 (13:10 +0000)]
Add and corrections Portuguese
Takashi Sawanaka [Fri, 16 Feb 2018 12:14:46 +0000 (21:14 +0900)]
Merge pull request #68 from Lippe35/master
More add and corrections Portuguese translation
Lippe35 [Thu, 15 Feb 2018 14:50:18 +0000 (14:50 +0000)]
More Add and corrections Portuguese translation
Takashi Sawanaka [Thu, 15 Feb 2018 14:04:37 +0000 (23:04 +0900)]
Merge pull request #67 from Lippe35/master
Add and corrections Portuguese translation
Lippe35 [Thu, 15 Feb 2018 13:35:56 +0000 (13:35 +0000)]
Add and corrections Portuguese translation
Takashi Sawanaka [Mon, 12 Feb 2018 12:58:12 +0000 (21:58 +0900)]
Update Turkish translation. Bitbucket#86
Takashi Sawanaka [Sun, 11 Feb 2018 14:08:50 +0000 (23:08 +0900)]
Update Turkish translation. Bitbucket#86
Takashi Sawanaka [Sun, 11 Feb 2018 13:33:12 +0000 (22:33 +0900)]
ShellExtension/Sinhala.po: Use LANG_SINHALESE instead of LANG_SINHALA that is not defined
Takashi Sawanaka [Sun, 11 Feb 2018 13:30:31 +0000 (22:30 +0900)]
Update Turkish translation. Bitbucket#85, #86
Takashi Sawanaka [Sun, 11 Feb 2018 08:54:18 +0000 (17:54 +0900)]
Installer: Add "How to Apply These Terms to Your New Programs" section into GPL.rtf. sf.net#2098
Takashi Sawanaka [Sun, 11 Feb 2018 07:22:18 +0000 (16:22 +0900)]
GhostTextBuffer.cpp: if the last line in selection to be deleted is a ghost line,
the EOL of last real line in selection should not be deleted.
Otherwise, a line with no EOL will appear.
Takashi Sawanaka [Sun, 11 Feb 2018 05:51:07 +0000 (14:51 +0900)]
GhostTextBuffer.cpp: Remove unnecessary function call
Takashi Sawanaka [Sun, 11 Feb 2018 05:33:17 +0000 (14:33 +0900)]
Update translations
Takashi Sawanaka [Sat, 10 Feb 2018 00:20:54 +0000 (09:20 +0900)]
Update *.isl files
Takashi Sawanaka [Sat, 10 Feb 2018 00:20:12 +0000 (09:20 +0900)]
Update Polish translation sf.net#3034
Takashi Sawanaka [Sat, 10 Feb 2018 00:19:24 +0000 (09:19 +0900)]
Update Persian translation sf.net#3033
Takashi Sawanaka [Sat, 10 Feb 2018 00:17:59 +0000 (09:17 +0900)]
Update Contributors.txt
Takashi Sawanaka [Sat, 10 Feb 2018 00:17:10 +0000 (09:17 +0900)]
Add Sinhala translation sf.net#3032
Takashi Sawanaka [Sat, 10 Feb 2018 00:15:11 +0000 (09:15 +0900)]
Add Finnish translation sf.net#3031
Takashi Sawanaka [Thu, 8 Feb 2018 22:10:44 +0000 (07:10 +0900)]
LanguageSelect.cpp: Add Sinhalese
Takashi Sawanaka [Thu, 8 Feb 2018 15:00:18 +0000 (00:00 +0900)]
UpdatePoFilesFromPotFile.vbs: Add support for *.po file encoded in UTF-8
Takashi Sawanaka [Thu, 8 Feb 2018 14:54:06 +0000 (23:54 +0900)]
ShellExtension/Basque.po: Fix wrong codepage
Takashi Sawanaka [Thu, 8 Feb 2018 14:49:54 +0000 (23:49 +0900)]
ShellExtensionPortuguese.rc: Recreate from .po file
Takashi Sawanaka [Thu, 8 Feb 2018 14:46:43 +0000 (23:46 +0900)]
ShellExtension/Portuguese.po: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Tue, 6 Feb 2018 22:03:00 +0000 (07:03 +0900)]
Japanese.po: Remove an unused line
Takashi Sawanaka [Tue, 6 Feb 2018 22:01:40 +0000 (07:01 +0900)]
Portuguese.po: Change the file encoding from UTF-8 to CP1252
Takashi Sawanaka [Tue, 6 Feb 2018 21:55:31 +0000 (06:55 +0900)]
Merge pull request #64 from Lippe35/patch-1
Update Portuguese
Lippe35 [Tue, 6 Feb 2018 21:06:43 +0000 (21:06 +0000)]
Update Portuguese
Takashi Sawanaka [Mon, 5 Feb 2018 13:00:26 +0000 (22:00 +0900)]
Portuguese.po: Restore lost file masks
Takashi Sawanaka [Mon, 5 Feb 2018 12:56:50 +0000 (21:56 +0900)]
Korean.po: Change the file encoding from utf-8 to CP949
Takashi Sawanaka [Mon, 5 Feb 2018 12:21:04 +0000 (21:21 +0900)]
Merge pull request #62 from Lippe35/master
Add and corrections translation PT-PT
Takashi Sawanaka [Mon, 5 Feb 2018 12:18:02 +0000 (21:18 +0900)]
Merge pull request #61 from sheppaul/patch-1
Updated Korean
Lippe35 [Mon, 5 Feb 2018 11:39:56 +0000 (11:39 +0000)]
Add and corrections translation PT-PT
sheppaul [Mon, 5 Feb 2018 04:55:49 +0000 (13:55 +0900)]
Updated Korean
Hi,
Just updated the language for Korean.
Thank you for the job.
regards,
sheppaul
Takashi Sawanaka [Sun, 4 Feb 2018 13:35:10 +0000 (22:35 +0900)]
CompareMSExcelFiles.sct: Add "Compare headers and footers" checkbox to settings dialog. sf.net#2102
Takashi Sawanaka [Sun, 4 Feb 2018 11:53:16 +0000 (20:53 +0900)]
Installer: Remove extra space in installer: "Launch WinMerge" (sf.net#2144)
Takashi Sawanaka [Sun, 4 Feb 2018 11:14:11 +0000 (20:14 +0900)]
MovedBlockes.cpp: Attempt to fix the bug sf.net#2174
Takashi Sawanaka [Sat, 3 Feb 2018 12:54:45 +0000 (21:54 +0900)]
Poslish.po: Update Polish translation (sf.net#2177)
Takashi Sawanaka [Sat, 3 Feb 2018 12:47:23 +0000 (21:47 +0900)]
PathDlg.cpp: Fix a problem that typed-in Context in Generate Patch is not applied. sf.net#2179
Takashi Sawanaka [Sat, 3 Feb 2018 11:45:04 +0000 (20:45 +0900)]
DirActions.h: Setting empty filename in diffFileInfo when failing partially to rename filename causes various terrible behavior with some operations after renaming.
(parent folder name unexpectedly renamed... etc.)
Takashi Sawanaka [Sat, 3 Feb 2018 09:55:21 +0000 (18:55 +0900)]
(File|Folder)CompareReport: Entitify file paths in HTML & XML directory comparison reports (merge from bitbucket.org/jtuc/winmerge2011) (sf.net#2199)
Takashi Sawanaka [Sat, 3 Feb 2018 03:47:02 +0000 (12:47 +0900)]
TimeSizeCompare.cpp: Fix a problem that unique files are invisible when comparing files using 'Date' compare method
Takashi Sawanaka [Sat, 3 Feb 2018 03:33:40 +0000 (12:33 +0900)]
DirActions.cpp: files with comparison error were not shown in list view
Takashi Sawanaka [Tue, 30 Jan 2018 22:04:20 +0000 (07:04 +0900)]
Merge pull request #60 from Lippe35/master
Corrections Portuguese
Lippe35 [Tue, 30 Jan 2018 17:30:02 +0000 (17:30 +0000)]
Corrections Portuguese
Takashi Sawanaka [Tue, 30 Jan 2018 14:01:10 +0000 (23:01 +0900)]
Merge
Takashi Sawanaka [Tue, 30 Jan 2018 13:58:49 +0000 (22:58 +0900)]
OptionsFont.cpp: Fix the problem that the messase "assertion failed" is displayed when WinMerge is executed under Windows XP.
Takashi Sawanaka [Tue, 30 Jan 2018 13:45:55 +0000 (22:45 +0900)]
ReadMe-Portuguese.txt: Change the file encoding from utf-8 to cp1252
Takashi Sawanaka [Tue, 30 Jan 2018 13:43:55 +0000 (22:43 +0900)]
Installer: Install ReadMe-Portuguese.txt (2)
Takashi Sawanaka [Tue, 30 Jan 2018 13:40:18 +0000 (22:40 +0900)]
Merge pull request #59 from Lippe35/master
Corrections Portuguese
Tim Gerundt [Tue, 30 Jan 2018 05:00:12 +0000 (06:00 +0100)]
GetTranslationsStatus.py: Fix UnicodeDecodeError with Python 3
Lippe35 [Mon, 29 Jan 2018 23:46:32 +0000 (23:46 +0000)]
Merge branch 'master' into master
Lippe35 [Mon, 29 Jan 2018 23:30:54 +0000 (23:30 +0000)]
Corrections Portuguese
Takashi Sawanaka [Mon, 29 Jan 2018 22:17:17 +0000 (07:17 +0900)]
Merge
Takashi Sawanaka [Mon, 29 Jan 2018 22:09:51 +0000 (07:09 +0900)]
Installer: Install ReadMe-Portuguese.txt
Takashi Sawanaka [Mon, 29 Jan 2018 22:09:20 +0000 (07:09 +0900)]
ReadMe-Portuguese.txt: Rename ReadMe-Portuguese to ReadMe-Portuguese.txt
Change the file encoding from utf-8 to cp1252
Takashi Sawanaka [Mon, 29 Jan 2018 21:52:23 +0000 (06:52 +0900)]
Merge pull request #58 from Lippe35/master
Fix ReadMe-Portuguese
Lippe35 [Mon, 29 Jan 2018 19:27:16 +0000 (19:27 +0000)]
Fix ReadMe-Portuguese
Takashi Sawanaka [Mon, 29 Jan 2018 18:31:25 +0000 (03:31 +0900)]
Merge pull request #57 from Lippe35/patch-2
Update Portuguese.po
Takashi Sawanaka [Mon, 29 Jan 2018 18:30:52 +0000 (03:30 +0900)]
Merge pull request #56 from Lippe35/patch-1
ReadMe-Portuguese
OSDN Git Service
