Thread: [Winmerge-svn] SF.net SVN: winmerge:[7272] branches/R2_14
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2010-09-22 16:27:23
|
Revision: 7272 http://winmerge.svn.sourceforge.net/winmerge/?rev=7272&view=rev Author: kimmov Date: 2010-09-22 16:27:16 +0000 (Wed, 22 Sep 2010) Log Message: ----------- Update version number in 2.14 branch to 2.13.19. Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/versions.ini Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-22 16:22:45 UTC (rev 7271) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-22 16:27:16 UTC (rev 7272) @@ -3,7 +3,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.12.6 +WinMerge 2.13.19 Add missing keywords to Pascal highlighter (#2834192) Fix help locations (#2988974) New translation: Persian (#2877121, #3065119) Modified: branches/R2_14/versions.ini =================================================================== --- branches/R2_14/versions.ini 2010-09-22 16:22:45 UTC (rev 7271) +++ branches/R2_14/versions.ini 2010-09-22 16:27:16 UTC (rev 7272) @@ -7,13 +7,13 @@ description = WinMerge InnoSetup installer path = Installer/InnoSetup/WinMerge.iss macro = AppVersion -version = "2.12.9" +version = "2.13.19" [Executable] type = WinRC description = WinMerge executable path = Src/Merge.rc -version = "2.12.9" +version = "2.13.19" [Dll] type = WinRC This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-09-22 16:40:54
|
Revision: 7273 http://winmerge.svn.sourceforge.net/winmerge/?rev=7273&view=rev Author: kimmov Date: 2010-09-22 16:40:48 +0000 (Wed, 22 Sep 2010) Log Message: ----------- Remove the MakePatchDirs tool from 2.14 branch. This tool hasn't been maintained or actively used for a long time so we don't want to ship it with stable release. Modified Paths: -------------- branches/R2_14/Docs/Developers/SVN_Organisation.txt branches/R2_14/Docs/Developers/readme-developers.html Removed Paths: ------------- branches/R2_14/Tools/MakePatchDirs/ Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt =================================================================== --- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:27:16 UTC (rev 7272) +++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:40:48 UTC (rev 7273) @@ -44,7 +44,7 @@ - selftests - Tools - diff2winmerge - - MakePatchDirs + - Scripts - Web @@ -176,11 +176,5 @@ - Commandline wrapper for WinMerge executable, offers diffutils -style commandline switches (needed by Perl selftests). -WinMerge/Tools/MakePatchDirs/ - - Source files for MakePatchDirs, a program to generate original & - altered directories - - Used to create patches to WinMerge source tree, for upload to - sourceforge patch board - WinMerge/Web/ - Homepages. Modified: branches/R2_14/Docs/Developers/readme-developers.html =================================================================== --- branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 16:27:16 UTC (rev 7272) +++ branches/R2_14/Docs/Developers/readme-developers.html 2010-09-22 16:40:48 UTC (rev 7273) @@ -52,7 +52,6 @@ <h3>Table of Contents</h3> <ol> <li><a href="#Code_changes">Code changes</a></li> - <li><a href="#MakePatchDirs">MakePatchDirs</a></li> <li><a href="#Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></li> <li><a href="#Coding_conventions">Coding conventions</a></li> <li><a href="#Doxygen_comments">Doxygen comments</a></li> @@ -151,32 +150,6 @@ subfolders have their own <code>Changes.txt</code> -file. If the file exists in the folder, it must be used instead of "global" <code>Src/Changes.txt</code>. -<h3><a name="MakePatchDirs">MakePatchDirs</a></h3> - -<p>Perry wrote a small program called -<a href="readme-developers-MakePatchDirs.html">MakePatchDirs</a>, which helps -in his patch process -- read the link for more information.</p> - -<h3><a name="Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></h3> - -<p>It is reasonable to post small snippets of code showing small changes -directly in the text in bug postings, or patch postings. For example, see -<a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216&func=detail&aid=824987">PATCH [ 824987 ] "Change binary-file detection (look only for zeros)"</a>, -which gives the change directly in the text.</p> - -<p>Note, however, that sourceforge trackers currently ignore tabs, so if you -can convert tabs to spaces in your posting, it helps greatly.</p> - -<p>Bugfixes may be treated less formally, especially for simple ones, or for -fixes to code you know well -- eg, you caused the bug yourself with a -recent patch :)</p> - -<p>Consider still posting something to the tracker lists, even if it is -simply a summary in English. If the fix is something like -"misspelled variable name foo as fooz in many places", it is quite -understandable that you prefer to just fix the instances rather than -doing a full patch for it.</p> - <h3><a name="Coding_conventions">Coding conventions</a></h3> <p>Please conform to the prevalent coding conventions. There are quite a number of This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-09-22 16:49:38
|
Revision: 7274 http://winmerge.svn.sourceforge.net/winmerge/?rev=7274&view=rev Author: kimmov Date: 2010-09-22 16:49:32 +0000 (Wed, 22 Sep 2010) Log Message: ----------- Remove VS2003 runtime files from 2.14 branch. Modified Paths: -------------- branches/R2_14/Docs/Developers/SVN_Organisation.txt Removed Paths: ------------- branches/R2_14/Installer/Runtimes/ Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt =================================================================== --- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:40:48 UTC (rev 7273) +++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 16:49:32 UTC (rev 7274) @@ -22,7 +22,6 @@ - InnoSetup - Art - Languages - - Runtimes - Plugins - dlls - Src_Delphi @@ -112,9 +111,6 @@ WinMerge/Installer/InnoSetup/Languages/ - Installer translations -WinMerge/Installer/Runtimes/ - - Libraries for WinMerge added to install package - WinMerge/Plugins/ - Plugins files. Also plugins documentation at the moment. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-09-22 19:08:14
|
Revision: 7277 http://winmerge.svn.sourceforge.net/winmerge/?rev=7277&view=rev Author: gerundt Date: 2010-09-22 19:08:08 +0000 (Wed, 22 Sep 2010) Log Message: ----------- Drop website sources from SVN - We use now a bitbucket project for the website Modified Paths: -------------- branches/R2_14/Docs/Developers/SVN_Organisation.txt Removed Paths: ------------- branches/R2_14/Web/ Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt =================================================================== --- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 19:01:43 UTC (rev 7276) +++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-22 19:08:08 UTC (rev 7277) @@ -44,7 +44,6 @@ - Tools - diff2winmerge - Scripts - - Web WinMerge/ArchiveSupport/ @@ -171,6 +170,3 @@ WinMerge/Tools/diff2winmerge/ - Commandline wrapper for WinMerge executable, offers diffutils -style commandline switches (needed by Perl selftests). - -WinMerge/Web/ - - Homepages. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-09-25 13:56:34
|
Revision: 7283 http://winmerge.svn.sourceforge.net/winmerge/?rev=7283&view=rev Author: gerundt Date: 2010-09-25 13:56:28 +0000 (Sat, 25 Sep 2010) Log Message: ----------- BUG: [ 3022292 ] Location pane focus enabled "Save" Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/LocationView.cpp branches/R2_14/Src/LocationView.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 11:53:58 UTC (rev 7282) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 13:56:28 UTC (rev 7283) @@ -12,6 +12,7 @@ libraries installer (#3070254) Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security Advisory (2269637) (#33056008) + Bugfix: Location pane focus enabled "Save" (#3022292) Translation updates: - Chinese (#3033324) - Dutch (#2804979) Modified: branches/R2_14/Src/LocationView.cpp =================================================================== --- branches/R2_14/Src/LocationView.cpp 2010-09-25 11:53:58 UTC (rev 7282) +++ branches/R2_14/Src/LocationView.cpp 2010-09-25 13:56:28 UTC (rev 7283) @@ -118,6 +118,9 @@ ON_WM_SIZE() ON_WM_VSCROLL() ON_WM_ERASEBKGND() + ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateFileSave) + ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_LEFT, OnUpdateFileSaveLeft) + ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_RIGHT, OnUpdateFileSaveRight) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -1074,3 +1077,42 @@ pDC->SelectObject(pOldBrush); pDC->SelectObject(oldObj); } + +/** + * @brief Called when "Save" item is updated + */ +void CLocationView::OnUpdateFileSave(CCmdUI* pCmdUI) +{ + CMergeDoc *pd = GetDocument(); + + if (pd->m_ptBuf[0]->IsModified() || pd->m_ptBuf[1]->IsModified()) + pCmdUI->Enable(true); + else + pCmdUI->Enable(false); +} + +/** + * @brief Called when "Save left (as...)" item is updated + */ +void CLocationView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI) +{ + CMergeDoc *pd = GetDocument(); + + if (!pd->m_ptBuf[0]->GetReadOnly() && pd->m_ptBuf[0]->IsModified()) + pCmdUI->Enable(true); + else + pCmdUI->Enable(false); +} + +/** + * @brief Called when "Save right (as...)" item is updated + */ +void CLocationView::OnUpdateFileSaveRight(CCmdUI* pCmdUI) +{ + CMergeDoc *pd = GetDocument(); + + if (!pd->m_ptBuf[1]->GetReadOnly() && pd->m_ptBuf[1]->IsModified()) + pCmdUI->Enable(true); + else + pCmdUI->Enable(false); +} \ No newline at end of file Modified: branches/R2_14/Src/LocationView.h =================================================================== --- branches/R2_14/Src/LocationView.h 2010-09-25 11:53:58 UTC (rev 7282) +++ branches/R2_14/Src/LocationView.h 2010-09-25 13:56:28 UTC (rev 7283) @@ -127,6 +127,9 @@ afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg BOOL OnEraseBkgnd(CDC* pDC); afx_msg void OnPaint(); + afx_msg void OnUpdateFileSave(CCmdUI* pCmdUI); + afx_msg void OnUpdateFileSaveLeft(CCmdUI* pCmdUI); + afx_msg void OnUpdateFileSaveRight(CCmdUI* pCmdUI); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-09-25 14:20:24
|
Revision: 7284 http://winmerge.svn.sourceforge.net/winmerge/?rev=7284&view=rev Author: gerundt Date: 2010-09-25 14:20:18 +0000 (Sat, 25 Sep 2010) Log Message: ----------- BUG: [ 3033325 ] copy and advance: toolbar icons not automatically enabled Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/MergeEditView.cpp Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 13:56:28 UTC (rev 7283) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-09-25 14:20:18 UTC (rev 7284) @@ -13,6 +13,7 @@ Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security Advisory (2269637) (#33056008) Bugfix: Location pane focus enabled "Save" (#3022292) + Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325) Translation updates: - Chinese (#3033324) - Dutch (#2804979) Modified: branches/R2_14/Src/MergeEditView.cpp =================================================================== --- branches/R2_14/Src/MergeEditView.cpp 2010-09-25 13:56:28 UTC (rev 7283) +++ branches/R2_14/Src/MergeEditView.cpp 2010-09-25 14:20:18 UTC (rev 7284) @@ -2169,10 +2169,6 @@ */ void CMergeEditView::OnL2RNext() { - // Check that diff is selected - if (GetDocument()->GetCurrentDiff() == -1) - return; - OnL2r(); OnNextdiff(); } @@ -2182,11 +2178,7 @@ */ void CMergeEditView::OnUpdateL2RNext(CCmdUI* pCmdUI) { - // Check that right side is not readonly - if (!IsReadOnly(1)) - pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1); - else - pCmdUI->Enable(false); + OnUpdateL2r(pCmdUI); } /** @@ -2194,10 +2186,6 @@ */ void CMergeEditView::OnR2LNext() { - // Check that diff is selected - if (GetDocument()->GetCurrentDiff() == -1) - return; - OnR2l(); OnNextdiff(); } @@ -2207,11 +2195,7 @@ */ void CMergeEditView::OnUpdateR2LNext(CCmdUI* pCmdUI) { - // Check that left side is not readonly - if (!IsReadOnly(0)) - pCmdUI->Enable(GetDocument()->GetCurrentDiff()!=-1); - else - pCmdUI->Enable(false); + OnUpdateR2l(pCmdUI); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-09-25 15:54:44
|
Revision: 7285 http://winmerge.svn.sourceforge.net/winmerge/?rev=7285&view=rev Author: kimmov Date: 2010-09-25 15:54:38 +0000 (Sat, 25 Sep 2010) Log Message: ----------- Remove (old version) of CppUnit sources. Modified Paths: -------------- branches/R2_14/Docs/Developers/SVN_Organisation.txt branches/R2_14/Externals/versions.txt Removed Paths: ------------- branches/R2_14/Externals/cppunit/ Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt =================================================================== --- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-25 14:20:18 UTC (rev 7284) +++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-09-25 15:54:38 UTC (rev 7285) @@ -12,7 +12,6 @@ - Languages - Manual - Externals - - cppunit - expat - heksedit - pcre @@ -80,9 +79,6 @@ WinMerge/Externals/ - External code modules WinMerge uses -WinMerge/Externals/cppunit/ - - CppUnit unit-testing suite for C++ <http://cppunit.sourceforge.net/> - WinMerge/Externals/expat/ - Expat XML parser <http://expat.sourceforge.net/> Modified: branches/R2_14/Externals/versions.txt =================================================================== --- branches/R2_14/Externals/versions.txt 2010-09-25 14:20:18 UTC (rev 7284) +++ branches/R2_14/Externals/versions.txt 2010-09-25 15:54:38 UTC (rev 7285) @@ -3,7 +3,6 @@ This file lists versions of the external components we are using. -CppUnit: 1.12.0 Expat: 2.0.1 PCRE: 7.8 Heksedit: Frhed SVN trunk r 45 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-02 14:24:52
|
Revision: 7293 http://winmerge.svn.sourceforge.net/winmerge/?rev=7293&view=rev Author: gerundt Date: 2010-10-02 14:24:45 +0000 (Sat, 02 Oct 2010) Log Message: ----------- Installer: Remove Uninstall shortcut from start menu folder (#3076909) Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Installer/InnoSetup/WinMerge.iss Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 11:05:38 UTC (rev 7292) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:24:45 UTC (rev 7293) @@ -10,6 +10,7 @@ New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime libraries installer (#3070254) + Installer: Remove Uninstall shortcut from start menu folder (#3076909) Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security Advisory (2269637) (#33056008) Bugfix: Location pane focus enabled "Save" (#3022292) Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss =================================================================== --- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 11:05:38 UTC (rev 7292) +++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:24:45 UTC (rev 7293) @@ -330,6 +330,9 @@ ;This removes the desktop icon in case the user chooses not to install it after previously having it installed Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon') +;Removes the Uninstall icon from the start menu... +Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files; + ;Remove ANSI executable link from start menu for NT-based Windows versions ;This was installed earlier, but not anymore. Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4 @@ -458,7 +461,6 @@ Name: {group}\WinMerge; Filename: {app}\{code:ExeName} Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm -Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe} Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: http://winmerge.org/ ;Link to translated ReadMe in Start Menu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-02 14:32:39
|
Revision: 7295 http://winmerge.svn.sourceforge.net/winmerge/?rev=7295&view=rev Author: gerundt Date: 2010-10-02 14:32:33 +0000 (Sat, 02 Oct 2010) Log Message: ----------- PATCH: [ 3079966 ] Installer: Don't install quick launch icon for Windows 7 Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Installer/InnoSetup/WinMerge.iss Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:31:53 UTC (rev 7294) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:32:33 UTC (rev 7295) @@ -11,6 +11,7 @@ Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime libraries installer (#3070254) Installer: Remove Uninstall shortcut from start menu folder (#3076909) + Installer: Don't install quick launch icon for Windows 7 (#3079966) Bugfix: WinMerge was vulnerable to DLL hijacking as described in Microsoft Security Advisory (2269637) (#33056008) Bugfix: Location pane focus enabled "Save" (#3022292) Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss =================================================================== --- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:31:53 UTC (rev 7294) +++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:32:33 UTC (rev 7295) @@ -272,7 +272,7 @@ Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3 Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked -Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons} +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.1 [InstallDelete] ; Diff.txt is a file left over from previous versions of WinMerge (before version 2.0), we just delete it to be nice. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-08 16:12:27
|
Revision: 7301 http://winmerge.svn.sourceforge.net/winmerge/?rev=7301&view=rev Author: gerundt Date: 2010-10-08 16:12:20 +0000 (Fri, 08 Oct 2010) Log Message: ----------- PATCH: [ 3082392 ] Updated Bulgarian Language Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/Languages/Bulgarian.po Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-08 16:11:19 UTC (rev 7300) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-08 16:12:20 UTC (rev 7301) @@ -17,6 +17,7 @@ Bugfix: Location pane focus enabled "Save" (#3022292) Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325) Translation updates: + - Bulgarian (#3082392) - Chinese (#3033324) - Dutch (#2804979) - French (#2850842, #2968200) Modified: branches/R2_14/Src/Languages/Bulgarian.po =================================================================== --- branches/R2_14/Src/Languages/Bulgarian.po 2010-10-08 16:11:19 UTC (rev 7300) +++ branches/R2_14/Src/Languages/Bulgarian.po 2010-10-08 16:12:20 UTC (rev 7301) @@ -13,7 +13,7 @@ "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-05-04 21:51+0100\n" +"PO-Revision-Date: 2010-10-06 22:09+0200\n" "Last-Translator: tigertron <ivg_18 at yahoo.com>\n" "Language-Team: Bulgarian <win...@li...>\n" "MIME-Version: 1.0\n" @@ -286,7 +286,7 @@ #: Merge.rc:454 #, c-format msgid "&List..." -msgstr "" +msgstr "&\xD1\xEF\xE8\xF1\xFA\xEA..." #: Merge.rc:152 #: Merge.rc:273 @@ -504,17 +504,17 @@ #: Merge.rc:224 #, c-format msgid "Tree &Mode" -msgstr "" +msgstr "\xD0\xE5\xE6\xE8\xEC &\xC4\xFA\xF0\xE2\xEE" #: Merge.rc:225 #, c-format msgid "E&xpand All Subfolders" -msgstr "" +msgstr "&\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8" #: Merge.rc:226 #, c-format msgid "&Collapse All Subfolders" -msgstr "" +msgstr "&\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8" #: Merge.rc:239 #, c-format @@ -652,17 +652,17 @@ #: Merge.rc:342 #, c-format msgid "&Windows (CRLF)" -msgstr "" +msgstr "&Windows (CRLF)" #: Merge.rc:343 #, c-format msgid "&Unix (LF)" -msgstr "" +msgstr "&Unix (LF)" #: Merge.rc:344 #, c-format msgid "&Mac (CR)" -msgstr "" +msgstr "&Mac (CR)" #: Merge.rc:347 #, c-format @@ -1063,7 +1063,7 @@ #: Merge.rc:668 #, c-format msgid "(Private Build)" -msgstr "" +msgstr "(\xC2\xFA\xF2\xF0\xE5\xF8\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF)" #: Merge.rc:669 #, c-format @@ -1194,7 +1194,7 @@ #: Merge.rc:715 #, c-format msgid "Visual SourceSafe" -msgstr "" +msgstr "\xC2\xE8\xE7\xF3\xE0\xEB\xE5\xED SourceSafe" #: Merge.rc:720 #, c-format @@ -1298,7 +1298,7 @@ #: Merge.rc:774 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" -msgstr "" +msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \"\xC8\xE7\xE1\xE5\xF0\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8\" \xEF\xF0\xE8 \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5" #: Merge.rc:776 #, c-format @@ -1441,7 +1441,7 @@ #: Merge.rc:2187 #, c-format msgid "Rational ClearCase" -msgstr "" +msgstr "\xD0\xE0\xF6\xE8\xEE\xED\xE0\xEB\xE5\xED ClearCase" #: Merge.rc:869 #, c-format @@ -1841,7 +1841,7 @@ #: Merge.rc:1164 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "" +msgstr "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xFA\xF9\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE7\xE0 \xF4\xEE\xF0\xEC\xE0\xF2\xE0 (Windows/Unix/Mac)" #: Merge.rc:1167 #, c-format @@ -2023,8 +2023,12 @@ #: Merge.rc:1271 #, c-format -msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" +msgid "" +"Detect codepage info for these files: .html, .rc, .xml \n" +"need to restart session" msgstr "" +"\xCE\xF2\xEA\xF0\xE8\xE9 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xED\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5: .html, .rc, .xml \n" +"\xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0" #: Merge.rc:1274 #, c-format @@ -2039,7 +2043,7 @@ #: Merge.rc:1278 #, c-format msgid "Custom codepage:" -msgstr "" +msgstr "\xC7\xE0\xE4\xE0\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0:" #: Merge.rc:1286 #, c-format @@ -2102,7 +2106,7 @@ #: Merge.rc:1306 #, c-format msgid "Merge7z000U.dll" -msgstr "" +msgstr "Merge7z000U.dll" #: Merge.rc:1309 #, c-format @@ -2137,8 +2141,12 @@ #: Merge.rc:1320 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" +msgstr "" +"\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n" +"(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)" #: Merge.rc:1324 #, c-format @@ -2578,23 +2586,23 @@ #: Merge.rc:1657 #, c-format msgid "Plugins" -msgstr "" +msgstr "\xC4\xEE\xE1\xE0\xE2\xEA\xE8" #: Merge.rc:1660 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5" #: Merge.rc:1671 #: Merge.rc:1952 #, c-format msgid "Shell Integration" -msgstr "" +msgstr "\xC8\xED\xF2\xE5\xE3\xF0\xE8\xF0\xE0\xED\xE5 \xE2 \xF8\xE5\xEB-\xE0" #: Merge.rc:1674 #, c-format msgid "Explorer" -msgstr "" +msgstr "Explorer" #: Merge.rc:1675 #, c-format @@ -2609,17 +2617,17 @@ #: Merge.rc:1679 #, c-format msgid "&Add to context menu" -msgstr "" +msgstr "&\xC4\xEE\xE1\xE0\xE2\xE8 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE" #: Merge.rc:1681 #, c-format msgid "Folder compare" -msgstr "" +msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8" #: Merge.rc:1682 #, c-format msgid "Add &Shell menu to context menu" -msgstr "" +msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 \xF0\xE5\xE4 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE" #. StringFileInfo.Block #: Merge.rc:1708 @@ -2641,32 +2649,32 @@ #: Merge.rc:1745 #, c-format msgid "EXT" -msgstr "" +msgstr "EXT" #: Merge.rc:1746 #, c-format msgid "CAP" -msgstr "" +msgstr "CAP" #: Merge.rc:1747 #, c-format msgid "NUM" -msgstr "" +msgstr "NUM" #: Merge.rc:1748 #, c-format msgid "SCRL" -msgstr "" +msgstr "SCRL" #: Merge.rc:1749 #, c-format msgid "OVR" -msgstr "" +msgstr "OVR" #: Merge.rc:1750 #, c-format msgid "REC" -msgstr "" +msgstr "REC" #: Merge.rc:1756 #, c-format @@ -2757,17 +2765,17 @@ #: Merge.rc:1770 #, c-format msgid "Toggle tree mode" -msgstr "" +msgstr "\xCF\xF0\xE5\xE2\xEA\xEB\xFE\xF7\xE8 \xED\xE0 \xE4\xFA\xF0\xE2\xEE\xE2\xE8\xE4\xE5\xED \xF0\xE5\xE6\xE8\xEC" #: Merge.rc:1771 #, c-format msgid "Expand all subfolders" -msgstr "" +msgstr "\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8" #: Merge.rc:1772 #, c-format msgid "Collapse all subfolders" -msgstr "" +msgstr "\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8" #: Merge.rc:1778 #, c-format @@ -2878,22 +2886,22 @@ "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE" #: Merge.rc:1824 -#, fuzzy, c-format +#, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" "Tile Windows Horizontally" msgstr "" -"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n" -"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5" +"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n" +"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE" #: Merge.rc:1825 -#, fuzzy, c-format +#, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" "Tile Windows Vertically" msgstr "" -"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n" -"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5" +"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n" +"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE" #: Merge.rc:1831 #, c-format @@ -3005,8 +3013,12 @@ #: Merge.rc:1848 #, c-format -msgid "Automatically resize panes\nLock Panes" -msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5" +msgid "" +"Automatically resize panes\n" +"Lock Panes" +msgstr "" +"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n" +"\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5" #: Merge.rc:1854 #, c-format @@ -3069,13 +3081,41 @@ #: Merge.rc:1880 #, c-format -msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" msgstr "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5" #: Merge.rc:1881 #, c-format -msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" msgstr "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8" #: Merge.rc:1888 #, c-format @@ -3095,8 +3135,12 @@ #: Merge.rc:1908 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgstr "" +"\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1909 #, c-format @@ -3226,7 +3270,7 @@ #: Merge.rc:1971 #, c-format msgid "X64" -msgstr "" +msgstr "X64" #: Merge.rc:1977 #, c-format @@ -3313,22 +3357,22 @@ #: Merge.rc:2009 #, c-format msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #: Merge.rc:2010 #, c-format msgid "UTF-8 (B)" -msgstr "" +msgstr "UTF-8 (B)" #: Merge.rc:2011 #, c-format msgid "UCS-2 LE" -msgstr "" +msgstr "UCS-2 LE" #: Merge.rc:2012 #, c-format msgid "UCS-2 BE" -msgstr "" +msgstr "UCS-2 BE" #: Merge.rc:2018 #, c-format @@ -3374,7 +3418,7 @@ #: Merge.rc:2031 #, c-format msgid "[F] " -msgstr "" +msgstr "[F] " #: Merge.rc:2032 #: Merge.rc:2655 @@ -3470,13 +3514,19 @@ #: Merge.rc:2059 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"\xD4\xE8\xEB\xF2\xF0\xE8\xF2\xE5 \xE1\xFF\xF5\xE0 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE8. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xED\xE0 \xEF\xE0\xEF\xEA\xE8?\n" +"\n" +"\xC0\xEA\xEE \xED\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xF1\xE5\xE3\xE0, \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xED\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xCD\xE5 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xEF\xEE-\xEA\xFA\xF1\xED\xEE." #: Merge.rc:2066 #, c-format msgid "&Path to SS.EXE:" -msgstr "" +msgstr "&\xCF\xFA\xF2 \xE4\xEE SS.EXE:" #: Merge.rc:2072 #, c-format @@ -3561,12 +3611,12 @@ #: Merge.rc:2093 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "\xCE\xF2\xEC\xE5\xED\xFF\xED\xE5 \xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..." #: Merge.rc:2094 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "\xCF\xEE\xE2\xF2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xE4\xE8\xF8\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..." #: Merge.rc:2100 #, c-format @@ -3689,8 +3739,14 @@ #: Merge.rc:2137 #, c-format -msgid "The file\n%1\nis not a conflict file." -msgstr "\xD4\xE0\xE9\xEB\xFA\xF2\n%1\n\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED." +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." +msgstr "" +"\xD4\xE0\xE9\xEB\xFA\xF2\n" +"%1\n" +"\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED." #: Merge.rc:2143 #, c-format @@ -3803,8 +3859,18 @@ #: Merge.rc:2155 #, c-format -msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"Do you want to reload the file?" msgstr "" +"\xC4\xF0\xF3\xE3\xEE \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5 \xE5 \xEE\xE1\xED\xEE\xE2\xE8\xEB\xEE \xF4\xE0\xE9\xEB\xE0\n" +"%1\n" +"\xF1\xEB\xE5\xE4 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xF1\xEA\xE0\xED\xE8\xF0\xE0\xED\xE5 \xEE\xF2 WinMerge.\n" +"\n" +"\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xE0 \xED\xE0\xED\xEE\xE2\xEE?" #: Merge.rc:2156 #, c-format @@ -3818,8 +3884,14 @@ #: Merge.rc:2158 #, c-format -msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." +msgid "" +"The file\n" +"%1\n" +"has disappeared. Please save a copy of the file to continue." msgstr "" +"\xD4\xE0\xE9\xEB\xFA\xF2\n" +"%1\n" +"\xE5 \xE8\xE7\xF7\xE5\xE7\xED\xE0\xEB. \xCC\xEE\xEB\xFF, \xE7\xE0\xEF\xE8\xF8\xE5\xF2\xE5 \xED\xE5\xE3\xEE\xE2\xEE \xEA\xEE\xEF\xE8\xE5, \xE7\xE0 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5." #: Merge.rc:2164 #, c-format @@ -4092,17 +4164,17 @@ #: Merge.rc:2241 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5:" #: Merge.rc:2242 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5 %d :" #: Merge.rc:2244 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "\xCF\xEE\xF2\xE2\xFA\xF0\xE4\xE5\xF2\xE5 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE2\xE0\xED\xE5" #: Merge.rc:2250 #, c-format @@ -4167,12 +4239,12 @@ #: Merge.rc:2267 #, c-format msgid "Left Shell menu" -msgstr "" +msgstr "\xCB\xFF\xE2\xEE \xEC\xE5\xED\xFE" #: Merge.rc:2268 #, c-format msgid "Right Shell menu" -msgstr "" +msgstr "\xC4\xFF\xF1\xED\xEE \xEC\xE5\xED\xFE" #: Merge.rc:2274 #, c-format @@ -4383,7 +4455,7 @@ #: Merge.rc:2338 #, c-format msgid "Folders are different" -msgstr "" +msgstr "\xCF\xE0\xEF\xEA\xE8\xF2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8" #: Merge.rc:2339 #, c-format @@ -4403,12 +4475,12 @@ #: Merge.rc:2343 #, c-format msgid "Text files are identical" -msgstr "" +msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8" #: Merge.rc:2348 #, c-format msgid "Text files are different" -msgstr "" +msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8" #: Merge.rc:2354 #, c-format @@ -4631,8 +4703,14 @@ #: Merge.rc:2421 #, c-format -msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?" -msgstr "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?" +msgid "" +"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" +" With the current options, they will be unified to the main type.\n" +" Do you want to change the options and preserve the different EOL ?" +msgstr "" +"\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n" +" \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n" +" \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?" #: Merge.rc:2422 #, c-format @@ -4651,8 +4729,18 @@ #: Merge.rc:2425 #, c-format -msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" -msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" +msgstr "" +"\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n" +"\n" +"\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n" +"%1\n" +"\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?" #: Merge.rc:2431 #, c-format @@ -5235,17 +5323,17 @@ #: Merge.rc:2629 #, c-format msgid "Win" -msgstr "" +msgstr "Win" #: Merge.rc:2630 #, c-format msgid "Mac" -msgstr "" +msgstr "Mac" #: Merge.rc:2631 #, c-format msgid "Unix" -msgstr "" +msgstr "Unix" #: Merge.rc:2632 #, c-format @@ -5255,17 +5343,17 @@ #: Merge.rc:2634 #, c-format msgid "LF" -msgstr "" +msgstr "LF" #: Merge.rc:2635 #, c-format msgid "CR" -msgstr "" +msgstr "CR" #: Merge.rc:2636 #, c-format msgid "CRLF" -msgstr "" +msgstr "CRLF" #: Merge.rc:2643 #, c-format @@ -5300,22 +5388,22 @@ #: Merge.rc:2654 #, c-format msgid "Type" -msgstr "" +msgstr "\xD2\xE8\xEF" #: Merge.rc:2656 #, c-format msgid "Unpacker" -msgstr "" +msgstr "\xD0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0" #: Merge.rc:2657 #, c-format msgid "Prediffer" -msgstr "" +msgstr "\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xD0\xE0\xE7\xEB\xE8\xEA\xE0" #: Merge.rc:2658 #, c-format msgid "Editor script" -msgstr "" +msgstr "\xD1\xEA\xF0\xE8\xEF\xF2 \xED\xE0 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xE0" #: Merge.rc:2665 #, c-format @@ -5340,12 +5428,12 @@ #: Merge.rc:2669 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE" #: Merge.rc:2670 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE" #: Merge.rc:2671 #, c-format @@ -5541,13 +5629,21 @@ #: Merge.rc:2714 #, c-format -msgid "Select the current user interface language\nLanguage" -msgstr "\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n\xC5\xE7\xE8\xEA" +msgid "" +"Select the current user interface language\n" +"Language" +msgstr "" +"\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n" +"\xC5\xE7\xE8\xEA" #: Merge.rc:2715 #, c-format -msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0" +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" +msgstr "" +"\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n" +"\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0" #: Merge.rc:2716 #, c-format @@ -5598,28 +5694,48 @@ #: Merge.rc:2728 #, c-format -msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)" +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" +msgstr "" +"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n" +"\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)" #: Merge.rc:2729 #, c-format -msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)" +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" +msgstr "" +"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n" +"\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)" #: Merge.rc:2730 #, c-format -msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)" +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" +msgstr "" +"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n" +"\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)" #: Merge.rc:2731 #, c-format -msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)" +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" +msgstr "" +"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n" +"\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)" #: Merge.rc:2732 #, c-format -msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)" +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" +msgstr "" +"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n" +"\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)" #: Merge.rc:2733 #, c-format @@ -5708,7 +5824,7 @@ #: Merge.rc:2755 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF1\xEF\xE8\xF1\xFA\xEA \xF1 \xED\xE0\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE4\xEE\xE1\xE0\xE2\xEA\xE8" #: Merge.rc:2756 #, c-format @@ -5747,8 +5863,12 @@ #: Merge.rc:2768 #, c-format -msgid "Activates next visible file\nActivate next File" -msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB" +msgid "" +"Activates next visible file\n" +"Activate next File" +msgstr "" +"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n" +"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB" #: Merge.rc:2769 #, c-format @@ -5757,8 +5877,12 @@ #: Merge.rc:2775 #, c-format -msgid "Opens the WinMerge Help\nWinMerge Help" -msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\nWinMerge \xEF\xEE\xEC\xEE\xF9" +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" +msgstr "" +"\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\n" +"WinMerge \xEF\xEE\xEC\xEE\xF9" #: Merge.rc:2776 #, c-format @@ -5777,13 +5901,21 @@ #: Merge.rc:2779 #, c-format -msgid "Opens the release notes document\nRelease Notes" -msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n\xC1\xE5\xEB\xE5\xE6\xEA\xE8" +msgid "" +"Opens the release notes document\n" +"Release Notes" +msgstr "" +"\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n" +"\xC1\xE5\xEB\xE5\xE6\xEA\xE8" #: Merge.rc:2780 #, c-format -msgid "Opens the translations website\nTranslations" -msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n\xCF\xF0\xE5\xE2\xEE\xE4\xE8" +msgid "" +"Opens the translations website\n" +"Translations" +msgstr "" +"\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n" +"\xCF\xF0\xE5\xE2\xEE\xE4\xE8" #: Merge.rc:2786 #, c-format @@ -5878,117 +6010,117 @@ #: Merge.rc:2825 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "\xC1\xE5\xE7 \xEE\xF6\xE2\xE5\xF2\xFF\xE2\xE0\xED\xE5" #: Merge.rc:2826 #, c-format msgid "ASP" -msgstr "" +msgstr "ASP" #: Merge.rc:2827 #, c-format msgid "Basic" -msgstr "\xCE\xF1\xED\xEE\xE2\xE5\xED" +msgstr "Basic" #: Merge.rc:2828 #, c-format msgid "Batch" -msgstr "" +msgstr "Batch" #: Merge.rc:2829 #, c-format msgid "C/C++" -msgstr "" +msgstr "C/C++" #: Merge.rc:2830 #, c-format msgid "C#" -msgstr "" +msgstr "C#" #: Merge.rc:2831 #, c-format msgid "CSS" -msgstr "" +msgstr "CSS" #: Merge.rc:2832 #, c-format msgid "DCL" -msgstr "" +msgstr "DCL" #: Merge.rc:2833 #, c-format msgid "Fortran" -msgstr "" +msgstr "Fortran" #: Merge.rc:2834 #, c-format msgid "HTML" -msgstr "" +msgstr "HTML" #: Merge.rc:2835 #, c-format msgid "INI" -msgstr "" +msgstr "INI" #: Merge.rc:2836 #, c-format msgid "InnoSetup" -msgstr "" +msgstr "InnoSetup" #: Merge.rc:2837 #, c-format msgid "InstallShield" -msgstr "" +msgstr "InstallShield" #: Merge.rc:2838 #, c-format msgid "Java" -msgstr "" +msgstr "Java" #: Merge.rc:2839 #, c-format msgid "AutoLISP" -msgstr "" +msgstr "AutoLISP" #: Merge.rc:2840 #, c-format msgid "NSIS" -msgstr "" +msgstr "NSIS" #: Merge.rc:2841 #, c-format msgid "Pascal" -msgstr "" +msgstr "Pascal" #: Merge.rc:2842 #, c-format msgid "Perl" -msgstr "" +msgstr "Perl" #: Merge.rc:2843 #, c-format msgid "PHP" -msgstr "" +msgstr "PHP" #: Merge.rc:2844 #, c-format msgid "Portable Object" -msgstr "" +msgstr "\xCF\xF0\xE5\xED\xEE\xF1\xE8\xEC \xEE\xE1\xE5\xEA\xF2" #: Merge.rc:2845 #, c-format msgid "PowerShell" -msgstr "" +msgstr "PowerShell" #: Merge.rc:2846 #, c-format msgid "Python" -msgstr "" +msgstr "Python" #: Merge.rc:2847 #, c-format msgid "REXX" -msgstr "" +msgstr "REXX" #: Merge.rc:2848 #, c-format @@ -5998,47 +6130,47 @@ #: Merge.rc:2849 #, c-format msgid "Ruby" -msgstr "" +msgstr "Ruby" #: Merge.rc:2850 #, c-format msgid "SGML" -msgstr "" +msgstr "SGML" #: Merge.rc:2851 #, c-format msgid "Shell" -msgstr "" +msgstr "Shell" #: Merge.rc:2852 #, c-format msgid "SIOD" -msgstr "" +msgstr "SIOD" #: Merge.rc:2853 #, c-format msgid "SQL" -msgstr "" +msgstr "SQL" #: Merge.rc:2854 #, c-format msgid "TCL" -msgstr "" +msgstr "TCL" #: Merge.rc:2855 #, c-format msgid "TEX" -msgstr "" +msgstr "TEX" #: Merge.rc:2856 #, c-format msgid "Verilog" -msgstr "" +msgstr "Verilog" #: Merge.rc:2857 #, c-format msgid "XML" -msgstr "" +msgstr "XML" #: Merge.rc:2862 #, c-format This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-16 16:16:03
|
Revision: 7307 http://winmerge.svn.sourceforge.net/winmerge/?rev=7307&view=rev Author: gerundt Date: 2010-10-16 16:15:56 +0000 (Sat, 16 Oct 2010) Log Message: ----------- PATCH: [ 3075470 ] Backport MSI setup to R2_14 Added Paths: ----------- branches/R2_14/Docs/Developers/readme-WIX.html branches/R2_14/Installer/WiX/ branches/R2_14/Installer/WiX/Bitmaps/ branches/R2_14/Installer/WiX/Bitmaps/banner.bmp branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp branches/R2_14/Installer/WiX/Config.wxi branches/R2_14/Installer/WiX/Fragments/ branches/R2_14/Installer/WiX/Fragments/Core.wxs branches/R2_14/Installer/WiX/Fragments/Docs.wxs branches/R2_14/Installer/WiX/Fragments/Features.wxs branches/R2_14/Installer/WiX/Fragments/Filters.wxs branches/R2_14/Installer/WiX/Fragments/Languages.wxs branches/R2_14/Installer/WiX/Fragments/Plugins.wxs branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs branches/R2_14/Installer/WiX/WinMerge.wixproj branches/R2_14/Installer/WiX/WinMerge.wxs branches/R2_14/Installer/WiX/build.bat Added: branches/R2_14/Docs/Developers/readme-WIX.html =================================================================== --- branches/R2_14/Docs/Developers/readme-WIX.html (rev 0) +++ branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,220 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>Building WinMerge MSI Installer</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <style type="text/css"> + <!-- + body { + font-family: Verdana,Helvetica,Arial,sans-serif; + font-size: small; + } + code,pre { + font-family: "Courier New",Courier,monospace; + font-size: 1em; + } + h3 { + padding: 2px; + border-left: 4px solid #FFCC00; + border-bottom: 1px solid #FFCC00; + } + pre { + margin-left: 25px; + margin-right: 25px; + padding: 5px; + background-color: #EEEEEE; + border-left: 10px solid #CCCCCC; + } + p.note { + padding: 5px; + background-color: #DDDDFF; + border: 1px solid #6666FF; + } + --> + </style> +</head> +<body> + +<h2>Building WinMerge MSI Installer</h2> + +<p class="note">MSI installer is still in heavy development and is highly +experimental. DO NOT use it to install WinMerge to production environment! +</p> + +<h3>Needed programs:</h3> +<ul> + <li> + <a href="http://wix.sourceforge.net/">Wix</a> version 3.0 or later. + </li> + <li> + <a href="http://msdn.microsoft.com/en-us/library/0k6kkbsd.aspx">MSBuild</a>. + MSBuild is part of .NET 2.0 or later SDK. + </li> +</ul> + +<h3>Installer script:</h3> +<p>The main installer script is in <code>Installer/WIX</code> folder: +<code>WinMerge.wxs</code>. This file includes other needed files.</p> + +<h3>Folder structure and files needed:</h3> +<p>First make sure you have all needed files compiled and available:</p> +<ul> + <li>WinMerge executables: <code>WinMergeU.exe</code></li> + <li>Translation library: <code>MergeLang.dll</code></li> + <li>Executable translations: <code>/Translations/WinMerge/*.po</code></li> + <li>Libraries: <code>libexpat.dll</code> and <code>pcre.dll</code></li> + <li>Manual: <code>WinMerge.chm</code></li> + <li>ShellExtension: <code>ShellExtensionU.dll</code> and <code>ShellExtensionX64.dll</code></li> + <li>Documents: <code>/Docs/Users/*</code></li> + <li>Filters: <code>/Filters/*</code></li> +</ul> + +<p>These files are produced by compiling WinMerge, documentation etc, but +that's not subject of this document, refer to <a href="Compiling.html">Compiling.html</a>, +<a href="readme-manual.html">readme-manual.html</a> and +<a href="Translations.html">Translations.html</a>.</p> + +<p>In addition you will need Microsoft C- and MFC-runtime <em>merge modules</em>. +Those files are not distributes with WinMerge. By default we use VS2008 +merge modules from the <code>%CommonProgramFiles%\Merge Modules</code> folder:</p> +<ul> + <li><code>Microsoft_VC90_CRT_x86.msm</code></li> + <li><code>Microsoft_VC90_MFC_x86.msm</code></li> + <li><code>Microsoft_VC90_CRT_x86_x64.msm</code></li> + <li><code>Microsoft_VC90_MFC_x86_x64.msm</code></li> +</ul> + +<h4>Folder structure</h4> + +<p>Copy or move the files into the following layout:</p> + +<ul> + <li> + <code>Build/</code> + <ul> + <li> + <code>expat</code> + <ul> + <li><code>libexpat.dll</code></li> + </ul> + </li> + <li> + <code>heksedit</code> + <ul> + <li><code>hekseditU.dll</code></li> + </ul> + </li> + <li> + <code>Manual/htmlhelp</code> + <ul> + <li><code>WinMerge.chm</code></li> + </ul> + </li> + <li> + <code>MergeUnicodeRelease/</code> + <ul> + <li><code>MergeLang.dll</code></li> + <li><code>ShellExtensionU.dll</code></li> + <li><code>WinMergeU.exe</code></li> + </ul> + </li> + <li> + <code>pcre/</code> + <ul> + <li><code>pcre.dll</code></li> + </ul> + </li> + <li> + <code>ShellExtensionX64/</code> + <ul> + <li><code>ShellExtensionX64.dll</code></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Docs/</code> + <ul> + <li> + <code>Users</code> + <ul> + <li><em>Copy the entire <code>Docs/Users</code> folder to here</em></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Filters/</code> + <ul> + <li><code>FileFilter.tmpl</code></li> + <li><code>*.flt</code></li> + </ul> + </li> + <li> + <code>Installer/</code> + <ul> + <li> + <code>WIX/</code> + <ul> + <li><em>Copy the entire <code>Installer/WIX</code> folder to here</em></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Plugins/</code> + <ul> + <li> + <code>dlls/</code> + <ul> + <li><em>Copy the entire <code>Plugins/dlls</code> folder to here</em></li> + </ul> + </li> + </ul> + </li> + <li> + <code>Src/</code> + <ul> + <li> + <code>Languages/</code> + <ul> + <li><em>Copy the entire <code>Src/Languages</code> folder to here</em></li> + </ul> + </li> + </ul> + </li> +</ul> + +<h3>Running WIX tools to create installer</h3> + +<p><code>WinMerge.wxs</code> (in <code>WIX</code> folder) +is script used to create WinMerge MSI installer. Other tools and IDEs can +be used also. For example WixEdit or SharpDevelop.</p> + +<h4>Building with MSBuild</h4> + +<p>Open the Visual Studio command prompt and CD to <code>Installer/WIX</code> -folder. Run +command: +<pre> + msbuild.exe WinMerge.wixproj +</pre> +There are two commonly used parameters: +<ul> + <li>Platform: <code>/p:Platform=x86</code> or <code>/p:Platform=x64</code></li> + <li>Version: <code>/p:ProductVersion=x.x.x</code>. If the version number + is not given it is read from <code>Config.wxi</code>. But then filename + does not contain version number.</li> +</ul> +For example: +<pre> + msbuild.exe WinMerge.wixproj /p:Platform=x86,ProductVersion=1.0.2 +</pre> + +<p>If the compile succeeds you have <code>WinMerge-[platform]-Setup.msi</code> +files in <code>Build\WiX\Release\</code>folder's subfolders. + +<p><strong>Test installer!</strong></p> + +</body> +</html> \ No newline at end of file Property changes on: branches/R2_14/Docs/Developers/readme-WIX.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: branches/R2_14/Installer/WiX ___________________________________________________________________ Added: bugtraq:url + http://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:logregex + (\d{6,}) Property changes on: branches/R2_14/Installer/WiX/Bitmaps ___________________________________________________________________ Added: bugtraq:url + http://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:logregex + (\d{6,}) Added: branches/R2_14/Installer/WiX/Bitmaps/banner.bmp =================================================================== (Binary files differ) Property changes on: branches/R2_14/Installer/WiX/Bitmaps/banner.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp =================================================================== (Binary files differ) Property changes on: branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/R2_14/Installer/WiX/Config.wxi =================================================================== --- branches/R2_14/Installer/WiX/Config.wxi (rev 0) +++ branches/R2_14/Installer/WiX/Config.wxi 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<Include> + <?ifndef Platform ?> <!-- if platform NOT defined --> + <?define Platform = "x86" ?> + <?endif ?> + <?define Manufacturer = "Thingamahoochie Software" ?> + <?define ProductName = "WinMerge" ?> + <?ifndef ProductVersion ?> <!-- if product version NOT defined --> + <?define ProductVersion = "0.0.1" ?> + <?endif ?> + + <?define PackageDescription = "WinMerge Installer" ?> + <?define PackageKeywords = "Installer" ?> + <?define PackageComments = "WinMerge" ?> + + <?if $(var.Platform) = "x64" ?> <!-- if "x64" platform --> + <?define Win64 = "yes" ?> + <?define PackagePlatform = "x64" ?> + <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?> + + <?define ProgramFilesFolder = "ProgramFiles64Folder" ?> + <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?> + <?define HekseditBuildDir = "..\..\Build\heksedit\x64\Release" ?> + <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?> + <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> + <?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?> + + <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?> + <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?> + + <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm" ?> + <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm" ?> + <?else ?> <!-- if "x86" platform --> + <?define Win64 = "no" ?> + <?define PackagePlatform = "x86" ?> + <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> + + <?define ProgramFilesFolder = "ProgramFilesFolder" ?> + <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> + <?define ExpatBuildDir = "..\..\Build\expat" ?> + <?define HekseditBuildDir = "..\..\Build\heksedit" ?> + <?define PcreBuildDir = "..\..\Build\pcre" ?> + <?define ShellExtBuildDir = "..\..\Build\MergeUnicodeRelease" ?> + + <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?> + <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?> + + <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?> + <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_MFC_x86.msm" ?> + <?endif ?> +</Include> \ No newline at end of file Property changes on: branches/R2_14/Installer/WiX/Config.wxi ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: branches/R2_14/Installer/WiX/Fragments ___________________________________________________________________ Added: bugtraq:url + http://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:logregex + (\d{6,}) Added: branches/R2_14/Installer/WiX/Fragments/Core.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Core.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeUEXE" + Name="WinMergeU.exe" + Source="$(var.MergeBuildDir)\WinMergeU.exe" + Vital="yes" /> + </Component> + + <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> + <File Id="libexpatDLL" + Name="libexpat.dll" + Source="$(var.ExpatBuildDir)\libexpat.dll" + Vital="yes" /> + </Component> + + <Component Id="heksedit" Guid="*" Win64="$(var.Win64)"> + <File Id="hekseditUDLL" + Name="hekseditU.dll" + Source="$(var.HekseditBuildDir)\hekseditU.dll" + Vital="yes" /> + </Component> + + <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> + <File Id="pcreDLL" + Name="pcre.dll" + Source="$(var.PcreBuildDir)\pcre.dll" + Vital="yes" /> + </Component> + + <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> + <File Id="MergeLangDLL" + Name="MergeLang.dll" + Source="$(var.MergeBuildDir)\MergeLang.dll" + Vital="yes" /> + </Component> + + <Component Id="Files" Guid="*" Win64="$(var.Win64)"> + <File Id="FilesTXT" + Name="Files.txt" + Source="..\..\Docs\Users\Files.txt" + Vital="no" /> + </Component> + + <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> + <File Id="ContributorsTXT" + Name="Contributors.txt" + Source="..\..\Docs\Users\Contributors.txt" + Vital="no" /> + </Component> + </DirectoryRef> + + <!-- Shell Extension --> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> + <?if $(var.Platform) = "x64" ?> + <File Id="ShellExtensionX64DLL" + Name="ShellExtensionX64.dll" + SelfRegCost="1" + Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll" + Vital="yes" /> + <?else ?> + <File Id="ShellExtensionUDLL" + Name="ShellExtensionU.dll" + SelfRegCost="1" + Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll" + Vital="yes" /> + <?endif ?> + </Component> + </DirectoryRef> + + <!-- Startmenu shortcuts --> + <DirectoryRef Id="WinMergeMenuFolder"> + <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> + <Condition>TASK_STARTMENUSHORTCUTS</Condition> + <Shortcut Id="WinMergeStartMenuShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="ReadMeStartMenuShortcut" + Name="Read Me" + Target="[INSTALLDIR]Docs\ReadMe.txt" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="HelpStartMenuShortcut" + Name="WinMerge Help" + Target="[INSTALLDIR]Docs\WinMerge.chm" + WorkingDirectory="INSTALLDIR" /> + <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + + <!-- Desktop shortcut --> + <DirectoryRef Id="DesktopFolder"> + <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> + <Condition>TASK_DESKTOPSHORTCUT</Condition> + <Shortcut Id="WinMergeDesktopShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Core.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/Docs.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Docs.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Docs.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="DOCSDIR"> + <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> + <File Id="ReadMeTXT" + Name="ReadMe.txt" + Source="..\..\Docs\Users\ReadMe.txt" + Vital="no" /> + </Component> + + <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> + <File Id="ReleaseNotesHTML" + Name="ReleaseNotes.html" + Source="..\..\Docs\Users\ReleaseNotes.html" + Vital="no" /> + </Component> + + <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> + <File Id="ChangeLogTXT" + Name="ChangeLog.txt" + Source="..\..\Docs\Users\ChangeLog.txt" + Vital="no" /> + </Component> + + <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeCHM" + Name="WinMerge.chm" + Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Docs.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/Features.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Features.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <!-- + * Level <= 3 is "Typical" + * Level <= 1000 is "Complete" + --> + <Feature Id="WinMerge" + Absent="disallow" + AllowAdvertise="no" + ConfigurableDirectory="INSTALLDIR" + Display="expand" + Level="1" + Title="WinMerge"> + <ComponentRef Id="WinMergeU" /> + <ComponentRef Id="libexpat" /> + <ComponentRef Id="pcre" /> + <ComponentRef Id="heksedit" /> + <ComponentRef Id="MergeLang" /> + <ComponentRef Id="StartMenuShortcuts" /> + <ComponentRef Id="DesktopShortcut" /> + <Feature Id="ShellExtension" + AllowAdvertise="no" + Description="Explorer context menu integration" + Level="1" + Title="Shell Extension"> + <ComponentRef Id="ShellExtension" /> + </Feature> + <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation"> + <ComponentRef Id="Files" /> + <ComponentRef Id="Contributors" /> + <ComponentRef Id="ReadMe" /> + <ComponentRef Id="ReleaseNotes" /> + <ComponentRef Id="ChangeLog" /> + <ComponentRef Id="WinMergeHelp" /> + </Feature> + <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters"> + <ComponentRef Id="ADAMulti" /> + <ComponentRef Id="ASPNET" /> + <ComponentRef Id="CSharp_loose" /> + <ComponentRef Id="Delphi" /> + <ComponentRef Id="FileFilter" /> + <ComponentRef Id="Frontpage" /> + <ComponentRef Id="MASM" /> + <ComponentRef Id="Merge_GnuC_loose" /> + <ComponentRef Id="Merge_VB_loose" /> + <ComponentRef Id="Merge_VC_loose" /> + <ComponentRef Id="SourceControl" /> + <ComponentRef Id="Symbian" /> + <ComponentRef Id="XML_html" /> + </Feature> + <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages"> + <ComponentRef Id="Brazilian" /> + <ComponentRef Id="Bulgarian" /> + <ComponentRef Id="Catalan" /> + <ComponentRef Id="ChineseSimplified" /> + <ComponentRef Id="ChineseTraditional" /> + <ComponentRef Id="Croatian" /> + <ComponentRef Id="Czech" /> + <ComponentRef Id="Danish" /> + <ComponentRef Id="Dutch" /> + <ComponentRef Id="French" /> + <ComponentRef Id="Galician" /> + <ComponentRef Id="German" /> + <ComponentRef Id="Greek" /> + <ComponentRef Id="Hungarian" /> + <ComponentRef Id="Italian" /> + <ComponentRef Id="Japanese" /> + <ComponentRef Id="Korean" /> + <ComponentRef Id="Norwegian" /> + <ComponentRef Id="Persian" /> + <ComponentRef Id="Polish" /> + <ComponentRef Id="Portuguese" /> + <ComponentRef Id="Romanian" /> + <ComponentRef Id="Russian" /> + <ComponentRef Id="Serbian" /> + <ComponentRef Id="Slovak" /> + <ComponentRef Id="Slovenian" /> + <ComponentRef Id="Spanish" /> + <ComponentRef Id="Swedish" /> + <ComponentRef Id="Turkish" /> + <ComponentRef Id="Ukrainian" /> + <ComponentRef Id="SetDefaultWinMergeLanguage" /> + </Feature> + <?if not $(var.Platform) = "x64" ?> + <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> + <ComponentRef Id="editoraddin" /> + <ComponentRef Id="insertdatetime" /> + <ComponentRef Id="CompareMSExcelFiles" /> + <ComponentRef Id="CompareMSWordFiles" /> + <ComponentRef Id="DisplayXMLFiles" /> + <ComponentRef Id="IgnoreColumns" /> + <ComponentRef Id="IgnoreCommentsC" /> + <ComponentRef Id="IgnoreFieldsComma" /> + <ComponentRef Id="IgnoreFieldsTab" /> + <ComponentRef Id="IgnoreLeadingLineNumbers" /> + <ComponentRef Id="WatchBeginningOfLog" /> + <ComponentRef Id="WatchEndOfLog" /> + </Feature> + <?endif ?> + <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components "> + <MergeRef Id="CRT"/> + </Feature> + <Feature Id="MFC" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 MFC Components "> + <MergeRef Id="MFC"/> + </Feature> + </Feature> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Features.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/Filters.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Filters.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Filters.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="FILTERSDIR"> + <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> + <File Id="ADAMultiFLT" + Name="ADAMulti.flt" + Source="..\..\Filters\ADAMulti.flt" + Vital="no" /> + </Component> + + <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> + <File Id="ASPNETFLT" + Name="ASPNET.flt" + Source="..\..\Filters\ASPNET.flt" + Vital="no" /> + </Component> + + <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="CSharp_looseFLT" + Name="CSharp_loose.flt" + Source="..\..\Filters\CSharp_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> + <File Id="DelphiFLT" + Name="Delphi.flt" + Source="..\..\Filters\Delphi.flt" + Vital="no" /> + </Component> + + <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> + <File Id="FileFilterTMPL" + Name="FileFilter.tmpl" + Source="..\..\Filters\FileFilter.tmpl" + Vital="no" /> + </Component> + + <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> + <File Id="FrontpageFLT" + Name="Frontpage.flt" + Source="..\..\Filters\Frontpage.flt" + Vital="no" /> + </Component> + + <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> + <File Id="MASMFLT" + Name="MASM.flt" + Source="..\..\Filters\MASM.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_GnuC_looseFLT" + Name="Merge_GnuC_loose.flt" + Source="..\..\Filters\Merge_GnuC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VB_looseFLT" + Name="Merge_VB_loose.flt" + Source="..\..\Filters\Merge_VB_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VC_looseFLT" + Name="Merge_VC_loose.flt" + Source="..\..\Filters\Merge_VC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> + <File Id="SourceControlFLT" + Name="SourceControl.flt" + Source="..\..\Filters\SourceControl.flt" + Vital="no" /> + </Component> + + <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> + <File Id="SymbianFLT" + Name="Symbian.flt" + Source="..\..\Filters\Symbian.flt" + Vital="no" /> + </Component> + + <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> + <File Id="XML_htmlFLT" + Name="XML_html.flt" + Source="..\..\Filters\XML_html.flt" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Filters.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/Languages.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Languages.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Languages.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,225 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="LANGDIR"> + <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> + <File Id="BrazilianPO" + Name="Brazilian.po" + Source="..\..\Src\Languages\Brazilian.po" + Vital="no" /> + </Component> + + <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> + <File Id="BulgarianPO" + Name="Bulgarian.po" + Source="..\..\Src\Languages\Bulgarian.po" + Vital="no" /> + </Component> + + <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> + <File Id="CatalanPO" + Name="Catalan.po" + Source="..\..\Src\Languages\Catalan.po" + Vital="no" /> + </Component> + + <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseSimplifiedPO" + Name="ChineseSimplified.po" + Source="..\..\Src\Languages\ChineseSimplified.po" + Vital="no" /> + </Component> + + <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseTraditionalPO" + Name="ChineseTraditional.po" + Source="..\..\Src\Languages\ChineseTraditional.po" + Vital="no" /> + </Component> + + <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> + <File Id="CroatianPO" + Name="Croatian.po" + Source="..\..\Src\Languages\Croatian.po" + Vital="no" /> + </Component> + + <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> + <File Id="CzechPO" + Name="Czech.po" + Source="..\..\Src\Languages\Czech.po" + Vital="no" /> + </Component> + + <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> + <File Id="DanishPO" + Name="Danish.po" + Source="..\..\Src\Languages\Danish.po" + Vital="no" /> + </Component> + + <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> + <File Id="DutchPO" + Name="Dutch.po" + Source="..\..\Src\Languages\Dutch.po" + Vital="no" /> + </Component> + + <Component Id="French" Guid="*" Win64="$(var.Win64)"> + <File Id="FrenchPO" + Name="French.po" + Source="..\..\Src\Languages\French.po" + Vital="no" /> + </Component> + + <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> + <File Id="GalicianPO" + Name="Galician.po" + Source="..\..\Src\Languages\Galician.po" + Vital="no" /> + </Component> + + <Component Id="German" Guid="*" Win64="$(var.Win64)"> + <File Id="GermanPO" + Name="German.po" + Source="..\..\Src\Languages\German.po" + Vital="no" /> + </Component> + + <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> + <File Id="GreekPO" + Name="Greek.po" + Source="..\..\Src\Languages\Greek.po" + Vital="no" /> + </Component> + + <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> + <File Id="HungarianPO" + Name="Hungarian.po" + Source="..\..\Src\Languages\Hungarian.po" + Vital="no" /> + </Component> + + <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> + <File Id="ItalianPO" + Name="Italian.po" + Source="..\..\Src\Languages\Italian.po" + Vital="no" /> + </Component> + + <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> + <File Id="JapanesePO" + Name="Japanese.po" + Source="..\..\Src\Languages\Japanese.po" + Vital="no" /> + </Component> + + <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> + <File Id="KoreanPO" + Name="Korean.po" + Source="..\..\Src\Languages\Korean.po" + Vital="no" /> + </Component> + + <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> + <File Id="NorwegianPO" + Name="Norwegian.po" + Source="..\..\Src\Languages\Norwegian.po" + Vital="no" /> + </Component> + + <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> + <File Id="PolishPO" + Name="Polish.po" + Source="..\..\Src\Languages\Polish.po" + Vital="no" /> + </Component> + + <Component Id="Persian" Guid="*" Win64="$(var.Win64)"> + <File Id="PersianPO" + Name="Persian.po" + Source="..\..\Src\Languages\Persian.po" + Vital="no" /> + </Component> + + <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> + <File Id="PortuguesePO" + Name="Portuguese.po" + Source="..\..\Src\Languages\Portuguese.po" + Vital="no" /> + </Component> + + <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> + <File Id="RomanianPO" + Name="Romanian.po" + Source="..\..\Src\Languages\Romanian.po" + Vital="no" /> + </Component> + + <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> + <File Id="RussianPO" + Name="Russian.po" + Source="..\..\Src\Languages\Russian.po" + Vital="no" /> + </Component> + + <Component Id="Serbian" Guid="*" Win64="$(var.Win64)"> + <File Id="SerbianPO" + Name="Serbian.po" + Source="..\..\Src\Languages\Serbian.po" + Vital="no" /> + </Component> + + <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovakPO" + Name="Slovak.po" + Source="..\..\Src\Languages\Slovak.po" + Vital="no" /> + </Component> + + <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovenianPO" + Name="Slovenian.po" + Source="..\..\Src\Languages\Slovenian.po" + Vital="no" /> + </Component> + + <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> + <File Id="SpanishPO" + Name="Spanish.po" + Source="..\..\Src\Languages\Spanish.po" + Vital="no" /> + </Component> + + <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> + <File Id="SwedishPO" + Name="Swedish.po" + Source="..\..\Src\Languages\Swedish.po" + Vital="no" /> + </Component> + + <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> + <File Id="TurkishPO" + Name="Turkish.po" + Source="..\..\Src\Languages\Turkish.po" + Vital="no" /> + </Component> + + <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> + <File Id="UkrainianPO" + Name="Ukrainian.po" + Source="..\..\Src\Languages\Ukrainian.po" + Vital="no" /> + </Component> + + <!-- Set the default WinMerge language --> + <Component Id="SetDefaultWinMergeLanguage" Guid="*" Win64="$(var.Win64)"> + <!-- We just write the system language ID to the registry. + If WinMerge have no language with this ID, it will fall back to English! + This is a little bit lazy but also the easiest way! ;-) --> + <RegistryValue Root="HKLM" Key="Software\Thingamahoochie\WinMerge\Locale" Name="LanguageId" Type="integer" Value="[SystemLanguageID]" KeyPath="yes" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Languages.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/Plugins.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Plugins.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/Plugins.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <?if not $(var.Platform) = "x64" ?> + <DirectoryRef Id="PLUGINSDIR"> + <Component Id="editoraddin" Guid="*" Win64="no"> + <File Id="editoraddinSCT" + Name="editor addin.sct" + Source="..\..\Plugins\dlls\editor addin.sct" + Vital="no" /> + </Component> + + <Component Id="insertdatetime" Guid="*" Win64="no"> + <File Id="insertdatetimeSCT" + Name="insert datetime.sct" + Source="..\..\Plugins\dlls\insert datetime.sct" + Vital="no" /> + </Component> + + <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> + <File Id="CompareMSExcelFilesDLL" + Name="CompareMSExcelFiles.dll" + Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" + Vital="no" /> + </Component> + + <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> + <File Id="CompareMSWordFilesDLL" + Name="CompareMSWordFiles.dll" + Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" + Vital="no" /> + </Component> + + <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> + <File Id="DisplayXMLFilesDLL" + Name="DisplayXMLFiles.dll" + Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreColumns" Guid="*" Win64="no"> + <File Id="IgnoreColumnsDLL" + Name="IgnoreColumns.dll" + Source="..\..\Plugins\dlls\IgnoreColumns.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> + <File Id="IgnoreCommentsCDLL" + Name="IgnoreCommentsC.dll" + Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> + <File Id="IgnoreFieldsCommaDLL" + Name="IgnoreFieldsComma.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> + <File Id="IgnoreFieldsTabDLL" + Name="IgnoreFieldsTab.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> + <File Id="IgnoreLeadingLineNumbersDLL" + Name="IgnoreLeadingLineNumbers.dll" + Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" + Vital="no" /> + </Component> + + <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> + <File Id="WatchBeginningOfLogDLL" + Name="WatchBeginningOfLog.dll" + Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" + Vital="no" /> + </Component> + + <Component Id="WatchEndOfLog" Guid="*" Win64="no"> + <File Id="WatchEndOfLogDLL" + Name="WatchEndOfLog.dll" + Source="..\..\Plugins\dlls\WatchEndOfLog.dll" + Vital="no" /> + </Component> + </DirectoryRef> + <?endif ?> + </Fragment> +</Wix> Property changes on: branches/R2_14/Installer/WiX/Fragments/Plugins.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. + + The use and distribution terms for this software are covered by the + Common Public License 1.0 (http://opensource.org/licenses/cpl.php) + which can be found in the file CPL.TXT at the root of this distribution. + By using this software in any fashion, you are agreeing to be bound by + the terms of this license. + + You must not remove this notice, or any other, from this software. +--> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI> + <!-- TODO: Use to <WixLocalization> + <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="!(loc.AdditionalTasksDlg_Title)"> + --> + <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="[ProductName] Setup"> + <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" /> + <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> + <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> + </Control> + + <!--<Control Id="SplitLine" Type="Line" X="0" Y="160" Width="370" Height="0" />--> + <Control Id="StartMenuShortcuts" Type="CheckBox" Height="18" Width="295" X="40" Y="70" + Text="Create the startmenu shortcuts" + Property="TASK_STARTMENUSHORTCUTS" CheckBoxValue="1" /> + <Control Id="DesktopShortcut" Type="CheckBox" Height="18" Width="295" X="40" Y="90" + Text="Create a desktop shortcut" + Property="TASK_DESKTOPSHORTCUT" CheckBoxValue="1" /> + + <!-- TODO: Use to <WixLocalization> + <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgDescription)" /> + <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgTitle)" /> + <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdditionalTasksDlgBannerBitmap)" /> + --> + <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Which additional tasks should be performed?" /> + <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Additional Tasks" /> + <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" /> + <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> + <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> + </Dialog> + </UI> + </Fragment> +</Wix> + +<!-- TODO: Use to <WixLocalization> +<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization"> + <String Id="AdditionalTasksDlg_Title">[ProductName] Setup</String> + <String Id="AdditionalTasksDlgTitle">{\WixUI_Font_Title}Additional Tasks</String> + <String Id="AdditionalTasksDlgDescription">...</String> + <String Id="AdditionalTasksDlgBannerBitmap">WixUI_Bmp_Banner</String> +</WixLocalization> +--> \ No newline at end of file Property changes on: branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs (rev 0) +++ branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. + + The use and distribution terms for this software are covered by the + Common Public License 1.0 (http://opensource.org/licenses/cpl.php) + which can be found in the file CPL.TXT at the root of this distribution. + By using this software in any fashion, you are agreeing to be bound by + the terms of this license. + + You must not remove this notice, or any other, from this software. +--> +<!-- +First-time install dialog sequence: Maintenance dialog sequence: + - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg + - WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg + - WixUI_SetupTypeDlg - WixUI_CustomizeDlg + - WixUI_VerifyReadyDlg - WixUI_AdditionalTasksDlg + - WixUI_CustomizeDlg - WixUI_VerifyReadyDlg + - WixUI_DiskCostDlg + - WixUI_BrowseDlg + - WixUI_AdditionalTasksDlg +--> + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI Id="WixUI_WinMerge"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="Mondo" /> + + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + + <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish> + + <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish> + + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish> + + <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish> + <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish> + <Publish Dialog="AdditionalTasksDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + </UI> + + <UIRef Id="WixUI_Common" /> + </Fragment> +</Wix> \ No newline at end of file Property changes on: branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/WinMerge.wixproj =================================================================== --- branches/R2_14/Installer/WiX/WinMerge.wixproj (rev 0) +++ branches/R2_14/Installer/WiX/WinMerge.wixproj 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,32 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <DefineSolutionProperties>false</DefineSolutionProperties> + + <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath> + <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + + <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> + + <OutputName Condition=" '$(ProductVersion)' != '' ">WinMerge-$(ProductVersion)-$(Platform)-Setup</OutputName> + <OutputName Condition=" '$(ProductVersion)' == '' ">WinMerge-$(Platform)-Setup</OutputName> + <OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath> + <IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath> + <OutputType>package</OutputType> + </PropertyGroup> + + <ItemGroup> + <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> + <Compile Include="WinMerge.wxs"/> + <Compile Include="Fragments\Core.wxs"/> + <Compile Include="Fragments\Docs.wxs"/> + <Compile Include="Fragments\Filters.wxs"/> + <Compile Include="Fragments\Languages.wxs"/> + <Compile Include="Fragments\Plugins.wxs"/> + <Compile Include="Fragments\Features.wxs"/> + <Compile Include="Fragments\WixUI_WinMerge.wxs"/> + <Compile Include="Fragments\WixUI_AdditionalTasksDlg.wxs"/> + </ItemGroup> + + <Import Project="$(WixTargetsPath)"/> +</Project> Property changes on: branches/R2_14/Installer/WiX/WinMerge.wixproj ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/WinMerge.wxs =================================================================== --- branches/R2_14/Installer/WiX/WinMerge.wxs (rev 0) +++ branches/R2_14/Installer/WiX/WinMerge.wxs 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Plugins.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" "Fragments\WixUI_AdditionalTasksDlg.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" "WixUI_AdditionalTasksDlg.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> +--> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <!-- + TODO: + * Tasks + * Shortcuts + * Quick Launch + * Integrate to... + * TortoiseCVS + * TortoiseSVN + * ClearCase + * Modify Path + * Don't install 32 bit version von Windows x64 + * Install translated readme files + * Mutli-language support + * ... + --> + <Product Id="*" + Codepage="1252" + Language="1033" + Manufacturer="$(var.Manufacturer)" + Name="$(var.ProductName)" + UpgradeCode="$(var.UpgradeGuid)" + Version="$(var.ProductVersion)"> + + <Package Id="*" + Comments="$(var.PackageComments)" + Compressed="yes" + Description="$(var.Manufacturer)" + InstallerVersion="300" + Keywords="$(var.PackageKeywords)" + Languages="1033" + Manufacturer="$(var.PackageDescription)" + Platform="$(var.PackagePlatform)" + SummaryCodepage="1252" /> + + <Media Id="1" + Cabinet="winmerge.cab" + EmbedCab="yes" /> + + <Directory Id="TARGETDIR" Name="SourceDir"> + <Directory Id="$(var.ProgramFilesFolder)"> + <Directory Id="INSTALLDIR" Name="WinMerge"> + <Directory Id="DOCSDIR" Name="Docs" /> + <Directory Id="FILTERSDIR" Name="Filters" /> + <Directory Id="LANGDIR" Name="Languages" /> + <Directory Id="PLUGINSDIR" Name="MergePlugins" /> + </Directory> + </Directory> + <Directory Id="ProgramMenuFolder"> + <Directory Id="WinMergeMenuFolder" Name="WinMerge" /> + </Directory> + <Directory Id="DesktopFolder" /> + <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> + <Merge Id="MFC" Language="0" SourceFile="$(var.MfcMergeModule)" DiskId="1" /> + </Directory> + + <Property Id="TASK_STARTMENUSHORTCUTS">1</Property> + <Property Id="TASK_DESKTOPSHORTCUT">1</Property> + + <FeatureRef Id="WinMerge" /> + + <!-- TODO: Works this really? --> + <Condition Message="WinMerge requires Windows 2000/XP/2003/Vista/2008 or later to install."> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> + </Condition> + + <WixVariable Id="WixUILicenseRtf" Value="..\..\Docs\users\GPL.rtf" /> + <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp" /> + <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dialog.bmp" /> + + <UIRef Id="WixUI_WinMerge" /> + + <UI /> + + </Product> +</Wix> Property changes on: branches/R2_14/Installer/WiX/WinMerge.wxs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Installer/WiX/build.bat =================================================================== --- branches/R2_14/Installer/WiX/build.bat (rev 0) +++ branches/R2_14/Installer/WiX/build.bat 2010-10-16 16:15:56 UTC (rev 7307) @@ -0,0 +1 @@ +"C:\Windows\Microsoft.NET\Framework\v2.0.50727\msbuild.exe" WinMerge.wixproj Property changes on: branches/R2_14/Installer/WiX/build.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2010-10-17 15:38:32
|
Revision: 7310 http://winmerge.svn.sourceforge.net/winmerge/?rev=7310&view=rev Author: christianlist Date: 2010-10-17 15:38:25 +0000 (Sun, 17 Oct 2010) Log Message: ----------- PATCH: [ 3088720 ] Add OpenCandy to the InnoSetup installer This is using the OpenCandy 1.4.2.28 Inno SDK. The WinMerge.iss is including a file OpenCandyKeys.iss which is not included. This file contains the private keys for WinMerge, and can be obtained from the WinMerge administrators if you are creating the WinMerge releases. If you just want to use the installer without the WinMerge keys, then remove this line: #include <OpenCandyKeys.iss> This makes the installer compile with default demo keys instead of the WinMerge specific keys. Modified Paths: -------------- branches/R2_14/Docs/Users/GPL.rtf branches/R2_14/Installer/InnoSetup/WinMerge.iss Added Paths: ----------- branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt Modified: branches/R2_14/Docs/Users/GPL.rtf =================================================================== (Binary files differ) Added: branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll =================================================================== (Binary files differ) Property changes on: branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss =================================================================== --- branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss (rev 0) +++ branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss 2010-10-17 15:38:25 UTC (rev 7310) @@ -0,0 +1,803 @@ +;---------------------------------------------------------------------------; +; OCSetupHlp.iss ; +;---------------------------------------------------------------------------; +; ; +; Header file for OpenCandy integration ; +; with Inno Setup 5 projects and files. ; +; ; +;---------------------------------------------------------------------------; + +; +; OpenCandy Defines +; ----------------- +; +; Used to abstract file names. +; + +#define OCDLL "OCSetupHlp.dll" +#define OCREADME "OpenCandy_Why_Is_This_Here.txt" + +[Code] + +#ifdef UNICODE +type OCString = AnsiString; +#else +type OCString = String; +#endif + + +// +// OpenCandy Global Variables +// -------------------------- +// + +var + + bDetached:boolean; // Used to keep track of offer page state + UseOfferPage: Boolean; // Used to know if we should shown an offer + OfferAccepted: Boolean; // Used to keep track of the user selection + OCOfferPage: TWizardPage; // Handle to the offer page wizard page + OCNOCANDY: Boolean; // Used to keep track of /NOCANDY parameter + ProductKey: OCString; // Used to store the product key + GoodOS: Boolean; // Used to store the results of the OS check + SignalSent: Boolean; // Used to keep track or server comm + GetOffersCalled: Boolean; // Used to keep track of the first call + ProductFailed: Boolean; // Keeps track of errors that may occur during product installation, so we can signal the DLL on failure + OffersReady: Boolean; // Set to false if offers are not ready in time + +// +// OpenCandy DLL (OCSetupHlp) function declarations +// ------------------------------------------------ +// +// These functions are exported from OCSetupHlp.dll +// and used throughout the setup to perform the operations +// needed for the display of the offer page +// + +function OCInit(a,b,c,d,e:OCString; f,bAsyncMode:Boolean): Integer; +external 'OCInit2A@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCGetBannerInfo(a,b:OCString):Integer; +external 'OCGetBannerInfo@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCRunPage(hwnd,r,g,b:Integer): Integer; +external 'OCRunDialog@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCAdjustPage(hwnd,x,y,w,h : Integer): Integer; +external 'OCInnoAdjust@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCRestorePage(hwnd:Integer): Integer; +external 'OCInnoRestore@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCGetOfferState(): Integer; +external 'OCGetOfferState@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCGetOfferType(cmdline:OCString): Integer; +external 'OCGetOfferType@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCFinish(Mgr:OCString):Integer; +external 'OCExecuteOffer@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCShutdown(): Integer; +external 'OCShutdown@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCDetach(): Integer; +external 'OCDetach@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCSignalProductInstalled():Integer; +external 'OCSignalProductInstalled@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCSetOfferLocation(location,OID,PID:OCString):Integer; +external 'OCSetOfferLocation@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCGetMsg(a,b:OCString):Integer; +external 'OCGetMsg@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +function OCSignalProductFailed():Integer; +external 'OCSignalProductFailed@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +// Checks if offers are ready or not. +// 0 = Offers are ready to show +// 1 = Offers are not ready, but might be. try waiting a little while +// 2 = Offers are not ready, but might be. the delay could be long though. +// 3 = No offers available +function OpenCandyAreOffersReady():Integer; +external 'OCGetAsyncOfferStatus@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload'; + +// +// String manipulation function declaration from Kernel32.dll +// We use those to convert from UTF-8 to unicode and other codepages +// + +Function MultiByteToWideChar(CodePage: UINT; dwFlags: DWORD; + lpMultiByteStr: OCString; cbMultiByte: integer; + lpWideCharStr: String; cchWideChar: integer): longint; +external 'MultiByteToWideChar@kernel32.dll stdcall'; + +Function WideCharToMultiByte(CodePage: UINT; dwFlags: DWORD; + lpWideCharStr: String; cchWideChar: integer; + lpMultiByteStr: OCString; cbMultiByte: integer; + lpDefaultChar: integer; lpUsedDefaultChar: integer): longint; +external 'WideCharToMultiByte@kernel32.dll stdcall'; + +// +// Internal OpenCandy Helper Functions +// ----------------------------------- +// +// These functions are for internal use ONLY +// + +// +// ConvertUtf8ToCodePage() +// ----------------------- +// +// Internal function used to convert +// the i18n messages we get from the DLL +// into a given codepage for diplay in +// the ASCII version of Inno +// +// + +function ConvertUtf8ToCodePage(strSource: OCString; codePage: UINT): OCString; +var + nRet: integer; + WideCharBuf: OCString; + MultiByteBuf: OCString; + +begin + strSource := strSource + chr(0); + SetLength( WideCharBuf, Length( strSource ) * 2 ); + SetLength( MultiByteBuf, Length( strSource ) * 3 ); + + // CP_UTF8 is 65001 + nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf)); + nRet := WideCharToMultiByte(codePage, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0); + + if(nRet = 0) then + begin + // Try with CP_ACP (ASCII) + WideCharToMultiByte(0, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0); + end; + + Result := MultiByteBuf; +end; + +// +// ConvertUtf8ToUnicode() +// ----------------------- +// +// Internal function used to convert +// the i18n messages we get from the DLL +// into Unicode from UTF8 +// +// + +function ConvertUtf8ToUnicode(strSource: OCString): String; +var + nRet: integer; + WideCharBuf: String; +begin + strSource := strSource + chr(0); + SetLength(WideCharBuf, Length(strSource)*2); + + // CP_UTF8 is 65001 + nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf)); + + Result := WideCharBuf; +end; + + + +// OpenCandyDetectOS() +// ------------------- +// +// Internal Operating System version +// detection code, used to rule out +// operation on Windows 2000 and below +// + +procedure OpenCandyDetectOS(); +var + WindowsInfo: TWindowsVersion; +begin + GoodOS := False; + + GetWindowsVersionEx(WindowsInfo); + if WindowsInfo.NTPlatform and + ((WindowsInfo.Major > 5) or + ((WindowsInfo.Major = 5) and (WindowsInfo.minor > 0) )) then + begin + GoodOS := True; + end; +end; + +// +// External OpenCandy API Functions +// ----------------------------------- +// +// These functions are for use in your setup +// + +// +// OpenCandyInitRemnant() +// ---------------------- +// +// This function initializes the OpenCandy sytem. This function takes +// and extra argument compared to OpenCandyInit() (dontShowOC:boolean) +// that controls whrether an offer page is shown or not. This function +// is for using with installations where a primary offer can be shown +// in place of the OpenCandy offer. +// + + +procedure OpenCandyInitRemnant2(publisher: OCString; + key: OCString; + secret: OCString; + language: OCString; + location: OCString; + dontShowOC: boolean; + bUseAsyncMode: boolean); +var + retval:integer; + i:integer; + title:OCString; + description:OCString; + OID: OCString; + uDesc: String; + uTitle: String; + +begin + // Set ProductInstalled to True once entire product install completes. + ProductFailed := False; + bDetached := True; + ProductKey := key; + OCNOCANDY := False; + OfferAccepted := False; + SignalSent := False; + UseOfferPage := False; + GetOffersCalled := False; + OffersReady := True; + + OpenCandyDetectOS(); + + if GoodOS = False then Exit; + for i := 0 to ParamCount() do + begin; + if CompareText(ParamStr(i), '/NOCANDY') = 0 then + begin + OCNOCANDY := True; + if( i > 1) then + begin; + OID:=ParamStr(i-1); + retval:=OCSetOfferLocation(location,OID,key); + end; + end; + if CompareText(ParamStr(i), '/SILENT') = 0 then + begin + OCNOCANDY := True; + end; + if CompareText(ParamStr(i), '/VERYSILENT') = 0 then + begin + OCNOCANDY := True; + end; + end; + + if(OCNOCANDY <> True) and (dontShowOC <> True) then + begin + retval := OCInit(publisher, key, secret, language, location, false,bUseAsyncMode); + + GetOffersCalled := True; + + if retval = 0 then + begin + + UseOfferPage := True; + title:=StringOfChar(' ',512); + description:=StringOfChar(' ',512); + retval:= OCGetBannerInfo(title,description); + if retval = 1 then + begin + description:=''; + end; + if retval = 2 then + begin + title :=''; + end; + if (retval = -1) OR (retval=0) then + begin + description:='blah'; + title :='blah'; + end; + + #ifdef UNICODE + uDesc := ConvertUtf8ToUnicode(description); + uTitle := ConvertUtf8ToUnicode(title); + OCOfferPage := CreateCustomPage(wpSelectTasks, uTitle, uDesc); + #else + description := ConvertUtf8ToCodePage(description, GetUILanguage()); + title := ConvertUtf8ToCodePage(title, GetUILanguage()); + OCOfferPage := CreateCustomPage(wpSelectTasks, title, description); + #endif + + + end; + end; +end; + + +procedure OpenCandyInitRemnant(key: OCString; + secret: OCString; + language: OCString; + location: OCString; + dontShowOC: boolean); +begin + OpenCandyInitRemnant2('', key, secret, language, location, dontShowOC, False); +end; + + +// +// OpenCandyInit() +// --------------- +// +// These function initializes the OpenCandy system. +// It calls the OpenCandyInitRemnant() function with +// the last parameter set to False, so that the offer +// page will be shown (if available). This is the +// normal scenario. + +// Includes publisher parameter +procedure OpenCandyInit2(publisher: OCString; + key: OCString; + secret: OCString; + language: OCString; + location: OCString; + bUseAsyncMode: Boolean); +begin + OpenCandyInitRemnant2(publisher, + key, + secret, + language, + location, + False, + bUseAsyncMode); +end; + +// Use server setting +procedure OpenCandyInit(publisher: OCString; + key: OCString; + secret: OCString; + language: OCString; + location: OCString); +begin + OpenCandyInitRemnant2(publisher, + key, + secret, + language, + location, + False, + False); +end; + + + +// +// OpenCandyShouldSkipPage() +// ------------------------- +// +// Checks if page should be skipped +// + + +function OpenCandyShouldSkipPage(CurPageID: Integer) : Boolean; +var + retval: Integer; + nOffersState: Integer; +begin + + if GoodOS = false then Exit; + + if UseOfferPage = True then + begin + if CurPageID = OCOfferPage.ID then + begin + if OffersReady = False then + begin + Result := True; + //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK); + Exit; + end; + if bDetached = True then + begin + Result := True; + bDetached := False; + OffersReady := False; + //MsgBox('ShouldSkipPage', mbInformation, MB_OK); + retval := OCRunPage(OCOfferPage.Surface.Handle,240,240,240); + if retval <> -1 then + begin + Result := False; + OffersReady := True; + //MsgBox('Not skipping Page', mbInformation, MB_OK); + end; + if retval = -1 then + begin + //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK); + end; + end; + end; + end; +end; + +// +// OpenCandyCurPageChanged() +// ------------------------- +// +// This function is to be called from CurPageChanged() +// It makes sure to run the OpenCandy offer page when it +// is time to run it. +// + +procedure OpenCandyCurPageChanged(CurPageID: Integer); +var + retval: Integer; +begin + if GoodOS = false then Exit; + if OffersReady = False then + begin + Exit; + end; + + if UseOfferPage = True then + begin + if CurPageID = OCOfferPage.ID then + begin + retval := OCAdjustPage(OCOfferPage.Surface.Handle,12,70,480,300); + end; + end; +end; + +// +// OpenCandyNextButtonClick() +// -------------------------- +// +// This function should be called from NextButtonClick() +// It handles the logic of the Offer page, making +// sure a selection was made (offer or no offer) before. +// + +function OpenCandyNextButtonClick(CurPageID: Integer): Boolean; +var + retval: Integer; + getmsg: Integer; + shouldContinue: Boolean; + msgText: OCString; + uMsg: String; +begin + shouldContinue := True; + + if GoodOS = false then + begin + Result := shouldContinue; + Exit; + end; + + if UseOfferPage = True then + begin + if CurPageID = OCOfferPage.ID then + begin + + retval := OCGetOfferState(); + + if( retval < 0) then + begin + msgText := StringOfChar(' ', 1024); + getmsg := OCGetMsg('PleaseChoose', msgText); +#ifdef UNICODE + uMsg := ConvertUtf8ToUnicode(msgText); + MsgBox(uMsg, mbInformation, MB_OK); +#else + msgText := ConvertUtf8ToCodePage(msgText, GetUILanguage()); + MsgBox(msgText, mbInformation, MB_OK); +#endif + shouldContinue := False; + end; + + if(retval >= 0) then + begin + + OfferAccepted := False; + if(retval = 1) then + begin + OfferAccepted := True; + end; + //MsgBox('OCRestorePage 1', mbInformation, MB_OK); + retval := OCRestorePage(OCOfferPage.Surface.Handle); + shouldContinue := True; + end; + + end; + end; + + Result := shouldContinue; +end; + +// +// OpenCandyBackButtonClick() +// -------------------------- +// +// This function should be called from BackButtonClick(). +// It restores the layout of the installer window for +// other pages to use. +// + +function OpenCandyBackButtonClick(CurPageID: Integer): Boolean; +begin + if GoodOS = false then + begin + Result := True; + Exit; + end; + + if UseOfferPage = True then + begin + if CurPageID = OCOfferPage.ID then + begin + //MsgBox('OCRestorePage 2', mbInformation, MB_OK); + OCRestorePage(OCOfferPage.Surface.Handle); + end; + end; + + Result := True; +end; + +// +// OpenCandyDeinitializeSetup() +// ---------------------------- +// +// This should be called from DeinitializeSetup() +// It cleans up the temporarily loaded DLL and releases +// the memory we have been using (if any). +// + +procedure OpenCandyDeinitializeSetup(); +var +retval:integer; +begin + if GoodOS = false then Exit; + + if UseOfferPage = True then + begin + if ProductFailed = True then + begin + retval := OCSignalProductFailed(); + end; + + if bDetached = False then + begin + bDetached:=True; + retval:=OCDetach(); + end; + OCShutdown(); + end; + +end; + +// +// OpenCandyCurStepChanged() +// ------------------------- +// +// This should be called from CurStepChanged(). +// +// It handles necesary operations at the various +// different stages of the setup. +// + +procedure OpenCandyCurStepChanged(CurStep: TSetupStep); +var + retval: Integer; + s,s2: OCString; + cmdline: OCString; +begin + if CurStep = ssInstall then + begin + // Set to true in case it fails. + ProductFailed:= True; + end; + if CurStep = ssPostInstall then + begin + ProductFailed:= False; + end; + + + + if GoodOS = false then Exit; + + // Install Step + + if CurStep = ssInstall then + begin + if UseOfferPage = True then + begin + if bDetached = False then + begin + bDetached := True; + retval := OCDetach(); + end; + end; + end; + + // Post Install Step + + if CurStep = ssPostInstall then + begin + if OCNOCANDY = False then + begin + if UseOfferPage = True then + begin + cmdline := StringOfChar(' ',1024); + retval := OCGetOfferType(cmdline); + + if retval = 1 then // OC_OFFER_TYPE_NORMAL + begin + s := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}'; + s := GetShortName(s); + s2 := s + ',_MgrCheck@16'; + retval:=OCFinish(s2); + end; + end; + end; + end; + + // Install Done Step + + if CurStep = ssDone then + begin + if (OCNOCANDY = False) and (GetOffersCalled = True) then + begin + // Product was installed so let's signal it + + retval := OCSignalProductInstalled(); + + // Check if offer was accepted + if (OfferAccepted = True) then + begin + + cmdline := StringOfChar(' ',1024); + retval := OCGetOfferType(cmdline); + + if retval = 1 then // OC_OFFER_TYPE_NORMAL + begin + // Offer was accepted, let's run + s := ExpandConstant('{app}') + '\OpenCandy\OCSetupHlp.Dll'; + s := GetShortName(s); + s := s + ',_MgrCheck@16'; + s:='RunDll32.exe ' + s; + Exec('>', s, '', SW_SHOW, ewNoWait, retval); + end; + end; + end; + end; +end; + +// +// OpenCandyProcessEmbedded() +// -------------------------- +// +// This function should NOT be called +// directly. It serves as an installation +// handle for the OCDLL file (see the Files +// section in the main setup script) +// + +procedure OpenCandyProcessEmbedded(); +var + retval: Integer; + str: OCString; + cmdline: OCString; + params: OCString; + tmp: OCString; + ResultCode: Integer; +begin + if GoodOS = false then Exit; + + if UseOfferPage = True then + begin + cmdline := StringOfChar(' ',1024); + retval := OCGetOfferType(cmdline); + if retval = 2 then // OC_OFFER_TYPE_EMBEDDED + begin + + str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}'; + str := GetShortName(str); + str := str + ',_MgrCheck@16'; + retval:=OCFinish(str); + + if(OfferAccepted = True) then + begin + str := 'RunDll32.exe ' + str; + + // The DLL does not append a \0 since inno chokes on it, so we need to trim the string back down. + tmp := TrimRight(cmdline); + params := tmp + ' /S' + ProductKey; + + str := str + params; + Exec('>', str, '', SW_HIDE, ewWaitUntilTerminated, ResultCode); + end; + + end; + end; +end; + +// +// OpenCandyCheckInstallDLL() +// -------------------------- +// +// This function should NOT be called +// directly. It serves as an installation +// check for the OCDLL files (see the Files +// section in the main setup script) +// + +function OpenCandyCheckInstallDLL(): Boolean; +var + str: OCString; + retval: Integer; + cmdline: OCString; +begin + + Result := False; + + if GoodOS = false then Exit; + + if (UseOfferPage = True) and (OCNOCANDY = False) then + begin + if (OfferAccepted = False) and (SignalSent = False) then + begin + cmdline := StringOfChar(' ',1024); + retval := OCGetOfferType(cmdline); + + if retval = 2 then // OC_OFFER_TYPE_EMBEDDED + begin + // We won't install the DLL but + // we still need to call OCFinish() + + str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}'; + str := GetShortName(str); + str := str + ',_MgrCheck@16'; + OCFinish(str); + SignalSent := True; + end; + end; + end; + + Result := OfferAccepted; +end; + +// +// OpenCandyCheckInstallReadme() +// ----------------------------- +// +// This function should NOT be called +// directly. It serves as an installation +// check for the OCREADME file (see the Files +// section in the main setup script) +// + +function OpenCandyCheckInstallReadme(): Boolean; +begin + Result := OfferAccepted; +end; + +//---------------------------------------------------------------------------// +// End of File // +//---------------------------------------------------------------------------// + + + + + + + + + + Added: branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt =================================================================== --- branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt (rev 0) +++ branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt 2010-10-17 15:38:25 UTC (rev 7310) @@ -0,0 +1,52 @@ +What is OpenCandy? + +OpenCandy is a platform and network which enables software publishers +to recommend other products, during installation of their software, they +believe you will find valuable. + +So\x85 What is this folder, its contents, and why is it here? + +These files are only on your computer because you accepted a software +recommendation. These files are TEMPORARILY copied to a folder within +the publisher's program files directory until the recommended software +is downloaded and installation is performed. + +This folder contains: + + * OpenCandy_Why_Is_This_Here.txt + - This text file you\x92re reading. :) + + * OCSetupHlp.dll + - This file is used to display a recommendation during the + publisher\x92s software installation and to facilitate the download + and installation of the recommended software. This file also + allows us to provide software publishers with *non personally + identifiable* information such as statistics like install + initiated and completed, country, operating system and language, + and whether the software recommendation was accepted or not. + +After the recommended software\x92s installation is started (and regardless +of whether it is successfully completed) these files and the 'OpenCandy' +folder will be automatically deleted next time the system is restarted. + +The possible reasons this folder and its contents remain are: + + A) You rebooted before installing the recommend software + B) You lost power before the recommended software was installed + C) Your computer exploded before the recommended software was + installed (Then how are you reading this?) + +Feel free to delete this OpenCandy folder (and its contents) at any +time; there is no harm in doing so. If you believe this folder and its +files should have been deleted and were not (and neither A, B, or C +happened), we'd appreciate if you contacted us (see below) and told us +what you think happened. If it happens to be a bug, we'll fix it so this +doesn't happen to anyone else. Oh yeah, and we'll send you an awesome +purple t-shirt for helping us out! + +If you have any questions, please don\x92t hesitate to contact us at +www.opencandy.com/contact/. + +Thank you. + +- The OpenCandy team \ No newline at end of file Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss =================================================================== --- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-17 12:15:28 UTC (rev 7309) +++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-17 15:38:25 UTC (rev 7310) @@ -52,7 +52,33 @@ #define RuntimesX86Installer "..\..\..\Runtimes\vcredist_x86.exe" #define RuntimesX64Installer "..\..\..\Runtimes\vcredist_x64.exe" +; OpenCandy includes and defines +#include <OCSetupHlp.iss> +// The OpenCandyKeys.iss file contains the WinMerge specific OpenCandy keys. +// The file can be obtained from the WinMerge administrators. +// Remove the next line to use the demo keys only. +#include <OpenCandyKeys.iss> + +#define OC_STR_MY_PRODUCT_NAME "WinMerge" + +// Note: These keys are demo keys only, the WinMerge keys are kept somewhere else +#ifndef OC_STR_KEY + #define OC_STR_KEY "1401d0bd8048e1f0f4628dbec1a73092" +#endif +#ifndef OC_STR_SECRET + #define OC_STR_SECRET "4564bdaf826bbe2115718d1643ecc19e" +#endif + +#define OC_STR_REGISTRY_PATH "Software\Thingamahoochie\OpenCandy" + +#if OC_STR_KEY == "1401d0bd8048e1f0f4628dbec1a73092" + #pragma warning "Do not forget to change the test key '1401d0bd8048e1f0f4628dbec1a73092' to your company's product key before releasing this installer." +#endif +#if OC_STR_SECRET == "4564bdaf826bbe2115718d1643ecc19e" + #pragma warning "Do not forget to change the test secret '4564bdaf826bbe2115718d1643ecc19e' to your company's product secret before releasing this installer." +#endif + [Setup] AppName=WinMerge AppVersion={#AppVersion} @@ -155,7 +181,7 @@ English.FinishedLabel=Setup has finished installing WinMerge on your computer. English.SetupAppTitle=Setup - WinMerge {#AppVersion} English.WizardInfoBefore=License Agreement -English.InfoBeforeLabel=GNU General Public License +English.InfoBeforeLabel=GNU General Public License & OpenCandy EULA [Types] @@ -455,6 +481,10 @@ Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins Source: ..\..\Plugins\dlls\*.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins +; OPEN CANDY START +Source: {#OCREADME}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallReadme +Source: {#OCDLL}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallDLL; AfterInstall: OpenCandyProcessEmbedded +; OPEN CANDY END [Icons] ;Start Menu Icons @@ -970,6 +1000,9 @@ If CurPage = wpInstalling Then {Delete the previous start menu group if the location has changed since the last install} DeletePreviousStartMenu; + // OPEN CANDY START + OpenCandyCurPageChanged(CurPage); + // OPEN CANDY END End; // Checks if context menu is already enabled for shell extension @@ -1088,6 +1121,9 @@ IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName()); end; end; + // OPEN CANDY START + OpenCandyCurStepChanged(CurStep); + // OPEN CANDY END End; Procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); @@ -1109,3 +1145,139 @@ IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe'); end; End; + +procedure InitializeWizard; +Var OCstrInstallerLanguage: String; +begin + // OPEN CANDY START + // Convert the internal language name to an ISO 639-1 code. Find a list at http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes + Case ActiveLanguage of + 'default' : Begin + OCstrInstallerLanguage := 'en'; + End; + 'English' : Begin + OCstrInstallerLanguage := 'en'; + End; + 'Bulgarian' : Begin + OCstrInstallerLanguage := 'bg'; + End; + 'Catalan' : Begin + OCstrInstallerLanguage := 'ca'; + End; + 'Chinese_Simplified' : Begin + OCstrInstallerLanguage := 'zh'; + End; + 'Chinese_Traditional' : Begin + OCstrInstallerLanguage := 'zh'; + End; + 'Croatian' : Begin + OCstrInstallerLanguage := 'hr'; + End; + 'Czech' : Begin + OCstrInstallerLanguage := 'cs'; + End; + 'Danish' : Begin + OCstrInstallerLanguage := 'da'; + End; + 'Dutch' : Begin + OCstrInstallerLanguage := 'nl'; + End; + 'French' : Begin + OCstrInstallerLanguage := 'fr'; + End; + 'Galician' : Begin + OCstrInstallerLanguage := 'gl'; + End; + 'German' : Begin + OCstrInstallerLanguage := 'de'; + End; + 'Greek' : Begin + OCstrInstallerLanguage := 'el'; + End; + 'Hungarian' : Begin + OCstrInstallerLanguage := 'hu'; + End; + 'Italian' : Begin + OCstrInstallerLanguage := 'it'; + End; + 'Japanese' : Begin + OCstrInstallerLanguage := 'ja'; + End; + 'Korean' : Begin + OCstrInstallerLanguage := 'ko'; + End; + 'Norwegian' : Begin + OCstrInstallerLanguage := 'no'; + End; + 'Persian' : Begin + OCstrInstallerLanguage := 'fa'; + End; + 'Polish' : Begin + OCstrInstallerLanguage := 'pl'; + End; + 'Portuguese' : Begin + OCstrInstallerLanguage := 'pt'; + End; + 'PortugueseBrazilian' : Begin + OCstrInstallerLanguage := 'pt'; + End; + 'Romanian' : Begin + OCstrInstallerLanguage := 'ro'; + End; + 'Russian' : Begin + OCstrInstallerLanguage := 'ru'; + End; + 'Serbian' : Begin + OCstrInstallerLanguage := 'sr'; + End; + 'Slovak' : Begin + OCstrInstallerLanguage := 'sk'; + End; + 'Slovenian' : Begin + OCstrInstallerLanguage := 'sl'; + End; + 'Spanish' : Begin + OCstrInstallerLanguage := 'es'; + End; + 'Swedish' : Begin + OCstrInstallerLanguage := 'sv'; + End; + 'Turkish' : Begin + OCstrInstallerLanguage := 'tr'; + End; + 'Ukrainian' : Begin + OCstrInstallerLanguage := 'uk'; + End; + End; {End Case} + OpenCandyInit('{#OC_STR_MY_PRODUCT_NAME}','{#OC_STR_KEY}','{#OC_STR_SECRET}',OCstrInstallerLanguage ,'{#OC_STR_REGISTRY_PATH}'); + // OPEN CANDY END +end; + +function ShouldSkipPage(PageID: Integer): Boolean; +begin + // OPEN CANDY START + Result := OpenCandyShouldSkipPage(PageID); + // OPEN CANDY END +end; + +function NextButtonClick(CurPageID: Integer): Boolean; +begin + // OPEN CANDY START + Result := OpenCandyNextButtonClick(CurPageID); + // OPEN CANDY END +end; + +function BackButtonClick(CurPageID: Integer): Boolean; +begin + // OPEN CANDY START + Result := OpenCandyBackButtonClick(CurPageID); + // OPEN CANDY END +end; + +procedure DeinitializeSetup(); +begin + // OPEN CANDY START + OpenCandyDeinitializeSetup(); + // OPEN CANDY END +end; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-18 08:56:52
|
Revision: 7312 http://winmerge.svn.sourceforge.net/winmerge/?rev=7312&view=rev Author: gerundt Date: 2010-10-18 08:56:46 +0000 (Mon, 18 Oct 2010) Log Message: ----------- PATCH: [ 3042393 ] add ascx to Highlightsyntax ASP Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/editlib/ccrystaltextview.cpp Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-17 15:58:28 UTC (rev 7311) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-18 08:56:46 UTC (rev 7312) @@ -5,6 +5,7 @@ WinMerge 2.13.19 Add missing keywords to Pascal highlighter (#2834192) + Recognize .ascx files as ASP files (#3042393) Fix help locations (#2988974) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-17 15:58:28 UTC (rev 7311) +++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-18 08:56:46 UTC (rev 7312) @@ -272,7 +272,7 @@ CCrystalTextView::TextDefinition CCrystalTextView::m_SourceDefs[] = { CCrystalTextView::SRC_PLAIN, _T ("Plain"), _T ("txt,doc,diz"), &CCrystalTextView::ParseLinePlain, SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T (""), (DWORD)-1, - CCrystalTextView::SRC_ASP, _T ("ASP"), _T ("asp"), &CCrystalTextView::ParseLineAsp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("'"), (DWORD)-1, + CCrystalTextView::SRC_ASP, _T ("ASP"), _T ("asp,ascx"), &CCrystalTextView::ParseLineAsp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("'"), (DWORD)-1, CCrystalTextView::SRC_BASIC, _T ("Basic"), _T ("bas,vb,vbs,frm,dsm,cls,ctl,pag,dsr"), &CCrystalTextView::ParseLineBasic, SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T ("\'"), (DWORD)-1, CCrystalTextView::SRC_BATCH, _T ("Batch"), _T ("bat,btm,cmd"), &CCrystalTextView::ParseLineBatch, SRCOPT_INSERTTABS|SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T ("rem "), (DWORD)-1, CCrystalTextView::SRC_C, _T ("C"), _T ("c,cc,cpp,cxx,h,hpp,hxx,hm,inl,rh,tlh,tli,xs"), &CCrystalTextView::ParseLineC, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-19 17:25:15
|
Revision: 7316 http://winmerge.svn.sourceforge.net/winmerge/?rev=7316&view=rev Author: kimmov Date: 2010-10-19 17:25:09 +0000 (Tue, 19 Oct 2010) Log Message: ----------- PATCH: [ 2600787 ] Remove copy to left at context menu Submitted by Dmitry Maslov Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/MergeEditView.cpp Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-18 13:52:00 UTC (rev 7315) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:25:09 UTC (rev 7316) @@ -7,6 +7,8 @@ Add missing keywords to Pascal highlighter (#2834192) Recognize .ascx files as ASP files (#3042393) Fix help locations (#2988974) + Show only "Copy to other side" item in file compare + context menu (#2600787) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/MergeEditView.cpp =================================================================== --- branches/R2_14/Src/MergeEditView.cpp 2010-10-18 13:52:00 UTC (rev 7315) +++ branches/R2_14/Src/MergeEditView.cpp 2010-10-19 17:25:09 UTC (rev 7316) @@ -2041,6 +2041,13 @@ // Create the menu and populate it with the available functions BCMenu menu; VERIFY(menu.LoadMenu(IDR_POPUP_MERGEVIEW)); + + // Remove copying item copying from active side + if (m_nThisPane == 0) // left? + menu.RemoveMenu(ID_R2L, MF_BYCOMMAND); + else + menu.RemoveMenu(ID_L2R, MF_BYCOMMAND); + VERIFY(menu.LoadToolbar(IDR_MAINFRAME)); theApp.TranslateMenu(menu.m_hMenu); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-19 17:40:58
|
Revision: 7317 http://winmerge.svn.sourceforge.net/winmerge/?rev=7317&view=rev Author: kimmov Date: 2010-10-19 17:40:49 +0000 (Tue, 19 Oct 2010) Log Message: ----------- RFE: [ 2203904 ] "Include Subfolders": Enable Keyboard for Collapse/Expand Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/DirView.cpp branches/R2_14/Src/DirView.h branches/R2_14/Src/Languages/English.pot branches/R2_14/Src/Merge.rc branches/R2_14/Src/resource.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:25:09 UTC (rev 7316) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:40:49 UTC (rev 7317) @@ -9,6 +9,7 @@ Fix help locations (#2988974) Show only "Copy to other side" item in file compare context menu (#2600787) + Expand/collapse folders from keyboard (#2203904) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-10-19 17:25:09 UTC (rev 7316) +++ branches/R2_14/Src/DirView.cpp 2010-10-19 17:40:49 UTC (rev 7317) @@ -250,6 +250,8 @@ ON_COMMAND(ID_EDIT_UNDO, OnEditUndo) ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo) ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList) + ON_COMMAND(ID_VIEW_EXPAND, OnExpandFolder) + ON_COMMAND(ID_VIEW_COLLAPSE, OnCollapseFolder) //}}AFX_MSG_MAP ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick) ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) @@ -1102,6 +1104,38 @@ } /** + * @brief Expand collapsed folder in tree-view mode. + */ +void CDirView::OnExpandFolder() +{ + const int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED); + if (nSelItem == -1) + return; + const DIFFITEM &di = GetItemAt(nSelItem); + if (di.diffcode.isDirectory() && (di.customFlags1 & + ViewCustomFlags::EXPANDED) == 0) + { + ExpandSubdir(nSelItem); + } +} + +/** + * @brief Collapse expanded folder in tree-view mode. + */ +void CDirView::OnCollapseFolder() +{ + const int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED); + if (nSelItem == -1) + return; + const DIFFITEM &di = GetItemAt(nSelItem); + if (di.diffcode.isDirectory() && (di.customFlags1 & + ViewCustomFlags::EXPANDED)) + { + CollapseSubdir(nSelItem); + } +} + +/** * @brief Collapse subfolder * @param [in] sel Folder item index in listview. */ Modified: branches/R2_14/Src/DirView.h =================================================================== --- branches/R2_14/Src/DirView.h 2010-10-19 17:25:09 UTC (rev 7316) +++ branches/R2_14/Src/DirView.h 2010-10-19 17:40:49 UTC (rev 7317) @@ -397,6 +397,8 @@ afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnPluginsList(); + afx_msg void OnExpandFolder(); + afx_msg void OnCollapseFolder(); //}}AFX_MSG DECLARE_MESSAGE_MAP() BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult); Modified: branches/R2_14/Src/Languages/English.pot =================================================================== --- branches/R2_14/Src/Languages/English.pot 2010-10-19 17:25:09 UTC (rev 7316) +++ branches/R2_14/Src/Languages/English.pot 2010-10-19 17:40:49 UTC (rev 7317) @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" -"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2009-02-10 22:14+0000\n" +"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" +"POT-Creation-Date: 2010-10-19 20:38+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -385,7 +385,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1933 +#: Merge.rc:1935 #, c-format msgid "&Help" msgstr "" @@ -716,7 +716,7 @@ msgstr "" #: Merge.rc:370 -#: Merge.rc:2789 +#: Merge.rc:2791 #, c-format msgid "< Empty >" msgstr "" @@ -913,15 +913,15 @@ msgstr "" #: Merge.rc:522 -#: Merge.rc:1135 -#: Merge.rc:1517 +#: Merge.rc:1137 +#: Merge.rc:1519 #, c-format msgid "&Left" msgstr "" #: Merge.rc:523 -#: Merge.rc:1137 -#: Merge.rc:1520 +#: Merge.rc:1139 +#: Merge.rc:1522 #, c-format msgid "&Right" msgstr "" @@ -1051,1719 +1051,1717 @@ msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:662 +#: Merge.rc:664 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:668 +#: Merge.rc:670 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:669 +#: Merge.rc:671 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:670 +#: Merge.rc:672 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:673 -#: Merge.rc:705 -#: Merge.rc:797 -#: Merge.rc:983 -#: Merge.rc:1054 -#: Merge.rc:1083 -#: Merge.rc:1093 -#: Merge.rc:1259 -#: Merge.rc:1323 -#: Merge.rc:1336 -#: Merge.rc:1428 -#: Merge.rc:1443 -#: Merge.rc:1665 +#: Merge.rc:675 +#: Merge.rc:707 +#: Merge.rc:799 +#: Merge.rc:985 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1261 +#: Merge.rc:1325 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "OK" msgstr "" -#: Merge.rc:674 +#: Merge.rc:676 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:681 +#: Merge.rc:683 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:684 -#: Merge.rc:1594 +#: Merge.rc:686 +#: Merge.rc:1596 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:688 -#: Merge.rc:749 -#: Merge.rc:997 -#: Merge.rc:1019 +#: Merge.rc:690 +#: Merge.rc:751 +#: Merge.rc:999 +#: Merge.rc:1021 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:689 -#: Merge.rc:1598 +#: Merge.rc:691 +#: Merge.rc:1600 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:693 -#: Merge.rc:1030 +#: Merge.rc:695 +#: Merge.rc:1032 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:694 -#: Merge.rc:1602 +#: Merge.rc:696 +#: Merge.rc:1604 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:697 -#: Merge.rc:1604 +#: Merge.rc:699 +#: Merge.rc:1606 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:698 +#: Merge.rc:700 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:701 +#: Merge.rc:703 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:702 -#: Merge.rc:1605 +#: Merge.rc:704 +#: Merge.rc:1607 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:704 +#: Merge.rc:706 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:706 -#: Merge.rc:736 -#: Merge.rc:798 -#: Merge.rc:828 -#: Merge.rc:860 -#: Merge.rc:870 -#: Merge.rc:1055 -#: Merge.rc:1084 -#: Merge.rc:1094 -#: Merge.rc:1145 -#: Merge.rc:1260 -#: Merge.rc:1337 -#: Merge.rc:1429 -#: Merge.rc:1444 -#: Merge.rc:1666 +#: Merge.rc:708 +#: Merge.rc:738 +#: Merge.rc:800 +#: Merge.rc:830 +#: Merge.rc:862 +#: Merge.rc:872 +#: Merge.rc:1057 +#: Merge.rc:1086 +#: Merge.rc:1096 +#: Merge.rc:1147 +#: Merge.rc:1262 +#: Merge.rc:1339 +#: Merge.rc:1431 +#: Merge.rc:1446 +#: Merge.rc:1668 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:707 -#: Merge.rc:1338 +#: Merge.rc:709 +#: Merge.rc:1340 #, c-format msgid "Help" msgstr "" -#: Merge.rc:708 +#: Merge.rc:710 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:715 +#: Merge.rc:717 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:720 +#: Merge.rc:722 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:723 +#: Merge.rc:725 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:726 +#: Merge.rc:728 #, c-format msgid "User:" msgstr "" -#: Merge.rc:728 +#: Merge.rc:730 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:730 +#: Merge.rc:732 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:732 -#: Merge.rc:875 +#: Merge.rc:734 +#: Merge.rc:877 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:734 +#: Merge.rc:736 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:735 -#: Merge.rc:871 +#: Merge.rc:737 +#: Merge.rc:873 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:741 +#: Merge.rc:743 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:744 +#: Merge.rc:746 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:747 -#: Merge.rc:2065 +#: Merge.rc:749 +#: Merge.rc:2067 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:754 -#: Merge.rc:1941 +#: Merge.rc:756 +#: Merge.rc:1943 #, c-format msgid "General" msgstr "" -#: Merge.rc:757 +#: Merge.rc:759 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:760 +#: Merge.rc:762 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:762 +#: Merge.rc:764 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:764 +#: Merge.rc:766 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:767 +#: Merge.rc:769 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:769 +#: Merge.rc:771 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:771 +#: Merge.rc:773 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:774 +#: Merge.rc:776 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:776 +#: Merge.rc:778 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:779 +#: Merge.rc:781 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:781 -#: Merge.rc:1617 +#: Merge.rc:783 +#: Merge.rc:1619 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:783 -#: Merge.rc:1619 +#: Merge.rc:785 +#: Merge.rc:1621 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:785 +#: Merge.rc:787 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:787 +#: Merge.rc:789 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:794 +#: Merge.rc:796 #, c-format msgid "Language" msgstr "" -#: Merge.rc:801 +#: Merge.rc:803 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:807 +#: Merge.rc:809 #, c-format msgid "Find" msgstr "" -#: Merge.rc:810 -#: Merge.rc:837 +#: Merge.rc:812 +#: Merge.rc:839 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:815 +#: Merge.rc:845 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:815 -#: Merge.rc:845 +#: Merge.rc:817 +#: Merge.rc:847 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:817 -#: Merge.rc:847 +#: Merge.rc:819 +#: Merge.rc:849 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:819 +#: Merge.rc:821 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:822 +#: Merge.rc:824 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:823 +#: Merge.rc:825 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:825 +#: Merge.rc:827 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:827 -#: Merge.rc:857 +#: Merge.rc:829 +#: Merge.rc:859 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:834 +#: Merge.rc:836 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:840 +#: Merge.rc:842 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:849 +#: Merge.rc:851 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:852 +#: Merge.rc:854 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:853 +#: Merge.rc:855 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:855 +#: Merge.rc:857 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:858 +#: Merge.rc:860 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:859 +#: Merge.rc:861 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:866 -#: Merge.rc:2187 +#: Merge.rc:868 +#: Merge.rc:2189 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:869 +#: Merge.rc:871 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:874 -#: Merge.rc:1179 +#: Merge.rc:876 +#: Merge.rc:1181 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:877 +#: Merge.rc:879 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:883 +#: Merge.rc:885 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:886 +#: Merge.rc:888 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:889 +#: Merge.rc:891 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:896 +#: Merge.rc:898 #, c-format msgid "Save" msgstr "" -#: Merge.rc:897 +#: Merge.rc:899 #, c-format msgid "New" msgstr "" -#: Merge.rc:898 +#: Merge.rc:900 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:899 +#: Merge.rc:901 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:904 -#: Merge.rc:1944 +#: Merge.rc:906 +#: Merge.rc:1946 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:907 +#: Merge.rc:909 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:911 +#: Merge.rc:913 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1569 +#: Merge.rc:917 +#: Merge.rc:1571 #, c-format msgid "Background" msgstr "" -#: Merge.rc:916 +#: Merge.rc:918 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:929 -#: Merge.rc:1364 -#: Merge.rc:1570 +#: Merge.rc:931 +#: Merge.rc:1366 +#: Merge.rc:1572 #, c-format msgid "Text" msgstr "" -#: Merge.rc:933 +#: Merge.rc:935 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:943 +#: Merge.rc:945 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:955 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:960 +#: Merge.rc:962 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:967 +#: Merge.rc:969 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:974 -#: Merge.rc:1053 -#: Merge.rc:1082 -#: Merge.rc:1182 -#: Merge.rc:1410 +#: Merge.rc:976 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1184 +#: Merge.rc:1412 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:980 -#: Merge.rc:1352 -#: Merge.rc:1558 +#: Merge.rc:982 +#: Merge.rc:1354 +#: Merge.rc:1560 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:990 -#: Merge.rc:1947 +#: Merge.rc:992 +#: Merge.rc:1949 #, c-format msgid "System" msgstr "" -#: Merge.rc:993 +#: Merge.rc:995 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:995 +#: Merge.rc:997 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:998 +#: Merge.rc:1000 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1000 +#: Merge.rc:1002 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:1001 +#: Merge.rc:1003 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:1004 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1004 +#: Merge.rc:1006 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1007 -#: Merge.rc:1023 +#: Merge.rc:1009 +#: Merge.rc:1025 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1015 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1016 +#: Merge.rc:1018 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1020 +#: Merge.rc:1022 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1026 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1027 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1027 +#: Merge.rc:1029 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1033 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1034 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1035 +#: Merge.rc:1037 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1040 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1039 +#: Merge.rc:1041 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1041 +#: Merge.rc:1043 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1043 +#: Merge.rc:1045 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1045 +#: Merge.rc:1047 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1047 +#: Merge.rc:1049 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1049 +#: Merge.rc:1051 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1051 +#: Merge.rc:1053 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1075 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1079 +#: Merge.rc:1081 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1080 +#: Merge.rc:1082 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1090 +#: Merge.rc:1092 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1095 +#: Merge.rc:1097 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1098 +#: Merge.rc:1100 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1101 +#: Merge.rc:1103 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1102 +#: Merge.rc:1104 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1113 +#: Merge.rc:1115 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1116 -#: Merge.rc:1894 +#: Merge.rc:1118 +#: Merge.rc:1896 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1121 +#: Merge.rc:1123 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1124 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1123 +#: Merge.rc:1125 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1129 +#: Merge.rc:1131 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1134 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1134 +#: Merge.rc:1136 #, c-format msgid "File" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1141 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1140 +#: Merge.rc:1142 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1142 +#: Merge.rc:1144 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1144 +#: Merge.rc:1146 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1150 -#: Merge.rc:1942 +#: Merge.rc:1152 +#: Merge.rc:1944 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1155 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1154 +#: Merge.rc:1156 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1156 +#: Merge.rc:1158 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1158 +#: Merge.rc:1160 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1162 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1162 +#: Merge.rc:1164 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1166 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1169 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1169 +#: Merge.rc:1171 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1171 +#: Merge.rc:1173 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1174 +#: Merge.rc:1176 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:1179 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1180 +#: Merge.rc:1182 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1187 -#: Merge.rc:1943 +#: Merge.rc:1189 +#: Merge.rc:1945 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1192 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1192 +#: Merge.rc:1194 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1194 +#: Merge.rc:1196 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1196 +#: Merge.rc:1198 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1199 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1200 +#: Merge.rc:1202 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1202 +#: Merge.rc:1204 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1204 +#: Merge.rc:1206 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1206 +#: Merge.rc:1208 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1210 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1210 +#: Merge.rc:1212 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1227 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:1233 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1232 +#: Merge.rc:1234 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1233 +#: Merge.rc:1235 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1236 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1235 +#: Merge.rc:1237 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1241 +#: Merge.rc:1243 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1244 +#: Merge.rc:1246 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1247 +#: Merge.rc:1249 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1251 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1253 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1256 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1256 +#: Merge.rc:1258 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1258 +#: Merge.rc:1260 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1265 -#: Merge.rc:1513 -#: Merge.rc:1949 +#: Merge.rc:1267 +#: Merge.rc:1515 +#: Merge.rc:1951 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1268 +#: Merge.rc:1270 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1271 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1271 +#: Merge.rc:1273 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1274 +#: Merge.rc:1276 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1276 +#: Merge.rc:1278 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1278 +#: Merge.rc:1280 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1286 +#: Merge.rc:1288 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1291 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1294 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1294 +#: Merge.rc:1296 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1298 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1298 +#: Merge.rc:1300 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1300 +#: Merge.rc:1302 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1304 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1305 -#: Merge.rc:1308 +#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "present" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1308 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1309 +#: Merge.rc:1311 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1311 -#: Merge.rc:1316 +#: Merge.rc:1313 +#: Merge.rc:1318 #, c-format msgid "none" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1315 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1314 +#: Merge.rc:1316 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1318 +#: Merge.rc:1320 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1319 +#: Merge.rc:1321 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1320 +#: Merge.rc:1322 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1324 +#: Merge.rc:1326 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1333 +#: Merge.rc:1335 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1346 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1348 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1347 +#: Merge.rc:1349 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1357 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1358 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1357 +#: Merge.rc:1359 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1358 +#: Merge.rc:1360 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1359 +#: Merge.rc:1361 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1360 +#: Merge.rc:1362 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1361 +#: Merge.rc:1363 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1362 +#: Merge.rc:1364 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1363 +#: Merge.rc:1365 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1368 -#: Merge.rc:1373 -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 +#: Merge.rc:1370 +#: Merge.rc:1375 +#: Merge.rc:1380 +#: Merge.rc:1385 +#: Merge.rc:1390 +#: Merge.rc:1395 +#: Merge.rc:1400 +#: Merge.rc:1405 +#: Merge.rc:1410 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1418 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1421 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1422 -#: Merge.rc:1596 -#: Merge.rc:1600 -#: Merge.rc:1627 +#: Merge.rc:1424 +#: Merge.rc:1598 +#: Merge.rc:1602 +#: Merge.rc:1629 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1423 +#: Merge.rc:1425 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1426 +#: Merge.rc:1428 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1436 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1439 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1439 +#: Merge.rc:1441 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1441 +#: Merge.rc:1443 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1449 -#: Merge.rc:1950 +#: Merge.rc:1451 +#: Merge.rc:1952 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1454 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1456 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1457 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1459 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1460 +#: Merge.rc:1462 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1462 +#: Merge.rc:1464 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1470 +#: Merge.rc:1472 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1473 +#: Merge.rc:1475 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1474 +#: Merge.rc:1476 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1475 -#: Merge.rc:2341 +#: Merge.rc:1477 +#: Merge.rc:2343 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1478 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1479 -#: Merge.rc:1498 +#: Merge.rc:1481 +#: Merge.rc:1500 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1484 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1483 +#: Merge.rc:1485 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1488 +#: Merge.rc:1490 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1493 -#: Merge.rc:2335 +#: Merge.rc:1495 +#: Merge.rc:2337 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1502 +#: Merge.rc:1504 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1509 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1518 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1521 +#: Merge.rc:1524 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1525 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1524 +#: Merge.rc:1526 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1526 -#: Merge.rc:1529 +#: Merge.rc:1528 +#: Merge.rc:1531 #, c-format msgid "..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1529 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1530 +#: Merge.rc:1532 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1533 +#: Merge.rc:1535 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1534 -#: Merge.rc:1916 +#: Merge.rc:1536 +#: Merge.rc:1918 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1541 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1542 +#: Merge.rc:1544 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1546 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1548 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1548 +#: Merge.rc:1550 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1552 +#: Merge.rc:1554 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1553 +#: Merge.rc:1555 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1563 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1564 +#: Merge.rc:1566 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1566 +#: Merge.rc:1568 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1567 +#: Merge.rc:1569 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1568 +#: Merge.rc:1570 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1593 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1597 +#: Merge.rc:1599 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1603 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1609 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1608 +#: Merge.rc:1610 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1613 -#: Merge.rc:1951 +#: Merge.rc:1615 +#: Merge.rc:1953 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1616 +#: Merge.rc:1618 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1623 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1624 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1626 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1628 +#: Merge.rc:1630 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1629 +#: Merge.rc:1631 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1633 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1638 -#: Merge.rc:2243 +#: Merge.rc:1640 +#: Merge.rc:2245 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1642 +#: Merge.rc:1644 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1646 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1647 +#: Merge.rc:1649 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1651 +#: Merge.rc:1653 #, c-format msgid "No" msgstr "" -#: Merge.rc:1657 +#: Merge.rc:1659 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1660 +#: Merge.rc:1662 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1671 -#: Merge.rc:1952 +#: Merge.rc:1673 +#: Merge.rc:1954 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1674 +#: Merge.rc:1676 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1675 +#: Merge.rc:1677 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:1677 +#: Merge.rc:1679 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:1679 +#: Merge.rc:1681 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1681 +#: Merge.rc:1683 #, c-format msgid "Folder compare" msgstr "" -#: Merge.rc:1682 +#: Merge.rc:1684 #, c-format msgid "Add &Shell menu to context menu" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1708 +#: Merge.rc:1710 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1724 +#: Merge.rc:1726 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1741 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1745 +#: Merge.rc:1747 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1746 +#: Merge.rc:1748 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1749 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1748 +#: Merge.rc:1750 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1749 +#: Merge.rc:1751 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1750 +#: Merge.rc:1752 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1756 +#: Merge.rc:1758 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1757 +#: Merge.rc:1759 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1758 +#: Merge.rc:1760 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:1759 +#: Merge.rc:1761 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1760 +#: Merge.rc:1762 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:1761 +#: Merge.rc:1763 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:1762 +#: Merge.rc:1764 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:1763 +#: Merge.rc:1765 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:1764 +#: Merge.rc:1766 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:1769 +#: Merge.rc:1771 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1770 +#: Merge.rc:1772 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:1771 +#: Merge.rc:1773 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:1772 +#: Merge.rc:1774 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:1778 +#: Merge.rc:1780 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:1779 +#: Merge.rc:1781 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1780 +#: Merge.rc:1782 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1783 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1782 +#: Merge.rc:1784 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1785 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1784 +#: Merge.rc:1786 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:1789 +#: Merge.rc:1791 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:1790 +#: Merge.rc:1792 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:1796 -#: Merge.rc:1797 #: Merge.rc:1798 #: Merge.rc:1799 #: Merge.rc:1800 @@ -2778,2859 +2776,2861 @@ #: Merge.rc:1809 #: Merge.rc:1810 #: Merge.rc:1811 +#: Merge.rc:1812 +#: Merge.rc:1813 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1818 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1819 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1826 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1827 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:1833 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:1832 +#: Merge.rc:1834 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:1833 +#: Merge.rc:1835 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:1834 +#: Merge.rc:1836 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:1835 +#: Merge.rc:1837 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:1836 +#: Merge.rc:1838 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:1837 +#: Merge.rc:1839 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:1838 +#: Merge.rc:1840 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1841 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1848 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:1847 +#: Merge.rc:1849 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1848 +#: Merge.rc:1850 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1854 +#: Merge.rc:1856 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1855 +#: Merge.rc:1857 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1856 +#: Merge.rc:1858 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1857 +#: Merge.rc:1859 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1858 +#: Merge.rc:1860 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1859 +#: Merge.rc:1861 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1862 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1867 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1868 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1869 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1875 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1882 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1881 +#: Merge.rc:1883 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:1890 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1895 +#: Merge.rc:1897 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1901 -#: Merge.rc:1902 +#: Merge.rc:1903 +#: Merge.rc:1904 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1908 +#: Merge.rc:1910 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1911 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1915 +#: Merge.rc:1917 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1919 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1920 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1921 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1922 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1921 +#: Merge.rc:1923 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:1929 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1928 +#: Merge.rc:1930 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1929 +#: Merge.rc:1931 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1930 +#: Merge.rc:1932 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1931 +#: Merge.rc:1933 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1932 +#: Merge.rc:1934 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1934 +#: Merge.rc:1936 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1935 +#: Merge.rc:1937 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1945 +#: Merge.rc:1947 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1948 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1948 +#: Merge.rc:1950 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1961 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1962 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1961 +#: Merge.rc:1963 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1964 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1963 +#: Merge.rc:1965 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1969 +#: Merge.rc:1971 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1972 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1971 +#: Merge.rc:1973 #, c-format msgid "X64" msgstr "" -#: Merge.rc:1977 +#: Merge.rc:1979 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1980 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1979 +#: Merge.rc:1981 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1982 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1984 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1984 +#: Merge.rc:1986 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1990 +#: Merge.rc:1992 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1991 +#: Merge.rc:1993 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:1994 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1995 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1995 +#: Merge.rc:1997 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2003 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2002 +#: Merge.rc:2004 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2005 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2011 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:2010 +#: Merge.rc:2012 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2013 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:2012 +#: Merge.rc:2014 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:2020 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:2019 +#: Merge.rc:2021 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:2020 +#: Merge.rc:2022 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:2021 +#: Merge.rc:2023 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:2022 +#: Merge.rc:2024 #, c-format msgid "Size" msgstr "" -#: Merge.rc:2028 -#: Merge.rc:2653 +#: Merge.rc:2030 +#: Merge.rc:2655 #, c-format msgid "Name" msgstr "" -#: Merge.rc:2029 +#: Merge.rc:2031 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2030 +#: Merge.rc:2032 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2031 +#: Merge.rc:2033 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2032 -#: Merge.rc:2655 +#: Merge.rc:2034 +#: Merge.rc:2657 #, c-format msgid "Description" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2035 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2036 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2038 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2038 +#: Merge.rc:2040 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2040 +#: Merge.rc:2042 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2042 +#: Merge.rc:2044 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2045 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2047 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2049 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2055 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2061 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2068 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2074 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2075 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2076 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2077 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2076 +#: Merge.rc:2078 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2079 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2085 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2086 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2087 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2088 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2089 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2090 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2093 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2094 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2093 +#: Merge.rc:2095 #, c-format msgid "Undoing the last operation..." msgstr "" -#: Merge.rc:2094 +#: Merge.rc:2096 #, c-format msgid "Redoing the previous operation..." msgstr "" -#: Merge.rc:2100 +#: Merge.rc:2102 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2103 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2104 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2105 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2106 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2107 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2106 +#: Merge.rc:2108 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2107 +#: Merge.rc:2109 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2113 +#: Merge.rc:2115 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2114 +#: Merge.rc:2116 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2123 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2124 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2125 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2126 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2127 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:2128 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2127 +#: Merge.rc:2129 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2135 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2136 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2137 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2138 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2139 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2143 +#: Merge.rc:2145 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2144 +#: Merge.rc:2146 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2147 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2148 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2149 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2151 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2152 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2153 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2154 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2155 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2156 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2157 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?" msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2158 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2157 +#: Merge.rc:2159 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2158 +#: Merge.rc:2160 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2166 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2172 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2171 +#: Merge.rc:2173 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2176 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2177 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2178 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2179 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2180 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "" -#: Merge.rc:2184 -#: Merge.rc:2637 +#: Merge.rc:2186 +#: Merge.rc:2639 #, c-format msgid "None" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2187 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2188 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2188 +#: Merge.rc:2190 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2191 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2195 #: Merge.rc:2197 +#: Merge.rc:2199 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2196 #: Merge.rc:2198 +#: Merge.rc:2200 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2201 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2202 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2203 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2204 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2205 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2206 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2207 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2208 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2209 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2208 -#: Merge.rc:2224 +#: Merge.rc:2210 +#: Merge.rc:2226 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2209 -#: Merge.rc:2225 +#: Merge.rc:2211 +#: Merge.rc:2227 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2210 -#: Merge.rc:2226 +#: Merge.rc:2212 +#: Merge.rc:2228 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2211 -#: Merge.rc:2227 +#: Merge.rc:2213 +#: Merge.rc:2229 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2219 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2220 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2221 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2222 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2223 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2224 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2225 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2230 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2231 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2232 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2233 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2239 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2240 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2241 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2242 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2243 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2244 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2246 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2252 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2253 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2254 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2255 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2256 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2257 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2258 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2259 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2260 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2261 #, c-format ms... [truncated message content] |
From: <ki...@us...> - 2010-10-19 17:57:31
|
Revision: 7318 http://winmerge.svn.sourceforge.net/winmerge/?rev=7318&view=rev Author: kimmov Date: 2010-10-19 17:57:24 +0000 (Tue, 19 Oct 2010) Log Message: ----------- PATCH: [ 2726531 ] Show XML config files like XML files Submitted by bulklodd Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/MergeDoc.cpp branches/R2_14/Src/editlib/ccrystaltextview.cpp branches/R2_14/Src/editlib/ccrystaltextview.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:40:49 UTC (rev 7317) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:57:24 UTC (rev 7318) @@ -10,6 +10,7 @@ Show only "Copy to other side" item in file compare context menu (#2600787) Expand/collapse folders from keyboard (#2203904) + Improve detecting XML files in file compare (#2726531) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/MergeDoc.cpp =================================================================== --- branches/R2_14/Src/MergeDoc.cpp 2010-10-19 17:40:49 UTC (rev 7317) +++ branches/R2_14/Src/MergeDoc.cpp 2010-10-19 17:57:24 UTC (rev 7318) @@ -2316,6 +2316,17 @@ pRightDetail->SetTextType(sextR.c_str()); } + // If textypes of the files aren't recogzined by their extentions, + // try to recognize them using their first lines + if (!bLeftTyped && !bRightTyped) + { + CString sFirstLine; + m_ptBuf[0]->GetLine(0, sFirstLine); + bLeftTyped = pLeft->SetTextTypeByContent(sFirstLine); + m_ptBuf[1]->GetLine(0, sFirstLine); + bRightTyped = pRight->SetTextTypeByContent(sFirstLine); + } + // If other side didn't have recognized texttype, apply recognized // type to unrecognized one. (comparing file.cpp and file.bak applies // cpp file type to .bak file. Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-19 17:40:49 UTC (rev 7317) +++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-19 17:57:24 UTC (rev 7318) @@ -6186,6 +6186,19 @@ } } +// Analyze the first line of file to detect its type +// Mainly it works for xml files +bool CCrystalTextView:: +SetTextTypeByContent (LPCTSTR pszContent) +{ + int nLen; + if (::FindStringHelper(pszContent, _T("^\\s*\\<\\?xml\\s+.+?\\?\\>\\s*$"), + FIND_REGEXP, nLen) == 0) + { + return SetTextType(CCrystalTextView::SRC_XML); + } + return false; +} //////////////////////////////////////////////////////////////////////////// #pragma warning ( default : 4100 ) Modified: branches/R2_14/Src/editlib/ccrystaltextview.h =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-19 17:40:49 UTC (rev 7317) +++ branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-19 17:57:24 UTC (rev 7318) @@ -790,6 +790,7 @@ virtual bool SetTextType (LPCTSTR pszExt); virtual bool SetTextType (CCrystalTextView::TextType enuType); virtual bool SetTextType (CCrystalTextView::TextDefinition *def); + virtual bool SetTextTypeByContent (LPCTSTR pszContent); static void LoadSettings (); static void SaveSettings (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-20 17:00:03
|
Revision: 7324 http://winmerge.svn.sourceforge.net/winmerge/?rev=7324&view=rev Author: gerundt Date: 2010-10-20 16:59:57 +0000 (Wed, 20 Oct 2010) Log Message: ----------- PATCH: [ 2788142 ] Improve startup time Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/BCMenu.cpp Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 15:40:39 UTC (rev 7323) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 16:59:57 UTC (rev 7324) @@ -11,6 +11,7 @@ context menu (#2600787) Expand/collapse folders from keyboard (#2203904) Improve detecting XML files in file compare (#2726531) + Improve startup time (#2788142) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/BCMenu.cpp =================================================================== --- branches/R2_14/Src/BCMenu.cpp 2010-10-20 15:40:39 UTC (rev 7323) +++ branches/R2_14/Src/BCMenu.cpp 2010-10-20 16:59:57 UTC (rev 7324) @@ -2237,35 +2237,33 @@ void BCMenu::GetTransparentBitmap(CBitmap &bmp) { CDC ddc; - COLORREF bgcol,col,newcol; BITMAP BitMap; bmp.GetBitmap(&BitMap); ddc.CreateCompatibleDC(NULL); CBitmap * pddcOldBmp = ddc.SelectObject(&bmp); - // use this to get the background color, takes into account color shifting - CDC ddc2; - CBrush brush; - CBitmap bmp2; - ddc2.CreateCompatibleDC(NULL); - bmp2.CreateCompatibleBitmap(&ddc,BitMap.bmWidth,BitMap.bmHeight); - col=RGB(255,0,255); // Original was RGB(192,192,192) - brush.CreateSolidBrush(col); - CBitmap * pddcOldBmp2 = ddc2.SelectObject(&bmp2); - CRect rect(0,0,BitMap.bmWidth,BitMap.bmHeight); - ddc2.FillRect(rect,&brush); - bgcol=ddc2.GetPixel(1,1); - brush.DeleteObject(); - ddc2.SelectObject(pddcOldBmp2); - newcol=GetSysColor(COLOR_3DFACE); + CDC ddcMask; + CBitmap bmpMask; + ddcMask.CreateCompatibleDC(NULL); + bmpMask.CreateBitmap(BitMap.bmWidth, BitMap.bmHeight, 1, 1, NULL); + CBitmap * pddcMaskOldBmp = ddcMask.SelectObject(&bmpMask); - for(int i=0;i<BitMap.bmWidth;++i){ - for(int j=0;j<BitMap.bmHeight;++j){ - col=ddc.GetPixel(i,j); - if(col==bgcol)ddc.SetPixel(i,j,newcol); - } - } + /* Generate mask */ + ddc.SetBkColor(RGB(255, 0, 255)); + ddcMask.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddc, 0, 0, SRCCOPY); + + /* Remove transparent areas from bmp */ + ddc.SetBkColor(RGB(0, 0, 0)); + ddc.SetTextColor(RGB(255, 255, 255)); + ddc.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddcMask, 0, 0, SRCAND); + + /* Fill transparent areas with COLOR_3DFACE */ + ddc.SetBkColor(GetSysColor(COLOR_3DFACE)); + ddc.SetTextColor(RGB(0, 0, 0)); + ddc.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddcMask, 0, 0, SRCPAINT); + + ddcMask.SelectObject(pddcMaskOldBmp); ddc.SelectObject(pddcOldBmp); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-20 17:51:00
|
Revision: 7325 http://winmerge.svn.sourceforge.net/winmerge/?rev=7325&view=rev Author: gerundt Date: 2010-10-20 17:50:53 +0000 (Wed, 20 Oct 2010) Log Message: ----------- PATCH: [ 2638608 ] Autoprediff Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/MainFrm.cpp branches/R2_14/Src/MainFrm.h branches/R2_14/Src/Merge.rc branches/R2_14/Src/resource.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 16:59:57 UTC (rev 7324) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 17:50:53 UTC (rev 7325) @@ -12,6 +12,7 @@ Expand/collapse folders from keyboard (#2203904) Improve detecting XML files in file compare (#2726531) Improve startup time (#2788142) + Add menuitems for selecting automatic or manual prediffing (#2638608) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/MainFrm.cpp =================================================================== --- branches/R2_14/Src/MainFrm.cpp 2010-10-20 16:59:57 UTC (rev 7324) +++ branches/R2_14/Src/MainFrm.cpp 2010-10-20 17:50:53 UTC (rev 7325) @@ -189,6 +189,8 @@ ON_WM_SETCURSOR() ON_COMMAND_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnPluginUnpackMode) ON_UPDATE_COMMAND_UI_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnUpdatePluginUnpackMode) + ON_COMMAND_RANGE(ID_PREDIFFER_MANUAL, ID_PREDIFFER_AUTO, OnPluginPrediffMode) + ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFFER_MANUAL, ID_PREDIFFER_AUTO, OnUpdatePluginPrediffMode) ON_UPDATE_COMMAND_UI(ID_RELOAD_PLUGINS, OnUpdateReloadPlugins) ON_COMMAND(ID_RELOAD_PLUGINS, OnReloadPlugins) ON_COMMAND(ID_HELP_GETCONFIG, OnSaveConfigData) @@ -284,8 +286,7 @@ InitializeSourceControlMembers(); g_bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), PLUGIN_MANUAL); - // uncomment this when the GUI allows to toggle the mode -// g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL); + g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL); m_pSyntaxColors = new SyntaxColors(); if (m_pSyntaxColors) @@ -1081,6 +1082,9 @@ CString strLeft = pszLeft; CString strRight = pszRight; + g_bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), PLUGIN_MANUAL); + g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL); + PackingInfo infoUnpacker; BOOL bROLeft = dwLeftFlags & FFILEOPEN_READONLY; @@ -2230,7 +2234,32 @@ if (pCmdUI->m_nID == ID_UNPACK_AUTO) pCmdUI->SetRadio(PLUGIN_AUTO == g_bUnpackerMode); } +void CMainFrame::OnPluginPrediffMode(UINT nID ) +{ + switch (nID) + { + case ID_PREDIFFER_MANUAL: + g_bPredifferMode = PLUGIN_MANUAL; + break; + case ID_PREDIFFER_AUTO: + g_bPredifferMode = PLUGIN_AUTO; + break; + } + theApp.WriteProfileInt(_T("Settings"), _T("PredifferMode"), g_bPredifferMode); +} +void CMainFrame::OnUpdatePluginPrediffMode(CCmdUI* pCmdUI) +{ + if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED)) + pCmdUI->Enable(TRUE); + else + pCmdUI->Enable(FALSE); + + if (pCmdUI->m_nID == ID_PREDIFFER_MANUAL) + pCmdUI->SetRadio(PLUGIN_MANUAL == g_bPredifferMode); + if (pCmdUI->m_nID == ID_PREDIFFER_AUTO) + pCmdUI->SetRadio(PLUGIN_AUTO == g_bPredifferMode); +} /** * @brief Called when "Reload Plugins" item is updated */ Modified: branches/R2_14/Src/MainFrm.h =================================================================== --- branches/R2_14/Src/MainFrm.h 2010-10-20 16:59:57 UTC (rev 7324) +++ branches/R2_14/Src/MainFrm.h 2010-10-20 17:50:53 UTC (rev 7325) @@ -307,6 +307,8 @@ afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); afx_msg void OnUpdatePluginUnpackMode(CCmdUI* pCmdUI); afx_msg void OnPluginUnpackMode(UINT nID); + afx_msg void OnUpdatePluginPrediffMode(CCmdUI* pCmdUI); + afx_msg void OnPluginPrediffMode(UINT nID); afx_msg void OnUpdateReloadPlugins(CCmdUI* pCmdUI); afx_msg void OnReloadPlugins(); afx_msg void OnSaveConfigData(); Modified: branches/R2_14/Src/Merge.rc =================================================================== --- branches/R2_14/Src/Merge.rc 2010-10-20 16:59:57 UTC (rev 7324) +++ branches/R2_14/Src/Merge.rc 2010-10-20 17:50:53 UTC (rev 7325) @@ -149,6 +149,9 @@ BEGIN MENUITEM "&List...", ID_PLUGINS_LIST MENUITEM SEPARATOR + MENUITEM "Ma&nual Prediffer", ID_PREDIFFER_MANUAL + MENUITEM "A&utomatic Prediffer", ID_PREDIFFER_AUTO + MENUITEM SEPARATOR MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO MENUITEM SEPARATOR Modified: branches/R2_14/Src/resource.h =================================================================== --- branches/R2_14/Src/resource.h 2010-10-20 16:59:57 UTC (rev 7324) +++ branches/R2_14/Src/resource.h 2010-10-20 17:50:53 UTC (rev 7325) @@ -1071,6 +1071,8 @@ #define ID_HELP_TRANSLATIONS 33171 #define ID_VIEW_ZOOMNORMAL 33172 #define ID_PLUGINS_LIST 33173 +#define ID_PREDIFFER_MANUAL 33174 +#define ID_PREDIFFER_AUTO 33175 #define ID_VIEW_EXPAND 33176 #define ID_VIEW_COLLAPSE 33177 // Next default values for new objects @@ -1078,8 +1080,8 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 237 -#define _APS_NEXT_COMMAND_VALUE 33174 +#define _APS_NEXT_RESOURCE_VALUE 238 +#define _APS_NEXT_COMMAND_VALUE 33178 #define _APS_NEXT_CONTROL_VALUE 1345 #define _APS_NEXT_SYMED_VALUE 113 #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 07:06:20
|
Revision: 7331 http://winmerge.svn.sourceforge.net/winmerge/?rev=7331&view=rev Author: gerundt Date: 2010-10-21 07:06:13 +0000 (Thu, 21 Oct 2010) Log Message: ----------- BUG: [ 3025855 ] Untranslated strings in folder compare window Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/DirFrame.cpp branches/R2_14/Src/DirFrame.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 00:37:16 UTC (rev 7330) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 07:06:13 UTC (rev 7331) @@ -6,6 +6,8 @@ WinMerge 2.13.21 Improve startup time (#2788142) Add menuitems for selecting automatic or manual prediffing (#2638608) + Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed + in status bar (#3025855) WinMerge 2.13.20 - 2010-10-20 (r7319) Add missing keywords to Pascal highlighter (#2834192) Modified: branches/R2_14/Src/DirFrame.cpp =================================================================== --- branches/R2_14/Src/DirFrame.cpp 2010-10-21 00:37:16 UTC (rev 7330) +++ branches/R2_14/Src/DirFrame.cpp 2010-10-21 07:06:13 UTC (rev 7331) @@ -151,6 +151,20 @@ } /** + * @brief Handle translation of default messages on the status bar + */ +void CDirFrame::GetMessageString(UINT nID, CString& rMessage) const +{ + // load appropriate string + const String s = theApp.LoadString(nID); + if (!AfxExtractSubString(rMessage, &*s.begin(), 0)) + { + // not found + TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID); + } +} + +/** * @brief Get the interface to the header (path) bar */ IHeaderBar * CDirFrame::GetHeaderInterface() { Modified: branches/R2_14/Src/DirFrame.h =================================================================== --- branches/R2_14/Src/DirFrame.h 2010-10-21 00:37:16 UTC (rev 7330) +++ branches/R2_14/Src/DirFrame.h 2010-10-21 07:06:13 UTC (rev 7331) @@ -57,6 +57,7 @@ void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; }; // Overrides + virtual void GetMessageString(UINT nID, CString& rMessage) const; // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CDirFrame) public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 17:17:11
|
Revision: 7332 http://winmerge.svn.sourceforge.net/winmerge/?rev=7332&view=rev Author: gerundt Date: 2010-10-21 17:17:04 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Initialize folder selection dialog to currently selected folder in options dialog - R2_14 Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/PropBackups.cpp branches/R2_14/Src/PropRegistry.cpp Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 07:06:13 UTC (rev 7331) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 17:17:04 UTC (rev 7332) @@ -17,6 +17,8 @@ context menu (#2600787) Expand/collapse folders from keyboard (#2203904) Improve detecting XML files in file compare (#2726531) + Initialize folder selection dialog to currently selected folder in + options dialog (r6570) New translation: Persian (#2877121, #3065119) New translation: Serbian (#3017674, #3065119) Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime Modified: branches/R2_14/Src/PropBackups.cpp =================================================================== --- branches/R2_14/Src/PropBackups.cpp 2010-10-21 07:06:13 UTC (rev 7331) +++ branches/R2_14/Src/PropBackups.cpp 2010-10-21 17:17:04 UTC (rev 7332) @@ -113,7 +113,7 @@ void CPropBackups::OnBnClickedBackupBrowse() { CString path; - if (SelectFolder(path, NULL, 0, GetSafeHwnd())) + if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd())) { SetDlgItemText(IDC_BACKUP_FOLDER, path); } Modified: branches/R2_14/Src/PropRegistry.cpp =================================================================== --- branches/R2_14/Src/PropRegistry.cpp 2010-10-21 07:06:13 UTC (rev 7331) +++ branches/R2_14/Src/PropRegistry.cpp 2010-10-21 17:17:04 UTC (rev 7332) @@ -148,7 +148,7 @@ void CPropRegistry::OnBrowseFilterPath() { CString path; - if (SelectFolder(path, NULL, IDS_OPEN_TITLE, GetSafeHwnd())) + if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd())) { SetDlgItemText(IDC_FILTER_USER_PATH, path); } @@ -158,7 +158,7 @@ void CPropRegistry::OnBrowseTmpFolder() { CString path; - if (SelectFolder(path, NULL, NULL, GetSafeHwnd())) + if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd())) { SetDlgItemText(IDC_TMPFOLDER_NAME, path); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 18:29:23
|
Revision: 7333 http://winmerge.svn.sourceforge.net/winmerge/?rev=7333&view=rev Author: gerundt Date: 2010-10-21 18:29:15 +0000 (Thu, 21 Oct 2010) Log Message: ----------- PATCH: [ 2823536 ] Add accelerator keys for Shell context menu Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/ShellExtension/ShellExtension.rc Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 17:17:04 UTC (rev 7332) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 18:29:15 UTC (rev 7333) @@ -6,6 +6,7 @@ WinMerge 2.13.21 Improve startup time (#2788142) Add menuitems for selecting automatic or manual prediffing (#2638608) + Add accelerator keys for Shell context menu (#2823536) Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed in status bar (#3025855) Modified: branches/R2_14/ShellExtension/ShellExtension.rc =================================================================== --- branches/R2_14/ShellExtension/ShellExtension.rc 2010-10-21 17:17:04 UTC (rev 7332) +++ branches/R2_14/ShellExtension/ShellExtension.rc 2010-10-21 18:29:15 UTC (rev 7333) @@ -358,15 +358,15 @@ STRINGTABLE BEGIN IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "WinMerge" + IDS_CONTEXT_MENU "&WinMerge" IDS_CONTEXT_HELP "Open with WinMerge" IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items" - IDS_COMPARE "Compare" - IDS_COMPARE_ELLIPSIS "Compare..." - IDS_COMPARE_TO "Compare To" + IDS_COMPARE "&Compare" + IDS_COMPARE_ELLIPSIS "&Compare..." + IDS_COMPARE_TO "&Compare To" IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_FIRST "Re-select First" + IDS_RESELECT_FIRST "&Re-select First" END #endif // English (U.S.) resources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 22:48:18
|
Revision: 7338 http://winmerge.svn.sourceforge.net/winmerge/?rev=7338&view=rev Author: gerundt Date: 2010-10-21 22:48:11 +0000 (Thu, 21 Oct 2010) Log Message: ----------- PATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability Modified Paths: -------------- branches/R2_14/Docs/Users/ChangeLog.txt branches/R2_14/Src/LineFiltersDlg.cpp branches/R2_14/Src/LineFiltersDlg.h branches/R2_14/Src/Merge.rc branches/R2_14/Src/resource.h Modified: branches/R2_14/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 22:20:18 UTC (rev 7337) +++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 22:48:11 UTC (rev 7338) @@ -7,6 +7,7 @@ Improve startup time (#2788142) Add menuitems for selecting automatic or manual prediffing (#2638608) Add accelerator keys for Shell context menu (#2823536) + Improve editing of linefilter regular expressions (#3015416) Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed in status bar (#3025855) Modified: branches/R2_14/Src/LineFiltersDlg.cpp =================================================================== --- branches/R2_14/Src/LineFiltersDlg.cpp 2010-10-21 22:20:18 UTC (rev 7337) +++ branches/R2_14/Src/LineFiltersDlg.cpp 2010-10-21 22:48:11 UTC (rev 7338) @@ -11,7 +11,6 @@ #include "LineFiltersList.h" #include "MainFrm.h" #include "LineFiltersDlg.h" -#include "dllver.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -33,8 +32,6 @@ LineFiltersDlg::LineFiltersDlg() : CPropertyPage(LineFiltersDlg::IDD) , m_pList(NULL) -, m_bEditing(FALSE) -, m_editedIndex(-1) { //{{AFX_DATA_INIT(LineFiltersDlg) m_bIgnoreRegExp = FALSE; @@ -53,22 +50,19 @@ DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp); //}}AFX_DATA_MAP DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList); - DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp); - DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp); } BEGIN_MESSAGE_MAP(LineFiltersDlg, CPropertyPage) //{{AFX_MSG_MAP(LineFiltersDlg) - ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp) ON_COMMAND(ID_HELP, OnHelp) //}}AFX_MSG_MAP ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn) ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn) ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn) - ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave) ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList) - ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox) + ON_NOTIFY(LVN_KEYDOWN, IDC_LFILTER_LIST, OnLvnKeyDownLfilterList) + ON_NOTIFY(LVN_ENDLABELEDIT, IDC_LFILTER_LIST, OnEndLabelEditLfilterList) END_MESSAGE_MAP() @@ -96,48 +90,23 @@ void LineFiltersDlg::InitList() { // Show selection across entire row. - DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT | - LVS_EX_ONECLICKACTIVATE; - // Also enable infotips if they have new enough version for our - // custom draw code - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) - newstyle |= LVS_EX_INFOTIP; + // Also enable infotips. + m_filtersList.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); - m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS); - - m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle); - String title = theApp.LoadString(IDS_FILTERLINE_REGEXP); m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500); int count = m_pList->GetCount(); - int ind = -1; for (int i = 0; i < count; i++) { const LineFilterItem &item = m_pList->GetAt(i); - ind = AddRow(item.filterStr.c_str(), item.enabled); + AddRow(item.filterStr.c_str(), item.enabled); } - if (count > 0) - { - m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED); - BOOL bPartialOk = FALSE; - m_filtersList.EnsureVisible(0, bPartialOk); - CString text = m_filtersList.GetItemText(0, 0); - m_editRegexp.SetWindowText(text); - } + m_filtersList.SetItemState(0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); UpdateData(FALSE); } /** - * @brief User clicked filter enable/disable checkbox. - */ -void LineFiltersDlg::OnIgnoreregexp() -{ - UpdateData(); -} - -/** * @brief Open help from mainframe when user presses F1. */ void LineFiltersDlg::OnHelp() @@ -154,7 +123,7 @@ int LineFiltersDlg::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/) { int items = m_filtersList.GetItemCount(); - int ind = m_filtersList.InsertItem(items + 1, filter); + int ind = m_filtersList.InsertItem(items, filter); m_filtersList.SetCheck(ind, enabled); return ind; } @@ -168,14 +137,7 @@ int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED); if (sel > -1) { - CString text = m_filtersList.GetItemText(sel, 0); - m_editRegexp.SetWindowText(text); - m_editRegexp.SetReadOnly(FALSE); - m_saveRegexp.EnableWindow(TRUE); - m_editRegexp.SetFocus(); - m_editRegexp.SetSel(0, -1); - m_bEditing = TRUE; - m_editedIndex = sel; + m_filtersList.EditLabel(sel); } } @@ -188,8 +150,7 @@ if (ind >= -1) { m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED); - BOOL bPartialOk = FALSE; - m_filtersList.EnsureVisible(ind, bPartialOk); + m_filtersList.EnsureVisible(ind, FALSE); EditSelectedFilter(); } } @@ -234,8 +195,7 @@ */ void LineFiltersDlg::OnBnClickedLfilterRemovebtn() { - int sel =- 1; - sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); + int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED); if (sel != -1) { m_filtersList.DeleteItem(sel); @@ -251,78 +211,31 @@ } /** - * @brief Called when Save button is clicked. + * @brief Called when the user activates an item. */ -void LineFiltersDlg::OnBnClickedLfilterEditsave() -{ - SaveItem(); -} - -/** - * @brief Cancel editing of filter when ESC is pressed. - */ -BOOL LineFiltersDlg::PreTranslateMessage(MSG* pMsg) -{ - if (m_bEditing) - { - // Handle Esc key press - if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE) - { - m_saveRegexp.EnableWindow(FALSE); - m_editRegexp.SetReadOnly(TRUE); - m_bEditing = FALSE; - m_filtersList.SetFocus(); - int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED); - if (sel > -1) - { - CString text = m_filtersList.GetItemText(sel, 0); - m_editRegexp.SetWindowText(text); - } - return TRUE; - } - } - return CPropertyPage::PreTranslateMessage(pMsg); -} - -/** - * @brief Called when selected item in list changes. - */ void LineFiltersDlg::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult) { - LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR); - int item = pNMIA->iItem; - if (m_bEditing) - { - m_saveRegexp.EnableWindow(FALSE); - m_editRegexp.SetReadOnly(TRUE); - m_bEditing = FALSE; - } - CString text = m_filtersList.GetItemText(item, 0); - m_editRegexp.SetWindowText(text); + EditSelectedFilter(); *pResult = 0; } /** - * @brief Save the current filter in edit box. + * @brief Called when a key has been pressed while the list has the focus. */ -void LineFiltersDlg::SaveItem() +void LineFiltersDlg::OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult) { - if (m_bEditing) + LPNMKEY pNMKey = reinterpret_cast<LPNMKEY>(pNMHDR); + if (LOWORD(pNMKey->nVKey) == VK_F2) { - CString text; - m_editRegexp.GetWindowText(text); - m_filtersList.SetItemText(m_editedIndex, 0, text); - m_bEditing = FALSE; - m_editRegexp.SetReadOnly(TRUE); - m_saveRegexp.EnableWindow(FALSE); - m_editedIndex = -1; + EditSelectedFilter(); } + *pResult = 0; } /** - * @brief Called when filter edit box loses its focus. + * @brief Called when in-place editing has finished. */ -void LineFiltersDlg::OnEnKillfocusLfilterEditbox() +void LineFiltersDlg::OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult) { - SaveItem(); + *pResult = 1; } Modified: branches/R2_14/Src/LineFiltersDlg.h =================================================================== --- branches/R2_14/Src/LineFiltersDlg.h 2010-10-21 22:20:18 UTC (rev 7337) +++ branches/R2_14/Src/LineFiltersDlg.h 2010-10-21 22:48:11 UTC (rev 7338) @@ -46,32 +46,25 @@ // Generated message map functions //{{AFX_MSG(LineFiltersDlg) virtual BOOL OnInitDialog(); - afx_msg void OnIgnoreregexp(); afx_msg void OnHelp(); virtual void OnOK(); afx_msg void OnBnClickedLfilterAddBtn(); afx_msg void OnBnClickedLfilterEditbtn(); afx_msg void OnBnClickedLfilterRemovebtn(); - virtual BOOL PreTranslateMessage(MSG* pMsg); - afx_msg void OnBnClickedLfilterEditsave(); afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult); - afx_msg void OnEnKillfocusLfilterEditbox(); + afx_msg void OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult); + afx_msg void OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult); //}}AFX_MSG DECLARE_MESSAGE_MAP() void InitList(); int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE); void EditSelectedFilter(); - void SaveItem(); private: CListCtrl m_filtersList; /**< List control having filter strings */ - CEdit m_editRegexp; /**< Editbox for editing filter */ - CButton m_saveRegexp; /**< Button for saving edited filter */ LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */ - BOOL m_bEditing; /**< Are we editing a filter string? */ - int m_editedIndex; /**< Index of the item being edited. */ }; //{{AFX_INSERT_LOCATION}} Modified: branches/R2_14/Src/Merge.rc =================================================================== --- branches/R2_14/Src/Merge.rc 2010-10-21 22:20:18 UTC (rev 7337) +++ branches/R2_14/Src/Merge.rc 2010-10-21 22:48:11 UTC (rev 7338) @@ -895,10 +895,7 @@ 351,8 CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | - LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105 - EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL | - ES_READONLY - PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED + LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,121 PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14 PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14 PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14 Modified: branches/R2_14/Src/resource.h =================================================================== --- branches/R2_14/Src/resource.h 2010-10-21 22:20:18 UTC (rev 7337) +++ branches/R2_14/Src/resource.h 2010-10-21 22:48:11 UTC (rev 7338) @@ -430,10 +430,8 @@ #define IDC_LFILTER_LIST 1327 #define IDC_LFILTER_ADDBTN 1328 #define IDC_LFILTER_EDITBTN 1329 -#define IDC_LFILTER_EDITBOX 1330 #define IDC_LFILTER_REMOVEBTN 1331 #define IDC_BUTTON2 1332 -#define IDC_LFILTER_EDITSAVE 1333 #define IDC_ABOUTBOX_ICON 1334 #define IDC_ASK_MULTIWINDOW_CLOSE 1335 #define IDC_COLDLG_LIST 1336 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-24 18:45:51
|
Revision: 7350 http://winmerge.svn.sourceforge.net/winmerge/?rev=7350&view=rev Author: kimmov Date: 2010-10-24 18:45:42 +0000 (Sun, 24 Oct 2010) Log Message: ----------- Upgrade VS solution / project files to VS 2005 versions. Modified Paths: -------------- branches/R2_14/Externals/expat/examples/elements.vcproj branches/R2_14/Externals/expat/examples/outline.vcproj branches/R2_14/Externals/expat/expat.sln branches/R2_14/Externals/expat/lib/expat.vcproj branches/R2_14/Externals/expat/lib/expat_static.vcproj branches/R2_14/Externals/expat/lib/expatw.vcproj branches/R2_14/Externals/expat/lib/expatw_static.vcproj branches/R2_14/Externals/expat/xmlwf/xmlwf.vcproj branches/R2_14/Externals/pcre/Win32/PCRE.sln branches/R2_14/Externals/pcre/Win32/pcre.vcproj branches/R2_14/Externals/scew/win32/scew.vcproj branches/R2_14/ShellExtension/ShellExtension.vcproj branches/R2_14/Src/Merge.vcproj branches/R2_14/WinMerge.sln Modified: branches/R2_14/Externals/expat/examples/elements.vcproj =================================================================== --- branches/R2_14/Externals/expat/examples/elements.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/examples/elements.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,24 +1,46 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="elements" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\../../../Build/expat/elements/Debug" IntermediateDirectory=".\../../../BuildTmp/expat/elements/Debug" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\lib" @@ -31,105 +53,146 @@ ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Debug/" BrowseInformation="1" WarningLevel="3" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" DebugInformationFormat="4" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib" OutputFile=".\../../../Build/expat/elements/Debug/elements.exe" LinkIncremental="2" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../Build/expat/lib/Debug_static" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\../../../Build/expat/elements/Release" IntermediateDirectory=".\../../../BuildTmp/expat/elements/Release" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\lib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC" - StringPooling="TRUE" + StringPooling="true" RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../../../BuildTmp/expat/elements/Release/elements.pch" AssemblerListingLocation=".\../../../BuildTmp/expat/elements/Release/" ObjectFile=".\../../../BuildTmp/expat/elements/Release/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Release/" WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> + SuppressStartupBanner="true" + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib" OutputFile=".\../../../Build/expat/elements/Release/elements.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../Build/expat/lib/Release_static" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -137,36 +200,44 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > <File - RelativePath="elements.c"> + RelativePath="elements.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter="h;hpp;hxx;hm;inl" + > </Filter> <Filter Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > </Filter> </Files> <Globals> Modified: branches/R2_14/Externals/expat/examples/outline.vcproj =================================================================== --- branches/R2_14/Externals/expat/examples/outline.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/examples/outline.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,24 +1,46 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="outline" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{FD603999-011A-458C-9677-D596E25A620C}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\../../../Build/expat/outline/Debug" IntermediateDirectory=".\../../../BuildTmp/expat/outline/Debug" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\lib" @@ -30,101 +52,142 @@ ObjectFile=".\../../../BuildTmp/expat/outline/Debug/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Debug/" WarningLevel="3" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" DebugInformationFormat="4" - CompileAs="0"/> + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile=".\../../../Build/expat/outline/Debug/outline.exe" LinkIncremental="2" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" + SuppressStartupBanner="true" + GenerateDebugInformation="true" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\../../../Build/expat/outline/Release" IntermediateDirectory=".\../../../BuildTmp/expat/outline/Release" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\lib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" + StringPooling="true" RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../../../BuildTmp/expat/outline/Release/outline.pch" AssemblerListingLocation=".\../../../BuildTmp/expat/outline/Release/" ObjectFile=".\../../../BuildTmp/expat/outline/Release/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Release/" WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> + SuppressStartupBanner="true" + CompileAs="0" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile=".\../../../Build/expat/outline/Release/outline.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -132,35 +195,43 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > <File - RelativePath="outline.c"> + RelativePath="outline.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter="h;hpp;hxx;hm;inl" + > </Filter> <Filter Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > </Filter> </Files> <Globals> Modified: branches/R2_14/Externals/expat/expat.sln =================================================================== --- branches/R2_14/Externals/expat/expat.sln 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/expat.sln 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,24 +1,17 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "examples\elements.vcproj", "{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}" ProjectSection(ProjectDependencies) = postProject {464DBF5A-69E8-4E1A-8401-171371B86299} = {464DBF5A-69E8-4E1A-8401-171371B86299} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "lib\expat.vcproj", "{ACAE29AF-D15F-402E-AE0A-93141CF439C6}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "lib\expat_static.vcproj", "{464DBF5A-69E8-4E1A-8401-171371B86299}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw", "lib\expatw.vcproj", "{AC9279F5-5C6F-477F-AA3B-A42F8859D236}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw_static", "lib\expatw_static.vcproj", "{4815F7F0-BA32-4D79-A041-A146B0130D9E}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "outline", "examples\outline.vcproj", "{FD603999-011A-458C-9677-D596E25A620C}" ProjectSection(ProjectDependencies) = postProject @@ -31,44 +24,41 @@ EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.ActiveCfg = Debug|Win32 + {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.Build.0 = Debug|Win32 + {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.ActiveCfg = Release|Win32 + {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.Build.0 = Release|Win32 + {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.Build.0 = Debug|Win32 + {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.ActiveCfg = Release|Win32 + {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.Build.0 = Release|Win32 + {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.ActiveCfg = Debug|Win32 + {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.Build.0 = Debug|Win32 + {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.ActiveCfg = Release|Win32 + {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.Build.0 = Release|Win32 + {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.ActiveCfg = Debug|Win32 + {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.Build.0 = Debug|Win32 + {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.ActiveCfg = Release|Win32 + {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.Build.0 = Release|Win32 + {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.Build.0 = Debug|Win32 + {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.ActiveCfg = Release|Win32 + {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.Build.0 = Release|Win32 + {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.Build.0 = Debug|Win32 + {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.ActiveCfg = Release|Win32 + {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.Build.0 = Release|Win32 + {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.Build.0 = Debug|Win32 + {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.ActiveCfg = Release|Win32 + {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.ActiveCfg = Debug|Win32 - {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.Build.0 = Debug|Win32 - {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.ActiveCfg = Release|Win32 - {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.Build.0 = Release|Win32 - {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.ActiveCfg = Debug|Win32 - {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.Build.0 = Debug|Win32 - {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.ActiveCfg = Release|Win32 - {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.Build.0 = Release|Win32 - {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.ActiveCfg = Debug|Win32 - {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.Build.0 = Debug|Win32 - {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.ActiveCfg = Release|Win32 - {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.Build.0 = Release|Win32 - {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.ActiveCfg = Debug|Win32 - {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.Build.0 = Debug|Win32 - {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.ActiveCfg = Release|Win32 - {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.Build.0 = Release|Win32 - {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.ActiveCfg = Debug|Win32 - {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.Build.0 = Debug|Win32 - {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.ActiveCfg = Release|Win32 - {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.Build.0 = Release|Win32 - {FD603999-011A-458C-9677-D596E25A620C}.Debug.ActiveCfg = Debug|Win32 - {FD603999-011A-458C-9677-D596E25A620C}.Debug.Build.0 = Debug|Win32 - {FD603999-011A-458C-9677-D596E25A620C}.Release.ActiveCfg = Release|Win32 - {FD603999-011A-458C-9677-D596E25A620C}.Release.Build.0 = Release|Win32 - {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.ActiveCfg = Debug|Win32 - {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.Build.0 = Debug|Win32 - {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.ActiveCfg = Release|Win32 - {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.Build.0 = Release|Win32 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection EndGlobal Modified: branches/R2_14/Externals/expat/lib/expat.vcproj =================================================================== --- branches/R2_14/Externals/expat/lib/expat.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/lib/expat.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,24 +1,50 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="expat" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{ACAE29AF-D15F-402E-AE0A-93141CF439C6}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\../../../Build/expat/lib/Debug" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug" ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL" @@ -30,108 +56,145 @@ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug/" BrowseInformation="1" WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile="../../../Build/expat/lib/Debug/libexpat.dll" LinkIncremental="2" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ModuleDefinitionFile=".\libexpat.def" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" ImportLibrary=".\../../../Build/expat/lib/Debug/libexpat.lib" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\../../../Build/expat/lib/Release" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release" ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;COMPILED_FROM_DSP" - StringPooling="TRUE" + StringPooling="true" RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release/expat.pch" AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release/" ObjectFile=".\../../../BuildTmp/expat/lib/Release/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release/" WarningLevel="3" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="true" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile="../../../Build/expat/lib/Release/libexpat.dll" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ModuleDefinitionFile=".\libexpat.def" ImportLibrary=".\../../../Build/expat/lib/Release/libexpat.lib" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -139,150 +202,191 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > <File - RelativePath="libexpat.def"> + RelativePath="libexpat.def" + > </File> <File - RelativePath="xmlparse.c"> + RelativePath="xmlparse.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)" - ExceptionHandling="FALSE" + ExceptionHandling="0" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)" + /> </FileConfiguration> </File> <File - RelativePath="xmlrole.c"> + RelativePath="xmlrole.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)" + /> </FileConfiguration> </File> <File - RelativePath="xmltok.c"> + RelativePath="xmltok.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_impl.c"> + RelativePath="xmltok_impl.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_ns.c"> + RelativePath="xmltok_ns.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)" + /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter="h;hpp;hxx;hm;inl" + > <File - RelativePath="ascii.h"> + RelativePath="ascii.h" + > </File> <File - RelativePath="asciitab.h"> + RelativePath="asciitab.h" + > </File> <File - RelativePath="expat.h"> + RelativePath="expat.h" + > </File> <File - RelativePath="expat_external.h"> + RelativePath="expat_external.h" + > </File> <File - RelativePath="iasciitab.h"> + RelativePath="iasciitab.h" + > </File> <File - RelativePath="internal.h"> + RelativePath="internal.h" + > </File> <File - RelativePath="latin1tab.h"> + RelativePath="latin1tab.h" + > </File> <File - RelativePath="nametab.h"> + RelativePath="nametab.h" + > </File> <File - RelativePath="utf8tab.h"> + RelativePath="utf8tab.h" + > </File> <File - RelativePath="xmlrole.h"> + RelativePath="xmlrole.h" + > </File> <File - RelativePath="xmltok.h"> + RelativePath="xmltok.h" + > </File> <File - RelativePath="xmltok_impl.h"> + RelativePath="xmltok_impl.h" + > </File> </Filter> <Filter Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > </Filter> </Files> <Globals> Modified: branches/R2_14/Externals/expat/lib/expat_static.vcproj =================================================================== --- branches/R2_14/Externals/expat/lib/expat_static.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/lib/expat_static.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,24 +1,44 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="expat_static" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{464DBF5A-69E8-4E1A-8401-171371B86299}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\../../../Build/expat/lib/Debug_static" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug_static" ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;COMPILED_FROM_DSP;_LIB" @@ -30,83 +50,112 @@ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug_static/" BrowseInformation="1" WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLibrarianTool" OutputFile="../../../Build/expat/lib/Debug_static/libexpatMT.lib" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\../../../Build/expat/lib/Release_static" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release_static" ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP" - StringPooling="TRUE" + StringPooling="true" RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release_static/expat_static.pch" AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release_static/" ObjectFile=".\../../../BuildTmp/expat/lib/Release_static/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release_static/" WarningLevel="3" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="true" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLibrarianTool" OutputFile="../../../Build/expat/lib/Release_static/libexpatMT.lib" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="true" + /> <Tool - Name="VCMIDLTool"/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -114,141 +163,180 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > <File - RelativePath="xmlparse.c"> + RelativePath="xmlparse.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> <File - RelativePath="xmlrole.c"> + RelativePath="xmlrole.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> <File - RelativePath="xmltok.c"> + RelativePath="xmltok.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_impl.c"> + RelativePath="xmltok_impl.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_ns.c"> + RelativePath="xmltok_ns.c" + > <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter="h;hpp;hxx;hm;inl" + > <File - RelativePath="ascii.h"> + RelativePath="ascii.h" + > </File> <File - RelativePath="asciitab.h"> + RelativePath="asciitab.h" + > </File> <File - RelativePath="expat.h"> + RelativePath="expat.h" + > </File> <File - RelativePath="expat_external.h"> + RelativePath="expat_external.h" + > </File> <File - RelativePath="iasciitab.h"> + RelativePath="iasciitab.h" + > </File> <File - RelativePath="internal.h"> + RelativePath="internal.h" + > </File> <File - RelativePath="latin1tab.h"> + RelativePath="latin1tab.h" + > </File> <File - RelativePath="nametab.h"> + RelativePath="nametab.h" + > </File> <File - RelativePath="utf8tab.h"> + RelativePath="utf8tab.h" + > </File> <File - RelativePath="xmlrole.h"> + RelativePath="xmlrole.h" + > </File> <File - RelativePath="xmltok.h"> + RelativePath="xmltok.h" + > </File> <File - RelativePath="xmltok_impl.h"> + RelativePath="xmltok_impl.h" + > </File> </Filter> </Files> Modified: branches/R2_14/Externals/expat/lib/expatw.vcproj =================================================================== --- branches/R2_14/Externals/expat/lib/expatw.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/lib/expatw.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,85 +1,141 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="expatw" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{AC9279F5-5C6F-477F-AA3B-A42F8859D236}" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\../../../Build/expat/lib/Release-w" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release-w" ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T" - StringPooling="TRUE" + StringPooling="true" RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release-w/expatw.pch" AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release-w/" ObjectFile=".\../../../BuildTmp/expat/lib/Release-w/" ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release-w/" WarningLevel="3" - SuppressStartupBanner="TRUE"/> + SuppressStartupBanner="true" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile="../../../Build/expat/lib/Release-w/libexpatw.dll" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ModuleDefinitionFile=".\libexpatw.def" ImportLibrary=".\../../../Build/expat/lib/Release-w/libexpatw.lib" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\../../../Build/expat/lib/Debug-w" IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug-w" ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb" + HeaderFileName="" + /> + <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T" @@ -91,47 +147,54 @@ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug-w/" BrowseInformation="1" WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" OutputFile="../../../Build/expat/lib/Debug-w/libexpatw.dll" LinkIncremental="2" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ModuleDefinitionFile=".\libexpatw.def" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" ImportLibrary=".\../../../Build/expat/lib/Debug-w/libexpatw.lib" - TargetMachine="1"/> + TargetMachine="1" + /> <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb" - HeaderFileName=""/> + Name="VCALinkTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + Name="VCFxCopTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCWebDeploymentTool" + /> <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -139,150 +202,191 @@ <Files> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > <File - RelativePath="libexpatw.def"> + RelativePath="libexpatw.def" + > </File> <File - RelativePath="xmlparse.c"> + RelativePath="xmlparse.c" + > <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" + /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" - ExceptionHandling="FALSE" + ExceptionHandling="0" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> </File> <File - RelativePath="xmlrole.c"> + RelativePath="xmlrole.c" + > <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" + /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> </File> <File - RelativePath="xmltok.c"> + RelativePath="xmltok.c" + > <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" + /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_impl.c"> + RelativePath="xmltok_impl.c" + > <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" + /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> </File> <File - RelativePath="xmltok_ns.c"> + RelativePath="xmltok_ns.c" + > <FileConfiguration - Name="Release|Win32"> + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/> + PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" + /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)" BasicRuntimeChecks="3" - BrowseInformation="1"/> + BrowseInformation="1" + /> </FileConfiguration> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter="h;hpp;hxx;hm;inl" + > <File - RelativePath="ascii.h"> + RelativePath="ascii.h" + > </File> <File - RelativePath="asciitab.h"> + RelativePath="asciitab.h" + > </File> <File - RelativePath="expat.h"> + RelativePath="expat.h" + > </File> <File - RelativePath="expat_external.h"> + RelativePath="expat_external.h" + > </File> <File - RelativePath="iasciitab.h"> + RelativePath="iasciitab.h" + > </File> <File - RelativePath="internal.h"> + RelativePath="internal.h" + > </File> <File - RelativePath="latin1tab.h"> + RelativePath="latin1tab.h" + > </File> <File - RelativePath="nametab.h"> + RelativePath="nametab.h" + > </File> <File - RelativePath="utf8tab.h"> + RelativePath="utf8tab.h" + > </File> <File - RelativePath="xmlrole.h"> + RelativePath="xmlrole.h" + > </File> <File - RelativePath="xmltok.h"> + RelativePath="xmltok.h" + > </File> <File - RelativePath="xmltok_impl.h"> + RelativePath="xmltok_impl.h" + > </File> </Filter> <Filter Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > </Filter> </Files> <Globals> Modified: branches/R2_14/Externals/expat/lib/expatw_static.vcproj =================================================================== --- branches/R2_14/Externals/expat/lib/expatw_static.vcproj 2010-10-24 11:59:07 UTC (rev 7349) +++ branches/R2_14/Externals/expat/lib/expatw_static.vcproj 2010-10-24 18:45:42 UTC (rev 7350) @@ -1,73 +1,116 @@ <?xml version="1.0" encoding="Windows-1252"?> ... [truncated message content] |
From: <ki...@us...> - 2010-10-27 16:49:06
|
Revision: 7360 http://winmerge.svn.sourceforge.net/winmerge/?rev=7360&view=rev Author: kimmov Date: 2010-10-27 16:48:59 +0000 (Wed, 27 Oct 2010) Log Message: ----------- Remove unneeded ShellExtensionX64.vcproj project file and update 64-bit ShellExtension compiling instructions. Modified Paths: -------------- branches/R2_14/Docs/Developers/Compiling.html Removed Paths: ------------- branches/R2_14/ShellExtension/ShellExtensionX64.vcproj Modified: branches/R2_14/Docs/Developers/Compiling.html =================================================================== --- branches/R2_14/Docs/Developers/Compiling.html 2010-10-27 16:47:07 UTC (rev 7359) +++ branches/R2_14/Docs/Developers/Compiling.html 2010-10-27 16:48:59 UTC (rev 7360) @@ -228,41 +228,11 @@ </ul> <h3><a name="ShellExt64">Shell Extension (64-bit)</a></h3> -<p>This is a bit tricky, and needs some patience to setup.</p> +<p>Visual Studio 2005 and later come with 64-bit compiler. To compile 64-bit +ShellExtension, open the <code>ShellExtension.vcproj</code> -project file +and select X64 Debug or X64 Release -target. Then compile as usual.</p> -<h4>Needed tools</h4> -<ul> - <li>Visual Studio 2003 or later</li> - <li>Platform SDK (for Windows 2003 SP1) with at least following components installed: - <ul> - <li>Configuration Options</li> - <li>Microsoft Windows Core SDK <strong>with tools and build environments</strong></li> - <li>Microsoft Web Workshop (IE) SDK</li> - <li>Microsoft Data Access Services (MDAC) SDK <i>not sure about this</i></li> - </ul> - </li> -</ul> - -<h4>Starting Visual Studio and opening the project</h4> -<p>We need to start Visual Studio from Platform SDK's 64-bit environment so that we get all -needed environment variables and paths correctly set. So:</p> -<ol> - <li>Start 64-bit Platform SDK environment:<br> - From Start menu: Platform SDK --> Open Build Environment Window --> Windows XP/2003 64-bit - environment --> Release/Debug environment</li> - <li>CD to Visual Studio install folder/Common7/IDE</li> - <li>Start Visual Studio with command:<br> - <code>devenv /USEENV (uses open environment)</code></li> - <li>Open <code>ShellExtensionX64.vcproj</code> from <code>ShellExtension</code> project - folder.</li> -</ol> - -<p>Make sure you have 64-bit target selected in Project Settings. Then check that paths are OK. -You <strong>MUST</strong> build to separate directory than 32-bit targets so that files don't -mix up.</p> - -<p>Compiling should now succeed. If not, check that all needed PSDK components are installed -and that paths are OK. If you are compiling in 32-bit Windows you get error about registering +<p>If you are compiling in 32-bit Windows you get error about registering but that is expected to happen.</p> <p>64-bit ShellExtension is registered to 64-bit Windows just like counterparts in 32-bit world:<br> Deleted: branches/R2_14/ShellExtension/ShellExtensionX64.vcproj =================================================================== --- branches/R2_14/ShellExtension/ShellExtensionX64.vcproj 2010-10-27 16:47:07 UTC (rev 7359) +++ branches/R2_14/ShellExtension/ShellExtensionX64.vcproj 2010-10-27 16:48:59 UTC (rev 7360) @@ -1,924 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="ShellExtension" - ProjectGUID="{C388C7AA-862D-455A-8D3B-8F4BF5AE44EA}" - SccProjectName="" - SccLocalPath="" - Keyword="MFCProj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug X64|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtensionX64Debug" - IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64Debug" - ConfigurationType="2" - UseOfMFC="0" - UseOfATL="1" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".,../src/common" - PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - BasicRuntimeChecks="0" - SmallerTypeCheck="FALSE" - RuntimeLibrary="3" - BufferSecurityCheck="FALSE" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64Debug/" - ObjectFile=".\..\BuildTmp\ShellExtensionX64Debug/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64Debug/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="if "%OS%"=="" goto NOTNT -if not "%OS%"=="Windows_NT" goto NOTNT -regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -goto end -:NOTNT -echo Warning : Cannot register Unicode DLL on Windows 95 -:end -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/machine:AMD64" - AdditionalDependencies="bufferoverflowU.lib" - OutputFile="..\Build\ShellExtensionX64Debug\ShellExtensionX64.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtensionX64.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb" - SubSystem="2" - OptimizeForWindows98="1" - ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionX64.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release X64|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtensionX64/" - IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64/" - ConfigurationType="2" - UseOfMFC="0" - UseOfATL="1" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories=".,../src/common" - PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - StringPooling="TRUE" - ExceptionHandling="TRUE" - RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64/" - ObjectFile=".\..\BuildTmp\ShellExtensionX64/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/machine:AMD64" - AdditionalDependencies="bufferoverflowU.lib" - OutputFile="..\Build\ShellExtensionX64\ShellExtensionX64.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtensionX64.def" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.pdb" - SubSystem="2" - OptimizeForWindows98="1" - ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionX64.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\src\common\coretools.cpp"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\common\RegKey.cpp"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/> - </FileConfiguration> - </File> - <File - RelativePath="ShellExtension.cpp"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/> - </FileConfiguration> - </File> - <File - RelativePath="ShellExtension.def"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - </File> - <File - RelativePath="ShellExtension.idl"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - </File> - <File - RelativePath=".\ShellExtensionU.def"> - </File> - <File - RelativePath=".\ShellExtensionX64.def"> - </File> - <File - RelativePath="StdAfx.cpp"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF)" - UsePrecompiledHeader="1"/> - </FileConfiguration> - </File> - <File - RelativePath="..\Src\Common\UnicodeString.cpp"> - </File> - <File - RelativePath="WinMergeShell.cpp"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="..\src\common\coretools.h"> - </File> - <File - RelativePath="..\src\common\RegKey.h"> - </File> - <File - RelativePath="Resource.h"> - </File> - <File - RelativePath="StdAfx.h"> - </File> - <File - RelativePath="..\Src\Common\UnicodeString.h"> - </File> - <File - RelativePath="WinMergeShell.h"> - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - <File - RelativePath="ShellExtension.rc"> - <FileConfiguration - Name="Debug X64|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionBrazilian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionBulgarian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionCatalan.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionChineseSimplified.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionChineseTraditional.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionCroatian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionCzech.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionDanish.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionDutch.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionFrench.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionGerman.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath=".\Languages\ShellExtensionGreek.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionHungarian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionItalian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionJapanese.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionKorean.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionNorwegian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionPersian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionPolish.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionPortuguese.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath=".\Languages\ShellExtensionRomanian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionRussian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionSerbian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionSlovak.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionSlovenian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionSpanish.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionSwedish.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionTurkish.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="Languages\ShellExtensionUkrainian.rc"> - <FileConfiguration - Name="Debug X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release X64|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - </File> - <File - RelativePath="WinMerge.bmp"> - </File> - <File - RelativePath="WinMergeShell.rgs"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-30 09:53:20
|
Revision: 7381 http://winmerge.svn.sourceforge.net/winmerge/?rev=7381&view=rev Author: kimmov Date: 2010-10-30 09:53:13 +0000 (Sat, 30 Oct 2010) Log Message: ----------- Remove hexedit from WinMerge sources. 2.14 branch also now uses the editor component from installed Frhed. Modified Paths: -------------- branches/R2_14/Docs/Developers/SVN_Organisation.txt branches/R2_14/Docs/Developers/readme-InnoSetup.html branches/R2_14/Docs/Developers/readme-WIX.html branches/R2_14/Installer/InnoSetup/WinMerge.iss branches/R2_14/Installer/WiX/Config.wxi branches/R2_14/Installer/WiX/Fragments/Core.wxs branches/R2_14/Installer/WiX/Fragments/Features.wxs branches/R2_14/Src/PreLink.bat Removed Paths: ------------- branches/R2_14/Externals/heksedit/ Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt =================================================================== --- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-10-30 09:53:13 UTC (rev 7381) @@ -13,7 +13,6 @@ - Manual - Externals - expat - - heksedit - pcre - scew - Filters @@ -82,9 +81,6 @@ WinMerge/Externals/expat/ - Expat XML parser <http://expat.sourceforge.net/> -WinMerge/Externals/heksedit/ - - Frhed binary file editor's heksedit component <http://frhed.sourceforge.net/> - WinMerge/Externals/pcre/ - PCRE - Perl Compatible Regular Expression <http://www.pcre.org/> Modified: branches/R2_14/Docs/Developers/readme-InnoSetup.html =================================================================== --- branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-30 09:53:13 UTC (rev 7381) @@ -101,12 +101,6 @@ </ul> </li> <li> - <code>heksedit</code> - <ul> - <li><code>hekseditU.dll</code></li> - </ul> - </li> - <li> <code>Manual/htmlhelp</code> <ul> <li><code>WinMerge.chm</code></li> Modified: branches/R2_14/Docs/Developers/readme-WIX.html =================================================================== --- branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-30 09:53:13 UTC (rev 7381) @@ -100,12 +100,6 @@ </ul> </li> <li> - <code>heksedit</code> - <ul> - <li><code>hekseditU.dll</code></li> - </ul> - </li> - <li> <code>Manual/htmlhelp</code> <ul> <li><code>WinMerge.chm</code></li> Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss =================================================================== --- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-30 09:53:13 UTC (rev 7381) @@ -414,9 +414,6 @@ ; MergeLang.dll - translation helper dll Source: ..\..\Build\MergeUnicodeRelease\MergeLang.dll; DestDir: {app}; Flags: promptifolder; Components: Core -; Binary file editor -Source: ..\..\Build\heksedit\hekseditU.dll; DestDir: {app}; Flags: promptifolder; Components: Core - ; Language files Source: ..\..\Src\Languages\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Modified: branches/R2_14/Installer/WiX/Config.wxi =================================================================== --- branches/R2_14/Installer/WiX/Config.wxi 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Installer/WiX/Config.wxi 2010-10-30 09:53:13 UTC (rev 7381) @@ -20,7 +20,6 @@ <?define ProgramFilesFolder = "ProgramFiles64Folder" ?> <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?> - <?define HekseditBuildDir = "..\..\Build\heksedit\x64\Release" ?> <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?> <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> <?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?> @@ -38,7 +37,6 @@ <?define ProgramFilesFolder = "ProgramFilesFolder" ?> <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat" ?> - <?define HekseditBuildDir = "..\..\Build\heksedit" ?> <?define PcreBuildDir = "..\..\Build\pcre" ?> <?define ShellExtBuildDir = "..\..\Build\MergeUnicodeRelease" ?> Modified: branches/R2_14/Installer/WiX/Fragments/Core.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-30 09:53:13 UTC (rev 7381) @@ -17,13 +17,6 @@ Vital="yes" /> </Component> - <Component Id="heksedit" Guid="*" Win64="$(var.Win64)"> - <File Id="hekseditUDLL" - Name="hekseditU.dll" - Source="$(var.HekseditBuildDir)\hekseditU.dll" - Vital="yes" /> - </Component> - <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> <File Id="pcreDLL" Name="pcre.dll" Modified: branches/R2_14/Installer/WiX/Fragments/Features.wxs =================================================================== --- branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-30 09:53:13 UTC (rev 7381) @@ -16,7 +16,6 @@ <ComponentRef Id="WinMergeU" /> <ComponentRef Id="libexpat" /> <ComponentRef Id="pcre" /> - <ComponentRef Id="heksedit" /> <ComponentRef Id="MergeLang" /> <ComponentRef Id="StartMenuShortcuts" /> <ComponentRef Id="DesktopShortcut" /> Modified: branches/R2_14/Src/PreLink.bat =================================================================== --- branches/R2_14/Src/PreLink.bat 2010-10-28 17:41:34 UTC (rev 7380) +++ branches/R2_14/Src/PreLink.bat 2010-10-30 09:53:13 UTC (rev 7381) @@ -52,65 +52,21 @@ :.\..\BuildTmp\MergeDebug %info% ANSI/Debug mkdir ..\Build\MergeDebug - -REM Build heksedit -cd %2\..\..\..\Externals\heksedit -%msdev% "heksedit.dsp" /make "heksedit - Win32 Debug" -%devenv% "heksedit.vcproj" /build "Debug" -cd %2\..\..\heksedit\Debug -copy heksedit.dll %2\..\ -copy heksedit.dll ..\ -mkdir %2\..\heksedit.lng -copy heksedit.lng\*.* %2\..\heksedit.lng - goto Debug :.\..\BuildTmp\MergeUnicodeDebug %info% UNICODE/Debug mkdir ..\Build\MergeUnicodeDebug - -REM Build heksedit -cd %2\..\..\..\Externals\heksedit -%msdev% "heksedit.dsp" /make "heksedit - Win32 UnicodeDebug" -%devenv% "heksedit.vcproj" /build "UnicodeDebug" -cd %2\..\..\heksedit\Debug -copy hekseditU.dll %2\..\ -copy hekseditU.dll ..\ -mkdir %2\..\heksedit.lng -copy heksedit.lng\*.* %2\..\heksedit.lng - goto Debug :.\..\BuildTmp\MergeRelease %info% ANSI/Release mkdir ..\Build\MergeRelease - -REM Build heksedit -cd %2\..\..\..\Externals\heksedit -%msdev% "heksedit.dsp" /make "heksedit - Win32 Release" -%devenv% "heksedit.vcproj" /build "Release" -cd %2\..\..\heksedit\Release -copy heksedit.dll %2\..\ -copy heksedit.dll ..\ -mkdir %2\..\heksedit.lng -copy heksedit.lng\*.* %2\..\heksedit.lng - goto Release :.\..\BuildTmp\MergeUnicodeRelease %info% UNICODE/Release mkdir ..\Build\MergeUnicodeRelease - -REM Build heksedit -cd %2\..\..\..\Externals\heksedit -%msdev% "heksedit.dsp" /make "heksedit - Win32 UnicodeRelease" -%devenv% "heksedit.vcproj" /build "UnicodeRelease" -cd %2\..\..\heksedit\Release -copy hekseditU.dll %2\..\ -copy hekseditU.dll ..\ -mkdir %2\..\heksedit.lng -copy heksedit.lng\*.* %2\..\heksedit.lng - goto Release :Debug This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |