OSDN Git Service
Perry Rapp [Tue, 3 Jan 2006 01:36:05 +0000 (01:36 +0000)]
PATCH: [
1391550 ] vbs script to check & optionally merge WinMerge resources
Src: new CheckTranslations.vbs
Perry Rapp [Tue, 3 Jan 2006 01:32:33 +0000 (01:32 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Translations
Src/Language: */Merge*.rc
Perry Rapp [Tue, 3 Jan 2006 01:18:25 +0000 (01:18 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
Kimmo Varis [Mon, 2 Jan 2006 21:40:48 +0000 (21:40 +0000)]
PATCH: [
1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
Kimmo Varis [Mon, 2 Jan 2006 21:29:29 +0000 (21:29 +0000)]
PATCH: [
1395474 ] Define WINVER for compiling with VS.net
Perry Rapp [Mon, 2 Jan 2006 20:05:41 +0000 (20:05 +0000)]
BUG: [
1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
Src: stringdiffs.cpp
Perry Rapp [Mon, 2 Jan 2006 20:02:51 +0000 (20:02 +0000)]
BUG: [
1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
(Delete unused variables)
Src: MergeDocLineDiffs.cpp
Perry Rapp [Mon, 2 Jan 2006 19:39:01 +0000 (19:39 +0000)]
PATCH: [
1395487 ] Unused local variable in UniStdioFile::DoOpen()
Src/Common: UniFile.cpp
Kimmo Varis [Mon, 2 Jan 2006 19:01:21 +0000 (19:01 +0000)]
Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
Perry Rapp [Mon, 2 Jan 2006 07:05:15 +0000 (07:05 +0000)]
BUG: [
1394707 ] Copy&paste compilation error in IgnoreFieldsComma
Fix include to say IgnoreFieldsComma.h (not IgnoreFieldsTab.h)
Plugins\src_VCPP\IgnoreFieldsComma\WinMergeScript.cpp
Perry Rapp [Mon, 2 Jan 2006 06:56:37 +0000 (06:56 +0000)]
PATCH: [
1394073 ] Fix ByteComparator: m_bol0
(Change in ByteComparator.h is cosmetic typo fix in comment)
(Fixes some bad tabbing as well)
Src: ByteComparator.cpp ByteComparator.h
Perry Rapp [Mon, 2 Jan 2006 06:42:38 +0000 (06:42 +0000)]
BUG: [
1395107 ] MergeKorean.rc not compile in cvs trunk
(resource.h => ..\..\resource.h fix missed Korean somehow)
Src/Languages/Korean: MergeKorean.rc
Perry Rapp [Mon, 2 Jan 2006 05:31:37 +0000 (05:31 +0000)]
PATCH: [
1394717 ] Fix resource.h include for translations
Src/Languages: */Merge*.rc
Src/Languages deleted: UpdateAll_resource_h.bat
Src/Languages deleted: */resource.h (localized versions of resource.h)
Perry Rapp [Mon, 2 Jan 2006 04:55:19 +0000 (04:55 +0000)]
PATCH: [
1392647 ] Prefix members with m_ in storage_for_plugins
Src/Common: multiformatText.cpp multiformatText.h
Kimmo Varis [Sun, 1 Jan 2006 23:37:49 +0000 (23:37 +0000)]
Add Gal Hammer to contributors list
Kimmo Varis [Sun, 1 Jan 2006 23:33:16 +0000 (23:33 +0000)]
PATCH: [
1394759 ] Allows quotes in Rational ClearCase checkout comment
- submitted by Gal Hammer
Perry Rapp [Sun, 1 Jan 2006 16:16:08 +0000 (16:16 +0000)]
BUG: [
1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
Src: codepage_detect.cpp
Kimmo Varis [Sun, 1 Jan 2006 16:04:06 +0000 (16:04 +0000)]
BUG: [
1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
Kimmo Varis [Sun, 1 Jan 2006 15:15:42 +0000 (15:15 +0000)]
PATCH: [
1394464 ] Find again code doesn't recognize dos/mac EOLs
Kimmo Varis [Sun, 1 Jan 2006 15:08:34 +0000 (15:08 +0000)]
PATCH: [
1392347 ] Fix status after synching unique binary files
Perry Rapp [Sat, 31 Dec 2005 19:44:19 +0000 (19:44 +0000)]
PATCH: [
1393979 ] Delete unused DiffWrapper fnc cleanup_script
Src: DiffWrapper.cpp
Perry Rapp [Sat, 31 Dec 2005 19:30:18 +0000 (19:30 +0000)]
PATCH: [
1394247 ] Fix GuessEncoding recognition of codepages
BUG: [
1394234 ] GuessEncodings fails to recognize CP-437
Src: codepage_detect.cpp
Perry Rapp [Fri, 30 Dec 2005 23:43:12 +0000 (23:43 +0000)]
PATCH: [
1392229 ] Fix Column item handling
Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
DirViewColItems.h
Perry Rapp [Fri, 30 Dec 2005 22:58:16 +0000 (22:58 +0000)]
PATCH: [
1393239 ] Split functions out of RunFileDiff
Src: DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Fri, 30 Dec 2005 01:57:44 +0000 (01:57 +0000)]
PATCH: [
1212368 ] Display correct paths in context patches
(Post-application)
Revising patched code, removing unneeded dispname added when patch applied
Src: DiffWrapper.cpp
diffutils\src: CONTEXT.C DIFF.H
Perry Rapp [Fri, 30 Dec 2005 01:11:45 +0000 (01:11 +0000)]
PATCH: [
1391732 ] Do not offer to unify codepages in UNICODE build
Also introduces new error IDS_DIFFERENT_UNICODINGS and new
global function IsUnicodeBuild.
Doing language synchronizations for this patch.
Src: Merge.rc
Languages\Brazilian\MergeBrazilian.rc
Languages\Bulgarian\MergeBulgarian.rc
Languages\Catalan\MergeCatalan.rc
Languages\ChineseSimplified\MergeChineseSimplified.rc
Languages\ChineseTraditional\MergeChineseTraditional.rc
Languages\Czech\MergeCzech.rc
Languages\Danish\MergeDanish.rc
Languages\Dutch\MergeDutch.rc
Languages\German\MergeGerman.rc
Languages\Hungarian\MergeHungarian.rc
Languages\Italian\MergeItalian.rc
Languages\Japanese\MergeJapanese.rc
Languages\Korean\MergeKorean.rc
Languages\Norwegian\MergeNorwegian.rc
Languages\Polish\MergePolish.rc
Languages\Russian\MergeRussian.rc
Languages\Slovak\MergeSlovak.rc
Languages\Spanish\MergeSpanish.rc
Languages\Swedish\MergeSwedish.rc
Languages\Turkish\MergeTurkish.rc
Perry Rapp [Fri, 30 Dec 2005 00:57:48 +0000 (00:57 +0000)]
PATCH: [
1390454 ] new commandline arguments (prediffer, ignorews...)
Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
MergeEditView.cpp MergeEditView.h
PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
ProjectFile.cpp
Src New files: MergeArgs.h MergeArgs.cpp
Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
Perry Rapp [Fri, 30 Dec 2005 00:25:48 +0000 (00:25 +0000)]
PATCH: [
1212368 ] Display correct paths in context patches
Src: DiffWrapper.cpp DiffWrapper.h
diffutils\src: CONTEXT.C DIFF.H
Perry Rapp [Thu, 29 Dec 2005 23:54:19 +0000 (23:54 +0000)]
PATCH: [
1391766 ] Sync language resources to English
Src: Merge.rc
Languages\Brazilian\MergeBrazilian.rc
Languages\Bulgarian\MergeBulgarian.rc
Languages\Catalan\MergeCatalan.rc
Languages\ChineseSimplified\MergeChineseSimplified.rc
Languages\ChineseTraditional\MergeChineseTraditional.rc
Languages\Czech\MergeCzech.rc
Languages\Danish\MergeDanish.rc
Languages\Dutch\MergeDutch.rc
Languages\German\MergeGerman.rc
Languages\Hungarian\MergeHungarian.rc
Languages\Italian\MergeItalian.rc
Languages\Japanese\MergeJapanese.rc
Languages\Korean\MergeKorean.rc
Languages\Norwegian\MergeNorwegian.rc
Languages\Polish\MergePolish.rc
Languages\Russian\MergeRussian.rc
Languages\Slovak\MergeSlovak.rc
Languages\Spanish\MergeSpanish.rc
Languages\Swedish\MergeSwedish.rc
Languages\Turkish\MergeTurkish.rc
Perry Rapp [Thu, 29 Dec 2005 23:25:03 +0000 (23:25 +0000)]
BUG: [
1392740 ] Clutter in debug output
Src: DirScan.cpp
Perry Rapp [Thu, 29 Dec 2005 20:05:31 +0000 (20:05 +0000)]
BUG: [
1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
Src: DiffWrapper.cpp
Perry Rapp [Thu, 29 Dec 2005 18:13:43 +0000 (18:13 +0000)]
PATCH: [
1392729 ] Cleanup variables in RunFileDiff
Src: DiffWrapper.cpp
Perry Rapp [Thu, 29 Dec 2005 10:15:49 +0000 (10:15 +0000)]
PATCH: [
1392650 ] Fix locals of CDiffWrapper::RunFileDiff
Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
Perry Rapp [Thu, 29 Dec 2005 08:09:08 +0000 (08:09 +0000)]
PATCH: [
1390774 ] Rename CRegOptions to CRegOptionsMgr
Docs\Developers: Options.html
Src\Common: OptionsMgr.cpp OptionsMgr.h
Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
SyntaxColors.h codepage.h
Perry Rapp [Wed, 28 Dec 2005 20:00:32 +0000 (20:00 +0000)]
PATCH: [
1391732 ] Do not offer to unify codepages in UNICODE build
Also introduces new error IDS_DIFFERENT_UNICODINGS and new
global function IsUnicodeBuild.
Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
Perry Rapp [Wed, 28 Dec 2005 04:50:33 +0000 (04:50 +0000)]
2005-12-28 Perry
BUG: [
1389855 ] grammar fix in plugin docs
Plugins.html
Perry Rapp [Wed, 28 Dec 2005 04:47:02 +0000 (04:47 +0000)]
BUG: [
1391212 ] New RCLocalizationHelper doesn't handle escaped quotes
Bump version from 1.0.1.0 to 1.0.2.0.
Plugins\src_VCPP\RCLocalizationHelper:
RCLocalizationHelper.rc WinMergeScript.cpp
Plugins\dlls:
RCLocalizationHelper.dll (v1.0.2.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
RCLocalizationHelperU.dll (v1.0.2.0)
Compiled from current CVS (UNICODE) (VC6sp6) Unicode Release MinDependency, v1.0.2.0
Perry Rapp [Tue, 27 Dec 2005 16:12:06 +0000 (16:12 +0000)]
PATCH: [
1390793 ] New global function GetOptionMgr
Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
Src/Common: OptionsMgr.h
Perry Rapp [Tue, 27 Dec 2005 11:48:15 +0000 (11:48 +0000)]
PATCH: [
1382130 ] New line-based RCLocalizationHelper
Bump version from 1.0.0.3 to 1.0.1.0
Plugins\src_VCPP\RCLocalizationHelper:
NEW PatternSet.cpp PatternSet.h PluginError.cpp PluginError.h
NEW widestr.h
NEW RCLocalizationHelper.ini RCLocalizationHelperU.ini
RCLocalizationHelper.dsp RCLocalizationHelper.rc Resource.h
WinMergeScript.cpp
Plugins\dlls:
NEW RCLocalizationHelper.ini RCLocalizationHelperU.ini
RCLocalizationHelper.dll (v1.0.1.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.1.0
RCLocalizationHelperU.dll (v1.0.1.0)
Compiled from current CVS (UNICODE) (VC6sp6) Unicode Release MinDependency, v1.0.1.0
Perry Rapp [Mon, 26 Dec 2005 21:54:45 +0000 (21:54 +0000)]
Update language versions of resource.h
Src/Languages/*: resource.h
Perry Rapp [Mon, 26 Dec 2005 21:43:25 +0000 (21:43 +0000)]
2005-12-26 Perry
PATCH: [
1388704 ] Simplified Chinese language .rc file for RC1
Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
Perry Rapp [Mon, 26 Dec 2005 00:07:15 +0000 (00:07 +0000)]
Update & synchronize translations: Korean Norwegian Polish Russian
Src: Merge.rc
Src/Languages:
Korean: MergeKorean.rc
Norwegian: MergeNorwegian.rc
Polish: MergePolish.rc
Russian: MergeRussian.rc
Perry Rapp [Sun, 25 Dec 2005 21:18:59 +0000 (21:18 +0000)]
Remove needless cast
Src/Common: unicoder.cpp
Perry Rapp [Sun, 25 Dec 2005 21:01:00 +0000 (21:01 +0000)]
2005-12-25 Perry
Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
Src: Merge.rc
Src/Languages:
Danish: MergeDanish.rc
Dutch: MergeDutch.rc
French: MergeFrench.rc
Hungarian: MergeHungarian.rc
Italian: MergeItalian.rc
Japanese: MergeJapanese.rc
Perry Rapp [Sat, 24 Dec 2005 02:04:52 +0000 (02:04 +0000)]
PATCH: [
1384813 ] Alphabetize entries in Plugins list_of_sources.txt
list_of_sources.txt
Perry Rapp [Sat, 24 Dec 2005 02:00:33 +0000 (02:00 +0000)]
Bugfix for patch above; put binaries into MergePlugin subdirectories.
Plugins\src_VCPP\WatchBeginningOfLog: WatchBeginningOfLog.dsp
Plugins\src_VCPP\WatchEndOfLog: WatchEndOfLog.dsp
Perry Rapp [Sat, 24 Dec 2005 01:44:04 +0000 (01:44 +0000)]
PATCH: [
1386809 ] Move temporaries out of src tree - log plugins
Plugins\src_VCPP\WatchBeginningOfLog:
WatchBeginningOfLog.dsp WatchBeginningOfLog.rc
Plugins\src_VCPP\WatchEndOfLog:
WatchEndOfLog.dsp WatchEndOfLog.rc
Plugins\dlls: WatchBeginningOfLog.dll (v1.0.0.2)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
WatchEndOfLog.dll (v1.0.0.2)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
Kimmo Varis [Fri, 23 Dec 2005 15:02:13 +0000 (15:02 +0000)]
PATCH: [
1388456 ] Convert rest of folder compare bitmaps to icons
- icons from Tim (Thanks!)
Kimmo Varis [Wed, 21 Dec 2005 20:14:56 +0000 (20:14 +0000)]
WinMerge experimental release 2.5.0.4 (cvs)
Kimmo Varis [Wed, 21 Dec 2005 20:13:56 +0000 (20:13 +0000)]
PATCH: [
1387297 ] Swedish translation update for 2.5.0.3+
- submitted by Hans Eriksson
Kimmo Varis [Wed, 21 Dec 2005 20:05:28 +0000 (20:05 +0000)]
BUG: [
1385518 ] Batch file syntax highlighting weirdness
- fix from Tim
Kimmo Varis [Wed, 21 Dec 2005 20:00:00 +0000 (20:00 +0000)]
BUG: [
1384832 ] ulink has ??? in FAQ
Perry Rapp [Wed, 21 Dec 2005 06:48:55 +0000 (06:48 +0000)]
PATCH: [
1386442 ] Local variable uses m_ prefix in CChildFrame
Src: ChildFrm.cpp
Perry Rapp [Tue, 20 Dec 2005 04:10:21 +0000 (04:10 +0000)]
PATCH: [
1384834 ] Copyedited FAQ
Manual: Faq.xml
Kimmo Varis [Mon, 19 Dec 2005 19:50:43 +0000 (19:50 +0000)]
PATCH: [
1384646 ] Replace Question icons with warning icons in messageboxes
Perry Rapp [Mon, 19 Dec 2005 17:50:34 +0000 (17:50 +0000)]
BUG: [
1384830 ] FAQ suggests non-proportional fonts available in 2.4+
removed version numbers ("WinMerge does not support non-proportional fonts")
Manual Faq.xml
Perry Rapp [Mon, 19 Dec 2005 02:07:29 +0000 (02:07 +0000)]
TODO: [
1379276 ] EditBinaryFiles not added to infrastructure
Add EditBinaryFiles to plugins list_of_sources.txt
Plugins: list_of_sources.txt
Perry Rapp [Mon, 19 Dec 2005 00:43:23 +0000 (00:43 +0000)]
PATCH: [
1384181 ] Fix byte difference fencepost/infinite loop
Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
Merge.dsp PatchDlg.cpp stringdiffs.cpp
Perry Rapp [Mon, 19 Dec 2005 00:13:37 +0000 (00:13 +0000)]
PATCH: [
1383120 ] Fix background colors in WinMerge
Src: SyntaxColors.cpp SyntaxColors.h
Src/Common: OptionsMgr.cpp OptionsMgr.h
Kimmo Varis [Sat, 17 Dec 2005 22:59:00 +0000 (22:59 +0000)]
PaTCH: [
1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
Kimmo Varis [Sat, 17 Dec 2005 16:08:44 +0000 (16:08 +0000)]
BUG: [
1375661 ] Readme incomplete in WinMerge 2.5.0.3
Kimmo Varis [Sat, 17 Dec 2005 15:56:39 +0000 (15:56 +0000)]
BUG: [
1379277 ] typo fix for docs
Takashi Sawanaka [Sat, 17 Dec 2005 11:25:04 +0000 (11:25 +0000)]
PATCH: [
1378771 ] Fix for BUG:[
1376552 ] char offset not getting updated when...
Tim Gerundt [Sat, 17 Dec 2005 11:10:11 +0000 (11:10 +0000)]
PATCH: [
1382921 ] Website changes for new stable release 2.4.4
Takashi Sawanaka [Sat, 17 Dec 2005 11:08:37 +0000 (11:08 +0000)]
PATCH: [
1378795 ] The searched word is not highlighted correctly
Perry Rapp [Sat, 17 Dec 2005 04:49:05 +0000 (04:49 +0000)]
PATCH: [
1376711 ] Change CFile::GetStatus to paths_DoesPathExist
Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
PathContext.cpp
Src/Common: coretools.cpp
Perry Rapp [Sat, 17 Dec 2005 04:24:40 +0000 (04:24 +0000)]
PATCH: [
1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
Src: DirFrame.cpp
Kimmo Varis [Fri, 16 Dec 2005 23:28:05 +0000 (23:28 +0000)]
PATCH: [
1381984 ] Folder compare progressdialog could be drawn off-screen
Perry Rapp [Fri, 16 Dec 2005 22:36:23 +0000 (22:36 +0000)]
PATCH: [
1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
Perry Rapp [Fri, 16 Dec 2005 22:35:13 +0000 (22:35 +0000)]
PATCH: [
1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
Kimmo Varis [Fri, 16 Dec 2005 22:34:16 +0000 (22:34 +0000)]
PATCH: [
1381975 ] Don't open Open-dialog outside screen
Perry Rapp [Fri, 16 Dec 2005 20:16:51 +0000 (20:16 +0000)]
PATCH: [
1379228 ] Fix Merge7zInstaller BuildTmp paths
Merge7zInstaller: Merge7zInstaller.dsp
Perry Rapp [Fri, 16 Dec 2005 20:10:20 +0000 (20:10 +0000)]
PATCH: [
1379227 ] Fix ExpatLibs BuildTmp paths
Src/ExpatLib: expat_static.dsp
Src/ExpatMapLib: expat_maps_static.dsp
Perry Rapp [Fri, 16 Dec 2005 20:01:43 +0000 (20:01 +0000)]
PATCH: [
1382131 ] English rc file has numbers instead of symbols for language
Src: Merge.rc
Perry Rapp [Fri, 16 Dec 2005 19:20:14 +0000 (19:20 +0000)]
BUG: [
1380019 ] Bulgarian translation has wrong language id
Src/Languages/Bulgarian: MergeBulgarian.rc
Kimmo Varis [Fri, 16 Dec 2005 17:28:12 +0000 (17:28 +0000)]
PATCH: [
1381935 ] Simplify DirView icon loading
Jochen Tucht [Fri, 16 Dec 2005 16:14:34 +0000 (16:14 +0000)]
BUG: [
1382021 ] Merge7z432 missing?
Perry Rapp [Fri, 16 Dec 2005 01:03:40 +0000 (01:03 +0000)]
PATCH: [
1379270 ] Fix RCLocalizationHelper to skip numeric handling in strings
Bump version from 1.0.0.2 to 1.0.0.3
Plugins\src_VCPP\RCLocalizationHelper:
WinMergeScript.cpp RCLocalizationHelper.rc
Plugins\dlls: RCLocalizationHelper.dll (v1.0.0.3)
Perry Rapp [Thu, 15 Dec 2005 23:25:51 +0000 (23:25 +0000)]
BUG: [
1381879 ] Unused variable in unicoder.cpp
Src/common: unicoder.cpp
Perry Rapp [Thu, 15 Dec 2005 18:13:59 +0000 (18:13 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
Last updates from submitted patch
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
Perry Rapp [Thu, 15 Dec 2005 03:07:00 +0000 (03:07 +0000)]
2005-12-15 Perry
PATCH: [
1379226 ] Fix Display Plugins BuildTmp paths
Plugins\src_VCPP\DisplayBinaryFiles:
DisplayBinaryFiles.dsp DisplayBinaryFiles.rc
Plugins\src_VCPP\DisplayXMLFiles:
DisplayXMLFiles.dsp DisplayXMLFiles.rc
Plugins\dlls: DisplayBinaryFiles.dll (v1.0.2.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
Plugins\dlls: DisplayXMLFiles.dll (v1.0.6.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.6.0
Perry Rapp [Thu, 15 Dec 2005 02:40:25 +0000 (02:40 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
Some more synchronizing from submitted patch
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
Perry Rapp [Wed, 14 Dec 2005 05:47:32 +0000 (05:47 +0000)]
Update & synchronize translations: French German Hungarian Italian Japanese
Src/Languages:
French: MergeFrench.rc
German: MergeGerman.rc
Hungarian: MergeHungarian.rc
Italian: MergeItalian.rc
Japanese: MergeJapanese.rc
Perry Rapp [Wed, 14 Dec 2005 02:38:26 +0000 (02:38 +0000)]
Update & synchronize translations: ChineseTraditional Czech Danish Dutch
Src/Languages:
ChineseTraditional: MergeChineseTraditional.rc
Czech: MergeCzech.rc
Danish: MergeDanish.rc
Dutch: MergeDutch.rc
Perry Rapp [Wed, 14 Dec 2005 01:30:40 +0000 (01:30 +0000)]
Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
Src/Languages:
Brazilian: MergeBrazilian.rc
Bulgarian: MergeBulgarian.rc
Catalan: MergeCatalan.rc
ChineseSimplified: MergeChineseSimplified.rc
Perry Rapp [Wed, 14 Dec 2005 00:48:07 +0000 (00:48 +0000)]
PATCH: [
1379894 ] Fix handling of unknown encoding
Src: MainFrm.cpp
Src/Common: unicoder.cpp
Kimmo Varis [Tue, 13 Dec 2005 18:09:36 +0000 (18:09 +0000)]
PATCH: [
1378174 ] Share Src/res between translations
Kimmo Varis [Tue, 13 Dec 2005 17:51:17 +0000 (17:51 +0000)]
PATCH: [
1378174 ] Share Src/res between translations
Perry Rapp [Tue, 13 Dec 2005 17:13:12 +0000 (17:13 +0000)]
PATCH: [
1373255 ] New EditBinaryFiles plugin & BUG: [
1379276 ] EditBinaryFiles not added to infrastructure
Plugins\dlls: NEW EditBinaryFiles.dll (V1.0.1.0)
(Compiled MSVC6sp6, ANSI, MinDependency, WinXP)
Plugins\src_VCPP\EditBinaryFiles: ChangeLog.txt
Perry Rapp [Tue, 13 Dec 2005 06:07:09 +0000 (06:07 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
& PATCH: [
1377545 ] Remove needless casts
Perry Rapp [Tue, 13 Dec 2005 06:00:54 +0000 (06:00 +0000)]
PATCH: [
1373255 ] New EditBinaryFiles plugin
NEW Plugins\src_VCPP\EditBinaryFiles
Perry Rapp [Tue, 13 Dec 2005 05:52:42 +0000 (05:52 +0000)]
PATCH [
1374981 ] Improvement for RCLocalizationHelper
Plugins\src_VCPP\RCLocalizationHelper:
WinMergeScript.cpp
Perry Rapp [Mon, 12 Dec 2005 16:39:59 +0000 (16:39 +0000)]
PATCH: [
1372549 ] readme for Merge7z distributables
Merge7z: readme.txt
Kimmo Varis [Sun, 11 Dec 2005 13:51:31 +0000 (13:51 +0000)]
PATCH: [
1371994 ] Enable hi-color icons for folder compare
Icons from Tim (Thanks!)
Perry Rapp [Sat, 10 Dec 2005 19:42:41 +0000 (19:42 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
Perry Rapp [Sat, 10 Dec 2005 05:58:22 +0000 (05:58 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
Src\Common: RegKey.cpp
Perry Rapp [Sat, 10 Dec 2005 05:29:05 +0000 (05:29 +0000)]
PATCH: [
1371384 ] Move Expat maps into WinMerge src
Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
Src\ExpatMapLib added
Many files moved from DisplayXMLFiles to new ExpatMapLib
Perry Rapp [Fri, 9 Dec 2005 20:48:33 +0000 (20:48 +0000)]
PATCH: [
1377362 ] Fix coretools to MakeResDll compiles
BUG: [
1377361 ] MakeResDll broken b/c coretools broken
Src/Common: coretools.cpp
Perry Rapp [Fri, 9 Dec 2005 18:24:58 +0000 (18:24 +0000)]
PATCH: [
1249007 ] Short size column
Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
Perry Rapp [Fri, 9 Dec 2005 04:11:39 +0000 (04:11 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
A few string resources
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc