OSDN Git Service

winmerge-jp/winmerge-jp.git
14 years agoPATCH: [ 2951149 ] Updated polish language file
Tim Gerundt [Fri, 19 Feb 2010 19:25:08 +0000 (19:25 +0000)]
PATCH: [ 2951149 ] Updated polish language file
 Submitted by Skiff

14 years agoPATCH: [ 2954833 ] Traditional Chinese Language File updated
Tim Gerundt [Fri, 19 Feb 2010 19:03:56 +0000 (19:03 +0000)]
PATCH: [ 2954833 ] Traditional Chinese Language File updated
 Submitted by wck3

14 years agoWeb: Add link to WinMerge Facebook group
Tim Gerundt [Fri, 12 Feb 2010 16:47:48 +0000 (16:47 +0000)]
Web: Add link to WinMerge Facebook group

14 years agoPATCH: [ 2943964 ] A Swedish Swedish.isl and sv.po translation update
Tim Gerundt [Sat, 6 Feb 2010 14:09:37 +0000 (14:09 +0000)]
PATCH: [ 2943964 ] A Swedish Swedish.isl and sv.po translation update
 Submitted by Hans Eriksson

14 years agoDrop "MakePatchDirs" from SVN_Organisation.txt
Tim Gerundt [Sat, 6 Feb 2010 13:23:09 +0000 (13:23 +0000)]
Drop "MakePatchDirs" from SVN_Organisation.txt

14 years agoFix small typo in Releasing.html developer file
Tim Gerundt [Sat, 6 Feb 2010 13:00:14 +0000 (13:00 +0000)]
Fix small typo in Releasing.html developer file

14 years agoDrop "MakePatchDirs" section from readme-developers.html
Tim Gerundt [Sat, 6 Feb 2010 12:35:23 +0000 (12:35 +0000)]
Drop "MakePatchDirs" section from readme-developers.html

14 years agoPATCH: [ 2669526 ] ViewColor
Takashi Sawanaka [Mon, 1 Feb 2010 14:24:51 +0000 (14:24 +0000)]
PATCH: [ 2669526 ] ViewColor
  Bug fix in HTML report

14 years agoPATCH: [ 2942365 ] Fix scewX64 VC project file
Tim Gerundt [Sat, 30 Jan 2010 08:41:09 +0000 (08:41 +0000)]
PATCH: [ 2942365 ] Fix scewX64 VC project file

14 years agoWeb: Tweak detectLanguageFromBrowser() function from SimpleTranslate class
Tim Gerundt [Thu, 21 Jan 2010 19:42:51 +0000 (19:42 +0000)]
Web: Tweak detectLanguageFromBrowser() function from SimpleTranslate class

14 years agoPATCH: [ 2934354 ] Final Slovenian translation for stable and unstable
Tim Gerundt [Tue, 19 Jan 2010 19:30:46 +0000 (19:30 +0000)]
PATCH: [ 2934354 ] Final Slovenian translation for stable and unstable
 Submitted by Filip Komar

14 years agoChange version nummer from 2.3.11 to 2.13.11 in change log
Tim Gerundt [Sat, 16 Jan 2010 08:21:28 +0000 (08:21 +0000)]
Change version nummer from 2.3.11 to 2.13.11 in change log

14 years agoWinMerge experimental release 2.3.11. (SVN r7111)
Kimmo Varis [Fri, 15 Jan 2010 19:01:44 +0000 (19:01 +0000)]
WinMerge experimental release 2.3.11. (SVN r7111)

14 years agoUpdate version numbers for 2.13.11 experimental release.
Kimmo Varis [Fri, 15 Jan 2010 18:48:24 +0000 (18:48 +0000)]
Update version numbers for 2.13.11 experimental release.

14 years agoPATCH: [ 2932094 ] Updated Slovenian translation for stable and unstable trunk
Tim Gerundt [Fri, 15 Jan 2010 17:46:17 +0000 (17:46 +0000)]
PATCH: [ 2932094 ] Updated Slovenian translation for stable and unstable trunk
 Submitted by Filip Komar

14 years agoPATCH: [ 2931558 ] some smal cleanups
Kimmo Varis [Thu, 14 Jan 2010 21:43:14 +0000 (21:43 +0000)]
PATCH: [ 2931558 ] some smal cleanups
 mergedoc7097.patch
 Submitted by Matthias Mayer

14 years agoPATCH: [ 2931558 ] some smal cleanups
Kimmo Varis [Thu, 14 Jan 2010 21:29:10 +0000 (21:29 +0000)]
PATCH: [ 2931558 ] some smal cleanups
 ccrystaltextbuffer7097.patch
 Submitted by Matthias Mayer

14 years agoPATCH: [ 2931558 ] some smal cleanups
Kimmo Varis [Thu, 14 Jan 2010 21:14:22 +0000 (21:14 +0000)]
PATCH: [ 2931558 ] some smal cleanups
 Difflist7097.patch
 Submitted by Matthias Mayer

14 years agoBuildscript: Build 64-bit ShellExtension with the script.
Kimmo Varis [Wed, 13 Jan 2010 22:43:54 +0000 (22:43 +0000)]
Buildscript: Build 64-bit ShellExtension with the script.

14 years agoFix building ANSI release. Was missing scew.lib linkage
Kimmo Varis [Wed, 13 Jan 2010 22:27:27 +0000 (22:27 +0000)]
Fix building ANSI release. Was missing scew.lib linkage

14 years agoPATCH: [ 2917796 ] Updated and corrected Slovenian translation
Tim Gerundt [Wed, 13 Jan 2010 21:39:03 +0000 (21:39 +0000)]
PATCH: [ 2917796 ] Updated and corrected Slovenian translation
 Submitted by Filip Komar

14 years agoPATCH: [ 2930734 ] Winmerge 2.12.4 Spanish Update and Corrected
Tim Gerundt [Wed, 13 Jan 2010 20:36:19 +0000 (20:36 +0000)]
PATCH: [ 2930734 ] Winmerge 2.12.4 Spanish Update and Corrected
 Submitted by Mario Angel

14 years agoBuildScript: Update ShellExtension build folders.
Kimmo Varis [Tue, 12 Jan 2010 22:07:30 +0000 (22:07 +0000)]
BuildScript: Update ShellExtension build folders.

14 years agoUpdate ShellExtension build folders to WiX installer.
Kimmo Varis [Tue, 12 Jan 2010 21:52:21 +0000 (21:52 +0000)]
Update ShellExtension build folders to WiX installer.

14 years agoUpdate new ShellExtension build folders to InnoSetup installer.
Kimmo Varis [Tue, 12 Jan 2010 21:45:51 +0000 (21:45 +0000)]
Update new ShellExtension build folders to InnoSetup installer.

14 years agoContinue fixing ShellExtension build folders.
Kimmo Varis [Tue, 12 Jan 2010 20:39:43 +0000 (20:39 +0000)]
Continue fixing ShellExtension build folders.

14 years agoFix 64-bit ShellExtension build paths.
Kimmo Varis [Mon, 11 Jan 2010 21:17:08 +0000 (21:17 +0000)]
Fix 64-bit ShellExtension build paths.

14 years agoFix buildpaths in the SCEW project.
Kimmo Varis [Mon, 11 Jan 2010 20:45:25 +0000 (20:45 +0000)]
Fix buildpaths in the SCEW project.

14 years agoCleanup. Remove unused return value from method.
Kimmo Varis [Mon, 11 Jan 2010 20:27:43 +0000 (20:27 +0000)]
Cleanup. Remove unused return value from method.

14 years agoPATCH: [ 2929005 ] Quickcompare and EOL
Kimmo Varis [Mon, 11 Jan 2010 19:48:26 +0000 (19:48 +0000)]
PATCH: [ 2929005 ] Quickcompare and EOL
 Fixes bug #2210403
 Submitted by Matthias Mayer

14 years agoAutomatic rescanning was not disabled everywhere.
Kimmo Varis [Sat, 9 Jan 2010 18:39:27 +0000 (18:39 +0000)]
Automatic rescanning was not disabled everywhere.

Add forced rescan after loading documents (spotted by Matthias).

14 years agoImprove UpgradeProjects.py to cleanup backup/log files after update.
Kimmo Varis [Sat, 9 Jan 2010 16:40:17 +0000 (16:40 +0000)]
Improve UpgradeProjects.py to cleanup backup/log files after update.

14 years agoAdd new script to cleanup VS solution/project update backups/logs.
Kimmo Varis [Sat, 9 Jan 2010 16:13:30 +0000 (16:13 +0000)]
Add new script to cleanup VS solution/project update backups/logs.

14 years agoAutomatic rescanning was not disabled everywhere.
Kimmo Varis [Sat, 9 Jan 2010 13:38:25 +0000 (13:38 +0000)]
Automatic rescanning was not disabled everywhere.

14 years agoUpdate project upgrade scrip after PCRE update.
Kimmo Varis [Sat, 9 Jan 2010 13:30:38 +0000 (13:30 +0000)]
Update project upgrade scrip after PCRE update.

14 years agoLink against scew[_d].lib.
Kimmo Varis [Fri, 8 Jan 2010 21:40:43 +0000 (21:40 +0000)]
Link against scew[_d].lib.

This solves linking problems after SCEW update.

14 years agoPATCH: [ 2925723 ] Add "Additional Tasks" dialog to MSI setup
Tim Gerundt [Fri, 8 Jan 2010 19:49:11 +0000 (19:49 +0000)]
PATCH: [ 2925723 ] Add "Additional Tasks" dialog to MSI setup

14 years agoBUG: [ 2925208 ] Font charset name in config log is incorrect
Takashi Sawanaka [Sun, 3 Jan 2010 22:15:50 +0000 (22:15 +0000)]
BUG: [ 2925208 ] Font charset name in config log is incorrect

14 years agoMigrate to API changes in new SCEW version.
Kimmo Varis [Fri, 1 Jan 2010 20:33:30 +0000 (20:33 +0000)]
Migrate to API changes in new SCEW version.

14 years agoDowngrade SCEW project/solution file for VS2005.
Kimmo Varis [Fri, 1 Jan 2010 15:50:16 +0000 (15:50 +0000)]
Downgrade SCEW project/solution file for VS2005.

Use earlier project file as a base and just update files in project.

14 years agoUpdate SCEW to version 1.1.1.
Kimmo Varis [Fri, 1 Jan 2010 14:47:44 +0000 (14:47 +0000)]
Update SCEW to version 1.1.1.

14 years agoFix PCRE project to build for 64-bit. Use path macros in project file.
Kimmo Varis [Thu, 31 Dec 2009 20:31:33 +0000 (20:31 +0000)]
Fix PCRE project to build for 64-bit. Use path macros in project file.

14 years agoAdd 64-bit build target for PCRE.
Kimmo Varis [Thu, 31 Dec 2009 20:10:44 +0000 (20:10 +0000)]
Add 64-bit build target for PCRE.

14 years agoPATCH: [ 2922517 ] panes gets unaligned if differs for a EOL
Kimmo Varis [Thu, 31 Dec 2009 12:26:17 +0000 (12:26 +0000)]
PATCH: [ 2922517 ] panes gets unaligned if differs for a EOL
 Fixes bug #2794894
 Submitted by Matthias Mayer

14 years agoPATCH: [ 2923684 ] GUI Language update
Kimmo Varis [Wed, 30 Dec 2009 22:57:20 +0000 (22:57 +0000)]
PATCH: [ 2923684 ] GUI Language update
 Fixes bug #2808178
 Submitted by Matthias Mayer

14 years agoShellExtension: Add 64-bit targets to project file.
Kimmo Varis [Tue, 29 Dec 2009 22:48:57 +0000 (22:48 +0000)]
ShellExtension: Add 64-bit targets to project file.

14 years agoFix PreLink.bat to copy PCRE library from new build folder.
Kimmo Varis [Tue, 29 Dec 2009 19:52:31 +0000 (19:52 +0000)]
Fix PreLink.bat to copy PCRE library from new build folder.

14 years agoRemove custom CMake build steps from PCRE build.
Kimmo Varis [Tue, 29 Dec 2009 19:50:39 +0000 (19:50 +0000)]
Remove custom CMake build steps from PCRE build.

14 years agoRemove PCRE solution file.
Kimmo Varis [Tue, 29 Dec 2009 19:46:40 +0000 (19:46 +0000)]
Remove PCRE solution file.

Visual Studio is too smart and forces opening the solution if solution file
exists in the folder. I just want to build one project.

14 years agoRename PCRE solution file to be able to build just library project. Rename debug...
Kimmo Varis [Tue, 29 Dec 2009 19:26:44 +0000 (19:26 +0000)]
Rename PCRE solution file to be able to build just library project. Rename debug library to not have d-postix in name.

14 years agoFix PCRE project file.
Kimmo Varis [Tue, 29 Dec 2009 18:39:32 +0000 (18:39 +0000)]
Fix PCRE project file.

Use relative paths instead of absolute paths. Remove custom rule.

14 years agoUpdate PCRE to version 8.00.
Kimmo Varis [Tue, 29 Dec 2009 18:22:40 +0000 (18:22 +0000)]
Update PCRE to version 8.00.

14 years agoPATCH: [ 2922223 ] MergeDocLineDiffs clean up
Kimmo Varis [Tue, 29 Dec 2009 14:22:46 +0000 (14:22 +0000)]
PATCH: [ 2922223 ] MergeDocLineDiffs clean up
 Submitted by Matthias Mayer

14 years agoMore fixing for X64 project file. More precompiled header file removing.
Kimmo Varis [Mon, 28 Dec 2009 20:28:18 +0000 (20:28 +0000)]
More fixing for X64 project file. More precompiled header file removing.

14 years agoFix X64 project file. Was missing some new files and removal of precompiled headers...
Kimmo Varis [Mon, 28 Dec 2009 20:16:21 +0000 (20:16 +0000)]
Fix X64 project file. Was missing some new files and removal of precompiled headers from several files.

14 years agoWix: Remove already implemented TODO-item (C++ runtimes).
Kimmo Varis [Mon, 28 Dec 2009 11:54:11 +0000 (11:54 +0000)]
Wix: Remove already implemented TODO-item (C++ runtimes).

14 years agoUnify DIFFITEM method naming and remove unused method.
Kimmo Varis [Sun, 27 Dec 2009 15:28:16 +0000 (15:28 +0000)]
Unify DIFFITEM method naming and remove unused method.

14 years agoBUG: [ 2890961 ] Creation of matching folder is wrong in recursive view mode
Kimmo Varis [Sun, 27 Dec 2009 14:43:51 +0000 (14:43 +0000)]
BUG: [ 2890961 ] Creation of matching folder is wrong in recursive view mode

14 years agoPATCH: [ 2921555 ] selected codepage is not used
Kimmo Varis [Sun, 27 Dec 2009 12:51:35 +0000 (12:51 +0000)]
PATCH: [ 2921555 ] selected codepage is not used
 Fixes bug #2907951.
 Submitted by Matthias Mayer.

14 years agoPATCH: [ 2921555 ] selected codepage is not used
Kimmo Varis [Sun, 27 Dec 2009 12:46:20 +0000 (12:46 +0000)]
PATCH: [ 2921555 ] selected codepage is not used
 Fixes bug #2907951.
 Submitted by Matthias Mayer.

14 years agoConvert most of the config log code to use String instead of CString.
Kimmo Varis [Sun, 27 Dec 2009 00:06:59 +0000 (00:06 +0000)]
Convert most of the config log code to use String instead of CString.

14 years agoAdd printf()-style formatting function for String.
Kimmo Varis [Sat, 26 Dec 2009 23:11:18 +0000 (23:11 +0000)]
Add printf()-style formatting function for String.
 Code originally from Paul Senzee.

14 years agoWrite config log as UTF-8 file.
Kimmo Varis [Sat, 26 Dec 2009 20:51:16 +0000 (20:51 +0000)]
Write config log as UTF-8 file.

14 years agoMake UniError::GetError() a const method.
Kimmo Varis [Sat, 26 Dec 2009 19:49:14 +0000 (19:49 +0000)]
Make UniError::GetError() a const method.

14 years agoPATCH: [ 2921400 ] MergeDocLineDiffs
Kimmo Varis [Sat, 26 Dec 2009 13:42:28 +0000 (13:42 +0000)]
PATCH: [ 2921400 ] MergeDocLineDiffs
 Fixes bug #2894033 GUI Word Wrap missing text, differences not highlighted
 Submitted by Matthias Mayer

14 years agoConvert CMergeDoc::GetMatchCost() to use String:s as parameters.
Kimmo Varis [Tue, 22 Dec 2009 17:59:08 +0000 (17:59 +0000)]
Convert CMergeDoc::GetMatchCost() to use String:s as parameters.

14 years agoPATCH: [ 2919475 ] plug in error after ESC in foldercompare
Kimmo Varis [Tue, 22 Dec 2009 17:51:13 +0000 (17:51 +0000)]
PATCH: [ 2919475 ] plug in error after ESC in foldercompare
 Submitted by Matthias Mayer

14 years agoPATCH: [ 2919477 ] plugin remove double call
Kimmo Varis [Tue, 22 Dec 2009 17:45:22 +0000 (17:45 +0000)]
PATCH: [ 2919477 ] plugin remove double call
 Submitted by Matthias Mayer

14 years agoWinMerge experimental release 2.13.10. (SVN r7051)
Kimmo Varis [Mon, 21 Dec 2009 20:05:46 +0000 (20:05 +0000)]
WinMerge experimental release 2.13.10. (SVN r7051)

14 years agoUpdate version numbers to 2.13.10.
Kimmo Varis [Mon, 21 Dec 2009 19:44:15 +0000 (19:44 +0000)]
Update version numbers to 2.13.10.

14 years agoShellExtension: Fix library file name in .def file.
Kimmo Varis [Mon, 21 Dec 2009 19:34:41 +0000 (19:34 +0000)]
ShellExtension: Fix library file name in .def file.

14 years agoConvert 64-bit ShellExtension project to VS2005 format.
Kimmo Varis [Mon, 21 Dec 2009 19:33:23 +0000 (19:33 +0000)]
Convert 64-bit ShellExtension project to VS2005 format.

14 years agoPATCH: [ 2876480 ] stringdiff more details
Kimmo Varis [Mon, 21 Dec 2009 19:08:49 +0000 (19:08 +0000)]
PATCH: [ 2876480 ] stringdiff more details
 Submitted by Matthias Mayer

14 years agoDocs: Wix installer needs to be compiled in Visual Studio command prompt.
Kimmo Varis [Mon, 21 Dec 2009 18:28:45 +0000 (18:28 +0000)]
Docs: Wix installer needs to be compiled in Visual Studio command prompt.

14 years agoVisual Studio project files upgraded to VS2005 format.
Kimmo Varis [Mon, 21 Dec 2009 17:48:18 +0000 (17:48 +0000)]
Visual Studio project files upgraded to VS2005 format.

14 years agoPATCH: [ 2894257 ] German shortcut key conflict resolution
Tim Gerundt [Tue, 8 Dec 2009 19:54:34 +0000 (19:54 +0000)]
PATCH: [ 2894257 ] German shortcut key conflict resolution
  by Robert Knienider

14 years agoUpdate Dutch website translation by Thomas De Rocker
Tim Gerundt [Wed, 25 Nov 2009 18:52:56 +0000 (18:52 +0000)]
Update Dutch website translation by Thomas De Rocker

14 years agoWeb: Show 404 error if wrong language id was committed - Include the 404 page not...
Tim Gerundt [Sat, 21 Nov 2009 17:34:05 +0000 (17:34 +0000)]
Web: Show 404 error if wrong language id was committed - Include the 404 page not work from every place, so send only 404 header for search engines

14 years agoWeb: Show 404 error if wrong language id was committed
Tim Gerundt [Sat, 21 Nov 2009 17:22:14 +0000 (17:22 +0000)]
Web: Show 404 error if wrong language id was committed

14 years agoFix meta data in Japanese web translation
Tim Gerundt [Sat, 21 Nov 2009 15:25:38 +0000 (15:25 +0000)]
Fix meta data in Japanese web translation

14 years agoFix wrong language code from Swedish web translation
Tim Gerundt [Sat, 21 Nov 2009 15:09:08 +0000 (15:09 +0000)]
Fix wrong language code from Swedish web translation

14 years agoWeb: Add "hreflang" to language links
Tim Gerundt [Sat, 21 Nov 2009 14:27:13 +0000 (14:27 +0000)]
Web: Add "hreflang" to language links

14 years agoUpdate German web PO file
Tim Gerundt [Sat, 21 Nov 2009 14:17:54 +0000 (14:17 +0000)]
Update German web PO file

14 years agoWeb: Use new file release RSS feed from SF.net
Tim Gerundt [Fri, 20 Nov 2009 19:16:40 +0000 (19:16 +0000)]
Web: Use new file release RSS feed from SF.net

14 years agoPATCH: [ 2898329 ] Drop MakePatchDirs tool
Tim Gerundt [Wed, 18 Nov 2009 18:56:59 +0000 (18:56 +0000)]
PATCH: [ 2898329 ] Drop MakePatchDirs tool

14 years agoPATCH: [ 2894123 ] Drop codepage translations
Tim Gerundt [Sat, 14 Nov 2009 17:02:15 +0000 (17:02 +0000)]
PATCH: [ 2894123 ] Drop codepage translations

14 years agoSuppress "the section called" prefix for xref links to sections.
Denis Bradford [Tue, 10 Nov 2009 15:18:11 +0000 (15:18 +0000)]
Suppress "the section called" prefix for xref links to sections.

14 years agoBUG: [ 2884856 ] New Persian translation don't work
Tim Gerundt [Tue, 3 Nov 2009 19:00:08 +0000 (19:00 +0000)]
BUG: [ 2884856 ] New Persian translation don't work

14 years agoWeb: Update to SimplePie 1.2
Tim Gerundt [Sat, 31 Oct 2009 18:53:08 +0000 (18:53 +0000)]
Web: Update to SimplePie 1.2

14 years agoMinor copy edit.
Denis Bradford [Mon, 26 Oct 2009 13:27:43 +0000 (13:27 +0000)]
Minor copy edit.

14 years agoWeb: Fix typo in quick tour description - Fix PO(T) files too
Tim Gerundt [Sat, 24 Oct 2009 14:12:59 +0000 (14:12 +0000)]
Web: Fix typo in quick tour description - Fix PO(T) files too

14 years agoWeb: Fix typo in quick tour description
Tim Gerundt [Sat, 24 Oct 2009 13:17:57 +0000 (13:17 +0000)]
Web: Fix typo in quick tour description

14 years agoWeb: Fix a link at translations page
Tim Gerundt [Sat, 24 Oct 2009 13:14:55 +0000 (13:14 +0000)]
Web: Fix a link at translations page

14 years agoUpdate web PO(T) files and add script for updateing PO files from POT file
Tim Gerundt [Fri, 23 Oct 2009 18:45:27 +0000 (18:45 +0000)]
Update web PO(T) files and add script for updateing PO files from POT file

14 years agoWinMerge experimental release 2.13.9. (SVN r7025)
Kimmo Varis [Thu, 22 Oct 2009 18:42:45 +0000 (18:42 +0000)]
WinMerge experimental release 2.13.9. (SVN r7025)

14 years agoFix ANSI build.
Kimmo Varis [Thu, 22 Oct 2009 18:26:45 +0000 (18:26 +0000)]
Fix ANSI build.

14 years agoPATCH: [ 2877121 ] Persian translation - Translate InnoSetup (by Abolfazl Rostamzadeh)
Tim Gerundt [Thu, 22 Oct 2009 10:07:45 +0000 (10:07 +0000)]
PATCH: [ 2877121 ] Persian translation - Translate InnoSetup (by Abolfazl Rostamzadeh)

14 years agoPATCH: [ 2877121 ] Persian translation - Translate ShellExtension (by Abolfazl Rostam...
Tim Gerundt [Wed, 21 Oct 2009 19:36:10 +0000 (19:36 +0000)]
PATCH: [ 2877121 ] Persian translation - Translate ShellExtension (by Abolfazl Rostamzadeh)

14 years agoAdd empty last line.
Kimmo Varis [Wed, 21 Oct 2009 18:45:05 +0000 (18:45 +0000)]
Add empty last line.

14 years agoVS2005 does not know SUBLANG_GREEK so use SUBLANG_DEFAULT.
Kimmo Varis [Wed, 21 Oct 2009 18:39:19 +0000 (18:39 +0000)]
VS2005 does not know SUBLANG_GREEK so use SUBLANG_DEFAULT.