-Files.rc2 RCDATA Files.rc2
-
-#define SHARPEN($) #$
-#define VIIZIP($) $ 7-ZIP SHARPEN(/7z465bin/$)
-#define MERGE7Z($) $ Merge7z SHARPEN(../../Build/MergeRelease/$)
-#define MERGE7ZU($) $ Merge7z SHARPEN(../../Build/MergeUnicodeRelease/$)
-
-MERGE7Z(Merge7z465.dll)
-MERGE7ZU(Merge7z465U.dll)
-MERGE7Z(Merge7z907.dll)
-MERGE7ZU(Merge7z907U.dll)
-MERGE7Z(Merge7z909.dll)
-MERGE7ZU(Merge7z909U.dll)
-MERGE7Z(Merge7z910.dll)
-MERGE7ZU(Merge7z910U.dll)
-MERGE7Z(Merge7z911.dll)
-MERGE7ZU(Merge7z911U.dll)
-MERGE7Z(Merge7z912.dll)
-MERGE7ZU(Merge7z912U.dll)
-MERGE7Z(Merge7z913.dll)
-MERGE7ZU(Merge7z913U.dll)
+Files.rc2 RCDATA Files.rc2\r
+\r
+#define SHARPEN($) #$\r
+#define VIIZIP($) $ 7-ZIP SHARPEN(/7z465bin/$)\r
+#define MERGE7Z($) $ Merge7z SHARPEN(../../Build/MergeRelease/$)\r
+#define MERGE7ZU($) $ Merge7z SHARPEN(../../Build/MergeUnicodeRelease/$)\r
+\r
+MERGE7Z(Merge7z465.dll)\r
+MERGE7ZU(Merge7z465U.dll)\r
+MERGE7Z(Merge7z907.dll)\r
+MERGE7ZU(Merge7z907U.dll)\r
+MERGE7Z(Merge7z909.dll)\r
+MERGE7ZU(Merge7z909U.dll)\r
+MERGE7Z(Merge7z910.dll)\r
+MERGE7ZU(Merge7z910U.dll)\r
+MERGE7Z(Merge7z911.dll)\r
+MERGE7ZU(Merge7z911U.dll)\r
+MERGE7Z(Merge7z912.dll)\r
+MERGE7ZU(Merge7z912U.dll)\r
+MERGE7Z(Merge7z913.dll)\r
+MERGE7ZU(Merge7z913U.dll)\r
+ MERGE7Z(Merge7z914.dll)
+ MERGE7ZU(Merge7z914U.dll)
-
-VIIZIP(7zip_pad.xml)
-VIIZIP(7z.dll)
-VIIZIP(Lang/af.txt)
-VIIZIP(Lang/ar.txt)
-VIIZIP(Lang/ast.txt)
-VIIZIP(Lang/az.txt)
-VIIZIP(Lang/ba.txt)
-VIIZIP(Lang/be.txt)
-VIIZIP(Lang/bg.txt)
-VIIZIP(Lang/bn.txt)
-VIIZIP(Lang/br.txt)
-VIIZIP(Lang/ca.txt)
-VIIZIP(Lang/cs.txt)
-VIIZIP(Lang/cy.txt)
-VIIZIP(Lang/da.txt)
-VIIZIP(Lang/de.txt)
-VIIZIP(Lang/el.txt)
-VIIZIP(Lang/en.ttt)
-VIIZIP(Lang/eo.txt)
-VIIZIP(Lang/es.txt)
-VIIZIP(Lang/et.txt)
-VIIZIP(Lang/eu.txt)
-VIIZIP(Lang/ext.txt)
-VIIZIP(Lang/fa.txt)
-VIIZIP(Lang/fi.txt)
-VIIZIP(Lang/fr.txt)
-VIIZIP(Lang/fur.txt)
-VIIZIP(Lang/fy.txt)
-VIIZIP(Lang/gl.txt)
-VIIZIP(Lang/he.txt)
-VIIZIP(Lang/hr.txt)
-VIIZIP(Lang/hu.txt)
-VIIZIP(Lang/hy.txt)
-VIIZIP(Lang/id.txt)
-VIIZIP(Lang/io.txt)
-VIIZIP(Lang/is.txt)
-VIIZIP(Lang/it.txt)
-VIIZIP(Lang/ja.txt)
-VIIZIP(Lang/ka.txt)
-VIIZIP(Lang/ko.txt)
-VIIZIP(Lang/ku.txt)
-VIIZIP(Lang/ku-ckb.txt)
-VIIZIP(Lang/lt.txt)
-VIIZIP(Lang/lv.txt)
-VIIZIP(Lang/mk.txt)
-VIIZIP(Lang/mn.txt)
-VIIZIP(Lang/mr.txt)
-VIIZIP(Lang/ms.txt)
-VIIZIP(Lang/nb.txt)
-VIIZIP(Lang/ne.txt)
-VIIZIP(Lang/nl.txt)
-VIIZIP(Lang/nn.txt)
-VIIZIP(Lang/pa-in.txt)
-VIIZIP(Lang/pl.txt)
-VIIZIP(Lang/ps.txt)
-VIIZIP(Lang/pt.txt)
-VIIZIP(Lang/pt-br.txt)
-VIIZIP(Lang/ro.txt)
-VIIZIP(Lang/ru.txt)
-VIIZIP(Lang/si.txt)
-VIIZIP(Lang/sk.txt)
-VIIZIP(Lang/sl.txt)
-VIIZIP(Lang/sq.txt)
-VIIZIP(Lang/sr-spc.txt)
-VIIZIP(Lang/sr-spl.txt)
-VIIZIP(Lang/sv.txt)
-VIIZIP(Lang/ta.txt)
-VIIZIP(Lang/th.txt)
-VIIZIP(Lang/tr.txt)
-VIIZIP(Lang/tt.txt)
-VIIZIP(Lang/uk.txt)
-VIIZIP(Lang/uz.txt)
-VIIZIP(Lang/va.txt)
-VIIZIP(Lang/vi.txt)
-VIIZIP(Lang/zh-cn.txt)
-VIIZIP(Lang/zh-tw.txt)
+\r
+VIIZIP(7zip_pad.xml)\r
+VIIZIP(7z.dll)\r
+VIIZIP(Lang/af.txt)\r
+VIIZIP(Lang/ar.txt)\r
+VIIZIP(Lang/ast.txt)\r
+VIIZIP(Lang/az.txt)\r
+VIIZIP(Lang/ba.txt)\r
+VIIZIP(Lang/be.txt)\r
+VIIZIP(Lang/bg.txt)\r
+VIIZIP(Lang/bn.txt)\r
+VIIZIP(Lang/br.txt)\r
+VIIZIP(Lang/ca.txt)\r
+VIIZIP(Lang/cs.txt)\r
+VIIZIP(Lang/cy.txt)\r
+VIIZIP(Lang/da.txt)\r
+VIIZIP(Lang/de.txt)\r
+VIIZIP(Lang/el.txt)\r
+VIIZIP(Lang/en.ttt)\r
+VIIZIP(Lang/eo.txt)\r
+VIIZIP(Lang/es.txt)\r
+VIIZIP(Lang/et.txt)\r
+VIIZIP(Lang/eu.txt)\r
+VIIZIP(Lang/ext.txt)\r
+VIIZIP(Lang/fa.txt)\r
+VIIZIP(Lang/fi.txt)\r
+VIIZIP(Lang/fr.txt)\r
+VIIZIP(Lang/fur.txt)\r
+VIIZIP(Lang/fy.txt)\r
+VIIZIP(Lang/gl.txt)\r
+VIIZIP(Lang/he.txt)\r
+VIIZIP(Lang/hr.txt)\r
+VIIZIP(Lang/hu.txt)\r
+VIIZIP(Lang/hy.txt)\r
+VIIZIP(Lang/id.txt)\r
+VIIZIP(Lang/io.txt)\r
+VIIZIP(Lang/is.txt)\r
+VIIZIP(Lang/it.txt)\r
+VIIZIP(Lang/ja.txt)\r
+VIIZIP(Lang/ka.txt)\r
+VIIZIP(Lang/ko.txt)\r
+VIIZIP(Lang/ku.txt)\r
+VIIZIP(Lang/ku-ckb.txt)\r
+VIIZIP(Lang/lt.txt)\r
+VIIZIP(Lang/lv.txt)\r
+VIIZIP(Lang/mk.txt)\r
+VIIZIP(Lang/mn.txt)\r
+VIIZIP(Lang/mr.txt)\r
+VIIZIP(Lang/ms.txt)\r
+VIIZIP(Lang/nb.txt)\r
+VIIZIP(Lang/ne.txt)\r
+VIIZIP(Lang/nl.txt)\r
+VIIZIP(Lang/nn.txt)\r
+VIIZIP(Lang/pa-in.txt)\r
+VIIZIP(Lang/pl.txt)\r
+VIIZIP(Lang/ps.txt)\r
+VIIZIP(Lang/pt.txt)\r
+VIIZIP(Lang/pt-br.txt)\r
+VIIZIP(Lang/ro.txt)\r
+VIIZIP(Lang/ru.txt)\r
+VIIZIP(Lang/si.txt)\r
+VIIZIP(Lang/sk.txt)\r
+VIIZIP(Lang/sl.txt)\r
+VIIZIP(Lang/sq.txt)\r
+VIIZIP(Lang/sr-spc.txt)\r
+VIIZIP(Lang/sr-spl.txt)\r
+VIIZIP(Lang/sv.txt)\r
+VIIZIP(Lang/ta.txt)\r
+VIIZIP(Lang/th.txt)\r
+VIIZIP(Lang/tr.txt)\r
+VIIZIP(Lang/tt.txt)\r
+VIIZIP(Lang/uk.txt)\r
+VIIZIP(Lang/uz.txt)\r
+VIIZIP(Lang/va.txt)\r
+VIIZIP(Lang/vi.txt)\r
+VIIZIP(Lang/zh-cn.txt)\r
+VIIZIP(Lang/zh-tw.txt)\r
--- /dev/null
- Dim ot: Set ot = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1)
+Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
+Dim sh: Set sh = CreateObject("WScript.Shell")
- Do Until ot.AtEndOfStream = True
- WScript.Echo sh.ExpandEnvironmentStrings(ot.ReadLine)
++Dim otf: Set otf = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1)
+
- ot.Close
++Do Until otf.AtEndOfStream = True
++ WScript.Echo sh.ExpandEnvironmentStrings(otf.ReadLine)
+Loop
+
++otf.Close
+
Name: Persian; MessagesFile: ..\..\Translations\InnoSetup\Persian.isl
Name: Polish; MessagesFile: ..\..\Translations\InnoSetup\Polish.isl
Name: Portuguese; MessagesFile: ..\..\Translations\InnoSetup\Portuguese.isl
-Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
+Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
Name: Romanian; MessagesFile: ..\..\Translations\InnoSetup\Romanian.isl
Name: Russian; MessagesFile: ..\..\Translations\InnoSetup\Russian.isl
+ Name: Serbian; MessagesFile: ..\..\Translations\InnoSetup\Serbian.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt
Name: Slovak; MessagesFile: ..\..\Translations\InnoSetup\Slovak.isl
Name: Slovenian; MessagesFile: ..\..\Translations\InnoSetup\Slovenian.isl
-Name: Spanish; MessagesFile: ..\..\Translations\InnoSetup\Spanish.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt
-Name: Swedish; MessagesFile: ..\..\Translations\InnoSetup\Swedish.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt
+Name: Spanish; MessagesFile: ..\..\Translations\InnoSetup\Spanish.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Spanish.txt
+Name: Swedish; MessagesFile: ..\..\Translations\InnoSetup\Swedish.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Swedish.txt
Name: Turkish; MessagesFile: ..\..\Translations\InnoSetup\Turkish.isl
-Name: Ukrainian; MessagesFile: ..\..\Translations\InnoSetup\Ukrainian.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt
+Name: Ukrainian; MessagesFile: ..\..\Translations\InnoSetup\Ukrainian.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt
[Messages]
--- /dev/null
- {We record the version of 7-Zip installed as 4.42 regardless of whether or not it's actually 4.21, 4.22, etc..}
+; ID line follows -- this is updated by SVN
+; $Id: WinMerge.iss 5430 2008-06-05 16:21:35Z kimmov $
+;
+; Programmed by: Christian Blackburn, Christian List, Kimmo Varis,
+; Purpose: The is the Inno Setup installation script for distributing our WinmMerge application.
+; Tools Needed To Compile: Inno Setup 5.1.7+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.7+(http://www.jrsoftware.org/isdl.php)
+; note: the versions of Inno Setup and the QuickStart Pack should be identical to ensure proper function
+;Directly Dependant Files: Because this is an installer. It would be difficult to list and maintain each of the files referenced
+; throughout the script in the header. If you search this plain text script for a particular file in our Subversio repository and it
+; doesn't appear then this script is not directly dependant on that file.
+;Compilation Instructions: 1. Open this file in Inno Setup or ISTool
+; 2. Make sure Compression=LZMA/Ultra, InternalCompressLevel=Ultra, and SolidCompression=True these values are lowered during
+; development to speed up compilation, however at release we want the intaller to be as strong as possible.
+; 3. Check all files are present:
+; -From ISTool Click
+; 4. Compile the script: "Project" --> "Verify Files..."
+; -From Inno Setup "Click "Build" --> "Compile"
+; -From ISTool Click "Project" --> "Compile Setup"
+; 5. The compiled installer will appear in the \InnoSetup\Output\ directory at currently should be around 1.5MBs in size.
+;
+; Installer To Do List:
+; # Make the Install7ZipDll() Function automatically work with future versions of Merge7zDLL (Use GetCurentFileName)
+; # Provide the option to or not to assign the Ctrl+Alt+M accelerator to WinMerge., make sure it's turned on for at least one icon
+; # Add WinMerge to the user's path so they can execute comparison's from a Dos Prompt (Cmd.exe/Command.exe)
+; # We need to unregister, and delete the ShellExtension Dll if the user doesn't want it, during installation
+
+; # Display integration options in gray rather than hiding them if the user doesn't have the application in question installed
+; # We need to ask those that have the RCLLocalization.dll in their plugins folder if they actually want it, their answer will need to be stored in the registry
+; # Write code to detect "\Programs\WinMerge\WinMerge" type start menu installs
+;
+; Custom Installer Pages:
+; # Bundle 7-Zip with WinMerge or provide on the fly download capability.
+; # Allow users to set their working directory via a custom installer page
+;
+; Things that make the user's life easier:
+; # Create instructions and a sample language file using the Inno Setup Translator Tool (http://www2.arnes.si/~sopjsimo/translator.html)
+; # Add "WinMerge is running would you like to close it now?" support with programmatic termination
+; -Note: We'll need to add a declares statement to our ISX code so that we can use FindWindowEx directly or a mutex search or two
+; # Rather than requiring users to restart we could just kill all intances of Explorer.exe, but we'll need to prompt the user first and restart it
+; once the ShellExtension.dll file has been added or removed.
+;
+; Non-Essential Features:
+; # See about getting a higher resolution copy of the Users's Guide.ico source art from somebody (A 32x32, and or 48x48 would be nice)
+; # Using the registry set the order our icons appear within their group in the start menu.:
+; 1. WinMerge
+; 2. Read Me
+; 3. Users's Guide
+; 4. WinMerge on the Web
+; 5. Uninstall WinMerge
+; # Create the ability to install to two start menu groups simultaneously
+;
+; Not yet possible (Limited by Inno Setup):
+; # While uninstalling prompt the user as to whether or not they'd like to remove their WinMerge preferences too?
+
+#define AppVersion GetFileVersion(SourcePath + "\..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe")
+#define FriendlyAppVersion Copy(GetFileVersion(SourcePath + "\..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe"), 1, 5)
+
+; Runtime files
+#define Runtime_MFC "..\Runtimes\mfc71.dll"
+#define Runtime_MFCU "..\Runtimes\mfc71u.dll"
+#define Runtime_C "..\Runtimes\msvcr71.dll"
+#define Runtime_CPP "..\Runtimes\msvcp71.dll"
+
+
+[Setup]
+AppName=WinMerge
+AppVersion={#AppVersion}
+AppVerName=WinMerge {#AppVersion} x64
+AppPublisher=Thingamahoochie Software
+AppPublisherURL=http://WinMerge.org/
+AppSupportURL=http://WinMerge.org/
+AppUpdatesURL=http://WinMerge.org/
+
+; Installer executable's version resource info
+VersionInfoCompany=http://winmerge.org
+VersionInfoDescription=WinMerge Installer
+VersionInfoVersion={#AppVersion}
+
+;This is in case an older version of the installer happened to be
+DirExistsWarning=no
+
+;Tells the installer to only display a select language dialog if the an exact match wasn't found
+ShowLanguageDialog=auto
+
+DefaultDirName={pf}\WinMerge
+DefaultGroupName=WinMerge
+DisableStartupPrompt=true
+AllowNoIcons=true
+InfoBeforeFile=..\..\Docs\users\GPL.rtf
+InfoAfterFile=..\..\Docs\users\ReadMe.txt
+
+OutputBaseFilename=WinMerge-{#AppVersion}-x64-Setup
+
+;This must be admin to install C++ Runtimes and shell extension
+PrivilegesRequired=admin
+
+UninstallDisplayIcon={app}\{code:ExeName}
+
+;Artwork References
+WizardImageFile=Art\Large Logo.bmp
+WizardSmallImageFile=Art\Small Logo.bmp
+WizardImageStretch=false
+
+;It is confusing, if Setup/Uninstall use the same icon like WinMerge!
+;SetupIconFile=..\..\src\res\Merge.ico
+
+;Compression Parameters
+;Please note while Compression=lzma/ultra and InternalCompressLevel=Ultra are better than max
+;they also require 320 MB of memory for compression. If you're system has at least 256MB RAM then by all
+;means set it to ultra before compilation
+Compression=lzma/ultra
+InternalCompressLevel=ultra
+SolidCompression=true
+
+; Update file associations for shell (project files)
+ChangesAssociations=true
+; Updates PATH
+ChangesEnvironment=true
+OutputDir=..\..\Build
+AlwaysShowComponentsList=true
+
+ArchitecturesInstallIn64BitMode=x64
+
+[Languages]
+;Inno Setup's Native Language
+Name: English; MessagesFile: ..\..\Translations\InnoSetup\English.isl
+
+;Localizations:
+Name: Bulgarian; MessagesFile: ..\..\Translations\InnoSetup\Bulgarian.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\\Docs\Readme\ReadMe-Bulgarian.txt
+Name: Catalan; MessagesFile: ..\..\Translations\InnoSetup\Catalan.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\\Docs\Readme\ReadMe-Catalan.txt
+Name: Chinese_Simplified; MessagesFile: ..\..\Translations\InnoSetup\Chinese_Simplified.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\\Docs\Readme\ReadMe-ChineseSimplified.txt
+Name: Chinese_Traditional; MessagesFile: ..\..\Translations\InnoSetup\Chinese_Traditional.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\\Docs\Readme\ReadMe-ChineseTraditional.txt
+Name: Croatian; MessagesFile: ..\..\Translations\InnoSetup\Croatian.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\\Docs\Readme\ReadMe-Croatian.txt
+Name: Czech; MessagesFile: ..\..\Translations\InnoSetup\Czech.isl
+Name: Danish; MessagesFile: ..\..\Translations\InnoSetup\Danish.isl
+Name: Dutch; MessagesFile: ..\..\Translations\InnoSetup\Dutch.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Dutch.txt
+Name: French; MessagesFile: ..\..\Translations\InnoSetup\French.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-French.txt
+Name: Galician; MessagesFile: ..\..\Translations\InnoSetup\Galician.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Galician.txt
+Name: German; MessagesFile: ..\..\Translations\InnoSetup\German.isl
+Name: Greek; MessagesFile: ..\..\Translations\InnoSetup\Greek.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Greek.txt
+Name: Hungarian; MessagesFile: ..\..\Translations\InnoSetup\Hungarian.isl
+Name: Italian; MessagesFile: ..\..\Translations\InnoSetup\Italian.isl
+Name: Japanese; MessagesFile: ..\..\Translations\InnoSetup\Japanese.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Japanese.txt
+Name: Korean; MessagesFile: ..\..\Translations\InnoSetup\Korean.isl
+Name: Norwegian; MessagesFile: ..\..\Translations\InnoSetup\Norwegian.isl
+Name: Persian; MessagesFile: ..\..\Translations\InnoSetup\Persian.isl
+Name: Polish; MessagesFile: ..\..\Translations\InnoSetup\Polish.isl
+Name: Portuguese; MessagesFile: ..\..\Translations\InnoSetup\Portuguese.isl
+Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
+Name: Romanian; MessagesFile: ..\..\Translations\InnoSetup\Romanian.isl
+Name: Russian; MessagesFile: ..\..\Translations\InnoSetup\Russian.isl
+Name: Slovak; MessagesFile: ..\..\Translations\InnoSetup\Slovak.isl
+Name: Slovenian; MessagesFile: ..\..\Translations\InnoSetup\Slovenian.isl
+Name: Spanish; MessagesFile: ..\..\Translations\InnoSetup\Spanish.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Spanish.txt
+Name: Swedish; MessagesFile: ..\..\Translations\InnoSetup\Swedish.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Swedish.txt
+Name: Turkish; MessagesFile: ..\..\Translations\InnoSetup\Turkish.isl
+Name: Ukrainian; MessagesFile: ..\..\Translations\InnoSetup\Ukrainian.isl; InfoAfterFile: ..\..\Docs\Users\..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt
+
+
+[Messages]
+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
+
+
+[Types]
+Name: typical; Description: {cm:TypicalInstallation}
+Name: full; Description: {cm:FullInstallation}
+Name: compact; Description: {cm:CompactInstallation}
+Name: custom; Description: {cm:CustomInstallation}; Flags: iscustom
+
+
+[Components]
+; Executable, libraries, documentation
+Name: Core; Description: {cm:AppCoreFiles}; Types: full custom typical compact; Flags: fixed
+
+Name: filters; Description: {cm:Filters}; Flags: disablenouninstallwarning; Types: full typical
+Name: Plugins; Description: {cm:Plugins}; Flags: disablenouninstallwarning; Types: full
+
+;Language components
+Name: Languages; Description: {cm:Languages}; Flags: disablenouninstallwarning
+Name: Languages\Bulgarian; Description: {cm:BulgarianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Bulgarian
+Name: Languages\Bulgarian; Description: {cm:BulgarianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Bulgarian
+
+Name: Languages\Catalan; Description: {cm:CatalanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Catalan
+Name: Languages\Catalan; Description: {cm:CatalanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Catalan
+
+Name: Languages\Chinese_Simplified; Description: {cm:ChineseSimplifiedLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Chinese_Simplified
+Name: Languages\Chinese_Simplified; Description: {cm:ChineseSimplifiedLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Chinese_Simplified
+
+Name: Languages\Chinese_Traditional; Description: {cm:ChineseTraditionalLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Chinese_Traditional
+Name: Languages\Chinese_Traditional; Description: {cm:ChineseTraditionalLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Chinese_Traditional
+
+Name: Languages\Croatian; Description: {cm:CroatianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Croatian
+Name: Languages\Croatian; Description: {cm:CroatianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Croatian
+
+Name: Languages\Czech; Description: {cm:CzechLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Czech
+Name: Languages\Czech; Description: {cm:CzechLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Czech
+
+Name: Languages\Danish; Description: {cm:DanishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Danish
+Name: Languages\Danish; Description: {cm:DanishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Danish
+
+Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Dutch
+Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Dutch
+
+Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not French
+Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: French
+
+Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Galician
+Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Galician
+
+Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not German
+Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: German
+
+Name: Languages\Greek; Description: {cm:GreekLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Greek
+Name: Languages\Greek; Description: {cm:GreekLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Greek
+
+Name: Languages\Hungarian; Description: {cm:HungarianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Hungarian
+Name: Languages\Hungarian; Description: {cm:HungarianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Hungarian
+
+Name: Languages\Italian; Description: {cm:ItalianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Italian
+Name: Languages\Italian; Description: {cm:ItalianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Italian
+
+Name: Languages\Japanese; Description: {cm:JapaneseLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Japanese
+Name: Languages\Japanese; Description: {cm:JapaneseLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Japanese
+
+Name: Languages\Korean; Description: {cm:KoreanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Korean
+Name: Languages\Korean; Description: {cm:KoreanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Korean
+
+Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Norwegian
+Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Norwegian
+
+Name: Languages\Persian; Description: {cm:PersianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Persian
+Name: Languages\Persian; Description: {cm:PersianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Persian
+
+Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Polish
+Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Polish
+
+Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Portuguese
+Name: Languages\Portuguese; Description: {cm:PortugueseLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Portuguese
+
+Name: Languages\PortugueseBrazilian; Description: {cm:PortugueseBrazilLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not PortugueseBrazilian
+Name: Languages\PortugueseBrazilian; Description: {cm:PortugueseBrazilLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: PortugueseBrazilian
+
+Name: Languages\Romanian; Description: {cm:RomanianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Romanian
+Name: Languages\Romanian; Description: {cm:RomanianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Romanian
+
+Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Russian
+Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Russian
+
+Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovak
+Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovak
+
+Name: Languages\Slovenian; Description: {cm:SlovenianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovenian
+Name: Languages\Slovenian; Description: {cm:SlovenianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovenian
+
+Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Spanish
+Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Spanish
+
+Name: Languages\Swedish; Description: {cm:SwedishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Swedish
+Name: Languages\Swedish; Description: {cm:SwedishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Swedish
+
+Name: Languages\Turkish; Description: {cm:TurkishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Turkish
+Name: Languages\Turkish; Description: {cm:TurkishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Turkish
+
+Name: Languages\Ukrainian; Description: {cm:UkrainianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Ukrainian
+Name: Languages\Ukrainian; Description: {cm:UkrainianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Ukrainian
+
+
+[Tasks]
+Name: ShellExtension; Description: {cm:ExplorerContextMenu}; GroupDescription: {cm:OptionalFeatures}
+Name: modifypath; Description: {cm:AddToPath}; GroupDescription: {cm:OptionalFeatures}; Flags: unchecked
+Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled
+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}
+
+[InstallDelete]
+; Diff.txt is a file left over from previous versions of WinMerge (before version 2.0), we just delete it to be nice.
+Type: files; Name: {app}\Diff.txt
+
+;All of these files are removed so if the user upgrades their operating system or changes their language selections only the
+;necessary files will be left in the installation folder
+;Another reason these files might be strays is if a user extracted one of the experimental builds such as:
+;WinMerge.{#AppVersion}-exe.7z.
+Name: {app}\WinMerge.exe; Type: files
+Name: {app}\WinMergeU.exe; Type: files; MinVersion: 0, 4
+
+;Remove manifest files as we don't need them in 2.6.2 / 2.7.1.1 or later
+Name: {app}\WinMerge.exe.manifest; Type: files
+Name: {app}\WinMergeU.exe.manifest; Type: files
+
+Name: {app}\Merge7z457.dll; Type: files
+Name: {app}\Merge7z457U.dll; Type: files; MinVersion: 0, 4
+
+Name: {app}\Merge7z465.dll; Type: files
+Name: {app}\Merge7z465U.dll; Type: files; MinVersion: 0, 4
+
+;This won't work, because the file has to be unregistered, and explorer closed, first.
+;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
+
+; Remove existing .lang files - we don't need them anymore as we are
+; using PO files now.
+Name: {app}\Languages\MergeBrazilian.lang; Type: files
+Name: {app}\Languages\MergeBulgarian.lang; Type: files
+Name: {app}\Languages\MergeCatalan.lang; Type: files
+Name: {app}\Languages\MergeChineseSimplified.lang; Type: files
+Name: {app}\Languages\MergeChineseTraditional.lang; Type: files
+Name: {app}\Languages\MergeCzech.lang; Type: files
+Name: {app}\Languages\MergeDanish.lang; Type: files
+Name: {app}\Languages\MergeDutch.lang; Type: files
+Name: {app}\Languages\MergeFrench.lang; Type: files
+Name: {app}\Languages\MergeGerman.lang; Type: files
+Name: {app}\Languages\MergeHungarian.lang; Type: files
+Name: {app}\Languages\MergeItalian.lang; Type: files
+Name: {app}\Languages\MergeJapanese.lang; Type: files
+Name: {app}\Languages\MergeKorean.lang; Type: files
+Name: {app}\Languages\MergeNorwegian.lang; Type: files
+Name: {app}\Languages\MergePersian.lang; Type: files
+Name: {app}\Languages\MergePolish.lang; Type: files
+Name: {app}\Languages\MergePortuguese.lang; Type: files
+Name: {app}\Languages\MergeSlovak.lang; Type: files
+Name: {app}\Languages\MergeSpanish.lang; Type: files
+Name: {app}\Languages\MergeRussian.lang; Type: files
+Name: {app}\Languages\MergeSwedish.lang; Type: files
+Name: {app}\Languages\MergeTurkish.lang; Type: files
+Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')
+
+;Removes the user's guide icon if the user deselects the user's guide component.
+Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')
+
+;This removes the quick launch icon in case the user chooses not to install it after previously having it installed
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
+Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
+
+;This removes the desktop icon in case the user chooses not to install it after previously having it installed
+Name: {userdesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
+Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
+
+;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
+Name: {app}\Docs; Type: filesandordirs
+
+Name: {app}\MergePlugins\editor addin.sct; Type: Files; Check: not IsComponentSelected('Plugins')
+Name: {app}\MergePlugins\insert datetime.sct; Type: Files; Check: not IsComponentSelected('Plugins')
+Name: {app}\MergePlugins; Type: DirIfEmpty; Check: not IsComponentSelected('Plugins')
+
+Name: {app}\Filters\ADAMulti.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\ASPNET.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\CSharp_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Delphi.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\MASM.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Merge_GnuC_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Merge_VC_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Merge_VB_loose.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\SourceControl.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\Symbian.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\XML_html.flt; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters\FileFilter.tmpl; Type: Files; Check: not IsComponentSelected('Filters')
+Name: {app}\Filters; Type: DirIfEmpty; Check: not IsComponentSelected('Filters')
+
+
+
+[Dirs]
+;The always uninstall flag tells the uninstaller to remove the folder if it's empty regardless of whether or not it existed prior to the installation
+Name: {app}; Flags: uninsalwaysuninstall
+
+
+[Files]
+; Select the proper executable for different Windows versions
+; For Windows 05/98/ME ANSI executable is installed (WinMerge.exe)
+; For Windows NT4/2000/XP/2003/Vista the Unicode executable is installed (WinMergeU.exe)
+Source: ..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
+
+; List of installed files
+Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
+
+; Microsoft runtime libraries (C-runtime, MFC)
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.CRT\msvcr90.dll"; DestDir: "{app}\Microsoft.VC90.CRT"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.CRT\msvcp90.dll"; DestDir: "{app}\Microsoft.VC90.CRT"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.CRT\msvcm90.dll"; DestDir: "{app}\Microsoft.VC90.CRT"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"; DestDir: "{app}\Microsoft.VC90.CRT"; Components: Core
+
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.MFC\mfc90.dll"; DestDir: "{app}\Microsoft.VC90.MFC"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.MFC\mfc90u.dll"; DestDir: "{app}\Microsoft.VC90.MFC"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.MFC\mfcm90.dll"; DestDir: "{app}\Microsoft.VC90.MFC"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.MFC\mfcm90u.dll"; DestDir: "{app}\Microsoft.VC90.MFC"; Components: Core
+Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC90.MFC\Microsoft.VC90.MFC.manifest"; DestDir: "{app}\Microsoft.VC90.MFC"; Components: Core
+
+; Shell extension
+; 64-bit version of ShellExtension
+Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
+
+;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version
+Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z465U.dll; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Check: Install7ZipDll('465')
+Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z457U.dll; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Check: Install7ZipDll('457')
+
+; Expat dll
+Source: ..\..\Build\expat\lib\X64\Release\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core
+
+; PCRE dll
+Source: ..\..\Build\pcre\X64\MinSizeRel\pcre.dll; DestDir: {app}; Flags: promptifolder; Components: Core
+
+; MergeLang.dll - translation helper dll
+Source: ..\..\Build\X64\MergeUnicodeRelease\MergeLang.dll; DestDir: {app}; Flags: promptifolder ignoreversion; Components: Core
+
+; Language files
+Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian
+Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
+Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan
+Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified
+Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional
+Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian
+Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch
+Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French
+Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician
+Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek
+Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion
+Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
+Source: ..\..\Build\Manual\htmlhelp\WinMerge_ja.chm; DestDir: {app}\Docs; Components: Languages\Japanese
+Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian
+Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish
+Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish
+Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian
+
+Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
+Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
+
+;Documentation
+Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
+Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
+Source: ..\..\Docs\Users\ReleaseNotes.html; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
+Source: ..\..\Docs\Users\ChangeLog.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
+Source: ..\..\Build\Manual\htmlhelp\WinMerge.chm; DestDir: {app}\Docs\; Flags: overwritereadonly uninsremovereadonly; Components: Core
+
+;Plugins
+;Please note IgnoreVersion and CompareTimeStamp are to instruct the installer to not not check for version info and go straight to comparing modification dates
+Source: ..\..\Plugins\dlls\editor addin.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
+Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
+Source: ..\..\Plugins\dlls\CompareMSExcelFiles.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
+Source: ..\..\Plugins\dlls\CompareMSWordFiles.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
+Source: ..\..\Plugins\dlls\X64\IgnoreColumns.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
+Source: ..\..\Plugins\dlls\X64\IgnoreCommentsC.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
+Source: ..\..\Plugins\dlls\X64\IgnoreFieldsComma.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
+Source: ..\..\Plugins\dlls\X64\IgnoreFieldsTab.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
+
+
+[Icons]
+;Start Menu Icons
+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
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Brazilian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: PortugueseBrazilian
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Bulgarian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Bulgarian
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Catalan.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Catalan
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseSimplified.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Simplified
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseTraditional.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Traditional
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Croatian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Croatian
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Dutch.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Dutch
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Galician.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Galician
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Greek.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Greek
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Japanese.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Japanese
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Romanian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Romanian
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Spanish.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Spanish
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Swedish.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Swedish
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Ukrainian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Ukrainian
+
+;Desktop Icon
+Name: {commondesktop}\WinMerge; Filename: {app}\{code:ExeName}; Tasks: desktopicon
+
+;Quick Launch Icon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon
+
+[Registry]
+Root: HKCU; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
+
+;Add Project file extension (.WinMerge) to known extensions and
+;set WinMerge to open those files
+;set Notepad to edit project files
+Root: HKCR; Subkey: .WinMerge; ValueType: String; ValueData: WinMerge.Project.File; Flags: uninsdeletekey
+Root: HKCR; Subkey: WinMerge.Project.File; ValueType: String; ValueData: {cm:ProjectFileDesc}; Flags: uninsdeletekey
+Root: HKCR; Subkey: WinMerge.Project.File\shell\open\command; ValueType: String; ValueData: """{app}\{code:ExeName}"" ""%1"""; Flags: uninsdeletekey
+Root: HKCR; Subkey: WinMerge.Project.File\shell\edit\command; ValueType: String; ValueData: """NOTEPAD.EXE"" ""%1"""; Flags: uninsdeletekey
+Root: HKCR; Subkey: WinMerge.Project.File\DefaultIcon; ValueType: String; ValueData: """{app}\{code:ExeName}"",1"; Flags: uninsdeletekey
+
+; delete obsolete values
+;In Inno Setup Version 4.18 ValueData couldn't be null and compile,
+;if this is fixed in a later version feel free to remove the parameter
+Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge\Settings; ValueType: none; ValueName: LeftMax; Flags: deletevalue
+Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge\Settings; ValueType: none; ValueName: DirViewMax; Flags: deletevalue
+
+;This removes the key that remembers which messageboxes to hide from the user, this is because the text of that message
+;can change and make it more clear as to the user why they might want to pay attention to a particular dialog and also
+;because a particular message might be added or removed and a new message might occupy a previous message's ID number
+Root: HKLM; Subkey: Software\Thingamahoochie\WinMerge\MessageBoxes; ValueType: none; Flags: deletekey
+
+Root: HKCR; SubKey: Directory\Shell\WinMerge\command; ValueType: none; Flags: deletekey noerror
+Root: HKCR; SubKey: Directory\Shell\WinMerge; ValueType: none; Flags: deletekey noerror
+
+;Adds "Start Menu" --> "Run" Support for WinMerge
+Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\App Paths\WinMerge.exe; ValueType: none; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Windows\CurrentVersion\App Paths\WinMergeU.exe; ValueType: none; Flags: uninsdeletekey
+Root: HKLM; SubKey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\WinMerge.exe; ValueType: string; ValueName: ; ValueData: {app}\{code:ExeName}
+Root: HKLM; SubKey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\WinMergeU.exe; ValueType: string; ValueName: ; ValueData: {app}\{code:ExeName}
+
+;Registry Keys for use by ShellExtension.dll
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: string; ValueName: Executable; ValueData: {app}\{code:ExeName}
+
+;Enables or disables the Context Menu preference based on what the user selects during install
+;Initially the Context menu is explicitly disabled:
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 0;
+
+;If the user chose to use the context menu then we re-enable it. This is necessary so it'll turn on and off not just on.
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 1; Tasks: ShellExtension
+Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: {code:ShellMenuEnabled}
+
+;If WinMerge.exe is installed then we'll automatically configure WinMerge as the differencing application
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+
+;Tells TortoiseCVS to use WinMerge as its differencing application (this happens whether or not Tortoise is current installed, that way
+;if it is installed at a later date this will automatically support it)
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+
+;Set WinMerge as TortoiseSVN diff tool
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+
+;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
+;(unless the user already has a startup language specified)
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000402; Flags: deletevalue; Languages: Bulgarian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000403; Flags: deletevalue; Languages: Catalan
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000804; Flags: deletevalue; Languages: Chinese_Simplified
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000404; Flags: deletevalue; Languages: Chinese_Traditional
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041a; Flags: deletevalue; Languages: Croatian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000405; Flags: deletevalue; Languages: Czech
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000406; Flags: deletevalue; Languages: Danish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000413; Flags: deletevalue; Languages: Dutch
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000409; Flags: deletevalue; Languages: English
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000040c; Flags: deletevalue; Languages: French
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000407; Flags: deletevalue; Languages: German
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000408; Flags: deletevalue; Languages: Greek
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000410; Flags: deletevalue; Languages: Italian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000411; Flags: deletevalue; Languages: Japanese
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000412; Flags: deletevalue; Languages: Korean
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000414; Flags: deletevalue; Languages: Norwegian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000429; Flags: deletevalue; Languages: Persian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000415; Flags: deletevalue; Languages: Polish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000816; Flags: deletevalue; Languages: Portuguese
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000418; Flags: deletevalue; Languages: Romanian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000419; Flags: deletevalue; Languages: Russian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041b; Flags: deletevalue; Languages: Slovak
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c0a; Flags: deletevalue; Languages: Spanish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041D; Flags: deletevalue; Languages: Swedish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041f; Flags: deletevalue; Languages: Turkish
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000422; Flags: deletevalue; Languages: Ukrainian
+
+
+[Run]
+;This will no longer appear unless the user chose to make a start menu group in the first place
+Filename: {win}\Explorer.exe; Description: {cm:ViewStartMenuFolder}; Parameters: """{group}"""; Flags: waituntilidle postinstall skipifsilent unchecked; Check: GroupCreated
+
+Filename: {app}\{code:ExeName}; Description: {cm:LaunchProgram, WinMerge}; Flags: nowait postinstall skipifsilent runmaximized
+
+
+[UninstallDelete]
+;Remove 7-zip integration dlls possibly installed (by hand or using separate installer)
+Name: {app}\Merge7z*.dll; Type: files
+Name: {app}\7zip_pad.xml; Type: files
+Name: {app}\Codecs; Type: filesandordirs
+Name: {app}\Formats; Type: filesandordirs
+Name: {app}\Lang; Type: filesandordirs
+
+Name: {group}; Type: dirifempty
+Name: {app}; Type: dirifempty
+
+
+[Code]
+Var
+ {Stores the version of 7-Zip Installed}
+ int7Zip_Version: Integer;
+
+ {Determines two things whether or not ComCtrl is needed and whether or not we've already checked}
+ intComCtlNeeded: Integer;
+
+{Determines whether or not the user chose to create a start menu}
+Function GroupCreated(): boolean;
+Var
+ {Stores the path of the start menu group Inno Setup may have created}
+ strGroup_Path: string;
+Begin
+ {Saves the path that Inno Setup intended to create the start menu group at}
+ strGroup_Path := ExpandConstant('{group}');
+
+ {If the start menu path isn't blank then..}
+ if strGroup_Path <> '' Then
+ Begin
+ {If the user choose to create the start menu then this folder will exist.
+ If the folder exists then GroupCreated = True otherwise it does not.}
+ Result := DirExists(strGroup_Path)
+ end
+ else
+ {Since the start menu path is null, we know that the user chose not to create a
+ start menu group (note in Inno Setup 4.18 this didn't yet work, but I'm sure it will in the future}
+ Result := False;
+
+ {Debug
+
+ If DirExists(strGroup_Path) = True Then
+ Msgbox('The group "' + ExpandConstant('group') + '" was found', mbInformation, mb_ok)
+ Else
+ Msgbox('The group "' + ExpandConstant('group') + '" doesn''t exist.', mbInformation, mb_ok); }
+End;
+
+
+{Returns the appropriate name of the .EXE being installed}
+Function ExeName(Unused: string): string;
+Begin
+
+ If UsingWinNT() = True Then
+ Result := 'WinMergeU.exe'
+ Else
+ Result := 'WinMerge.exe';
+End;
+
+Function FixVersion(strInput: string): string;
+{Returns a version with four segments A.B.C.D}
+Var
+ {Stores the number of periods found within the version string}
+ intPeriods: integer;
+
+ {Creates a counter}
+ i: integer;
+
+ {Generates the string to be returned to the user}
+ strVersion: string;
+Begin
+
+ {Creates a copy of the input string before we tear it apart}
+ strVersion := strInput;
+
+ {Until strInput is empty do..}
+ While Length(strInput) > 0 do
+ Begin
+ {if the first character of the input string is a period then}
+ If Copy(strInput, 1, 1) = '.' Then
+
+ {Incriment the number of periods found}
+ intPeriods := intPeriods + 1;
+
+ {Remove the first character from the Input string}
+ strInput := Copy(strINput, 2, length(strINput));
+ End;
+
+ {For every period shy of 3 do..}
+ For i := 1 to 3 - intperiods do
+
+ {Add a '.0' to the version string}
+ strVersion := strVersion + '.0';
+
+ {Returns the Version string with the correct number of segments}
+ Result := strVersion;
+
+End;
+
+Function RemoveLeadingZeros(strInput: string): string;
+{Removes the leading zeros if any from a numeric string}
+Begin
+
+ {While the first character of the string is a zero}
+ While Copy(strInput, 1, 1) = '0' Do
+ begin
+
+ {Removes one leading zero from the input string}
+ strInput := Copy(strInput, 2, Length(strINput));
+ end;
+
+ {Returns the formatted string}
+ Result := strInput;
+
+End;
+
+
+{Returns whether or not the version string detected is meets the version number requirement}
+Function VersionAtLeast(strVersion_Installed: string; intMajor: integer; intMinor: integer; intRevision: integer; intBuild: integer): boolean;
+Var
+
+ {Stores the Major of the Version installed (X.0.0.0)}
+ intMajor_Installed: Integer;
+
+ {Stores the Minor of the Version installed (1.X.0.0)}
+ intMinor_Installed: Integer;
+
+ {Stores the Revision of the Version installed (1.0.X.0)}
+ intRevision_Installed: Integer;
+
+ {Stores the Revision of the Version installed (1.0.0.X)}
+ intBuild_Installed: Integer;
+
+ {Stores the last valid character of a particular segment (Major, Minor, Revision) of the Version string}
+ intEnd_Pos: Integer;
+
+begin
+ {Debug
+ Msgbox('The version installed is ' + strVersion_Installed + ' and the required version is ' + IntToStr(intMajor) + '.' + IntToStr(intMinor) + '.' + IntToStr(intRevision) + '.' + IntToStr(intBuild), mbINformation, mb_OK)
+ }
+
+ {Makes sure the version string contains four numberic segments 5.2 ---> 5.2.0.0}
+ strVersion_Installed := FixVersion(strVersion_Installed);
+
+ {If the version number is empty then quit the function}
+ if strVersion_Installed = '' Then
+ begin
+ Result := False;
+
+ {Stops analyzing the version installed and returns that the version installed was inadequate}
+ exit;
+ end;
+
+ {Starts detecting the Major value of the Version Installed}
+
+ {Sets the end position equal to one character before the first period in the version number}
+ intEnd_Pos := Pos('.', strVersion_Installed) -1
+
+ {Sets the major version equal to all character before the first period }
+ intMajor_installed := StrToIntDef(RemoveLeadingZeros(Copy(strVersion_Installed, 1, intEnd_Pos)), 0);
+
+ {Debug
+ msgbox('The Major version installed is ' + IntToStr(intMajor_installed) + ' and the required Major is ' + IntToStr(intMajor) + '.', mbInformation, MB_OK)
+ }
+
+ {If the Major Version Installed is greater than the required value then...}
+ if intMajor_Installed > intMajor Then
+ begin
+ {Returns that the version number was adequate, since it actually exceeded the requirement}
+ Result := True;
+
+ {Debug
+ msgbox(IntToStr(intMajor_installed) + ' > ' + IntToStr(intMajor), mbInformation, MB_OK)
+ }
+
+ {Stops analyzing the version number since we already know it met the requirement}
+ exit;
+ end;
+
+ {If the Major version installed is less than the requirement then...}
+ If intMajor_Installed < intMajor Then
+ begin
+ {Debug
+ msgbox(IntToStr(intMajor_installed) + ' < ' + IntToStr(intMajor), mbInformation, MB_OK)
+ }
+
+ Result := False;
+
+ {Stops analyzing the version number since we already know it's inadequate and returns False (inadequate)}
+ exit;
+ end;
+
+
+ {Starts detecting the Minor version of the Version Installed}
+
+ {Modifies strVersion_Installed removing the first period and everything prior to it (Removes the Major Version)}
+ strVersion_Installed := Copy(strVersion_Installed, intEnd_Pos + 2, Length(strVersion_Installed));
+
+ {Sets the end position equal to one character before the first period in the version number}
+ intEnd_Pos := Pos('.', strVersion_Installed) -1
+
+ {Sets the Minor version equal to all character before the first period }
+ intMinor_installed := StrToIntDef(RemoveLeadingZeros(Copy(strVersion_Installed, 1, intEnd_Pos)), 0)
+
+ {Debug
+ msgbox('The Minor version installed is ' + IntToStr(intMinor_installed) + ' and the required Minor is ' + IntToStr(intMinor) + '.', mbInformation, MB_OK)
+ }
+
+ {If the Minor Version Installed is greater than the required value then...}
+ If intMinor_Installed > intMinor Then
+ begin
+ {Returns that the version number was adequate}
+ Result := True;
+
+ {Stops further analyzation of the version number}
+ exit
+ end;
+
+ {If the minor installed is less than what was required}
+ If intMinor_Installed < intMinor Then
+ Begin
+ Result := False;
+
+ {Returns that the version installed did not meet the required value and stops analyzing the version number}
+ exit;
+ end;
+
+
+ {Starts Detecting the Revision of the Version Installed}
+
+ {Modifies strVersion_Installed removing the first period and everything prior to it (Removes the Minor Version)}
+ strVersion_Installed := Copy(strVersion_Installed, intEnd_Pos + 2, Length(strVersion_Installed));
+
+ {Sets the last character of the Revision to last character before the first period}
+ intEnd_Pos := Pos('.', strVersion_Installed) -1
+
+ {Sets the Revision Installed equal to everything before the first period}
+ intRevision_Installed := strToIntDef(RemoveLeadingZeros(Copy(strVersion_Installed, 1, intEnd_Pos)), 0);
+
+ {Debug
+ msgbox('The Revision version installed is ' + IntToStr(intRevision_installed) + ' and the required Revision is ' + IntToStr(intRevision) + '.', mbInformation, MB_OK)
+ }
+
+ {If the Revision Installed is greater than the required value then...}
+ If intRevision_Installed > intRevision Then
+ begin
+ {Return that the version installed was adequate}
+ Result := True;
+
+ {Stops further analyzation of the version number}
+ exit
+ end;
+
+ {If the revision installed did not meet the requirement then...}
+ If intRevision_Installed < intRevision Then
+ begin
+ Result := False;
+
+ {Return that the version number failed to meet the requirement and stops further analyzation of the version number}
+ exit;
+ end;
+
+ {Start Detection the Build Installed}
+
+ {Modifies strVersion_Installed removing the first period and everything prior to it (Removes the Revision) leaving behind only the build number}
+ strVersion_Installed := Copy(strVersion_Installed, intEnd_Pos + 2, Length(strVersion_Installed));
+
+ {Set the build installed = to what's left of the strVersion_Installed text}
+ intBuild_installed := strToIntDef(RemoveLeadingZeros(strVersion_Installed), 0);
+
+ {Debug
+ msgbox('The Build version installed is ' + IntToStr(intBuild_installed) + ' and the required Build is ' + IntToStr(intBuild) + '.', mbInformation, MB_OK)
+ }
+
+ {If the build installed is greater than or equal to the requirement then...}
+ if intBuild_installed >= intBuild Then
+
+ {Report that the version installed was adequate}
+ Result := True
+ else
+
+ {Reports the inadequacy of the version installed and seases processing }
+ Result := False;
+end;
+
+{Returns whether or not the version of particular file is at least equal to requested value}
+Function FileVersionAtLeast(strFile_Path: string; intMajor: integer; intMinor: integer; intRevision: integer; intBuild: integer): boolean;
+ Var
+ {Stores the version of the file to be compared}
+ strVersion: string;
+Begin
+ {Gets the version number of the specified file}
+ GetVersionNumbersString(strFile_Path, strVersion)
+
+ {File Version at least is the result of the VersionAtLeast Determination}
+ Result := VersionAtLeast(strVersion, intMajor, intMinor, intRevision, intBuild);
+
+
+ {Debug: If you'd like to debug with a messagebox then un rem this
+ If Result = True then
+
+ Msgbox('The version of ' + strFile_path + ' required is "' + IntToStr(intMajor) + '.' + IntToStr(intMinor) + '.' + IntToStr(intRevision) + '.' + IntToStr(intBuild) + '". The version found was "' + strVersion + '. The version detected met the required value.', mbInformation, MB_OK)
+ else
+ Msgbox('The version of ' + strFile_path + ' required is "' + IntToStr(intMajor) + '.' + IntToStr(intMinor) + '.' + IntToStr(intRevision) + '.' + IntToStr(intBuild) + '". The version found was "' + strVersion + '. The version detected did not meet the required value.', mbInformation, MB_OK);
+ }
+end;
+
+function Install7ZipDll(strDLL_Version: string): Boolean;
+Var
+ {Stores the file path of the 7-Zip File Manager Program}
+ str7Zip_Path: String;
+
+ {Stores the version of 7-Zip Installed}
+ str7Zip_Version: String;
+
+ {Stores the DLL's Version Function Input Parameter in integer format}
+ intDLL_Version: Integer;
+Begin
+
+ {If the actual version of 7-Zip Installed hasn't been determined yet then...}
+ If int7Zip_Version = 0 Then
+ Begin
+ {Detects the install location of 7-Zip from the registry, if it's installed}
+ RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\7zFM.exe', '', str7Zip_Path)
+
+ {If there is 7-Zip information in the registry then...}
+ If length(str7Zip_Path) > 0 Then
+ begin
+ {If the 7zFM.exe file exists then...}
+ If FileExists(str7Zip_Path) = True Then
+ Begin
+ {Detects the version of the 7-Zip Installed}
+ GetVersionNumbersString(str7Zip_Path, str7Zip_Version)
+ {If the version of 7-Zip Installed is at least 3.11 Then...}
+ If VersionAtLeast(str7Zip_Version, 3, 11, 0, 0) = True Then
+ begin
+ {If the user has 3.12 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 3, 12, 0, 0) = True Then
+ Begin
+ {If the user has 3.13 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 3, 13, 0, 0) = True Then
+ Begin
+ {If the user has 4.20 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 20, 0, 0) = True Then
+ Begin
+ {If the user has 4.23 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 23, 0, 0) = True Then
+ Begin
+ {If the user has 4.31 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 31, 0, 0) = True Then
+ Begin
+ {If the user has 4.32 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 32, 0, 0) = True Then
+ Begin
+ {If the user has 4.32 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 42, 0, 0) = True Then
+ Begin
+ {If the user has 4.57 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 57, 0, 0) = True Then
+ Begin
+ {If the user has 465 or higher installed then...}
+ If VersionAtLeast(str7Zip_Version, 4, 65, 0, 0) = True Then
++ {We record the version of 7-Zip installed as 4.42 regardless of whether or not it's actually 4.21, 4.22, etc..}
+ int7Zip_Version := 465
+ Else
+ int7Zip_Version := 457
+ end
+ Else
+ {Since it was at least 4.42, but not 4.57 then it must be 4.42}
+ int7Zip_Version := 442
+ end
+ Else
+ {Since it was at least 4.32, but not 4.42 then it must be 4.32}
+ int7Zip_Version := 432
+ end
+ Else
+ {Since it was at least 4.31, but not 4.32 then it must be 4.31}
+ int7Zip_Version := 431
+ end
+ Else
+ {Since it was at least 4.23, but not 4.31 then it must be 4.23}
+ int7Zip_Version := 423
+ end
+ Else
+ {Since it was at least 4.20, but not 4.23 then it must be 4.20}
+ int7Zip_Version := 420
+ end
+ Else
+ {Since it was at least 3.13, but not 4.20 then it must be 3.13}
+ int7Zip_Version := 313
+ end
+ Else
+ {Since it was at least 3.12, but not 3.13 then it must be 3.12}
+ int7Zip_Version := 312;
+ end
+ Else
+ {Since it was at least 3.11, but not 3.12 then it must be 3.11}
+ int7Zip_Version := 311;
+ end;
+ End
+ Else
+ {Records that the 7-Zip program didn't exist for the rest of the installation}
+ int7Zip_Version := -1;
+ end
+ Else
+ {Records that the 7-Zip program wasn't installed for rest of the installation}
+ int7Zip_Version := -1;
+ end;
+
+ {Converts the DLL Version String to an Integer for numeric evaluation}
+ intDLL_Version := StrToInt(strDLL_Version);
+
+ {If 7-Zip either wasn't installed or was of inadequate version then...}
+ If int7Zip_Version = -1 Then
+ Begin
+ {If the program is trying to determine if the 313 DLL should be installed then the answer is yes
+ we install this, because it's the most recent version and if they were to install 7-zip this
+ would be the version they'd want (since people generally install the latest and greatest)}
+ if intDLL_Version = 313 Then
+ Result := True
+
+ {If the program is trying to install anything, but 313 on a system without 7-Zip
+ then we disallow the installation of that DLL}
+ else
+ Result := False;
+ End
+
+ {If the version of 7-Zip was sufficient then...}
+ Else
+ Begin
+ {if the version the program is trying to install matches the version installed on the clients system then...}
+ If int7Zip_Version = intDLL_Version Then
+ Result := True
+
+ {If the program is trying to install the 31X DLL on a 31Y system then we won't allow the file to be copied...}
+ else
+ Result := False;
+ End;
+
+ {Debug:
+ If UsingWinNT = True Then
+ begin
+ If Result = True Then
+ Msgbox('We''re are installing Merge7z' + strDLL_Version + 'U.DLL because the system has 7-Zip ' + IntToStr(int7Zip_Version) + ' installed.', mbInformation, mb_Ok)
+ Else
+ Msgbox('We''re aren''t installing Merge7z' + strDLL_Version + 'U.DLL because the system has 7-Zip ' + IntToStr(int7Zip_Version) + ' installed.', mbInformation, mb_Ok);
+ end
+
+
+ Else
+ begin
+ If Result = True Then
+ Msgbox('We''re are installing Merge7z' + strDLL_Version + '.DLL because the system has 7-Zip ' + IntToStr(int7Zip_Version) + ' installed.', mbInformation, mb_Ok)
+ Else
+ Msgbox('We''re aren''t installing Merge7z' + strDLL_Version + '.DLL because the system has 7-Zip ' + IntToStr(int7Zip_Version) + ' installed.', mbInformation, mb_Ok);
+ end }
+
+End;
+
+
+{Determines whether or not TortoiseCVS is installed}
+Function TortoiseCVSInstalled(): boolean;
+Begin
+ {This absolutely must remain as \CustomIcons, because our application used to create some TortoiseCVS keys even if the application wasn't installed!}
+ Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\CustomIcons') or RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\Icons');
+End;
+
+{Determines whether or not TortoiseSVN is installed}
+Function TortoiseSVNInstalled(): boolean;
+Begin
+ Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseSVN') or RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN');
+End;
+
+Function OldGroup(): string;
+Begin
+ {Stores where in \All Users\Programs\ our start menu used to be located}
+ RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinMerge_is1', 'Inno Setup: Icon Group', Result)
+End;
+
+Procedure DeletePreviousStartMenu();
+Var
+ strOld: string;
+ strNew: string;
+ strMessage: string;
+ strShortcut: string;
+Begin
+ {Detects the previous start menu group's path, if any}
+ strOld := OldGroup();
+
+ {Detects the current start menu group's path, if any (not creating a group is a valid option)}
+ strNew := ExpandConstant('{group}');
+
+ {removes the start menu portion of the path from the group path making it match the format of strOld}
+ StringChange(strNew, ExpandConstant('{commonprograms}\'), '')
+
+ {if the user does have a previous start menu location then..}
+ If strOld <> '' Then
+ Begin
+ {If the current and previous start menu locations are different then...}
+ If Uppercase(strOld) <> UpperCase(strNew) Then
+ Begin
+ strMessage := ExpandConstant('{cm:DeletePreviousStartMenu}');
+ strMessage := Format(strMessage, [strOld, strNew]);
+
+ {Display a dialog asking the user if they'd like to delete the previous start menu group}
+ {If they'd like to delete the previous start menu group then...}
+ If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then
+ Begin
+ strOld := ExpandConstant('{commonprograms}\') + strOld;
+ {Remove old start menu}
+ DelTree(strOld, True, True, True);
+ End;
+ End;
+ End;
+End;
+
+{This event procedure is queed each time the user changes pages within the installer}
+Procedure CurPageChanged(CurPage: integer);
+Begin
+ {if the installer reaches the file copy page then...}
+ If CurPage = wpInstalling Then
+ {Delete the previous start menu group if the location has changed since the last install}
+ DeletePreviousStartMenu;
+End;
+
+// Checks if context menu is already enabled for shell extension
+// If so, we won't overwrite its existing value in [Registry] section
+Function ShellMenuEnabled(Unused: string): string;
+Var
+ ContextMenuEnabled: DWORD;
+Begin
+ ContextMenuEnabled := 0;
+ RegQueryDWORDValue(HKCU, 'Software\Thingamahoochie\WinMerge', 'ContextMenuEnabled', ContextMenuEnabled);
+ if IsTaskSelected('ShellExtension') then
+ Result := inttostr(ContextMenuEnabled or 1)
+ else
+ Result := '0';
+End;
+
+{Replace one occurrence of OldStr in Str with NewStr}
+Function ReplaceSubString(Src: string; OldStr: string; NewStr: string) : string;
+Var
+ OldStrStartAt: Integer;
+
+Begin
+ OldStrStartAt := Pos(OldStr, Src);
+ if OldStrStartAt > 0 then
+ begin
+ {Remove old string}
+ Delete(Src, OldStrStartAt, Length(OldStr));
+ {Insert new string}
+ Insert(NewStr, Src, OldStrStartAt);
+ end;
+ Result := Src;
+End;
+
+{Returns WinMerge installed exeutable file name}
+Function WinMergeExeName(): string;
+Var
+ Unused: String;
+
+Begin
+ Result := ExpandConstant('{app}\') + ExeName(Unused);
+End;
+
+{Returns ClearCase external tools configuration file name}
+Function ClearCaseMapFile(): string;
+Begin
+ if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then
+ begin
+ Result := {pf} + '\Rational\';
+ end;
+ Result := Result + 'ClearCase\lib\mgrs\map';
+End;
+
+{Determines whether or not Rational ClearCase is installed}
+Function ClearCaseInstalled(): boolean;
+Begin
+ Result := FileExists(ClearCaseMapFile());
+End;
+
+{Intergrate WinMerge as ClearCase external diff tool}
+Procedure IntegrateClearCase(OldExe: String; NewExe: String);
+Var
+ MapFile: TStringList;
+ FileName: String;
+ I: Integer;
+ BakFile: String;
+
+Begin
+ FileName := ClearCaseMapFile();
+ {Create a backup file of the original file first time it gets modified}
+ BakFile := FileName + '.original';
+ if not FileExists(BakFile) then
+ begin
+ FileCopy(FileName, BakFile, True);
+ end;
+ MapFile := TStringList.Create();
+ {Read the entire map file to a string list}
+ MapFile.LoadFromFile(FileName);
+ if MapFile.Count > 0 then
+ begin
+ for I := 0 to MapFile.Count do
+ begin
+ {Search for the 'text_file_delta xcompare ...' line}
+ if (MapFile.Strings[I][1] <> ';') and (Pos('text_file_delta', MapFile.Strings[I]) > 0) and (Pos('xcompare', MapFile.Strings[I]) > 0) then
+ begin
+ {Replace old executable name with a new executable name}
+ MapFile.Strings[I] := ReplaceSubString(MapFile.Strings[I], OldExe, NewExe);
+ break;
+ end;
+ end;
+ { Save the modified file. }
+ MapFile.SaveToFile(FileName);
+ end;
+End;
+
+// Add WinMerge to system path.
+// This requires certain order of things to work:
+// #1 ModPathDir function must be first (it gets called by others)
+// #2 include of modpath.iss so modpath code gets included
+// #3 CurStepChanged and CurUninstallStepChanged procedures as they call
+// ModPath (in modpath.iss)
+function ModPathDir(): TArrayOfString;
+var
+ Dir: TArrayOfString;
+begin
+ setArrayLength(Dir, 1)
+ Dir[0] := ExpandConstant('{app}');
+ Result := Dir;
+end;
+
+#include "modpath.iss"
+
+procedure CurStepChanged(CurStep: TSetupStep);
+Begin
+ if CurStep = ssPostInstall then
+ begin
+ if IsTaskSelected('modifypath') then
+ ModPath();
+ if IsTaskSelected('ClearCase') then
+ begin
+ IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName());
+ end;
+ end;
+End;
+
+Procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+ appdir: String;
+ selectedTasks: String;
+Begin
+ appdir := ExpandConstant('{app}')
+ if CurUninstallStep = usUninstall then begin
+ if LoadStringFromFile(appdir + '\uninsTasks.txt', selectedTasks) then
+ if Pos('modifypath', selectedTasks) > 0 then
+ ModPath();
+ DeleteFile(appdir + '\uninsTasks.txt')
+ end;
+
+ if CurUninstallStep = usPostUninstall then
+ begin
+ if ClearCaseInstalled() then
+ IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');
+ end;
+End;
--- /dev/null
- set REVISION=12
+set MAJOR=2
+set MINOR=13
++set REVISION=13
+set PATCHLEVEL=1
+set PRIVATEBUILD=jp-1
+
+set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
+rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
+set STRVER=%MAJOR%.%MINOR%.%REVISION%
+set APPVER=%STRVER%+-%PRIVATEBUILD%
+set SAFEAPPVER=%STRVER%-%PRIVATEBUILD%
+
- <?xml version="1.0" encoding="shift_jis"?>
-<?xml version="1.0" encoding="Windows-1252"?>
--<VisualStudioProject
-- ProjectType="Visual C++"
- Version="7.10"
- Version="8.00"
-- Name="ShellExtension"
- ProjectGUID="{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
- SccProjectName=""
- SccLocalPath=""
- Keyword="AtlProj">
- ProjectGUID="{5615F4FD-FFC4-460F-9D12-26EFF2B558E4}"
- Keyword="AtlProj"
- >
-- <Platforms>
-- <Platform
- Name="Win32"/>
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
-- </Platforms>
- <ToolFiles>
- </ToolFiles>
-- <Configurations>
-- <Configuration
-- Name="Unicode Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <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="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
-- BasicRuntimeChecks="3"
-- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtensionU.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Unicode Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <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="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
-- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- SuppressStartupBanner="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"/>
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
-- <Tool
-- Name="VCLinkerTool"
-- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtensionU.def"
- GenerateDebugInformation="TRUE"
- GenerateDebugInformation="true"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
-- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
- HeaderFileName=""/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCXDCMakeTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Unicode Release MinSize|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtensionU.lib"
- TargetMachine="1"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- <Configuration
- Name="Unicode Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- Name="Unicode Release MinSize|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
-- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- InlineFunctionExpansion="1"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- StringPooling="true"
-- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
-- 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\MergeUnicodeRelease\ShellExtensionU.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtensionU.def"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
-- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
- HeaderFileName=""/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCXDCMakeTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Unicode Release MinDependency|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtensionU.lib"
- TargetMachine="1"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- <Configuration
- Name="Unicode Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- Name="Unicode Release MinDependency|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
-- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- InlineFunctionExpansion="1"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- StringPooling="true"
-- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
-- 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\MergeUnicodeRelease\ShellExtensionU.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtensionU.def"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
-- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCXDCMakeTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\/ShellExtension.lib"
- TargetMachine="1"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- <Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- Name="Release MinDependency|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
-- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- AdditionalOptions="/D "NDEBUG""
-- Optimization="1"
-- InlineFunctionExpansion="1"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- StringPooling="true"
-- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
-- 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\MergeRelease\ShellExtension.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtension.def"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
-- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCXDCMakeTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinSize|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtension.lib"
- TargetMachine="1"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- <Configuration
- Name="Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- Name="Release MinSize|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
-- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- AdditionalOptions="/D "NDEBUG""
-- Optimization="1"
-- InlineFunctionExpansion="1"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- StringPooling="true"
-- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
-- 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\MergeRelease\ShellExtension.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtension.def"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
-- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
- HeaderFileName=""/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCXDCMakeTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(IntDir)\ShellExtension.lib"
- TargetMachine="1"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=".,../src/common"
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
-- BasicRuntimeChecks="3"
-- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- UsePrecompiledHeader="0"
-- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
-- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
-- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
-- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
-- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
-- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
- echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
- "
- Outputs="$(OutDir)\regsvr32.trg"/>
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
-- <Tool
-- Name="VCLinkerTool"
-- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
-- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- SuppressStartupBanner="true"
-- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="TRUE"
- GenerateDebugInformation="true"
-- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
-- SubSystem="2"
-- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="1"/>
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="X64 Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <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="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
-- <Tool
-- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
- HeaderFileName=""/>
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
- HeaderFileName=""
- />
-- <Tool
- Name="VCPostBuildEventTool"/>
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
-- <Tool
- Name="VCPreBuildEventTool"/>
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
- Name="VCPreLinkEventTool"/>
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="X64 Debug|x64"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <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="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName="$(IntDir)/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\ShellExtensionX64.pdb"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- Culture="1033"
- />
-- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- Name="VCPreLinkEventTool"
- />
-- <Tool
- Name="VCXMLDataGeneratorTool"/>
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtensionX64.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionX64.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(IntDir)\ShellExtensionX64.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtensionX64.lib"
- TargetMachine="17"
- />
-- <Tool
- Name="VCWebDeploymentTool"/>
- Name="VCALinkTool"
- />
-- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- Name="VCManifestTool"
- />
-- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="X64 Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="X64 Release|x64"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\ShellExtensionX64.pdb"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtensionX64.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionX64.def"
- ProgramDatabaseFile="$(IntDir)/ShellExtensionX64.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)/ShellExtensionX64.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
-- </Configuration>
-- </Configurations>
-- <References>
-- </References>
-- <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="..\src\common\coretools.cpp">
- RelativePath="..\src\common\coretools.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="..\src\common\RegKey.cpp">
- RelativePath="..\src\common\RegKey.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="ShellExtension.cpp">
- RelativePath="ShellExtension.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="ShellExtension.def">
- RelativePath="ShellExtension.def"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="ShellExtension.idl">
- RelativePath="ShellExtension.idl"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- GenerateStublessProxies="true"
-- TypeLibraryName=".\ShellExtension.tlb"
-- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="ShellExtensionU.def">
- RelativePath="ShellExtensionU.def"
- >
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
- Name="VCCustomBuildTool"/>
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="StdAfx.cpp">
- RelativePath="StdAfx.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
-- BasicRuntimeChecks="3"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
-- BasicRuntimeChecks="3"
-- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"/>
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="..\Src\Common\UnicodeString.cpp">
- RelativePath="..\Src\Common\UnicodeString.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="WinMergeShell.cpp">
- RelativePath="WinMergeShell.cpp"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Unicode Release MinDependency|x64"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="1"
-- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
-- <Tool
-- Name="VCCLCompilerTool"
-- Optimization="0"
-- AdditionalIncludeDirectories=""
-- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"/>
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
-- </FileConfiguration>
-- </File>
-- </Filter>
-- <Filter
-- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- Filter="h;hpp;hxx;hm;inl"
- >
-- <File
- RelativePath="..\src\common\coretools.h">
- RelativePath="..\src\common\coretools.h"
- >
-- </File>
-- <File
- RelativePath="..\src\common\RegKey.h">
- RelativePath="..\src\common\RegKey.h"
- >
-- </File>
-- <File
- RelativePath="Resource.h">
- RelativePath="Resource.h"
- >
-- </File>
-- <File
- RelativePath="StdAfx.h">
- RelativePath="StdAfx.h"
- >
-- </File>
-- <File
- RelativePath="..\Src\Common\UnicodeString.h">
- RelativePath="..\Src\Common\UnicodeString.h"
- >
-- </File>
-- <File
- RelativePath="WinMergeShell.h">
- RelativePath="WinMergeShell.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"
- >
-- <File
- RelativePath="ShellExtension.rc">
- RelativePath="ShellExtension.rc"
- >
-- <FileConfiguration
- Name="Unicode Debug|Win32">
- Name="Unicode Debug|Win32"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinSize|Win32">
- Name="Unicode Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- Name="Unicode Release MinSize|x64"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinDependency|Win32">
- Name="Unicode Release MinDependency|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Release MinSize|Win32">
- Name="Release MinDependency|x64"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
- Name="Debug|Win32">
- Name="Release MinSize|Win32"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionBrazilian.rc">
- RelativePath="Languages\ShellExtensionBrazilian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionBulgarian.rc">
- RelativePath="Languages\ShellExtensionBulgarian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionCatalan.rc">
- RelativePath="Languages\ShellExtensionCatalan.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionChineseSimplified.rc">
- RelativePath="Languages\ShellExtensionChineseSimplified.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionChineseTraditional.rc">
- RelativePath="Languages\ShellExtensionChineseTraditional.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionCroatian.rc">
- RelativePath="Languages\ShellExtensionCroatian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionCzech.rc">
- RelativePath="Languages\ShellExtensionCzech.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionDanish.rc">
- RelativePath="Languages\ShellExtensionDanish.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionDutch.rc">
- RelativePath="Languages\ShellExtensionDutch.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionFrench.rc">
- RelativePath="Languages\ShellExtensionFrench.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionGalician.rc">
- RelativePath="Languages\ShellExtensionGalician.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionGerman.rc">
- RelativePath="Languages\ShellExtensionGerman.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath=".\Languages\ShellExtensionGreek.rc">
- RelativePath=".\Languages\ShellExtensionGreek.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionHungarian.rc">
- RelativePath="Languages\ShellExtensionHungarian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionItalian.rc">
- RelativePath="Languages\ShellExtensionItalian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionJapanese.rc">
- RelativePath="Languages\ShellExtensionJapanese.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionKorean.rc">
- RelativePath="Languages\ShellExtensionKorean.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionNorwegian.rc">
- RelativePath="Languages\ShellExtensionNorwegian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionPersian.rc">
- RelativePath="Languages\ShellExtensionPersian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionPolish.rc">
- RelativePath="Languages\ShellExtensionPolish.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionPortuguese.rc">
- RelativePath="Languages\ShellExtensionPortuguese.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath=".\Languages\ShellExtensionRomanian.rc">
- RelativePath=".\Languages\ShellExtensionRomanian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionRussian.rc">
- RelativePath="Languages\ShellExtensionRussian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionSlovak.rc">
- RelativePath="Languages\ShellExtensionSerbian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionSlovenian.rc">
- RelativePath="Languages\ShellExtensionSlovak.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionSpanish.rc">
- RelativePath="Languages\ShellExtensionSlovenian.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionSwedish.rc">
- RelativePath="Languages\ShellExtensionSpanish.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="Languages\ShellExtensionTurkish.rc">
- RelativePath="Languages\ShellExtensionSwedish.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath=".\Languages\ShellExtensionUkrainian.rc">
- RelativePath="Languages\ShellExtensionTurkish.rc"
- >
-- <FileConfiguration
-- Name="Unicode Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- <FileConfiguration
-- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- ExcludedFromBuild="true"
- >
-- <Tool
-- Name="VCResourceCompilerTool"
-- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
-- </FileConfiguration>
-- </File>
-- <File
- RelativePath="WinMerge.bmp">
- RelativePath=".\Languages\ShellExtensionUkrainian.rc"
- >
- <FileConfiguration
- Name="Unicode Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
-- </File>
-- <File
- RelativePath="WinMergeShell.rgs">
- RelativePath="WinMerge.bmp"
- >
- </File>
- <File
- RelativePath="WinMergeShell.rgs"
- >
-- </File>
-- </Filter>
-- </Files>
-- <Globals>
-- </Globals>
--</VisualStudioProject>
++<?xml version="1.0" encoding="shift_jis"?>\r
++<VisualStudioProject\r
++ ProjectType="Visual C++"\r
++ Version="7.10"\r
++ Name="ShellExtension"\r
++ ProjectGUID="{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"\r
++ SccProjectName=""\r
++ SccLocalPath=""\r
++ Keyword="AtlProj">\r
++ <Platforms>\r
++ <Platform\r
++ Name="Win32"/>\r
++ </Platforms>\r
++ <Configurations>\r
++ <Configuration\r
++ Name="Unicode Debug|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="1">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"\r
++ BasicRuntimeChecks="3"\r
++ RuntimeLibrary="3"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ DebugInformationFormat="4"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"\r
++ Description="Performing registration"\r
++ CommandLine="if "%OS%"=="" goto NOTNT\r
++if not "%OS%"=="Windows_NT" goto NOTNT\r
++regsvr32 /s /c "$(TargetPath)"\r
++echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"\r
++goto end\r
++:NOTNT\r
++echo Warning : Cannot register Unicode DLL on Windows 95\r
++:end\r
++"\r
++ Outputs="$(OutDir)\regsvr32.trg"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtensionU.def"\r
++ GenerateDebugInformation="TRUE"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ <Configuration\r
++ Name="Unicode Release MinSize|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ UseOfATL="2"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="1">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ InlineFunctionExpansion="1"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"\r
++ StringPooling="TRUE"\r
++ RuntimeLibrary="2"\r
++ EnableFunctionLevelLinking="TRUE"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtensionU.def"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ <Configuration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ UseOfATL="1"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="1">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ InlineFunctionExpansion="1"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"\r
++ StringPooling="TRUE"\r
++ RuntimeLibrary="2"\r
++ EnableFunctionLevelLinking="TRUE"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtensionU.def"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ <Configuration\r
++ Name="Release MinDependency|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ UseOfATL="1"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="2">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ AdditionalOptions="/D "NDEBUG""\r
++ Optimization="1"\r
++ InlineFunctionExpansion="1"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"\r
++ StringPooling="TRUE"\r
++ RuntimeLibrary="2"\r
++ EnableFunctionLevelLinking="TRUE"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeRelease\ShellExtension.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtension.def"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ <Configuration\r
++ Name="Release MinSize|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ UseOfATL="2"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="2">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ AdditionalOptions="/D "NDEBUG""\r
++ Optimization="1"\r
++ InlineFunctionExpansion="1"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"\r
++ StringPooling="TRUE"\r
++ RuntimeLibrary="2"\r
++ EnableFunctionLevelLinking="TRUE"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeRelease\ShellExtension.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtension.def"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ <Configuration\r
++ Name="Debug|Win32"\r
++ OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"\r
++ IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"\r
++ ConfigurationType="2"\r
++ UseOfMFC="0"\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="2">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=".,../src/common"\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"\r
++ BasicRuntimeChecks="3"\r
++ RuntimeLibrary="3"\r
++ UsePrecompiledHeader="2"\r
++ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"\r
++ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"\r
++ ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"\r
++ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"\r
++ WarningLevel="3"\r
++ SuppressStartupBanner="TRUE"\r
++ DebugInformationFormat="4"\r
++ CompileAs="0"/>\r
++ <Tool\r
++ Name="VCCustomBuildTool"\r
++ Description="Performing registration"\r
++ CommandLine="regsvr32 /s /c "$(TargetPath)"\r
++echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"\r
++"\r
++ Outputs="$(OutDir)\regsvr32.trg"/>\r
++ <Tool\r
++ Name="VCLinkerTool"\r
++ OutputFile="..\Build\MergeDebug\ShellExtension.dll"\r
++ LinkIncremental="1"\r
++ SuppressStartupBanner="TRUE"\r
++ ModuleDefinitionFile=".\ShellExtension.def"\r
++ GenerateDebugInformation="TRUE"\r
++ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"\r
++ SubSystem="2"\r
++ ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"\r
++ TargetMachine="1"/>\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
++ <Tool\r
++ Name="VCPostBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreBuildEventTool"/>\r
++ <Tool\r
++ Name="VCPreLinkEventTool"/>\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
++ <Tool\r
++ Name="VCWebDeploymentTool"/>\r
++ <Tool\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
++ </Configuration>\r
++ </Configurations>\r
++ <References>\r
++ </References>\r
++ <Files>\r
++ <Filter\r
++ Name="Source Files"\r
++ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
++ <File\r
++ RelativePath="..\src\common\coretools.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="..\src\common\RegKey.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="ShellExtension.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="ShellExtension.def">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="ShellExtension.idl">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCMIDLTool"\r
++ GenerateStublessProxies="TRUE"\r
++ TypeLibraryName=".\ShellExtension.tlb"\r
++ HeaderFileName="ShellExtension.h"\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="ShellExtensionU.def">\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCCustomBuildTool"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="StdAfx.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"\r
++ UsePrecompiledHeader="1"\r
++ PrecompiledHeaderThrough="stdafx.h"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="..\Src\Common\UnicodeString.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="WinMergeShell.cpp">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="1"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCCLCompilerTool"\r
++ Optimization="0"\r
++ AdditionalIncludeDirectories=""\r
++ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"\r
++ BasicRuntimeChecks="3"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ </Filter>\r
++ <Filter\r
++ Name="Header Files"\r
++ Filter="h;hpp;hxx;hm;inl">\r
++ <File\r
++ RelativePath="..\src\common\coretools.h">\r
++ </File>\r
++ <File\r
++ RelativePath="..\src\common\RegKey.h">\r
++ </File>\r
++ <File\r
++ RelativePath="Resource.h">\r
++ </File>\r
++ <File\r
++ RelativePath="StdAfx.h">\r
++ </File>\r
++ <File\r
++ RelativePath="..\Src\Common\UnicodeString.h">\r
++ </File>\r
++ <File\r
++ RelativePath="WinMergeShell.h">\r
++ </File>\r
++ </Filter>\r
++ <Filter\r
++ Name="Resource Files"\r
++ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">\r
++ <File\r
++ RelativePath="ShellExtension.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionBrazilian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionBulgarian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionCatalan.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionChineseSimplified.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionChineseTraditional.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionCroatian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionCzech.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionDanish.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionDutch.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionFrench.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionGalician.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionGerman.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath=".\Languages\ShellExtensionGreek.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionHungarian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionItalian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionJapanese.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionKorean.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionNorwegian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionPersian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionPolish.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionPortuguese.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath=".\Languages\ShellExtensionRomanian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionRussian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath=".\Languages\ShellExtensionSerbian.rc">\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionSlovak.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionSlovenian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionSpanish.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionSwedish.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="Languages\ShellExtensionTurkish.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath=".\Languages\ShellExtensionUkrainian.rc">\r
++ <FileConfiguration\r
++ Name="Unicode Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Unicode Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG;$(NoInherit)"\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinDependency|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Release MinSize|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ <FileConfiguration\r
++ Name="Debug|Win32"\r
++ ExcludedFromBuild="TRUE">\r
++ <Tool\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions=""\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
++ </FileConfiguration>\r
++ </File>\r
++ <File\r
++ RelativePath="WinMerge.bmp">\r
++ </File>\r
++ <File\r
++ RelativePath="WinMergeShell.rgs">\r
++ </File>\r
++ </Filter>\r
++ </Files>\r
++ <Globals>\r
++ </Globals>\r
++</VisualStudioProject>\r
- <?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\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\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>
+ <?xml version="1.0" encoding="Windows-1252"?>\r
+ <VisualStudioProject\r
+ ProjectType="Visual C++"\r
- Version="8.00"\r
++ Version="7.10"\r
+ Name="ShellExtension"\r
+ ProjectGUID="{C388C7AA-862D-455A-8D3B-8F4BF5AE44EA}"\r
- Keyword="MFCProj"\r
- >\r
++ SccProjectName=""\r
++ SccLocalPath=""\r
++ Keyword="MFCProj">\r
+ <Platforms>\r
+ <Platform\r
- Name="Win32"\r
- />\r
++ Name="Win32"/>\r
+ </Platforms>\r
- <ToolFiles>\r
- </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug X64|Win32"\r
+ OutputDirectory=".\..\BuildTmp\ShellExtensionX64Debug"\r
+ IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64Debug"\r
+ ConfigurationType="2"\r
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+ UseOfMFC="0"\r
+ UseOfATL="1"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
- CharacterSet="1"\r
- >\r
- <Tool\r
- Name="VCPreBuildEventTool"\r
- />\r
- <Tool\r
- Name="VCCustomBuildTool"\r
- Description="Performing registration"\r
- 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
"\r
- Outputs="$(OutDir)\regsvr32.trg"\r
- />\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"\r
- />\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"\r
- />\r
- <Tool\r
- Name="VCMIDLTool"\r
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"\r
- HeaderFileName=""\r
- />\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="1">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".,../src/common"\r
+ PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"\r
+ BasicRuntimeChecks="0"\r
- SmallerTypeCheck="false"\r
++ SmallerTypeCheck="FALSE"\r
+ RuntimeLibrary="3"\r
- BufferSecurityCheck="false"\r
- UsePrecompiledHeader="0"\r
++ BufferSecurityCheck="FALSE"\r
++ UsePrecompiledHeader="2"\r
+ PrecompiledHeaderThrough=""\r
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch"\r
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64Debug/"\r
+ ObjectFile=".\..\BuildTmp\ShellExtensionX64Debug/"\r
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64Debug/"\r
+ WarningLevel="3"\r
- SuppressStartupBanner="true"\r
- Detect64BitPortabilityProblems="true"\r
++ SuppressStartupBanner="TRUE"\r
++ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"\r
- CompileAs="0"\r
- />\r
++ CompileAs="0"/>\r
+ <Tool\r
- Name="VCManagedResourceCompilerTool"\r
- />\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG"\r
- Culture="1033"\r
- />\r
- <Tool\r
- Name="VCPreLinkEventTool"\r
- />\r
++ Name="VCCustomBuildTool"\r
++ Description="Performing registration"\r
++ CommandLine="if "%OS%"=="" goto NOTNT\r
++if not "%OS%"=="Windows_NT" goto NOTNT\r
++regsvr32 /s /c "$(TargetPath)"\r
++echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"\r
++goto end\r
++:NOTNT\r
++echo Warning : Cannot register Unicode DLL on Windows 95\r
++:end\r
++"\r
++ Outputs="$(OutDir)\regsvr32.trg"/>\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions="/machine:AMD64"\r
+ AdditionalDependencies="bufferoverflowU.lib"\r
+ OutputFile="..\Build\ShellExtensionX64Debug\ShellExtensionX64.dll"\r
+ LinkIncremental="1"\r
- SuppressStartupBanner="true"\r
++ SuppressStartupBanner="TRUE"\r
+ ModuleDefinitionFile=".\ShellExtensionX64.def"\r
- GenerateDebugInformation="true"\r
++ GenerateDebugInformation="TRUE"\r
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb"\r
+ SubSystem="2"\r
+ OptimizeForWindows98="1"\r
+ ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionX64.lib"\r
- TargetMachine="1"\r
- />\r
++ TargetMachine="1"/>\r
+ <Tool\r
- Name="VCALinkTool"\r
- />\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
+ <Tool\r
- Name="VCManifestTool"\r
- />\r
++ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
- Name="VCXDCMakeTool"\r
- />\r
++ Name="VCPreBuildEventTool"/>\r
+ <Tool\r
- Name="VCBscMakeTool"\r
- />\r
++ Name="VCPreLinkEventTool"/>\r
+ <Tool\r
- Name="VCFxCopTool"\r
- />\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="_DEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
++ <Tool\r
++ Name="VCXMLDataGeneratorTool"/>\r
+ <Tool\r
- Name="VCAppVerifierTool"\r
- />\r
++ Name="VCWebDeploymentTool"/>\r
+ <Tool\r
- Name="VCWebDeploymentTool"\r
- />\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
+ <Tool\r
- Name="VCPostBuildEventTool"\r
- />\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release X64|Win32"\r
+ OutputDirectory=".\..\BuildTmp\ShellExtensionX64/"\r
+ IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64/"\r
+ ConfigurationType="2"\r
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+ UseOfMFC="0"\r
+ UseOfATL="1"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
- CharacterSet="1"\r
- >\r
- <Tool\r
- Name="VCPreBuildEventTool"\r
- />\r
- <Tool\r
- Name="VCCustomBuildTool"\r
- />\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"\r
- />\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"\r
- />\r
- <Tool\r
- Name="VCMIDLTool"\r
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"\r
- HeaderFileName=""\r
- />\r
++ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
++ CharacterSet="1">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ InlineFunctionExpansion="1"\r
+ AdditionalIncludeDirectories=".,../src/common"\r
+ PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"\r
- StringPooling="true"\r
- ExceptionHandling="1"\r
++ StringPooling="TRUE"\r
++ ExceptionHandling="TRUE"\r
+ RuntimeLibrary="2"\r
- BufferSecurityCheck="false"\r
- EnableFunctionLevelLinking="true"\r
- UsePrecompiledHeader="0"\r
++ BufferSecurityCheck="FALSE"\r
++ EnableFunctionLevelLinking="TRUE"\r
++ UsePrecompiledHeader="2"\r
+ PrecompiledHeaderThrough=""\r
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64/ShellExtension.pch"\r
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64/"\r
+ ObjectFile=".\..\BuildTmp\ShellExtensionX64/"\r
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64/"\r
+ WarningLevel="3"\r
- SuppressStartupBanner="true"\r
- Detect64BitPortabilityProblems="true"\r
- CompileAs="0"\r
- />\r
- <Tool\r
- Name="VCManagedResourceCompilerTool"\r
- />\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="NDEBUG"\r
- Culture="1033"\r
- />\r
++ SuppressStartupBanner="TRUE"\r
++ Detect64BitPortabilityProblems="TRUE"\r
++ CompileAs="0"/>\r
+ <Tool\r
- Name="VCPreLinkEventTool"\r
- />\r
++ Name="VCCustomBuildTool"/>\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions="/machine:AMD64"\r
+ AdditionalDependencies="bufferoverflowU.lib"\r
+ OutputFile="..\Build\ShellExtensionX64\ShellExtensionX64.dll"\r
+ LinkIncremental="1"\r
- SuppressStartupBanner="true"\r
++ SuppressStartupBanner="TRUE"\r
+ ModuleDefinitionFile=".\ShellExtensionX64.def"\r
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.pdb"\r
+ SubSystem="2"\r
+ OptimizeForWindows98="1"\r
+ ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionX64.lib"\r
- TargetMachine="1"\r
- />\r
++ TargetMachine="1"/>\r
+ <Tool\r
- Name="VCALinkTool"\r
- />\r
++ Name="VCMIDLTool"\r
++ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"\r
++ HeaderFileName=""/>\r
+ <Tool\r
- Name="VCManifestTool"\r
- />\r
++ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
- Name="VCXDCMakeTool"\r
- />\r
++ Name="VCPreBuildEventTool"/>\r
+ <Tool\r
- Name="VCBscMakeTool"\r
- />\r
++ Name="VCPreLinkEventTool"/>\r
+ <Tool\r
- Name="VCFxCopTool"\r
- />\r
++ Name="VCResourceCompilerTool"\r
++ PreprocessorDefinitions="NDEBUG"\r
++ Culture="1033"/>\r
++ <Tool\r
++ Name="VCWebServiceProxyGeneratorTool"/>\r
+ <Tool\r
- Name="VCAppVerifierTool"\r
- />\r
++ Name="VCXMLDataGeneratorTool"/>\r
+ <Tool\r
- Name="VCWebDeploymentTool"\r
- />\r
++ Name="VCWebDeploymentTool"/>\r
+ <Tool\r
- Name="VCPostBuildEventTool"\r
- />\r
++ Name="VCManagedWrapperGeneratorTool"/>\r
++ <Tool\r
++ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
- >\r
++ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
+ <File\r
- RelativePath="..\src\common\coretools.cpp"\r
- >\r
++ RelativePath="..\src\common\coretools.cpp">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"\r
- BasicRuntimeChecks="3"\r
- />\r
++ BasicRuntimeChecks="3"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ AdditionalIncludeDirectories=""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"\r
- />\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="..\src\common\RegKey.cpp"\r
- >\r
++ RelativePath="..\src\common\RegKey.cpp">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"\r
- BasicRuntimeChecks="3"\r
- />\r
++ BasicRuntimeChecks="3"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ AdditionalIncludeDirectories=""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"\r
- />\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="ShellExtension.cpp"\r
- >\r
++ RelativePath="ShellExtension.cpp">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"\r
- BasicRuntimeChecks="3"\r
- />\r
++ BasicRuntimeChecks="3"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ AdditionalIncludeDirectories=""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"\r
- />\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="ShellExtension.def"\r
- >\r
++ RelativePath="ShellExtension.def">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
- Name="VCCustomBuildTool"\r
- />\r
++ Name="VCCustomBuildTool"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
- Name="VCCustomBuildTool"\r
- />\r
++ Name="VCCustomBuildTool"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="ShellExtension.idl"\r
- >\r
++ RelativePath="ShellExtension.idl">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCMIDLTool"\r
- GenerateStublessProxies="true"\r
++ GenerateStublessProxies="TRUE"\r
+ TypeLibraryName=".\ShellExtension.tlb"\r
+ HeaderFileName="ShellExtension.h"\r
- InterfaceIdentifierFileName="ShellExtension_i.c"\r
- />\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCMIDLTool"\r
- GenerateStublessProxies="true"\r
++ GenerateStublessProxies="TRUE"\r
+ TypeLibraryName=".\ShellExtension.tlb"\r
+ HeaderFileName="ShellExtension.h"\r
- InterfaceIdentifierFileName="ShellExtension_i.c"\r
- />\r
++ InterfaceIdentifierFileName="ShellExtension_i.c"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath=".\ShellExtensionU.def"\r
- >\r
++ RelativePath=".\ShellExtensionU.def">\r
+ </File>\r
+ <File\r
- RelativePath=".\ShellExtensionX64.def"\r
- >\r
++ RelativePath=".\ShellExtensionX64.def">\r
+ </File>\r
+ <File\r
- RelativePath="StdAfx.cpp"\r
- >\r
++ RelativePath="StdAfx.cpp">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"\r
+ BasicRuntimeChecks="3"\r
- UsePrecompiledHeader="1"\r
- />\r
++ UsePrecompiledHeader="1"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF)"\r
- UsePrecompiledHeader="1"\r
- />\r
++ UsePrecompiledHeader="1"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="..\Src\Common\UnicodeString.cpp"\r
- >\r
++ RelativePath="..\Src\Common\UnicodeString.cpp">\r
+ </File>\r
+ <File\r
- RelativePath="WinMergeShell.cpp"\r
- >\r
++ RelativePath="WinMergeShell.cpp">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF"\r
- BasicRuntimeChecks="3"\r
- />\r
++ BasicRuntimeChecks="3"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="1"\r
+ AdditionalIncludeDirectories=""\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"\r
- />\r
++ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
- Filter="h;hpp;hxx;hm;inl"\r
- >\r
++ Filter="h;hpp;hxx;hm;inl">\r
+ <File\r
- RelativePath="..\src\common\coretools.h"\r
- >\r
++ RelativePath="..\src\common\coretools.h">\r
+ </File>\r
+ <File\r
- RelativePath="..\src\common\RegKey.h"\r
- >\r
++ RelativePath="..\src\common\RegKey.h">\r
+ </File>\r
+ <File\r
- RelativePath="Resource.h"\r
- >\r
++ RelativePath="Resource.h">\r
+ </File>\r
+ <File\r
- RelativePath="StdAfx.h"\r
- >\r
++ RelativePath="StdAfx.h">\r
+ </File>\r
+ <File\r
- RelativePath="..\Src\Common\UnicodeString.h"\r
- >\r
++ RelativePath="..\Src\Common\UnicodeString.h">\r
+ </File>\r
+ <File\r
- RelativePath="WinMergeShell.h"\r
- >\r
++ RelativePath="WinMergeShell.h">\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
- >\r
++ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">\r
+ <File\r
- RelativePath="ShellExtension.rc"\r
- >\r
++ RelativePath="ShellExtension.rc">\r
+ <FileConfiguration\r
- Name="Debug X64|Win32"\r
- >\r
++ Name="Debug X64|Win32">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
- Name="Release X64|Win32"\r
- >\r
++ Name="Release X64|Win32">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionBrazilian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionBrazilian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionBulgarian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionBulgarian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionCatalan.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionCatalan.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionChineseSimplified.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionChineseSimplified.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionChineseTraditional.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionChineseTraditional.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionCroatian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionCroatian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionCzech.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionCzech.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionDanish.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionDanish.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionDutch.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionDutch.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionFrench.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionFrench.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionGerman.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionGerman.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath=".\Languages\ShellExtensionGreek.rc"\r
- >\r
++ RelativePath=".\Languages\ShellExtensionGreek.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionHungarian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionHungarian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionItalian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionItalian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionJapanese.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionJapanese.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionKorean.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionKorean.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionNorwegian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionNorwegian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionPersian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionPersian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionPolish.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionPolish.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionPortuguese.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionPortuguese.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionPortuguese.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionPortuguese.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath=".\Languages\ShellExtensionRomanian.rc"\r
- >\r
++ RelativePath=".\Languages\ShellExtensionRomanian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionRussian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionRussian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionSerbian.rc"\r
- >\r
- <FileConfiguration\r
- Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
- </FileConfiguration>\r
++ RelativePath=".\Languages\ShellExtensionSerbian.rc">\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionSlovak.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionSlovak.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionSlovenian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionSlovenian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionSpanish.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionSpanish.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionSwedish.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionSwedish.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionTurkish.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionTurkish.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="Languages\ShellExtensionUkrainian.rc"\r
- >\r
++ RelativePath="Languages\ShellExtensionUkrainian.rc">\r
+ <FileConfiguration\r
+ Name="Debug X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release X64|Win32"\r
- ExcludedFromBuild="true"\r
- >\r
++ ExcludedFromBuild="TRUE">\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"\r
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"\r
- />\r
++ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
- RelativePath="WinMerge.bmp"\r
- >\r
++ RelativePath="WinMerge.bmp">\r
+ </File>\r
+ <File\r
- RelativePath="WinMergeShell.rgs"\r
- >\r
++ RelativePath="WinMergeShell.rgs">\r
+ </File>\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+ </VisualStudioProject>\r
int nremains = nUcs;
for (UINT i = 0 ; i < nUtf && nremains > 0; )
- {\r
- int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);\r
- if (chlen < 1 || i + chlen > nUtf)\r
- *pwc++ = '?';\r
- else\r
- *pwc++ = ucr::GetUtf8Char(pUtf+i);\r
- nremains --;\r
- if (chlen < 1) chlen = 1;\r
- i += chlen;\r
- }\r
- \r
- // return number of written wchars\r
+ {
- *pwc++ = ucr::GetUtf8Char(pUtf+i);
- nremains --;
+ int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
++ if (chlen < 1 || i + chlen > nUtf)
++ *pwc++ = '?';
++ else
++ *pwc++ = ucr::GetUtf8Char(pUtf+i);
++ nremains --;
+ if (chlen < 1) chlen = 1;
+ i += chlen;
+ }
+
+ // return number of written wchars
- return (nUtf - nremains);
+ return (nUcs - nremains);
}
/**
return cnt;
}
-size_t linelen(const char *string)
++size_t linelen(const char *string, size_t maxlen)
+ {
+ size_t stringlen = 0;
- while (char c = string[stringlen])
++ while (stringlen < maxlen)
+ {
- if (c == '\r' || c == '\n')
++ char c = string[stringlen];
++ if (c == '\r' || c == '\n' || c == '\0')
+ break;
+ ++stringlen;
+ }
+ return stringlen;
+ }
void GetLocalDrives(LPTSTR letters)
{
String LegalizeFileName(LPCTSTR szFileName);
int tcssubptr(LPCTSTR start, LPCTSTR end);
-size_t linelen(const char *string);
++size_t linelen(const char *string, size_t maxlen);
HANDLE RunIt(LPCTSTR szExeFile, LPCTSTR szArgs, BOOL bMinimized = TRUE, BOOL bNewConsole = FALSE);
BOOL HasExited(HANDLE hProcess, DWORD *pCode = NULL);
int nremains = nUcs;
for (UINT i = 0 ; i < nUtf && nremains > 0; )
- {\r
- int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);\r
- if (chlen < 1 || i + chlen > nUtf)\r
- *pwc++ = '?';\r
- else\r
- *pwc++ = ucr::GetUtf8Char(pUtf+i);\r
- nremains --;\r
- if (chlen < 1) chlen = 1;\r
- i += chlen;\r
- }\r
- \r
- // return number of written wchars\r
+ {
- *pwc++ = ucr::GetUtf8Char(pUtf+i);
- nremains --;
+ int chlen = ucr::Utf8len_fromLeadByte(pUtf[i]);
++ if (chlen < 1 || i + chlen > nUtf)
++ *pwc++ = '?';
++ else
++ *pwc++ = ucr::GetUtf8Char(pUtf+i);
++ nremains --;
+ if (chlen < 1) chlen = 1;
+ i += chlen;
+ }
+
+ // return number of written wchars
- return (nUtf - nremains);
+ return (nUcs - nremains);
}
#include "DiffContext.h"
#include "DIFF.H"
#include "DiffUtils.h"
- #include "DiffList.h"\r
- #include "DiffWrapper.h"\r
- #include "FilterCommentsManager.h"\r
- \r
+ #include "coretools.h"
+
++#include "DiffList.h"
++#include "DiffWrapper.h"
++#include "FilterCommentsManager.h"
+
namespace CompareEngines
{
static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
: m_pOptions(NULL)
, m_pFilterList(NULL)
, m_inf(NULL)
- , m_FilterCommentsManager(new ::FilterCommentsManager)\r
++ , m_FilterCommentsManager(new ::FilterCommentsManager)
+ , m_pDiffWrapper(new ::CDiffWrapper)
{
}
*/
DiffUtils::~DiffUtils()
{
- delete m_FilterCommentsManager;\r
++ delete m_FilterCommentsManager;
ClearCompareOptions();
ClearFilterList();
}
{
if (m_pOptions != NULL)
ClearCompareOptions();
- \r
- m_pOptions = new DiffutilsOptions((DiffutilsOptions&)options);\r
+
- m_pOptions = new DiffutilsOptions(options);
++ m_pOptions = new DiffutilsOptions((DiffutilsOptions&)options);
+
if (m_pOptions == NULL)
return false;
m_ndiffs = 0;
m_ntrivialdiffs = 0;
- if (script)\r
- if (script && m_pFilterList && m_pFilterList->HasRegExps())
++ if (script)
{
struct change *next = script;
struct change *thisob = 0, *end = 0;
- String asLwrCaseExt;\r
- String LowerCaseExt = CA2T(m_inf[0].name);\r
- int PosOfDot = LowerCaseExt.rfind('.');\r
- if (PosOfDot != -1)\r
- {\r
- LowerCaseExt.erase(0, PosOfDot + 1);\r
- CharLower(&*LowerCaseExt.begin());\r
- asLwrCaseExt = LowerCaseExt;\r
++ String asLwrCaseExt;
++ String LowerCaseExt = CA2T(m_inf[0].name);
++ int PosOfDot = LowerCaseExt.rfind('.');
++ if (PosOfDot != -1)
++ {
++ LowerCaseExt.erase(0, PosOfDot + 1);
++ CharLower(&*LowerCaseExt.begin());
++ asLwrCaseExt = LowerCaseExt;
+ }
+
while (next)
{
/* Find a set of changes that belong together. */
int QtyLinesLeft = (trans_b0 - trans_a0);
int QtyLinesRight = (trans_b1 - trans_a1);
- if(m_pOptions->m_filterCommentsLines)\r
- {\r
- int op=0;\r
- if (!deletes && !inserts)\r
- op = OP_TRIVIAL;\r
- else\r
- op = OP_DIFF;\r
- \r
++ if(m_pOptions->m_filterCommentsLines)
++ {
++ int op=0;
++ if (!deletes && !inserts)
++ op = OP_TRIVIAL;
++ else
++ op = OP_DIFF;
++
+ DIFFOPTIONS options = {0};
+ options.nIgnoreWhitespace = m_pOptions->m_ignoreWhitespace;
+ options.bIgnoreBlankLines = m_pOptions->m_bIgnoreBlankLines;
+ options.bFilterCommentsLines = m_pOptions->m_filterCommentsLines;
+ options.bIgnoreCase = m_pOptions->m_bIgnoreCase;
+ options.bIgnoreEol = m_pOptions->m_bIgnoreEOLDifference;
+ m_pDiffWrapper->SetOptions(&options);
- m_pDiffWrapper->PostFilter(thisob->line0, QtyLinesLeft+1, thisob->line1, QtyLinesRight+1, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());\r
- if(op == OP_TRIVIAL)\r
- {\r
- thisob->trivial = 1;\r
- }\r
- }\r
++ m_pDiffWrapper->PostFilter(thisob->line0, QtyLinesLeft+1, thisob->line1, QtyLinesRight+1, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());
++ if(op == OP_TRIVIAL)
++ {
++ thisob->trivial = 1;
++ }
++ }
+
// Match lines against regular expression filters
// Our strategy is that every line in both sides must
// match regexp before we mark difference as ignored.
- if(m_pFilterList && m_pFilterList->HasRegExps())\r
- {\r
- bool match2 = false;
- bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
- if (match1)
- match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
- if (match1 && match2)
- thisob->trivial = 1;
++ if(m_pFilterList && m_pFilterList->HasRegExps())
++ {
+ bool match2 = false;
+ bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
+ if (match1)
+ match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
+ if (match1 && match2)
+ thisob->trivial = 1;
+ }
}
/* Reconnect the script so it will all be freed properly. */
while (line <= EndPos && linesMatch == true)
{
- std::string LineData(files[FileNo].linbuf[line]);
- size_t EolPos = LineData.find_first_of(EolIndicators);
- if (EolPos != std::string::npos)
- {
- LineData.erase(EolPos);
- }
-
- if (!m_pFilterList->Match(LineData.c_str(), m_codepage))
++ size_t len = files[FileNo].linbuf[line + 1] - files[FileNo].linbuf[line];
+ const char *string = files[FileNo].linbuf[line];
- size_t stringlen = linelen(string);
++ size_t stringlen = linelen(string, len);
+ if (!m_pFilterList->Match(stringlen, string, m_codepage))
{
linesMatch = false;
}
*/
CompareOptions * CDiffContext::GetCompareOptions(int compareMethod)
{
- // If compare method is same than in previous time, return cached value
+ //If compare method is same than in previous time, return cached value
if (compareMethod == m_nCurrentCompMethod && m_pCompareOptions != NULL)
return m_pCompareOptions;
-
+
// Otherwise we have to create new options
delete m_pCompareOptions;
m_pCompareOptions = NULL;
--/////////////////////////////////////////////////////////////////////////////
--// License (GPLv2+):
--// This program is free software; you can redistribute it and/or modify
--// it under the terms of the GNU General Public License as published by
--// the Free Software Foundation; either version 2 of the License, or (at
--// your option) any later version.
--//
--// This program is distributed in the hope that it will be useful, but
--// WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--// GNU General Public License for more details.
--//
--// You should have received a copy of the GNU General Public License
--// along with this program; if not, write to the Free Software
--// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--/////////////////////////////////////////////////////////////////////////////
--/**
-- * @file DiffWrapper.cpp
-- *
-- * @brief Code for DiffWrapper class
-- *
-- * @date Created: 2003-08-22
-- */
--// ID line follows -- this is updated by SVN
- // $Id: DiffWrapper.cpp 7091 2010-01-11 20:27:43Z kimmov $
-// $Id$
--
--#include "StdAfx.h"
--#include <sys/types.h>
--#include <sys/stat.h>
- #include <algorithm>
--#include <string>
--#include <map>
--#include <shlwapi.h>
--#include "Ucs2Utf8.h"
--#include "coretools.h"
--#include "DiffContext.h"
--#include "DiffList.h"
--#include "MovedLines.h"
--#include "FilterList.h"
--#include "DiffWrapper.h"
--#include "DIFF.H"
--#include "FileTransform.h"
--#include "LogFile.h"
--#include "paths.h"
--#include "CompareOptions.h"
--#include "FileTextStats.h"
--#include "FolderCmp.h"
--#include "FilterCommentsManager.h"
--#include "Environment.h"
- #include "PatchHTML.h"
--#include "AnsiConvert.h"
--#include "UnicodeString.h"
--
--#ifdef _DEBUG
--#define new DEBUG_NEW
--#undef THIS_FILE
--static char THIS_FILE[] = __FILE__;
--#endif
--
--extern int recursive;
--
--static void FreeDiffUtilsScript(struct change * & script);
- static void FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02);
--static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
--static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);
-
-// Postfiltering
-static bool IsTrivialBytes(const char* Start, const char* End,
- const FilterCommentsSet& filtercommentsset);
-static bool IsTrivialLine(const std::string &Line, const char * StartOfComment,
- const char * EndOfComment, const char * InLineComment,
- const FilterCommentsSet& filtercommentsset);
-static bool PostFilter(int StartPos, int EndPos, int Direction,
- int QtyLinesInBlock, int &Op, int FileNo,
- const FilterCommentsSet& filtercommentsset);
-static void PostFilterSingleLine(const char* LineStr, int &Op,
- const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck);
-static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
- int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
- const TCHAR *FileNameExt);
-
--
--/**
-- * @brief Default constructor.
-- * Initializes members and creates new FilterCommentsManager.
-- */
--CDiffWrapper::CDiffWrapper()
--: m_FilterCommentsManager(new FilterCommentsManager)
--, m_bCreatePatchFile(FALSE)
--, m_bUseDiffList(FALSE)
--, m_bAddCmdLine(TRUE)
--, m_bAppendFiles(FALSE)
--, m_nDiffs(0)
- , m_codepage(GetACP())
-, m_codepage(0)
--, m_infoPrediffer(NULL)
--, m_pDiffList(NULL)
--, m_bPathsAreTemp(FALSE)
-, m_pMovedLines(NULL)
--, m_pFilterList(NULL)
--, m_bPluginsEnabled(false)
--{
-- ZeroMemory(&m_status, sizeof(DIFFSTATUS));
-
- m_pMovedLines[0] = NULL;
- m_pMovedLines[1] = NULL;
- m_pMovedLines[2] = NULL;
-
-- // character that ends a line. Currently this is always `\n'
-- line_end_char = '\n';
--}
--
--/**
-- * @brief Destructor.
-- */
--CDiffWrapper::~CDiffWrapper()
--{
-- delete m_pFilterList;
-- delete m_infoPrediffer;
-- delete m_FilterCommentsManager;
- delete m_pMovedLines[0];
- delete m_pMovedLines[1];
- delete m_pMovedLines[2];
- delete m_pMovedLines;
--}
--
--/**
-- * @brief Set plugins enabled/disabled.
-- * @param [in] enable if true plugins are enabled.
-- */
--void CDiffWrapper::EnablePlugins(bool enable)
--{
-- m_bPluginsEnabled = enable;
--}
--
--/**
-- * @brief Enables/disables patch-file creation and sets filename.
-- * This function enables or disables patch file creation. When
-- * @p filename is empty, patch files are disabled.
-- * @param [in] filename Filename for patch file, or empty string.
-- */
--void CDiffWrapper::SetCreatePatchFile(const String &filename)
--{
-- if (filename.empty())
-- {
-- m_bCreatePatchFile = FALSE;
-- m_sPatchFile.clear();
-- }
-- else
-- {
-- m_bCreatePatchFile = TRUE;
-- m_sPatchFile = filename;
-- string_replace(m_sPatchFile, _T("/"), _T("\\"));
-- }
--}
--
--/**
-- * @brief Enables/disabled DiffList creation ands sets DiffList.
-- * This function enables or disables DiffList creation. When
-- * @p diffList is NULL difflist is not created. When valid DiffList
-- * pointer is given, compare results are stored into it.
-- * @param [in] diffList Pointer to DiffList getting compare results.
-- */
--void CDiffWrapper::SetCreateDiffList(DiffList *diffList)
--{
-- if (diffList == NULL)
-- {
-- m_bUseDiffList = FALSE;
-- m_pDiffList = NULL;
-- }
-- else
-- {
-- m_bUseDiffList = TRUE;
-- m_pDiffList = diffList;
-- }
--}
--
--/**
-- * @brief Returns current set of options used by diff-engine.
-- * This function converts internally used diff-options to
-- * format used outside CDiffWrapper and returns them.
-- * @param [in,out] options Pointer to structure getting used options.
-- */
--void CDiffWrapper::GetOptions(DIFFOPTIONS *options)
--{
-- ASSERT(options);
-- DIFFOPTIONS tmpOptions = {0};
-- m_options.GetAsDiffOptions(tmpOptions);
-- *options = tmpOptions;
--}
--
--/**
-- * @brief Set options for Diff-engine.
-- * This function converts given options to format CDiffWrapper uses
-- * internally and stores them.
-- * @param [in] options Pointer to structure having new options.
-- */
--void CDiffWrapper::SetOptions(const DIFFOPTIONS *options)
--{
-- ASSERT(options);
-- m_options.SetFromDiffOptions(*options);
--}
--
--/**
-- * @brief Set text tested to find the prediffer automatically.
-- * Most probably a concatenated string of both filenames.
-- */
--void CDiffWrapper::SetTextForAutomaticPrediff(const String &text)
--{
-- m_sToFindPrediffer = text;
--}
--void CDiffWrapper::SetPrediffer(PrediffingInfo * prediffer /*=NULL*/)
--{
-- if (m_infoPrediffer)
-- delete m_infoPrediffer;
--
-- // all flags are set correctly during the construction
-- m_infoPrediffer = new PrediffingInfo;
--
-- if (prediffer)
-- *m_infoPrediffer = *prediffer;
--}
--void CDiffWrapper::GetPrediffer(PrediffingInfo * prediffer)
--{
-- *prediffer = *m_infoPrediffer;
--}
--
--/**
-- * @brief Set options used for patch-file creation.
-- * @param [in] options Pointer to structure having new options.
-- */
--void CDiffWrapper::SetPatchOptions(const PATCHOPTIONS *options)
--{
-- ASSERT(options);
-- m_options.m_contextLines = options->nContext;
--
-- switch (options->outputStyle)
-- {
-- case OUTPUT_NORMAL:
-- m_options.m_outputStyle = DIFF_OUTPUT_NORMAL;
-- break;
-- case OUTPUT_CONTEXT:
-- m_options.m_outputStyle = DIFF_OUTPUT_CONTEXT;
-- break;
-- case OUTPUT_UNIFIED:
-- m_options.m_outputStyle = DIFF_OUTPUT_UNIFIED;
- break;
- case OUTPUT_HTML:
- m_options.m_outputStyle = DIFF_OUTPUT_HTML;
-- break;
-- default:
-- _RPTF0(_CRT_ERROR, "Unknown output style!");
-- break;
-- }
--
-- m_bAddCmdLine = options->bAddCommandline;
--}
--
--/**
-- * @brief Enables/disables moved block detection.
-- * @param [in] bDetectMovedBlocks If TRUE moved blocks are detected.
-- */
--void CDiffWrapper::SetDetectMovedBlocks(bool bDetectMovedBlocks)
--{
-- if (bDetectMovedBlocks)
-- {
- if (m_pMovedLines[0] == NULL)
- {
- m_pMovedLines[0] = new MovedLines;
- m_pMovedLines[1] = new MovedLines;
- m_pMovedLines[2] = new MovedLines;
- }
- if (m_pMovedLines == NULL)
- m_pMovedLines = new MovedLines;
-- }
-- else
-- {
- delete m_pMovedLines[0];
- delete m_pMovedLines[1];
- delete m_pMovedLines[2];
- m_pMovedLines[0] = NULL;
- m_pMovedLines[1] = NULL;
- m_pMovedLines[2] = NULL;
- delete m_pMovedLines;
- m_pMovedLines = NULL;
-- }
--}
--
--/**
-- * @brief Test for trivial only characters in string
-- * @param [in] Start - Start position in string
-- * @param [in] End - One character pass the end position of the string
-- * @param [in] filtercommentsset - For future use to determine trivial bytes
-- * @return Returns true if all characters are trivial
-- */
- bool CDiffWrapper::IsTrivialBytes(const char* Start, const char* End,
-static bool IsTrivialBytes(const char* Start, const char* End,
-- const FilterCommentsSet& filtercommentsset)
--{
-- std::string testdata(Start, End);
-- //@TODO: Need to replace the following trivial string with a user specified string
-- size_t pos = testdata.find_first_not_of(" \t\r\n");
-- return (pos == std::string::npos);
--}
--
--/**
-- * @brief Test for a line of trivial data
-- * @param [in] Line - String to test for
-- * @param [in] StartOfComment -
-- * @param [in] EndOfComment -
-- * @param [in] InLineComment -
-- * @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
-- * @return Returns true if entire line is trivial
-- */
- bool CDiffWrapper::IsTrivialLine(const std::string &Line,
-static bool IsTrivialLine(const std::string &Line,
-- const char * StartOfComment,
-- const char * EndOfComment,
-- const char * InLineComment,
-- const FilterCommentsSet& filtercommentsset)
--{
-- //Do easy test first
-- if ((!StartOfComment || !EndOfComment) && !InLineComment)
-- return false;//In no Start and End pair, and no single in-line set, then it's not trivial
--
-- if (StartOfComment == Line.c_str() &&
-- ((EndOfComment + filtercommentsset.EndMarker.size()) - StartOfComment) == Line.size())
-- {//If entire line is blocked by End and Start markers, then entire line is trivial
-- return true;
-- }
--
-- if (InLineComment && InLineComment < StartOfComment)
-- {
-- if (InLineComment == Line.c_str())
-- return true;//If line starts with InLineComment marker, then entire line is trivial
--
-- //Other wise, check if data before InLineComment marker is trivial
-- return IsTrivialBytes(Line.c_str(), InLineComment, filtercommentsset);
-- }
--
-- //Done with easy test, so now do more complex test
-- if (StartOfComment &&
-- EndOfComment &&
-- StartOfComment < EndOfComment &&
-- IsTrivialBytes(Line.c_str(), StartOfComment, filtercommentsset) &&
-- IsTrivialBytes(EndOfComment + filtercommentsset.EndMarker.size(),
-- Line.c_str()+Line.size(), filtercommentsset))
-- {
-- return true;
-- }
--
-- return false;
-}
-
-/**
- * @brief Find comment marker in string, excluding portions enclosed in quotation marks or apostrophes
- * @param [in] target - string to search
- * @param [in] marker - marker to search for
- * @return Returns position of marker, or NULL if none is present
- */
-static const char *FindCommentMarker(const char *target, const char *marker)
-{
- char prev = '\0';
- char quote = '\0';
- size_t marker_len = strlen(marker);
- while (const char c = *target)
- {
- if (quote == '\0' && memcmp(target, marker, marker_len) == 0)
- return target;
- if ((prev != '\\') &&
- (c == '"' || c == '\'') &&
- (quote == '\0' || quote == c))
- {
- quote ^= c;
- }
- prev = c;
- ++target;
- }
- return NULL;
--}
--
--/**
-- @brief Performs post-filtering, by setting comment blocks to trivial
-- @param [in] StartPos - First line number to read
-- @param [in] EndPos - The line number PASS the last line number to read
-- @param [in] QtyLinesInBlock - Number of lines in diff block. Not needed in backward direction.
-- @param [in] Direction - This should be 1 or -1, to indicate which direction to read (backward or forward)
-- @param [in,out] Op - This variable is set to trivial if block should be ignored.
-- @param [in] FileNo - Should be 0 or 1, to indicate left or right file.
-- @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
-- @return Always returns true in reverse direction.
-- In forward direction, returns false if none trivial data is found within QtyLinesInBlock
--*/
- bool CDiffWrapper::PostFilter(int StartPos, int EndPos, int Direction,
-static bool PostFilter(int StartPos, int EndPos, int Direction,
-- int QtyLinesInBlock, int &Op, int FileNo,
-- const FilterCommentsSet& filtercommentsset)
--{
-- const char* EolIndicators = "\r\n"; //List of characters used as EOL
-- if (Op == OP_TRIVIAL) //If already set to trivial, then exit.
-- return true;
-- bool OpShouldBeTrivial = false;
-- int QtyTrivialLines = 0;
-- for(int i = StartPos + ((Direction == -1)?-1:0); i != EndPos;i += Direction)
-- {
-- if ((i - StartPos) == QtyLinesInBlock &&
-- QtyLinesInBlock == QtyTrivialLines)
-- {
-- OpShouldBeTrivial = true;
-- break;
- }
- size_t len = files[FileNo].linbuf[i + 1] - files[FileNo].linbuf[i];
- std::string LineData(files[FileNo].linbuf[i], len);
- size_t EolPos = LineData.find_first_of(EolIndicators);
- if (EolPos != std::string::npos)
- {
- LineData.erase(EolPos);
-- }
--
- const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str());
- const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str());
- const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
- const char *LineStr = files[FileNo].linbuf[i];
- std::string LineData(LineStr, linelen(LineStr));
-
- const char * StartOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.StartMarker.c_str());
- const char * EndOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.EndMarker.c_str());
- const char * InLineComment = FindCommentMarker(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
-- //The following logic determines if the entire block is a comment block, and only marks it as trivial
-- //if all the changes are within a comment block.
-- if (Direction == -1)
-- {
-- if (!StartOfComment && EndOfComment)
-- break;
--
-- if (StartOfComment && (!EndOfComment || EndOfComment < StartOfComment) && (!InLineComment || InLineComment > StartOfComment))
-- {
-- OpShouldBeTrivial = true;
-- break;
-- }
-- }
-- else if (Direction == 1)
-- {
-- if (IsTrivialBytes(LineData.c_str(), LineData.c_str()+LineData.size(), filtercommentsset) ||
-- IsTrivialLine(LineData, StartOfComment, EndOfComment, InLineComment, filtercommentsset))
-- {
-- ++QtyTrivialLines;
-- }
--
-- if (!EndOfComment && StartOfComment)
-- {
-- if (i == (StartPos + QtyTrivialLines) )
-- {
-- if (StartOfComment == LineData.c_str())
-- {//If this is at the beginning of the first line, then lets continue
-- continue;
-- }
-- if (IsTrivialBytes(LineData.c_str(), StartOfComment, filtercommentsset))
-- {//If only trivial bytes before comment marker, then continue
-- continue;
-- }
-- break;
-- }
-- //If this is not the first line, then assume
-- //previous lines are non-trivial, and return true.
-- return false;
-- }
--
-- if (EndOfComment &&
-- (!StartOfComment || StartOfComment > EndOfComment) &&
-- (!InLineComment || InLineComment > EndOfComment) )
-- {
-- if (!IsTrivialBytes(EndOfComment+filtercommentsset.EndMarker.size(), LineData.c_str()+LineData.size(), filtercommentsset))
-- {
-- return false;
-- }
--
-- if ((i - StartPos) >= (QtyLinesInBlock-1))
-- {
-- OpShouldBeTrivial = true;
-- break;
-- }
--
-- //Lets check if the remaining lines only contain trivial data
-- bool AllRemainingLinesContainTrivialData = true;
-- int TrivLinePos = i+1;
-- for(; TrivLinePos != (StartPos + QtyLinesInBlock);++TrivLinePos)
-- {
- size_t len = files[FileNo].linbuf[TrivLinePos + 1] - files[FileNo].linbuf[TrivLinePos];
- std::string LineDataTrvCk(files[FileNo].linbuf[TrivLinePos], len);
- std::string LineDataTrvCk(files[FileNo].linbuf[TrivLinePos]);
-- size_t EolPos = LineDataTrvCk.find_first_of(EolIndicators);
-- if (EolPos != std::string::npos)
-- {
-- LineDataTrvCk.erase(EolPos);
-- }
-- if (LineDataTrvCk.size() &&
-- !IsTrivialBytes(LineDataTrvCk.c_str(), LineDataTrvCk.c_str() + LineDataTrvCk.size(), filtercommentsset))
-- {
-- AllRemainingLinesContainTrivialData = false;
-- break;
-- }
-- }
-- if (AllRemainingLinesContainTrivialData)
-- {
-- OpShouldBeTrivial = true;
-- break;
-- }
-- if (TrivLinePos != (StartPos + QtyLinesInBlock) )
-- {
-- return PostFilter(TrivLinePos, EndPos, Direction, QtyLinesInBlock - (TrivLinePos - StartPos), Op, FileNo, filtercommentsset);
-- }
-- }
-- }
-- }
-- if (OpShouldBeTrivial)
-- {
-- Op = OP_TRIVIAL;
-- }
-- return true;
-}
-
-/**
-@brief Performs post-filtering on single line comments, by setting comment blocks to trivial
-@param [in] LineStr - Line of string to check that must be NULL terminated.
-@param [in,out] Op - This variable is set to trivial if block should be ignored.
-@param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
-@param [in] PartOfMultiLineCheck- Set to true, if this block is a multiple line block
-*/
-static void PostFilterSingleLine(const char* LineStr, int &Op,
- const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
-{
- if (Op == OP_TRIVIAL)
- return;
- if (filtercommentsset.InlineMarker.empty())
- {//If filtercommentsset.InlineMarker is empty, then no support for single line comment
- return;
- }
- const char * EndLine = strchr(LineStr, '\0');
- if (EndLine)
- {
- std::string LineData(LineStr, EndLine);
- if (LineData.empty() && PartOfMultiLineCheck)
- {
- Op = OP_TRIVIAL;
- return;
- }
-
- size_t CommentStr = LineData.find(filtercommentsset.InlineMarker);
- if (CommentStr == std::string::npos)
- return;
- if (!CommentStr)
- {//If it begins with comment string, then this is a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
- //Consider adding code here to check if there's any significant code before the comment string
- }
-
-}
-
-/**
-@brief The main entry for post filtering. Performs post-filtering, by setting comment blocks to trivial
-@param [in] LineNumberLeft - First line number to read from left file
-@param [in] QtyLinesLeft - Number of lines in the block for left file
-@param [in] LineNumberRight - First line number to read from right file
-@param [in] QtyLinesRight - Number of lines in the block for right file
-@param [in,out] Op - This variable is set to trivial if block should be ignored.
-@param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
-@param [in] FileNameExt - The file name extension. Needs to be lower case string ("cpp", "java", "c")
-*/
-static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
- int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
- const TCHAR *FileNameExt)
-{
- if (Op == OP_TRIVIAL)
- return;
-
- //First we need to get lowercase file name extension
- FilterCommentsSet filtercommentsset = filtercommentsmanager.GetSetForFileType(FileNameExt);
- if (filtercommentsset.StartMarker.empty() &&
- filtercommentsset.EndMarker.empty() &&
- filtercommentsset.InlineMarker.empty())
- {
- return;
- }
-
- if (Op == OP_LEFTONLY)
- {//Only check left side
- if (PostFilter(LineNumberLeft, files[0].valid_lines, 1, QtyLinesLeft, Op, 0, filtercommentsset))
- {
- PostFilter(LineNumberLeft, -1, -1, QtyLinesLeft, Op, 0, filtercommentsset);
- }
-
- if (Op != OP_TRIVIAL && !filtercommentsset.InlineMarker.empty())
- {
- bool AllLinesAreComments = true;
- for(int i = LineNumberLeft;i < LineNumberLeft + QtyLinesLeft;++i)
- {
- int TestOp = 0;
- PostFilterSingleLine(files[0].linbuf[i], TestOp, filtercommentsset, QtyLinesLeft > 1);
- if (TestOp != OP_TRIVIAL)
- {
- AllLinesAreComments = false;
- break;
- }
- }
-
- if (AllLinesAreComments)
- Op = OP_TRIVIAL;
- }
- }
- else if (Op == OP_RIGHTONLY)
- {//Only check right side
- if (PostFilter(LineNumberRight, files[1].valid_lines, 1, QtyLinesRight, Op, 1, filtercommentsset))
- {
- PostFilter(LineNumberRight, -1, -1, QtyLinesRight, Op, 1, filtercommentsset);
- }
-
- if (Op != OP_TRIVIAL && !filtercommentsset.InlineMarker.empty())
- {
- bool AllLinesAreComments = true;
- for(int i = LineNumberRight;i < LineNumberRight + QtyLinesRight;++i)
- {
- int TestOp = 0;
- PostFilterSingleLine(files[1].linbuf[i], TestOp, filtercommentsset, QtyLinesRight > 1);
- if (TestOp != OP_TRIVIAL)
- {
- AllLinesAreComments = false;
- break;
- }
- }
-
- if (AllLinesAreComments)
- Op = OP_TRIVIAL;
- }
- }
- else
- {
- int LeftOp = 0;
- if (PostFilter(LineNumberLeft, files[0].valid_lines, 1, QtyLinesLeft, LeftOp, 0, filtercommentsset))
- PostFilter(LineNumberLeft, -1, -1, QtyLinesLeft, LeftOp, 0, filtercommentsset);
-
- int RightOp = 0;
- if (PostFilter(LineNumberRight, files[1].valid_lines, 1, QtyLinesRight, RightOp, 1, filtercommentsset))
- PostFilter(LineNumberRight, -1, -1, QtyLinesRight, RightOp, 1, filtercommentsset);
-
- if (LeftOp == OP_TRIVIAL && RightOp == OP_TRIVIAL)
- Op = OP_TRIVIAL;
- else if (!filtercommentsset.InlineMarker.empty() && QtyLinesLeft == 1 && QtyLinesRight == 1)
- {
- //Lets test if only a post line comment is different.
- const char *LineStrLeft = files[0].linbuf[LineNumberLeft];
- const char *LineStrRight = files[1].linbuf[LineNumberRight];
- std::string LineDataLeft(LineStrLeft, linelen(LineStrLeft));
- std::string LineDataRight(LineStrRight, linelen(LineStrRight));
- const char *CommentStrLeft = FindCommentMarker(LineDataLeft.c_str(), filtercommentsset.InlineMarker.c_str());
- const char *CommentStrRight = FindCommentMarker(LineDataRight.c_str(), filtercommentsset.InlineMarker.c_str());
- //If neither side has comment string, then lets assume significant difference, and return
- if (CommentStrLeft == NULL && CommentStrRight == NULL)
- {
- return;
- }
- //Do a quick test to see if both sides begin with comment character
- if (CommentStrLeft == LineDataLeft.c_str() && CommentStrRight == LineDataRight.c_str())
- {//If both sides begin with comment character, then this is a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
-
- //Lets remove comments, and see if lines are equal
- if (CommentStrLeft != NULL)
- LineDataLeft.erase(CommentStrLeft - LineDataLeft.c_str());
- if (CommentStrRight != NULL)
- LineDataRight.erase(CommentStrRight - LineDataRight.c_str());
- if (LineDataLeft == LineDataRight)
- {//If they're equal now, then only difference is comments, and that's a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
- }
- }
-}
-
-/**
- * @brief Set source paths for diffing two files.
- * Sets full paths to two files we are diffing. Paths can be actual user files
- * or temporary copies of user files. Parameter @p tempPaths tells if paths
- * are temporary paths that can be deleted.
- * @param [in] filepath1 First file to compare "original file".
- * @param [in] filepath2 Second file to compare "changed file".
- * @param [in] tempPaths Are given paths temporary (can be deleted)?.
- */
-void CDiffWrapper::SetPaths(const String &filepath1, const String &filepath2,
- BOOL tempPaths)
-{
- m_s1File = filepath1;
- m_s2File = filepath2;
- m_bPathsAreTemp = tempPaths;
-}
-
-/**
- * @brief Set source paths for original (NON-TEMP) diffing two files.
- * Sets full paths to two (NON-TEMP) files we are diffing.
- * @param [in] OriginalFile1 First file to compare "(NON-TEMP) file".
- * @param [in] OriginalFile2 Second file to compare "(NON-TEMP) file".
- */
-void CDiffWrapper::SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2)
-{
- m_sOriginalFile1 = OriginalFile1;
- m_sOriginalFile2 = OriginalFile2;
-}
-
-/**
- * @brief Set alternative paths for compared files.
- * Sets alternative paths for diff'ed files. These alternative paths might not
- * be real paths. For example when creating a patch file from folder compare
- * we want to use relative paths.
- * @param [in] altPath1 Alternative file path of first file.
- * @param [in] altPath2 Alternative file path of second file.
- */
-void CDiffWrapper::SetAlternativePaths(const String &altPath1, const String &altPath2)
-{
- m_s1AlternativePath = altPath1;
- m_s2AlternativePath = altPath2;
-}
-
-/**
- * @brief Runs diff-engine.
- */
-BOOL CDiffWrapper::RunFileDiff()
-{
- String filepath1(m_s1File);
- String filepath2(m_s2File);
- replace_char(&*filepath1.begin(), '/', '\\');
- replace_char(&*filepath2.begin(), '/', '\\');
-
- BOOL bRet = TRUE;
- String strFile1Temp(filepath1);
- String strFile2Temp(filepath2);
-
- m_options.SetToDiffUtils();
-
- if (m_bUseDiffList)
- m_nDiffs = m_pDiffList->GetSize();
-
- if (m_bPluginsEnabled)
- {
- // Do the preprocessing now, overwrite the temp files
- // NOTE: FileTransform_ToUTF8() may create new temp
- // files and return new names, those created temp files
- // are deleted in end of function.
- if (m_infoPrediffer->bToBeScanned)
- {
- // this can only fail if the data can not be saved back (no more
- // place on disk ???) What to do then ??
- FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer,
- m_bPathsAreTemp);
- }
- else
- {
- // This can fail if the prediffer has a problem
- if (FileTransform_Prediffing(strFile1Temp, *m_infoPrediffer,
- m_bPathsAreTemp) == FALSE)
- {
- // display a message box
- CString sError;
- LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(),
- m_infoPrediffer->pluginName.c_str());
- AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
- // don't use any more this prediffer
- m_infoPrediffer->bToBeScanned = FALSE;
- m_infoPrediffer->pluginName.erase();
- }
- }
-
- // We use the same plugin for both files, so it must be defined before
- // second file
- ASSERT(m_infoPrediffer->bToBeScanned == FALSE);
- if (FileTransform_Prediffing(strFile2Temp, *m_infoPrediffer,
- m_bPathsAreTemp) == FALSE)
- {
- // display a message box
- CString sError;
- LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(),
- m_infoPrediffer->pluginName.c_str());
- AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
- // don't use any more this prediffer
- m_infoPrediffer->bToBeScanned = FALSE;
- m_infoPrediffer->pluginName.erase();
- }
- }
-
- // check for both are same (Ansi or UTF8)
- // otherwise convert both to UTF8
- // WM is using inside UCS2LE
- // Analyze is using UTF8, other unicodes are marked as binary
- Transform2FilesToUTF8(strFile1Temp, strFile2Temp, m_bPathsAreTemp);
-
- DiffFileData diffdata;
- diffdata.SetDisplayFilepaths(filepath1.c_str(), filepath2.c_str()); // store true names for diff utils patch file
- // This opens & fstats both files (if it succeeds)
- if (!diffdata.OpenFiles(strFile1Temp.c_str(), strFile2Temp.c_str()))
- {
- return FALSE;
- }
-
- // Compare the files, if no error was found.
- // Last param (bin_file) is NULL since we don't
- // (yet) need info about binary sides.
- int bin_flag = 0;
- struct change *script = NULL;
- bRet = Diff2Files(&script, &diffdata, &bin_flag, NULL);
-
- // We don't anymore create diff-files for every rescan.
- // User can create patch-file whenever one wants to.
- // We don't need to waste time. But lets keep this as
- // debugging aid. Sometimes it is very useful to see
- // what differences diff-engine sees!
-#ifdef _DEBUG
- // throw the diff into a temp file
- String sTempPath = env_GetTempPath(); // get path to Temp folder
- String path = paths_ConcatPath(sTempPath, _T("Diff.txt"));
-
- outfile = _tfopen(path.c_str(), _T("w+"));
- if (outfile != NULL)
- {
- print_normal_script(script);
- fclose(outfile);
- outfile = NULL;
- }
-#endif
-
- // First determine what happened during comparison
- // If there were errors or files were binaries, don't bother
- // creating diff-lists or patches
-
- // diff_2_files set bin_flag to -1 if different binary
- // diff_2_files set bin_flag to +1 if same binary
- if (bin_flag != 0)
- {
- m_status.bBinaries = TRUE;
- if (bin_flag == -1)
- m_status.bIdentical = FALSE;
- else
- m_status.bIdentical = TRUE;
- }
- else
- { // text files according to diffutils, so change script exists
- m_status.bIdentical = (script == 0);
- m_status.bBinaries = FALSE;
- }
- file_data * inf = diffdata.m_inf;
- m_status.bLeftMissingNL = inf[0].missing_newline;
- m_status.bRightMissingNL = inf[1].missing_newline;
-
-
- // Create patch file
- if (!m_status.bBinaries && m_bCreatePatchFile)
- {
- WritePatchFile(script, &inf[0]);
- }
-
- // Go through diffs adding them to WinMerge's diff list
- // This is done on every WinMerge's doc rescan!
- if (!m_status.bBinaries && m_bUseDiffList)
- {
- LoadWinMergeDiffsFromDiffUtilsScript(script, diffdata.m_inf);
- }
-
- FreeDiffUtilsScript(script);
-
- // Done with diffutils filedata
- diffdata.Close();
-
- if (m_bPluginsEnabled)
- {
- // Delete temp files transformation functions possibly created
- if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0)
- {
- if (!::DeleteFile(strFile1Temp.c_str()))
- {
- LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile1Temp.c_str(), GetSysError(GetLastError()).c_str()));
- }
- strFile1Temp.erase();
- }
- if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0)
- {
- if (!::DeleteFile(strFile2Temp.c_str()))
- {
- LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile2Temp.c_str(), GetSysError(GetLastError()).c_str()));
- }
- strFile2Temp.erase();
- }
- }
- return bRet;
-}
-
-/**
- * @brief Add diff to external diff-list
- */
-void CDiffWrapper::AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op)
-{
- TRY {
- DIFFRANGE dr;
- dr.begin0 = begin0;
- dr.end0 = end0;
- dr.begin1 = begin1;
- dr.end1 = end1;
- dr.op = op;
- dr.blank0 = dr.blank1 = -1;
- m_pDiffList->AddDiff(dr);
- m_nDiffs++;
- }
- CATCH_ALL(e)
- {
- TCHAR msg[1024] = {0};
- e->GetErrorMessage(msg, 1024);
- AfxMessageBox(msg, MB_ICONSTOP);
- }
- END_CATCH_ALL;
-}
-
-/**
- * @brief Expand last DIFFRANGE of file by one line to contain last line after EOL.
- * @param [in] leftBufferLines size of array pane left
- * @param [in] rightBufferLines size of array pane right
- * @param [in] left on whitch side we have to insert
- * @param [in] bIgnoreBlankLines, if true we allways add a new diff and make as trivial
- */
-void CDiffWrapper::FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left, bool bIgnoreBlankLines)
-{
- DIFFRANGE dr;
- const int count = m_pDiffList->GetSize();
- if (count > 0 && !bIgnoreBlankLines)
- {
- m_pDiffList->GetDiff(count - 1, dr);
-
- if (left)
- {
- if (dr.op == OP_RIGHTONLY)
- dr.op = OP_DIFF;
- dr.end0++;
- }
- else
- {
- if (dr.op == OP_LEFTONLY)
- dr.op = OP_DIFF;
- dr.end1++;
- }
- m_pDiffList->SetDiff(count - 1, dr);
- }
- else
- {
- // we have to create the DIFF
- dr.end0 = leftBufferLines - 1;
- dr.end1 = rightBufferLines - 1;
- if (left)
- {
- dr.begin0 = dr.end0;
- dr.begin1 = dr.end1 + 1;
- dr.op = OP_LEFTONLY;
- }
- else
- {
- dr.begin0 = dr.end0 + 1;
- dr.begin1 = dr.end1;
- dr.op = OP_RIGHTONLY;
- }
- if (bIgnoreBlankLines)
- dr.op = OP_TRIVIAL;
- ASSERT(dr.begin0 == dr.begin1);
-
- AddDiffRange(dr.begin0, dr.end0, dr.begin1, dr.end1, dr.op);
- }
-}
-
-/**
- * @brief Returns status-data from diff-engine last run
- */
-void CDiffWrapper::GetDiffStatus(DIFFSTATUS *status)
-{
- CopyMemory(status, &m_status, sizeof(DIFFSTATUS));
-}
-
-/**
- * @brief Formats command-line for diff-engine last run (like it was called from command-line)
- */
-String CDiffWrapper::FormatSwitchString()
-{
- String switches;
- TCHAR tmpNum[5] = {0};
-
- switch (m_options.m_outputStyle)
- {
- case OUTPUT_CONTEXT:
- switches = _T(" C");
- break;
- case OUTPUT_UNIFIED:
- switches = _T(" U");
- break;
- case OUTPUT_ED:
- switches = _T(" e");
- break;
- case OUTPUT_FORWARD_ED:
- switches = _T(" f");
- break;
- case OUTPUT_RCS:
- switches = _T(" n");
- break;
- case OUTPUT_NORMAL:
- switches = _T(" ");
- break;
- case OUTPUT_IFDEF:
- switches = _T(" D");
- break;
- case OUTPUT_SDIFF:
- switches = _T(" y");
- break;
- }
-
- if (m_options.m_contextLines > 0)
- {
- _itot(m_options.m_contextLines, tmpNum, 10);
- switches += tmpNum;
- }
-
- if (ignore_all_space_flag > 0)
- switches += _T("w");
-
- if (ignore_blank_lines_flag > 0)
- switches += _T("B");
-
- if (ignore_case_flag > 0)
- switches += _T("i");
-
- if (ignore_space_change_flag > 0)
- switches += _T("b");
-
- return switches;
-}
-
-/**
- * @brief Enables/disables patch-file appending.
- * If the file for patch already exists then the patch will be appended to
- * existing file.
- * @param [in] bAppendFiles If TRUE patch will be appended to existing file.
- */
-void CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
-{
- m_bAppendFiles = bAppendFiles;
-}
-
-/**
- * @brief Compare two files using diffutils.
- *
- * Compare two files (in DiffFileData param) using diffutils. Run diffutils
- * inside SEH so we can trap possible error and exceptions. If error or
- * execption is trapped, return compare failure.
- * @param [out] diffs Pointer to list of change structs where diffdata is stored.
- * @param [in] diffData files to compare.
- * @param [out] bin_status used to return binary status from compare.
- * @param [out] bin_file Returns which file was binary file as bitmap.
- So if first file is binary, first bit is set etc. Can be NULL if binary file
- info is not needed (faster compare since diffutils don't bother checking
- second file if first is binary).
- * @return TRUE when compare succeeds, FALSE if error happened during compare.
- * @note This function is used in file compare, not folder compare. Similar
- * folder compare function is in DiffFileData.cpp.
- */
-BOOL CDiffWrapper::Diff2Files(struct change ** diffs, DiffFileData *diffData,
- int * bin_status, int * bin_file)
-{
- BOOL bRet = TRUE;
- __try
- {
- // Diff files. depth is zero because we are not 6comparing dirs
- *diffs = diff_2_files (diffData->m_inf, 0, bin_status,
- (m_pMovedLines != NULL), bin_file);
- CopyDiffutilTextStats(diffData->m_inf, diffData);
- }
- __except (EXCEPTION_EXECUTE_HANDLER)
- {
- *diffs = NULL;
- bRet = FALSE;
- }
- return bRet;
-}
-
-/**
- * @brief Free script (the diffutils linked list of differences)
- */
-static void
-FreeDiffUtilsScript(struct change * & script)
-{
- if (!script) return;
- struct change *e=0, *p=0;
- // cleanup the script
- for (e = script; e; e = p)
- {
- p = e->link;
- free(e);
- }
- script = 0;
-}
-
-/**
- * @brief Match regular expression list against given difference.
- * This function matches the regular expression list against the difference
- * (given as start line and end line). Matching the diff requires that all
- * lines in difference match.
- * @param [in] StartPos First line of the difference.
- * @param [in] endPos Last line of the difference.
- * @param [in] FileNo File to match.
- * return true if any of the expressions matches.
- */
-bool CDiffWrapper::RegExpFilter(int StartPos, int EndPos, int FileNo)
-{
- if (m_pFilterList == NULL)
- {
- _RPTF0(_CRT_ERROR, "CDiffWrapper::RegExpFilter() called when "
- "filterlist doesn't exist (=NULL)");
- return false;
- }
-
- bool linesMatch = true; // set to false when non-matching line is found.
- int line = StartPos;
-
- while (line <= EndPos && linesMatch == true)
- {
- const char *string = files[FileNo].linbuf[line];
- size_t stringlen = linelen(string);
- if (!m_pFilterList->Match(stringlen, string, m_codepage))
- {
- linesMatch = false;
- }
- ++line;
- }
- return linesMatch;
-}
-
-/**
- * @brief Walk the diff utils change script, building the WinMerge list of diff blocks
- */
-void
-CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const file_data * inf)
-{
- //Logic needed for Ignore comment option
- DIFFOPTIONS options;
- GetOptions(&options);
- String asLwrCaseExt;
- if (options.bFilterCommentsLines)
- {
- String LowerCaseExt = m_sOriginalFile1;
- int PosOfDot = LowerCaseExt.rfind('.');
- if (PosOfDot != -1)
- {
- LowerCaseExt.erase(0, PosOfDot + 1);
- CharLower(&*LowerCaseExt.begin());
- asLwrCaseExt = LowerCaseExt;
- }
- }
-
- struct change *next = script;
- struct change *thisob=0, *end=0;
-
- while (next)
- {
- /* Find a set of changes that belong together. */
- thisob = next;
- end = find_change(next);
-
- /* Disconnect them from the rest of the changes,
- making them a hunk, and remember the rest for next iteration. */
- next = end->link;
- end->link = 0;
-#ifdef DEBUG
- debug_script(thisob);
-#endif
-
- /* Print thisob hunk. */
- //(*printfun) (thisob);
- {
- /* Determine range of line numbers involved in each file. */
- int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
- int op=0;
- if (deletes || inserts || thisob->trivial)
- {
- if (deletes && inserts)
- op = OP_DIFF;
- else if (deletes)
- op = OP_LEFTONLY;
- else if (inserts)
- op = OP_RIGHTONLY;
- else
- op = OP_TRIVIAL;
-
- /* Print the lines that the first file has. */
- int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
- translate_range(&inf[0], first0, last0, &trans_a0, &trans_b0);
- translate_range(&inf[1], first1, last1, &trans_a1, &trans_b1);
-
- // Store information about these blocks in moved line info
- if (GetDetectMovedBlocks())
- {
- if (thisob->match0>=0)
- {
- ASSERT(thisob->inserted);
- for (int i=0; i<thisob->inserted; ++i)
- {
- int line0 = i+thisob->match0 + (trans_a0-first0-1);
- int line1 = i+thisob->line1 + (trans_a1-first1-1);
- GetMovedLines()->Add(MovedLines::SIDE_RIGHT, line1, line0);
- }
- }
- if (thisob->match1>=0)
- {
- ASSERT(thisob->deleted);
- for (int i=0; i<thisob->deleted; ++i)
- {
- int line0 = i+thisob->line0 + (trans_a0-first0-1);
- int line1 = i+thisob->match1 + (trans_a1-first1-1);
- GetMovedLines()->Add(MovedLines::SIDE_LEFT, line0, line1);
- }
- }
- }
-
- if (options.bFilterCommentsLines)
- {
- int QtyLinesLeft = (trans_b0 - trans_a0) + 1; //Determine quantity of lines in this block for left side
- int QtyLinesRight = (trans_b1 - trans_a1) + 1;//Determine quantity of lines in this block for right side
- PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());
- }
-
- if (m_pFilterList && m_pFilterList->HasRegExps())
- {
- //Determine quantity of lines in this block for both sides
- int QtyLinesLeft = (trans_b0 - trans_a0);
- int QtyLinesRight = (trans_b1 - trans_a1);
-
- // Match lines against regular expression filters
- // Our strategy is that every line in both sides must
- // match regexp before we mark difference as ignored.
- bool match2 = false;
- bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
- if (match1)
- match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
- if (match1 && match2)
- op = OP_TRIVIAL;
- }
-
- AddDiffRange(trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);
- TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),
- trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
- }
- }
-
- /* Reconnect the script so it will all be freed properly. */
- end->link = next;
- }
-}
-
-/**
- * @brief Write out a patch file.
- * Writes patch file using already computed diffutils script. Converts path
- * delimiters from \ to / since we want to keep compatibility with patch-tools.
- * @param [in] script list of changes.
- * @param [in] inf file_data table containing filenames
- */
-void CDiffWrapper::WritePatchFile(struct change * script, file_data * inf)
-{
- file_data inf_patch[2] = {0};
- CopyMemory(&inf_patch, inf, sizeof(file_data) * 2);
-
- // Get paths, primarily use alternative paths, only if they are empty
- // use full filepaths
- String path1(m_s1AlternativePath);
- String path2(m_s2AlternativePath);
- if (path1.empty())
- path1 = m_s1File;
- if (path2.empty())
- path2 = m_s2File;
- replace_char(&*path1.begin(), '\\', '/');
- replace_char(&*path2.begin(), '\\', '/');
- inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
- inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
-
- // If paths in m_s1File and m_s2File point to original files, then we can use
- // them to fix potentially meaningless stats from potentially temporary files,
- // resulting from whatever transforms may have taken place.
- // If not, then we can't help it, and hence ASSERT that this won't happen.
- if (!m_bPathsAreTemp)
- {
- _tstat(m_s1File.c_str(), &inf_patch[0].stat);
- _tstat(m_s2File.c_str(), &inf_patch[1].stat);
- }
- else
- {
- ASSERT(FALSE);
- }
-
- outfile = NULL;
- if (!m_sPatchFile.empty())
- {
- LPCTSTR mode = (m_bAppendFiles ? _T("a+") : _T("w+"));
- outfile = _tfopen(m_sPatchFile.c_str(), mode);
- }
-
- if (!outfile)
- {
- m_status.bPatchFileFailed = TRUE;
- return;
- }
-
- // Print "command line"
- if (m_bAddCmdLine)
- {
- String switches = FormatSwitchString();
- _ftprintf(outfile, _T("diff%s %s %s\n"),
- switches.c_str(), path1.c_str(), path2.c_str());
- }
-
- // Output patchfile
- switch (output_style)
- {
- case OUTPUT_CONTEXT:
- print_context_header(inf_patch, 0);
- print_context_script(script, 0);
- break;
- case OUTPUT_UNIFIED:
- print_context_header(inf_patch, 1);
- print_context_script(script, 1);
- break;
- case OUTPUT_ED:
- print_ed_script(script);
- break;
- case OUTPUT_FORWARD_ED:
- pr_forward_ed_script(script);
- break;
- case OUTPUT_RCS:
- print_rcs_script(script);
- break;
- case OUTPUT_NORMAL:
- print_normal_script(script);
- break;
- case OUTPUT_IFDEF:
- print_ifdef_script(script);
- break;
- case OUTPUT_SDIFF:
- print_sdiff_script(script);
- }
-
- fclose(outfile);
- outfile = NULL;
-
- free((void *)inf_patch[0].name);
- free((void *)inf_patch[1].name);
-}
-
-/**
- * @brief Set line filters, given as one string.
- * @param [in] filterStr Filters.
- */
-void CDiffWrapper::SetFilterList(LPCTSTR filterStr)
-{
- // Remove filterlist if new filter is empty
- if (*filterStr == '\0')
- {
- delete m_pFilterList;
- m_pFilterList = NULL;
- return;
- }
-
- // Adding new filter without previous filter
- if (m_pFilterList == NULL)
- {
- m_pFilterList = new FilterList;
- }
-
- m_pFilterList->RemoveAllFilters();
-
- char * regexp_str;
- FilterList::EncodingType type;
-
-#ifdef UNICODE
- regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);
- type = FilterList::ENC_UTF8;
-#else
- CString tmp_str(filterStr);
- regexp_str = tmp_str.LockBuffer();
- type = FilterList::ENC_ANSI;
-#endif
-
- // Add every "line" of regexps to regexp list
- char * token;
- const char sep[] = "\r\n";
- token = strtok(regexp_str, sep);
- while (token)
- {
- m_pFilterList->AddRegExp(token, type);
- token = strtok(NULL, sep);
- }
-#ifdef UNICODE
- UCS2UTF8_Dealloc(regexp_str);
-#else
- tmp_str.UnlockBuffer();
-#endif
-}
-
-/**
- * @brief Copy text stat results from diffutils back into the FileTextStats structure
- */
-void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)
-{
- myTextStats->ncrlfs = inf->count_crlfs;
- myTextStats->ncrs = inf->count_crs;
- myTextStats->nlfs = inf->count_lfs;
--}
--
-/**
- * @brief Copy both left & right text stats results back into the DiffFileData text stats
- */
-void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)
-{
- CopyTextStats(&inf[0], &diffData->m_textStats0);
- CopyTextStats(&inf[1], &diffData->m_textStats1);
-}
++/////////////////////////////////////////////////////////////////////////////\r
++// License (GPLv2+):\r
++// This program is free software; you can redistribute it and/or modify\r
++// it under the terms of the GNU General Public License as published by\r
++// the Free Software Foundation; either version 2 of the License, or (at\r
++// your option) any later version.\r
++// \r
++// This program is distributed in the hope that it will be useful, but\r
++// WITHOUT ANY WARRANTY; without even the implied warranty of\r
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
++// GNU General Public License for more details.\r
++//\r
++// You should have received a copy of the GNU General Public License\r
++// along with this program; if not, write to the Free Software\r
++// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
++/////////////////////////////////////////////////////////////////////////////\r
++/** \r
++ * @file DiffWrapper.cpp\r
++ *\r
++ * @brief Code for DiffWrapper class\r
++ *\r
++ * @date Created: 2003-08-22\r
++ */\r
++// ID line follows -- this is updated by SVN\r
++// $Id: DiffWrapper.cpp 7091 2010-01-11 20:27:43Z kimmov $\r
++\r
++#include "StdAfx.h"\r
++#include <sys/types.h>\r
++#include <sys/stat.h>\r
++#include <algorithm>\r
++#include <string>\r
++#include <map>\r
++#include <shlwapi.h>\r
++#include "Ucs2Utf8.h"\r
++#include "coretools.h"\r
++#include "DiffContext.h"\r
++#include "DiffList.h"\r
++#include "MovedLines.h"\r
++#include "FilterList.h"\r
++#include "DiffWrapper.h"\r
++#include "DIFF.H"\r
++#include "FileTransform.h"\r
++#include "LogFile.h"\r
++#include "paths.h"\r
++#include "CompareOptions.h"\r
++#include "FileTextStats.h"\r
++#include "FolderCmp.h"\r
++#include "FilterCommentsManager.h"\r
++#include "Environment.h"\r
++#include "PatchHTML.h"\r
++#include "AnsiConvert.h"\r
++#include "UnicodeString.h"\r
++\r
++#ifdef _DEBUG\r
++#define new DEBUG_NEW\r
++#undef THIS_FILE\r
++static char THIS_FILE[] = __FILE__;\r
++#endif\r
++\r
++extern int recursive;\r
++\r
++static void FreeDiffUtilsScript(struct change * & script);\r
++static void FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02);\r
++static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);\r
++static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);\r
++\r
++/**\r
++ * @brief Default constructor.\r
++ * Initializes members and creates new FilterCommentsManager.\r
++ */\r
++CDiffWrapper::CDiffWrapper()\r
++: m_FilterCommentsManager(new FilterCommentsManager)\r
++, m_bCreatePatchFile(FALSE)\r
++, m_bUseDiffList(FALSE)\r
++, m_bAddCmdLine(TRUE)\r
++, m_bAppendFiles(FALSE)\r
++, m_nDiffs(0)\r
++, m_codepage(GetACP())\r
++, m_infoPrediffer(NULL)\r
++, m_pDiffList(NULL)\r
++, m_bPathsAreTemp(FALSE)\r
++, m_pFilterList(NULL)\r
++, m_bPluginsEnabled(false)\r
++{\r
++ ZeroMemory(&m_status, sizeof(DIFFSTATUS));\r
++\r
++ m_pMovedLines[0] = NULL;\r
++ m_pMovedLines[1] = NULL;\r
++ m_pMovedLines[2] = NULL;\r
++\r
++ // character that ends a line. Currently this is always `\n'\r
++ line_end_char = '\n';\r
++}\r
++\r
++/**\r
++ * @brief Destructor.\r
++ */\r
++CDiffWrapper::~CDiffWrapper()\r
++{\r
++ delete m_pFilterList;\r
++ delete m_infoPrediffer;\r
++ delete m_FilterCommentsManager;\r
++ delete m_pMovedLines[0];\r
++ delete m_pMovedLines[1];\r
++ delete m_pMovedLines[2];\r
++}\r
++\r
++/**\r
++ * @brief Set plugins enabled/disabled.\r
++ * @param [in] enable if true plugins are enabled.\r
++ */\r
++void CDiffWrapper::EnablePlugins(bool enable)\r
++{\r
++ m_bPluginsEnabled = enable;\r
++}\r
++\r
++/**\r
++ * @brief Enables/disables patch-file creation and sets filename.\r
++ * This function enables or disables patch file creation. When\r
++ * @p filename is empty, patch files are disabled.\r
++ * @param [in] filename Filename for patch file, or empty string.\r
++ */\r
++void CDiffWrapper::SetCreatePatchFile(const String &filename)\r
++{\r
++ if (filename.empty())\r
++ {\r
++ m_bCreatePatchFile = FALSE;\r
++ m_sPatchFile.clear();\r
++ }\r
++ else\r
++ {\r
++ m_bCreatePatchFile = TRUE;\r
++ m_sPatchFile = filename;\r
++ string_replace(m_sPatchFile, _T("/"), _T("\\"));\r
++ }\r
++}\r
++\r
++/**\r
++ * @brief Enables/disabled DiffList creation ands sets DiffList.\r
++ * This function enables or disables DiffList creation. When\r
++ * @p diffList is NULL difflist is not created. When valid DiffList\r
++ * pointer is given, compare results are stored into it.\r
++ * @param [in] diffList Pointer to DiffList getting compare results.\r
++ */\r
++void CDiffWrapper::SetCreateDiffList(DiffList *diffList)\r
++{\r
++ if (diffList == NULL)\r
++ {\r
++ m_bUseDiffList = FALSE;\r
++ m_pDiffList = NULL;\r
++ }\r
++ else\r
++ {\r
++ m_bUseDiffList = TRUE;\r
++ m_pDiffList = diffList;\r
++ }\r
++}\r
++\r
++/**\r
++ * @brief Returns current set of options used by diff-engine.\r
++ * This function converts internally used diff-options to\r
++ * format used outside CDiffWrapper and returns them.\r
++ * @param [in,out] options Pointer to structure getting used options.\r
++ */\r
++void CDiffWrapper::GetOptions(DIFFOPTIONS *options)\r
++{\r
++ ASSERT(options);\r
++ DIFFOPTIONS tmpOptions = {0};\r
++ m_options.GetAsDiffOptions(tmpOptions);\r
++ *options = tmpOptions;\r
++}\r
++\r
++/**\r
++ * @brief Set options for Diff-engine.\r
++ * This function converts given options to format CDiffWrapper uses\r
++ * internally and stores them.\r
++ * @param [in] options Pointer to structure having new options.\r
++ */\r
++void CDiffWrapper::SetOptions(const DIFFOPTIONS *options)\r
++{\r
++ ASSERT(options);\r
++ m_options.SetFromDiffOptions(*options);\r
++}\r
++\r
++/**\r
++ * @brief Set text tested to find the prediffer automatically.\r
++ * Most probably a concatenated string of both filenames.\r
++ */\r
++void CDiffWrapper::SetTextForAutomaticPrediff(const String &text)\r
++{\r
++ m_sToFindPrediffer = text;\r
++}\r
++void CDiffWrapper::SetPrediffer(PrediffingInfo * prediffer /*=NULL*/)\r
++{\r
++ if (m_infoPrediffer)\r
++ delete m_infoPrediffer;\r
++\r
++ // all flags are set correctly during the construction\r
++ m_infoPrediffer = new PrediffingInfo;\r
++\r
++ if (prediffer)\r
++ *m_infoPrediffer = *prediffer;\r
++}\r
++void CDiffWrapper::GetPrediffer(PrediffingInfo * prediffer)\r
++{\r
++ *prediffer = *m_infoPrediffer;\r
++}\r
++\r
++/**\r
++ * @brief Set options used for patch-file creation.\r
++ * @param [in] options Pointer to structure having new options.\r
++ */\r
++void CDiffWrapper::SetPatchOptions(const PATCHOPTIONS *options)\r
++{\r
++ ASSERT(options);\r
++ m_options.m_contextLines = options->nContext;\r
++\r
++ switch (options->outputStyle)\r
++ {\r
++ case OUTPUT_NORMAL:\r
++ m_options.m_outputStyle = DIFF_OUTPUT_NORMAL;\r
++ break;\r
++ case OUTPUT_CONTEXT:\r
++ m_options.m_outputStyle = DIFF_OUTPUT_CONTEXT;\r
++ break;\r
++ case OUTPUT_UNIFIED:\r
++ m_options.m_outputStyle = DIFF_OUTPUT_UNIFIED;\r
++ break;\r
++ case OUTPUT_HTML:\r
++ m_options.m_outputStyle = DIFF_OUTPUT_HTML;\r
++ break;\r
++ default:\r
++ _RPTF0(_CRT_ERROR, "Unknown output style!");\r
++ break;\r
++ }\r
++\r
++ m_bAddCmdLine = options->bAddCommandline;\r
++}\r
++\r
++/**\r
++ * @brief Enables/disables moved block detection.\r
++ * @param [in] bDetectMovedBlocks If TRUE moved blocks are detected.\r
++ */\r
++void CDiffWrapper::SetDetectMovedBlocks(bool bDetectMovedBlocks)\r
++{\r
++ if (bDetectMovedBlocks)\r
++ {\r
++ if (m_pMovedLines[0] == NULL)\r
++ {\r
++ m_pMovedLines[0] = new MovedLines;\r
++ m_pMovedLines[1] = new MovedLines;\r
++ m_pMovedLines[2] = new MovedLines;\r
++ }\r
++ }\r
++ else\r
++ {\r
++ delete m_pMovedLines[0];\r
++ delete m_pMovedLines[1];\r
++ delete m_pMovedLines[2];\r
++ m_pMovedLines[0] = NULL;\r
++ m_pMovedLines[1] = NULL;\r
++ m_pMovedLines[2] = NULL;\r
++ }\r
++}\r
++\r
++/**\r
++ * @brief Test for trivial only characters in string\r
++ * @param [in] Start - Start position in string\r
++ * @param [in] End - One character pass the end position of the string\r
++ * @param [in] filtercommentsset - For future use to determine trivial bytes\r
++ * @return Returns true if all characters are trivial\r
++ */\r
++bool CDiffWrapper::IsTrivialBytes(const char* Start, const char* End,\r
++ const FilterCommentsSet& filtercommentsset)\r
++{\r
++ std::string testdata(Start, End);\r
++ //@TODO: Need to replace the following trivial string with a user specified string\r
++ size_t pos = testdata.find_first_not_of(" \t\r\n");\r
++ return (pos == std::string::npos);\r
++}\r
++\r
++/**\r
++ * @brief Test for a line of trivial data\r
++ * @param [in] Line - String to test for\r
++ * @param [in] StartOfComment - \r
++ * @param [in] EndOfComment - \r
++ * @param [in] InLineComment - \r
++ * @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.\r
++ * @return Returns true if entire line is trivial\r
++ */\r
++bool CDiffWrapper::IsTrivialLine(const std::string &Line, \r
++ const char * StartOfComment, \r
++ const char * EndOfComment, \r
++ const char * InLineComment, \r
++ const FilterCommentsSet& filtercommentsset)\r
++{\r
++ //Do easy test first\r
++ if ((!StartOfComment || !EndOfComment) && !InLineComment)\r
++ return false;//In no Start and End pair, and no single in-line set, then it's not trivial\r
++\r
++ if (StartOfComment == Line.c_str() &&\r
++ ((EndOfComment + filtercommentsset.EndMarker.size()) - StartOfComment) == Line.size())\r
++ {//If entire line is blocked by End and Start markers, then entire line is trivial\r
++ return true;\r
++ }\r
++\r
++ if (InLineComment && InLineComment < StartOfComment)\r
++ {\r
++ if (InLineComment == Line.c_str())\r
++ return true;//If line starts with InLineComment marker, then entire line is trivial\r
++\r
++ //Other wise, check if data before InLineComment marker is trivial\r
++ return IsTrivialBytes(Line.c_str(), InLineComment, filtercommentsset);\r
++ }\r
++\r
++ //Done with easy test, so now do more complex test\r
++ if (StartOfComment && \r
++ EndOfComment && \r
++ StartOfComment < EndOfComment &&\r
++ IsTrivialBytes(Line.c_str(), StartOfComment, filtercommentsset) &&\r
++ IsTrivialBytes(EndOfComment + filtercommentsset.EndMarker.size(),\r
++ Line.c_str()+Line.size(), filtercommentsset))\r
++ {\r
++ return true;\r
++ }\r
++\r
++ return false;\r
++}\r
++\r
++/**\r
++ * @brief Find comment marker in string, excluding portions enclosed in quotation marks or apostrophes\r
++ * @param [in] target - string to search\r
++ * @param [in] marker - marker to search for\r
++ * @return Returns position of marker, or NULL if none is present\r
++ */\r
++static const char *FindCommentMarker(const char *target, const char *marker)\r
++{\r
++ char prev = '\0';\r
++ char quote = '\0';\r
++ size_t marker_len = strlen(marker);\r
++ while (char c = *target)\r
++ {\r
++ if (quote == '\0' && strncmp(target, marker, marker_len) == 0)\r
++ return target;\r
++ if ((prev != '\\') &&\r
++ (c == '"' || c == '\'') &&\r
++ (quote == '\0' || quote == c))\r
++ {\r
++ quote ^= c;\r
++ }\r
++ prev = c;\r
++ ++target;\r
++ }\r
++ return NULL;\r
++}\r
++\r
++/**\r
++ @brief Performs post-filtering, by setting comment blocks to trivial\r
++ @param [in] StartPos - First line number to read\r
++ @param [in] EndPos - The line number PASS the last line number to read\r
++ @param [in] QtyLinesInBlock - Number of lines in diff block. Not needed in backward direction.\r
++ @param [in] Direction - This should be 1 or -1, to indicate which direction to read (backward or forward)\r
++ @param [in,out] Op - This variable is set to trivial if block should be ignored.\r
++ @param [in] FileNo - Should be 0 or 1, to indicate left or right file.\r
++ @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.\r
++ @return Always returns true in reverse direction.\r
++ In forward direction, returns false if none trivial data is found within QtyLinesInBlock\r
++*/\r
++bool CDiffWrapper::PostFilter(int StartPos, int EndPos, int Direction,\r
++ int QtyLinesInBlock, int &Op, int FileNo,\r
++ const FilterCommentsSet& filtercommentsset)\r
++{\r
++ if (Op == OP_TRIVIAL) //If already set to trivial, then exit.\r
++ return true;\r
++ bool OpShouldBeTrivial = false;\r
++ int QtyTrivialLines = 0;\r
++ for(int i = StartPos + ((Direction == -1)?-1:0); i != EndPos;i += Direction)\r
++ {\r
++ if ((i - StartPos) == QtyLinesInBlock && \r
++ QtyLinesInBlock == QtyTrivialLines)\r
++ {\r
++ OpShouldBeTrivial = true;\r
++ break;\r
++ }\r
++ size_t len = files[FileNo].linbuf[i + 1] - files[FileNo].linbuf[i];\r
++ const char *LineStr = files[FileNo].linbuf[i];\r
++ std::string LineData(LineStr, linelen(LineStr, len));\r
++\r
++ const char * StartOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.StartMarker.c_str());\r
++ const char * EndOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.EndMarker.c_str());\r
++ const char * InLineComment = FindCommentMarker(LineData.c_str(), filtercommentsset.InlineMarker.c_str());\r
++ //The following logic determines if the entire block is a comment block, and only marks it as trivial\r
++ //if all the changes are within a comment block.\r
++ if (Direction == -1)\r
++ {\r
++ if (!StartOfComment && EndOfComment)\r
++ break;\r
++ \r
++ if (StartOfComment && (!EndOfComment || EndOfComment < StartOfComment) && (!InLineComment || InLineComment > StartOfComment))\r
++ {\r
++ OpShouldBeTrivial = true;\r
++ break;\r
++ }\r
++ }\r
++ else if (Direction == 1)\r
++ {\r
++ if (IsTrivialBytes(LineData.c_str(), LineData.c_str()+LineData.size(), filtercommentsset) || \r
++ IsTrivialLine(LineData, StartOfComment, EndOfComment, InLineComment, filtercommentsset))\r
++ {\r
++ ++QtyTrivialLines;\r
++ }\r
++\r
++ if (!EndOfComment && StartOfComment)\r
++ {\r
++ if (i == (StartPos + QtyTrivialLines) )\r
++ {\r
++ if (StartOfComment == LineData.c_str())\r
++ {//If this is at the beginning of the first line, then lets continue\r
++ continue;\r
++ }\r
++ if (IsTrivialBytes(LineData.c_str(), StartOfComment, filtercommentsset))\r
++ {//If only trivial bytes before comment marker, then continue\r
++ continue;\r
++ }\r
++ break;\r
++ }\r
++ //If this is not the first line, then assume\r
++ //previous lines are non-trivial, and return true.\r
++ return false;\r
++ }\r
++\r
++ if (EndOfComment && \r
++ (!StartOfComment || StartOfComment > EndOfComment) && \r
++ (!InLineComment || InLineComment > EndOfComment) )\r
++ {\r
++ if (!IsTrivialBytes(EndOfComment+filtercommentsset.EndMarker.size(), LineData.c_str()+LineData.size(), filtercommentsset))\r
++ {\r
++ return false;\r
++ }\r
++\r
++ if ((i - StartPos) >= (QtyLinesInBlock-1))\r
++ {\r
++ OpShouldBeTrivial = true;\r
++ break;\r
++ }\r
++\r
++ //Lets check if the remaining lines only contain trivial data\r
++ bool AllRemainingLinesContainTrivialData = true;\r
++ int TrivLinePos = i+1;\r
++ for(; TrivLinePos != (StartPos + QtyLinesInBlock);++TrivLinePos)\r
++ {\r
++ size_t len = files[FileNo].linbuf[TrivLinePos + 1] - files[FileNo].linbuf[TrivLinePos];\r
++ const char *LineStrTrvCk = files[FileNo].linbuf[TrivLinePos];\r
++ std::string LineDataTrvCk(LineStrTrvCk, linelen(LineStrTrvCk, len));\r
++ if (LineDataTrvCk.size() &&\r
++ !IsTrivialBytes(LineDataTrvCk.c_str(), LineDataTrvCk.c_str() + LineDataTrvCk.size(), filtercommentsset))\r
++ {\r
++ AllRemainingLinesContainTrivialData = false;\r
++ break;\r
++ }\r
++ }\r
++ if (AllRemainingLinesContainTrivialData)\r
++ {\r
++ OpShouldBeTrivial = true;\r
++ break;\r
++ }\r
++ if (TrivLinePos != (StartPos + QtyLinesInBlock) )\r
++ {\r
++ return PostFilter(TrivLinePos, EndPos, Direction, QtyLinesInBlock - (TrivLinePos - StartPos), Op, FileNo, filtercommentsset);\r
++ }\r
++ }\r
++ }\r
++ }\r
++ if (OpShouldBeTrivial)\r
++ {\r
++ Op = OP_TRIVIAL;\r
++ }\r
++ return true;\r
++}\r
++\r
+/**\r
+@brief The main entry for post filtering. Performs post-filtering, by setting comment blocks to trivial\r
+@param [in] LineNumberLeft - First line number to read from left file\r
+@param [in] QtyLinesLeft - Number of lines in the block for left file\r
+@param [in] LineNumberRight - First line number to read from right file\r
+@param [in] QtyLinesRight - Number of lines in the block for right file\r
+@param [in,out] Op - This variable is set to trivial if block should be ignored.\r
+@param [in] filtercommentsset - Comment marker set used to indicate comment blocks.\r
+@param [in] FileNameExt - The file name extension. Needs to be lower case string ("cpp", "java", "c")\r
+*/\r
+void CDiffWrapper::PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,\r
+ int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,\r
+ const TCHAR *FileNameExt)\r
+{\r
+ if (Op == OP_TRIVIAL)\r
+ return;\r
+ \r
+ //First we need to get lowercase file name extension\r
+ FilterCommentsSet filtercommentsset = filtercommentsmanager.GetSetForFileType(FileNameExt);\r
+ if (filtercommentsset.StartMarker.empty() && \r
+ filtercommentsset.EndMarker.empty() &&\r
+ filtercommentsset.InlineMarker.empty())\r
+ {\r
+ return;\r
+ }\r
+\r
+ int LeftOp = 0;\r
+ int RightOp = 0;\r
+\r
+ if (QtyLinesRight == 0)\r
+ { //Only check left side\r
+ if (PostFilter(LineNumberLeft, files[0].valid_lines, 1, QtyLinesLeft, LeftOp, 0, filtercommentsset))\r
+ PostFilter(LineNumberLeft, -1, -1, QtyLinesLeft, LeftOp, 0, filtercommentsset);\r
+ }\r
+ else if (QtyLinesLeft == 0)\r
+ { //Only check right side\r
+ if (PostFilter(LineNumberRight, files[1].valid_lines, 1, QtyLinesRight, RightOp, 1, filtercommentsset))\r
+ PostFilter(LineNumberRight, -1, -1, QtyLinesRight, RightOp, 1, filtercommentsset);\r
+ }\r
+ else\r
+ {\r
+ if (PostFilter(LineNumberLeft, files[0].valid_lines, 1, QtyLinesLeft, LeftOp, 0, filtercommentsset))\r
+ PostFilter(LineNumberLeft, -1, -1, QtyLinesLeft, LeftOp, 0, filtercommentsset);\r
+\r
+ if (PostFilter(LineNumberRight, files[1].valid_lines, 1, QtyLinesRight, RightOp, 1, filtercommentsset))\r
+ PostFilter(LineNumberRight, -1, -1, QtyLinesRight, RightOp, 1, filtercommentsset);\r
+ }\r
+\r
+ for(int i = 0; (i < QtyLinesLeft) || (i < QtyLinesRight); i++)\r
+ {\r
+ //Lets test all lines if only a comment is different.\r
+ const char * LineStrLeft = "";\r
+ const char * EndLineLeft = LineStrLeft;\r
+ const char * LineStrRight = "";\r
+ const char * EndLineRight = LineStrRight;\r
+ if(i < QtyLinesLeft)\r
+ {\r
+ LineStrLeft = files[0].linbuf[LineNumberLeft + i];\r
+ EndLineLeft = files[0].linbuf[LineNumberLeft + i + 1];\r
+ //EndLineLeft = strchr(LineStrLeft, '\0');\r
+ \r
+ }\r
+ if(i < QtyLinesRight)\r
+ {\r
+ LineStrRight = files[1].linbuf[LineNumberRight + i];\r
+ EndLineRight = files[1].linbuf[LineNumberRight + i + 1];\r
+ //EndLineRight = strchr(LineStrRight, '\0');\r
+ }\r
+ \r
+ if (EndLineLeft && EndLineRight)\r
+ { \r
+ std::string LineDataLeft(LineStrLeft, EndLineLeft);\r
+ std::string LineDataRight(LineStrRight, EndLineRight);\r
+\r
+ if (!filtercommentsset.StartMarker.empty() && !filtercommentsset.EndMarker.empty())\r
+ {\r
+ size_t CommentStrLeftStart;\r
+ size_t CommentStrLeftEnd;\r
+ size_t CommentStrRightStart;\r
+ size_t CommentStrRightEnd;\r
+\r
+ BOOL bFirstLoop = TRUE;\r
+ do {\r
+ //Lets remove block comments, and see if lines are equal\r
+ CommentStrLeftStart = LineDataLeft.find(filtercommentsset.StartMarker);\r
+ CommentStrLeftEnd = LineDataLeft.find(filtercommentsset.EndMarker);\r
+ CommentStrRightStart = LineDataRight.find(filtercommentsset.StartMarker);\r
+ CommentStrRightEnd = LineDataRight.find(filtercommentsset.EndMarker);\r
+ \r
+ if (CommentStrLeftStart != std::string::npos && CommentStrLeftEnd != std::string::npos)\r
+ LineDataLeft.erase(CommentStrLeftStart, CommentStrLeftEnd + filtercommentsset.EndMarker.size() - CommentStrLeftStart);\r
+ else if (CommentStrLeftStart != std::string::npos)\r
+ LineDataLeft.erase(CommentStrLeftStart);\r
+ else if (CommentStrLeftEnd != std::string::npos)\r
+ LineDataLeft.erase(0, CommentStrLeftEnd + filtercommentsset.EndMarker.size());\r
+ else if(LeftOp == OP_TRIVIAL && bFirstLoop)\r
+ LineDataLeft.erase(0); //This line is all in block comments\r
+\r
+ if (CommentStrRightStart != std::string::npos && CommentStrRightEnd != std::string::npos)\r
+ LineDataRight.erase(CommentStrRightStart, CommentStrRightEnd + filtercommentsset.EndMarker.size() - CommentStrRightStart);\r
+ else if (CommentStrRightStart != std::string::npos)\r
+ LineDataRight.erase(CommentStrRightStart);\r
+ else if (CommentStrRightEnd != std::string::npos)\r
+ LineDataRight.erase(0, CommentStrRightEnd + filtercommentsset.EndMarker.size());\r
+ else if(RightOp == OP_TRIVIAL && bFirstLoop)\r
+ LineDataRight.erase(0); //This line is all in block comments\r
+\r
+ bFirstLoop = FALSE;\r
+\r
+ } while (CommentStrLeftStart != std::string::npos || CommentStrLeftEnd != std::string::npos\r
+ || CommentStrRightStart != std::string::npos || CommentStrRightEnd != std::string::npos); //Loops until all blockcomments are lost\r
+ }\r
+\r
+ if (!filtercommentsset.InlineMarker.empty())\r
+ {\r
+ //Lets remove line comments\r
+ size_t CommentStrLeft = LineDataLeft.find(filtercommentsset.InlineMarker);\r
+ size_t CommentStrRight = LineDataRight.find(filtercommentsset.InlineMarker);\r
+\r
+ if (CommentStrLeft != std::string::npos)\r
+ LineDataLeft.erase(CommentStrLeft);\r
+ if (CommentStrRight != std::string::npos)\r
+ LineDataRight.erase(CommentStrRight);\r
+ }\r
+\r
+ if (m_options.m_ignoreWhitespace == WHITESPACE_IGNORE_ALL)\r
+ {\r
+ //Ignore character case\r
- std::string::size_type pos = 0;
- while ((pos = LineDataLeft.find(" ", pos)) != String::npos)
- {
- LineDataLeft.replace(pos, 1, "");
- }
- pos = 0;
- while ((pos = LineDataLeft.find("\t", pos)) != String::npos)
- {
- LineDataLeft.replace(pos, 1, "");
- }
-
- pos = 0;
- while ((pos = LineDataRight.find(" ", pos)) != String::npos)
- {
- LineDataRight.replace(pos, 1, "");
++ std::string::size_type pos = 0;\r
++ while ((pos = LineDataLeft.find(" ", pos)) != String::npos)\r
++ {\r
++ LineDataLeft.replace(pos, 1, "");\r
++ }\r
++ pos = 0;\r
++ while ((pos = LineDataLeft.find("\t", pos)) != String::npos)\r
++ {\r
++ LineDataLeft.replace(pos, 1, "");\r
+ }\r
- pos = 0;
- while ((pos = LineDataRight.find("\t", pos)) != String::npos)
- {
- LineDataRight.replace(pos, 1, "");
++\r
++ pos = 0;\r
++ while ((pos = LineDataRight.find(" ", pos)) != String::npos)\r
++ {\r
++ LineDataRight.replace(pos, 1, "");\r
++ }\r
++ pos = 0;\r
++ while ((pos = LineDataRight.find("\t", pos)) != String::npos)\r
++ {\r
++ LineDataRight.replace(pos, 1, "");\r
+ }\r
- }
++ }\r
+ else if (m_options.m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)\r
+ {\r
+ //Ignore change in whitespace char count\r
- std::string::size_type pos = 0;
- while ((pos = LineDataLeft.find("\t", pos)) != String::npos)
- {
- LineDataLeft.replace(pos, 1, " ");
- }
- pos = 0;
- while ((pos = LineDataLeft.find(" ", pos)) != String::npos)
- {
- LineDataLeft.replace(pos, 2, " ");
- }
-
- pos = 0;
- while ((pos = LineDataRight.find("\t", pos)) != String::npos)
- {
- LineDataRight.replace(pos, 1, " ");
++ std::string::size_type pos = 0;\r
++ while ((pos = LineDataLeft.find("\t", pos)) != String::npos)\r
++ {\r
++ LineDataLeft.replace(pos, 1, " ");\r
++ }\r
++ pos = 0;\r
++ while ((pos = LineDataLeft.find(" ", pos)) != String::npos)\r
++ {\r
++ LineDataLeft.replace(pos, 2, " ");\r
+ }\r
- pos = 0;
- while ((pos = LineDataRight.find(" ", pos)) != String::npos)
- {
- LineDataRight.replace(pos, 2, " ");
++\r
++ pos = 0;\r
++ while ((pos = LineDataRight.find("\t", pos)) != String::npos)\r
++ {\r
++ LineDataRight.replace(pos, 1, " ");\r
++ }\r
++ pos = 0;\r
++ while ((pos = LineDataRight.find(" ", pos)) != String::npos)\r
++ {\r
++ LineDataRight.replace(pos, 2, " ");\r
+ }\r
+ }\r
+\r
- if (m_options.m_bIgnoreCase)
++ if (m_options.m_bIgnoreCase)\r
+ {\r
+ //ignore case\r
+ std::transform(LineDataLeft.begin(), LineDataLeft.end(), LineDataLeft.begin(), ::toupper);\r
+ std::transform(LineDataRight.begin(), LineDataRight.end(), LineDataRight.begin(), ::toupper);\r
+ }\r
+\r
+ if (LineDataLeft != LineDataRight)\r
+ { \r
+ return;\r
+ }\r
+ }\r
+ }\r
+ //only difference is trival\r
+ Op = OP_TRIVIAL;\r
+}\r
-
- /**
- * @brief Set source paths for diffing two files.
- * Sets full paths to two files we are diffing. Paths can be actual user files
- * or temporary copies of user files. Parameter @p tempPaths tells if paths
- * are temporary paths that can be deleted.
- * @param [in] files Files to compare
- * @param [in] tempPaths Are given paths temporary (can be deleted)?.
- */
- void CDiffWrapper::SetPaths(const PathContext &files,
- BOOL tempPaths)
- {
- m_files = files;
- m_bPathsAreTemp = tempPaths;
- }
-
- /**
- * @brief Set source paths for original (NON-TEMP) diffing two files.
- * Sets full paths to two (NON-TEMP) files we are diffing.
- * @param [in] OriginalFile1 First file to compare "(NON-TEMP) file".
- * @param [in] OriginalFile2 Second file to compare "(NON-TEMP) file".
- */
- void CDiffWrapper::SetCompareFiles(const PathContext &originalFile)
- {
- m_originalFile = originalFile;
- }
-
- /**
- * @brief Set alternative paths for compared files.
- * Sets alternative paths for diff'ed files. These alternative paths might not
- * be real paths. For example when creating a patch file from folder compare
- * we want to use relative paths.
- * @param [in] altPaths Alternative file paths.
- */
- void CDiffWrapper::SetAlternativePaths(const PathContext &altPaths)
- {
- m_alternativePaths = altPaths;
- }
-
- /**
- * @brief Runs diff-engine.
- */
- BOOL CDiffWrapper::RunFileDiff()
- {
- PathContext files = m_files;
- int file;
- for (file = 0; file < m_files.GetSize(); file++)
- replace_char(&*files[file].begin(), '/', '\\');
-
- BOOL bRet = TRUE;
- String strFileTemp[3];
- for (file = 0; file < m_files.GetSize(); file++)
- strFileTemp[file] = files[file];
-
-
- m_options.SetToDiffUtils();
-
- if (m_bUseDiffList)
- m_nDiffs = m_pDiffList->GetSize();
-
- for (file = 0; file < files.GetSize(); file++)
- {
- if (m_bPluginsEnabled)
- {
- // Do the preprocessing now, overwrite the temp files
- // NOTE: FileTransform_UCS2ToUTF8() may create new temp
- // files and return new names, those created temp files
- // are deleted in end of function.
- if (m_infoPrediffer->bToBeScanned)
- {
- // this can only fail if the data can not be saved back (no more
- // place on disk ???) What to do then ??
- FileTransform_Prediffing(strFileTemp[file], m_sToFindPrediffer.c_str(), m_infoPrediffer,
- m_bPathsAreTemp);
- }
- else
- {
- // This can fail if the prediffer has a problem
- if (FileTransform_Prediffing(strFileTemp[file], *m_infoPrediffer,
- m_bPathsAreTemp) == FALSE)
- {
- // display a message box
- CString sError;
- LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFileTemp[file].c_str(),
- m_infoPrediffer->pluginName.c_str());
- AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
- // don't use any more this prediffer
- m_infoPrediffer->bToBeScanned = FALSE;
- m_infoPrediffer->pluginName.erase();
- }
- }
- }
-
- FileTransform_UCS2ToUTF8(strFileTemp[file], m_bPathsAreTemp);
- // We use the same plugin for both files, so it must be defined before
- // second file
- ASSERT(m_infoPrediffer->bToBeScanned == FALSE);
- }
-
- struct change *script = NULL;
- struct change *script10 = NULL;
- struct change *script12 = NULL;
- struct change *script02 = NULL;
- DiffFileData diffdata, diffdata10, diffdata12, diffdata02;
- int bin_flag = 0, bin_flag10 = 0, bin_flag12 = 0, bin_flag02 = 0;
-
- if (files.GetSize() == 2)
- {
- diffdata.SetDisplayFilepaths(files[0].c_str(), files[1].c_str()); // store true names for diff utils patch file
- // This opens & fstats both files (if it succeeds)
- if (!diffdata.OpenFiles(strFileTemp[0].c_str(), strFileTemp[1].c_str()))
- {
- return FALSE;
- }
-
- // Compare the files, if no error was found.
- // Last param (bin_file) is NULL since we don't
- // (yet) need info about binary sides.
- bRet = Diff2Files(&script, &diffdata, &bin_flag, NULL);
-
- // We don't anymore create diff-files for every rescan.
- // User can create patch-file whenever one wants to.
- // We don't need to waste time. But lets keep this as
- // debugging aid. Sometimes it is very useful to see
- // what differences diff-engine sees!
- #ifdef _DEBUG
- // throw the diff into a temp file
- String sTempPath = env_GetTempPath(); // get path to Temp folder
- String path = paths_ConcatPath(sTempPath, _T("Diff.txt"));
-
- outfile = _tfopen(path.c_str(), _T("w+"));
- if (outfile != NULL)
- {
- print_normal_script(script);
- fclose(outfile);
- outfile = NULL;
- }
- #endif
- }
- else
- {
- diffdata10.SetDisplayFilepaths(files[1].c_str(), files[0].c_str()); // store true names for diff utils patch file
- diffdata02.SetDisplayFilepaths(files[0].c_str(), files[2].c_str()); // store true names for diff utils patch file
- diffdata12.SetDisplayFilepaths(files[1].c_str(), files[2].c_str()); // store true names for diff utils patch file
-
- if (!diffdata10.OpenFiles(strFileTemp[1].c_str(), strFileTemp[0].c_str()))
- {
- return FALSE;
- }
-
- bRet = Diff2Files(&script10, &diffdata10, &bin_flag10, NULL);
-
- if (!diffdata12.OpenFiles(strFileTemp[1].c_str(), strFileTemp[2].c_str()))
- {
- return FALSE;
- }
-
- bRet = Diff2Files(&script12, &diffdata12, &bin_flag12, NULL);
-
- if (!diffdata02.OpenFiles(strFileTemp[0].c_str(), strFileTemp[2].c_str()))
- {
- return FALSE;
- }
-
- bRet = Diff2Files(&script02, &diffdata02, &bin_flag02, NULL);
- }
-
- // First determine what happened during comparison
- // If there were errors or files were binaries, don't bother
- // creating diff-lists or patches
-
- // diff_2_files set bin_flag to -1 if different binary
- // diff_2_files set bin_flag to +1 if same binary
-
- file_data * inf = diffdata.m_inf;
- file_data * inf10 = diffdata10.m_inf;
- file_data * inf12 = diffdata12.m_inf;
- file_data * inf02 = diffdata02.m_inf;
-
- if (files.GetSize() == 2)
- {
- if (bin_flag != 0)
- {
- m_status.bBinaries = TRUE;
- if (bin_flag != -1)
- m_status.Identical = IDENTLEVEL_ALL;
- else
- m_status.Identical = IDENTLEVEL_NONE;
- }
- else
- { // text files according to diffutils, so change script exists
- m_status.Identical = (script == 0) ? IDENTLEVEL_ALL : IDENTLEVEL_NONE;
- m_status.bBinaries = FALSE;
- }
- m_status.bMissingNL[0] = inf[0].missing_newline;
- m_status.bMissingNL[1] = inf[1].missing_newline;
- }
- else
- {
- m_status.Identical = IDENTLEVEL_NONE;
- if (bin_flag10 != 0 || bin_flag12 != 0 || bin_flag02 != 0)
- {
- m_status.bBinaries = TRUE;
- if (bin_flag10 != -1 && bin_flag12 != -1)
- m_status.Identical = IDENTLEVEL_ALL;
- else if (bin_flag10 != -1)
- m_status.Identical = IDENTLEVEL_EXCEPTRIGHT;
- else if (bin_flag12 != -1)
- m_status.Identical = IDENTLEVEL_EXCEPTLEFT;
- else if (bin_flag02 != -1)
- m_status.Identical = IDENTLEVEL_EXCEPTMIDDLE;
- }
- else
- { // text files according to diffutils, so change script exists
- m_status.bBinaries = FALSE;
- if (script10 == 0 && script12 == 0)
- m_status.Identical = IDENTLEVEL_ALL;
- else if (script10 == 0)
- m_status.Identical = IDENTLEVEL_EXCEPTRIGHT;
- else if (script12 == 0)
- m_status.Identical = IDENTLEVEL_EXCEPTLEFT;
- else if (script02 == 0)
- m_status.Identical = IDENTLEVEL_EXCEPTMIDDLE;
- }
- m_status.bMissingNL[0] = inf02[0].missing_newline;
- m_status.bMissingNL[1] = inf12[0].missing_newline;
- m_status.bMissingNL[2] = inf12[1].missing_newline;
- }
-
-
- // Create patch file
- if (!m_status.bBinaries && m_bCreatePatchFile && files.GetSize() == 2)
- {
- WritePatchFile(script, &inf[0]);
- }
-
- // Go through diffs adding them to WinMerge's diff list
- // This is done on every WinMerge's doc rescan!
- if (!m_status.bBinaries && m_bUseDiffList)
- {
- if (files.GetSize() == 2)
- LoadWinMergeDiffsFromDiffUtilsScript(script, diffdata.m_inf);
- else
- LoadWinMergeDiffsFromDiffUtilsScript3(
- script10, script12, script02,
- diffdata10.m_inf, diffdata12.m_inf, diffdata02.m_inf);
- }
-
- // cleanup the script
- if (files.GetSize() == 2)
- FreeDiffUtilsScript(script);
- else
- FreeDiffUtilsScript3(script10, script12, script02);
-
- // Done with diffutils filedata
- if (files.GetSize() == 2)
- {
- diffdata.Close();
- }
- else
- {
- diffdata10.Close();
- diffdata12.Close();
- diffdata02.Close();
- }
-
- if (m_bPluginsEnabled)
- {
- // Delete temp files transformation functions possibly created
- for (file = 0; file < files.GetSize(); file++)
- {
- if (lstrcmpi(files[file].c_str(), strFileTemp[file].c_str()) != 0)
- {
- if (!::DeleteFile(strFileTemp[file].c_str()))
- {
- LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFileTemp[file], GetSysError(GetLastError()).c_str()));
- }
- strFileTemp[file].erase();
- }
- }
- }
- return bRet;
- }
-
- /**
- * @brief Add diff to external diff-list
- */
- void CDiffWrapper::AddDiffRange(DiffList *pDiffList, UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op)
- {
- TRY {
- DIFFRANGE dr;
- dr.begin[0] = begin0;
- dr.end[0] = end0;
- dr.begin[1] = begin1;
- dr.end[1] = end1;
- dr.begin[2] = -1;
- dr.end[2] = -1;
- dr.op = op;
- dr.blank[0] = dr.blank[1] = dr.blank[2] = -1;
- pDiffList->AddDiff(dr);
- }
- CATCH_ALL(e)
- {
- TCHAR msg[1024] = {0};
- e->GetErrorMessage(msg, 1024);
- AfxMessageBox(msg, MB_ICONSTOP);
- }
- END_CATCH_ALL;
- }
-
- void CDiffWrapper::AddDiffRange(DiffList *pDiffList, DIFFRANGE &dr)
- {
- TRY {
- pDiffList->AddDiff(dr);
- }
- CATCH_ALL(e)
- {
- TCHAR msg[1024] = {0};
- e->GetErrorMessage(msg, 1024);
- AfxMessageBox(msg, MB_ICONSTOP);
- }
- END_CATCH_ALL;
- }
-
- /**
- * @brief Expand last DIFFRANGE of file by one line to contain last line after EOL.
- * @param [in] leftBufferLines size of array pane left
- * @param [in] rightBufferLines size of array pane right
- * @param [in] left on whitch side we have to insert
- * @param [in] bIgnoreBlankLines, if true we allways add a new diff and make as trivial
- */
- void CDiffWrapper::FixLastDiffRange(int nFiles, int bufferLines[], int bMissingNL[], bool bIgnoreBlankLines)
- {
- DIFFRANGE dr;
- const int count = m_pDiffList->GetSize();
- if (count > 0 && !bIgnoreBlankLines)
- {
- m_pDiffList->GetDiff(count - 1, dr);
-
- for (int file = 0; file < nFiles; file++)
- {
- if (!bMissingNL[file])
- dr.end[file]++;
- }
-
- m_pDiffList->SetDiff(count - 1, dr);
- }
- else
- {
- // we have to create the DIFF
- for (int file = 0; file < nFiles; file++)
- {
- dr.end[file] = bufferLines[file] - 1;
- if (bMissingNL[file])
- dr.begin[file] = dr.end[file];
- else
- dr.begin[file] = dr.end[file] + 1;
- dr.op = OP_DIFF;
- ASSERT(dr.begin[0] == dr.begin[file]);
- }
- if (bIgnoreBlankLines)
- dr.op = OP_TRIVIAL;
-
- AddDiffRange(m_pDiffList, dr);
- }
- }
-
- /**
- * @brief Returns status-data from diff-engine last run
- */
- void CDiffWrapper::GetDiffStatus(DIFFSTATUS *status)
- {
- CopyMemory(status, &m_status, sizeof(DIFFSTATUS));
- }
-
- /**
- * @brief Formats command-line for diff-engine last run (like it was called from command-line)
- */
- String CDiffWrapper::FormatSwitchString()
- {
- String switches;
- TCHAR tmpNum[5] = {0};
-
- switch (m_options.m_outputStyle)
- {
- case OUTPUT_CONTEXT:
- switches = _T(" C");
- break;
- case OUTPUT_UNIFIED:
- switches = _T(" U");
- break;
- case OUTPUT_ED:
- switches = _T(" e");
- break;
- case OUTPUT_FORWARD_ED:
- switches = _T(" f");
- break;
- case OUTPUT_RCS:
- switches = _T(" n");
- break;
- case OUTPUT_NORMAL:
- switches = _T(" ");
- break;
- case OUTPUT_IFDEF:
- switches = _T(" D");
- break;
- case OUTPUT_SDIFF:
- switches = _T(" y");
- break;
- }
-
- if (m_options.m_contextLines > 0)
- {
- _itot(m_options.m_contextLines, tmpNum, 10);
- switches += tmpNum;
- }
-
- if (ignore_all_space_flag > 0)
- switches += _T("w");
-
- if (ignore_blank_lines_flag > 0)
- switches += _T("B");
-
- if (ignore_case_flag > 0)
- switches += _T("i");
-
- if (ignore_space_change_flag > 0)
- switches += _T("b");
-
- return switches;
- }
-
- /**
- * @brief Enables/disables patch-file appending.
- * If the file for patch already exists then the patch will be appended to
- * existing file.
- * @param [in] bAppendFiles If TRUE patch will be appended to existing file.
- */
- void CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
- {
- m_bAppendFiles = bAppendFiles;
- }
-
- /**
- * @brief Compare two files using diffutils.
- *
- * Compare two files (in DiffFileData param) using diffutils. Run diffutils
- * inside SEH so we can trap possible error and exceptions. If error or
- * execption is trapped, return compare failure.
- * @param [out] diffs Pointer to list of change structs where diffdata is stored.
- * @param [in] diffData files to compare.
- * @param [out] bin_status used to return binary status from compare.
- * @param [out] bin_file Returns which file was binary file as bitmap.
- So if first file is binary, first bit is set etc. Can be NULL if binary file
- info is not needed (faster compare since diffutils don't bother checking
- second file if first is binary).
- * @return TRUE when compare succeeds, FALSE if error happened during compare.
- * @note This function is used in file compare, not folder compare. Similar
- * folder compare function is in DiffFileData.cpp.
- */
- BOOL CDiffWrapper::Diff2Files(struct change ** diffs, DiffFileData *diffData,
- int * bin_status, int * bin_file)
- {
- BOOL bRet = TRUE;
- __try
- {
- // Diff files. depth is zero because we are not 6comparing dirs
- *diffs = diff_2_files (diffData->m_inf, 0, bin_status,
- (m_pMovedLines[0] != NULL), bin_file);
- CopyDiffutilTextStats(diffData->m_inf, diffData);
- }
- __except (EXCEPTION_EXECUTE_HANDLER)
- {
- *diffs = NULL;
- bRet = FALSE;
- }
- return bRet;
- }
-
- /**
- * @brief Free script (the diffutils linked list of differences)
- */
- static void
- FreeDiffUtilsScript(struct change * & script)
- {
- if (!script) return;
- struct change *e=0, *p=0;
- // cleanup the script
- for (e = script; e; e = p)
- {
- p = e->link;
- free(e);
- }
- script = 0;
- }
-
- /**
- * @brief Free script (the diffutils linked list of differences)
- */
- static void
- FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02)
- {
- struct change *e=0, *p=0;
- for (e = script10; e; e = p)
- {
- p = e->link;
- free (e);
- }
- for (e = script12; e; e = p)
- {
- p = e->link;
- free (e);
- }
- for (e = script02; e; e = p)
- {
- p = e->link;
- free (e);
- }
- }
-
- void
- CDiffWrapper::FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02)
- {
- ::FreeDiffUtilsScript3(script10, script12, script02);
- }
-
- /**
- * @brief Match regular expression list against given difference.
- * This function matches the regular expression list against the difference
- * (given as start line and end line). Matching the diff requires that all
- * lines in difference match.
- * @param [in] StartPos First line of the difference.
- * @param [in] endPos Last line of the difference.
- * @param [in] FileNo File to match.
- * return true if any of the expressions matches.
- */
- bool CDiffWrapper::RegExpFilter(int StartPos, int EndPos, int FileNo)
- {
- if (m_pFilterList == NULL)
- {
- _RPTF0(_CRT_ERROR, "CDiffWrapper::RegExpFilter() called when "
- "filterlist doesn't exist (=NULL)");
- return false;
- }
-
- const char EolIndicators[] = "\r\n"; //List of characters used as EOL
- bool linesMatch = true; // set to false when non-matching line is found.
- int line = StartPos;
-
- while (line <= EndPos && linesMatch == true)
- {
- size_t len = files[FileNo].linbuf[line + 1] - files[FileNo].linbuf[line];
- std::string LineData(files[FileNo].linbuf[line], len);
- size_t EolPos = LineData.find_first_of(EolIndicators);
- if (EolPos != std::string::npos)
- {
- LineData.erase(EolPos);
- }
-
- if (!m_pFilterList->Match(LineData.c_str(), m_codepage))
- {
- linesMatch = false;
- }
- ++line;
- }
- return linesMatch;
- }
-
- /**
- * @brief Walk the diff utils change script, building the WinMerge list of diff blocks
- */
- void
- CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const file_data * inf)
- {
- //Logic needed for Ignore comment option
- DIFFOPTIONS options;
- GetOptions(&options);
- String asLwrCaseExt;
- if (options.bFilterCommentsLines)
- {
- String LowerCaseExt = m_originalFile.GetLeft();
- int PosOfDot = LowerCaseExt.rfind('.');
- if (PosOfDot != -1)
- {
- LowerCaseExt.erase(0, PosOfDot + 1);
- CharLower(&*LowerCaseExt.begin());
- asLwrCaseExt = LowerCaseExt;
- }
- }
-
- struct change *next = script;
- struct change *thisob=0, *end=0;
-
- while (next)
- {
- /* Find a set of changes that belong together. */
- thisob = next;
- end = find_change(next);
-
- /* Disconnect them from the rest of the changes,
- making them a hunk, and remember the rest for next iteration. */
- next = end->link;
- end->link = 0;
- #ifdef DEBUG
- debug_script(thisob);
- #endif
-
- /* Print thisob hunk. */
- //(*printfun) (thisob);
- {
- /* Determine range of line numbers involved in each file. */
- int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts, inf);
- int op=0;
- if (deletes || inserts || thisob->trivial)
- {
- if (deletes && inserts)
- op = OP_DIFF;
- else if (deletes || inserts)
- op = OP_DIFF;
- else
- op = OP_TRIVIAL;
-
- /* Print the lines that the first file has. */
- int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
- translate_range(&inf[0], first0, last0, &trans_a0, &trans_b0);
- translate_range(&inf[1], first1, last1, &trans_a1, &trans_b1);
-
- // Store information about these blocks in moved line info
- if (GetDetectMovedBlocks())
- {
- if (thisob->match0>=0)
- {
- ASSERT(thisob->inserted);
- for (int i=0; i<thisob->inserted; ++i)
- {
- int line0 = i+thisob->match0 + (trans_a0-first0-1);
- int line1 = i+thisob->line1 + (trans_a1-first1-1);
- GetMovedLines(1)->Add(MovedLines::SIDE_LEFT, line1, line0);
- }
- }
- if (thisob->match1>=0)
- {
- ASSERT(thisob->deleted);
- for (int i=0; i<thisob->deleted; ++i)
- {
- int line0 = i+thisob->line0 + (trans_a0-first0-1);
- int line1 = i+thisob->match1 + (trans_a1-first1-1);
- GetMovedLines(0)->Add(MovedLines::SIDE_RIGHT, line0, line1);
- }
- }
- }
-
- if (options.bFilterCommentsLines)
- {
- int QtyLinesLeft = (trans_b0 - trans_a0) + 1; //Determine quantity of lines in this block for left side
- int QtyLinesRight = (trans_b1 - trans_a1) + 1;//Determine quantity of lines in this block for right side
- PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());
- }
-
- if (m_pFilterList && m_pFilterList->HasRegExps())
- {
- //Determine quantity of lines in this block for both sides
- int QtyLinesLeft = (trans_b0 - trans_a0);
- int QtyLinesRight = (trans_b1 - trans_a1);
-
- // Match lines against regular expression filters
- // Our strategy is that every line in both sides must
- // match regexp before we mark difference as ignored.
- bool match2 = false;
- bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
- if (match1)
- match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
- if (match1 && match2)
- op = OP_TRIVIAL;
- }
-
- AddDiffRange(m_pDiffList, trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);
- TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),
- trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
- }
- }
-
- /* Reconnect the script so it will all be freed properly. */
- end->link = next;
- }
- }
-
- /**
- * @brief Walk the diff utils change script, building the WinMerge list of diff blocks
- */
- void
- CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript3(
- struct change * script10,
- struct change * script12,
- struct change * script02,
- const file_data * inf10,
- const file_data * inf12,
- const file_data * inf02)
- {
- DiffList diff10, diff12, diff02, *pdiff;
- diff10.Clear();
- diff12.Clear();
- diff02.Clear();
-
- for (int file = 0; file < 3; file++)
- {
- struct change *next;
- int trans_a0, trans_b0, trans_a1, trans_b1;
- int first0, last0, first1, last1, deletes, inserts, op;
- struct change *thisob, *end;
- const file_data *pinf;
-
- switch (file)
- {
- case 0: next = script10; pdiff = &diff10; pinf = inf10; break;
- case 1: next = script12; pdiff = &diff12; pinf = inf12; break;
- case 2: next = script02; pdiff = &diff02; pinf = inf02; break;
- }
-
- while (next)
- {
- /* Find a set of changes that belong together. */
- thisob = next;
- end = find_change(next);
-
- /* Disconnect them from the rest of the changes,
- making them a hunk, and remember the rest for next iteration. */
- next = end->link;
- end->link = 0;
- #ifdef DEBUG
- debug_script(thisob);
- #endif
-
- /* Print thisob hunk. */
- //(*printfun) (thisob);
- {
- /* Determine range of line numbers involved in each file. */
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts, pinf);
- if (deletes || inserts || thisob->trivial)
- {
- if (deletes && inserts)
- op = OP_DIFF;
- else if (deletes || inserts)
- op = OP_DIFF;
- else
- op = OP_TRIVIAL;
-
- /* Print the lines that the first file has. */
- translate_range (&pinf[0], first0, last0, &trans_a0, &trans_b0);
- translate_range (&pinf[1], first1, last1, &trans_a1, &trans_b1);
-
- // Store information about these blocks in moved line info
- if (GetDetectMovedBlocks())
- {
- int index1 = -1;
- int index2 = -1;
- MovedLines::ML_SIDE side1;
- MovedLines::ML_SIDE side2;
- if (file == 0 /* diff10 */)
- {
- index1 = 0;
- index2 = 1;
- side1 = MovedLines::SIDE_RIGHT;
- side2 = MovedLines::SIDE_LEFT;
- }
- else if (file == 1 /* diff12 */)
- {
- index1 = 2;
- index2 = 1;
- side1 = MovedLines::SIDE_LEFT;
- side2 = MovedLines::SIDE_RIGHT;
- }
- if (index1 != -1 && index2 != -1)
- {
- if (thisob->match0>=0)
- {
- ASSERT(thisob->inserted);
- for (int i=0; i<thisob->inserted; ++i)
- {
- int line0 = i+thisob->match0 + (trans_a0-first0-1);
- int line1 = i+thisob->line1 + (trans_a1-first1-1);
- GetMovedLines(index1)->Add(side1, line1, line0);
- }
- }
- if (thisob->match1>=0)
- {
- ASSERT(thisob->deleted);
- for (int i=0; i<thisob->deleted; ++i)
- {
- int line0 = i+thisob->line0 + (trans_a0-first0-1);
- int line1 = i+thisob->match1 + (trans_a1-first1-1);
- GetMovedLines(index2)->Add(side2, line0, line1);
- }
- }
- }
- }
-
- AddDiffRange(pdiff, trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);
- TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),
- trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
- }
- }
-
- /* Reconnect the script so it will all be freed properly. */
- end->link = next;
- }
- }
-
- Make3wayDiff(*m_pDiffList, diff10, diff12, diff02);
- }
-
- void CDiffWrapper::WritePatchFileHeader(enum output_style output_style, BOOL bAppendFiles)
- {
- outfile = NULL;
- if (!m_sPatchFile.empty())
- {
- LPCTSTR mode = (bAppendFiles ? _T("a+") : _T("w+"));
- outfile = _tfopen(m_sPatchFile.c_str(), mode);
- }
-
- if (!outfile)
- {
- m_status.bPatchFileFailed = TRUE;
- return;
- }
-
- // Output patchfile
- switch (output_style)
- {
- case OUTPUT_CONTEXT:
- case OUTPUT_UNIFIED:
- case OUTPUT_ED:
- case OUTPUT_FORWARD_ED:
- case OUTPUT_RCS:
- case OUTPUT_NORMAL:
- case OUTPUT_IFDEF:
- case OUTPUT_SDIFF:
- break;
- case OUTPUT_HTML:
- print_html_header();
- break;
- }
-
- fclose(outfile);
- outfile = NULL;
- }
-
- void CDiffWrapper::WritePatchFileTerminator(enum output_style output_style)
- {
- outfile = NULL;
- if (!m_sPatchFile.empty())
- {
- outfile = _tfopen(m_sPatchFile.c_str(), _T("a+"));
- }
-
- if (!outfile)
- {
- m_status.bPatchFileFailed = TRUE;
- return;
- }
-
- // Output patchfile
- switch (output_style)
- {
- case OUTPUT_CONTEXT:
- case OUTPUT_UNIFIED:
- case OUTPUT_ED:
- case OUTPUT_FORWARD_ED:
- case OUTPUT_RCS:
- case OUTPUT_NORMAL:
- case OUTPUT_IFDEF:
- case OUTPUT_SDIFF:
- break;
- case OUTPUT_HTML:
- print_html_terminator();
- break;
- }
-
- fclose(outfile);
- outfile = NULL;
- }
-
- /**
- * @brief Write out a patch file.
- * Writes patch file using already computed diffutils script. Converts path
- * delimiters from \ to / since we want to keep compatibility with patch-tools.
- * @param [in] script list of changes.
- * @param [in] inf file_data table containing filenames
- */
- void CDiffWrapper::WritePatchFile(struct change * script, file_data * inf)
- {
- file_data inf_patch[2] = {0};
- CopyMemory(&inf_patch, inf, sizeof(file_data) * 2);
-
- // Get paths, primarily use alternative paths, only if they are empty
- // use full filepaths
- String path1(m_alternativePaths[0]);
- String path2(m_alternativePaths[1]);
- if (path1.empty())
- path1 = m_files[0];
- if (path2.empty())
- path2 = m_files[1];
- replace_char(&*path1.begin(), '\\', '/');
- replace_char(&*path2.begin(), '\\', '/');
- inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
- inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
-
- // Fix timestamps for generated patch files
- // If there are translations needed (e.g. when comparing UTF-16 files)
- // then the stats in 'inf' are read from temp files. If the original
- // file's and read timestamps differ, use original file's timestamps.
- // See also sf.net bug item #2791506.
- struct __stat64 st;
- _tstat64(path1.c_str(), &st);
- if (st.st_mtime != inf_patch[0].stat.st_mtime)
- inf_patch[0].stat.st_mtime = st.st_mtime;
- _tstat64(path2.c_str(), &st);
- if (st.st_mtime != inf_patch[1].stat.st_mtime)
- inf_patch[1].stat.st_mtime = st.st_mtime;
-
- outfile = NULL;
- if (!m_sPatchFile.empty())
- {
- LPCTSTR mode = (m_bAppendFiles ? _T("a+") : _T("w+"));
- outfile = _tfopen(m_sPatchFile.c_str(), mode);
- }
-
- if (!outfile)
- {
- m_status.bPatchFileFailed = TRUE;
- return;
- }
-
- // Print "command line"
- if (m_bAddCmdLine && output_style != OUTPUT_HTML)
- {
- String switches = FormatSwitchString();
- _ftprintf(outfile, _T("diff%s %s %s\n"),
- switches.c_str(),
- path1 == _T("NUL") ? _T("/dev/null") : path1.c_str(),
- path2 == _T("NUL") ? _T("/dev/null") : path2.c_str());
- }
-
- if (strcmp(inf[0].name, "NUL") == 0)
- {
- free((void *)inf[0].name);
- inf[0].name = strdup("/dev/null");
- }
- if (strcmp(inf[1].name, "NUL") == 0)
- {
- free((void *)inf[1].name);
- inf[1].name = strdup("/dev/null");
- }
-
- // Output patchfile
- switch (output_style)
- {
- case OUTPUT_CONTEXT:
- print_context_header(inf_patch, 0);
- print_context_script(script, 0);
- break;
- case OUTPUT_UNIFIED:
- print_context_header(inf_patch, 1);
- print_context_script(script, 1);
- break;
- case OUTPUT_ED:
- print_ed_script(script);
- break;
- case OUTPUT_FORWARD_ED:
- pr_forward_ed_script(script);
- break;
- case OUTPUT_RCS:
- print_rcs_script(script);
- break;
- case OUTPUT_NORMAL:
- print_normal_script(script);
- break;
- case OUTPUT_IFDEF:
- print_ifdef_script(script);
- break;
- case OUTPUT_SDIFF:
- print_sdiff_script(script);
- break;
- case OUTPUT_HTML:
- print_html_diff_header(inf_patch);
- print_html_script(script);
- print_html_diff_terminator();
- }
-
- fclose(outfile);
- outfile = NULL;
-
- free((void *)inf_patch[0].name);
- free((void *)inf_patch[1].name);
- }
-
- /**
- * @brief Set line filters, given as one string.
- * @param [in] filterStr Filters.
- */
- void CDiffWrapper::SetFilterList(LPCTSTR filterStr)
- {
- // Remove filterlist if new filter is empty
- if (*filterStr == '\0')
- {
- delete m_pFilterList;
- m_pFilterList = NULL;
- return;
- }
-
- // Adding new filter without previous filter
- if (m_pFilterList == NULL)
- {
- m_pFilterList = new FilterList;
- }
-
- m_pFilterList->RemoveAllFilters();
-
- char * regexp_str;
- FilterList::EncodingType type;
-
- #ifdef UNICODE
- regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);
- type = FilterList::ENC_UTF8;
- #else
- CString tmp_str(filterStr);
- regexp_str = tmp_str.LockBuffer();
- type = FilterList::ENC_ANSI;
- #endif
-
- // Add every "line" of regexps to regexp list
- char * token;
- const char sep[] = "\r\n";
- token = strtok(regexp_str, sep);
- while (token)
- {
- m_pFilterList->AddRegExp(token, type);
- token = strtok(NULL, sep);
- }
- #ifdef UNICODE
- UCS2UTF8_Dealloc(regexp_str);
- #else
- tmp_str.UnlockBuffer();
- #endif
- }
-
- /**
- * @brief Copy text stat results from diffutils back into the FileTextStats structure
- */
- void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)
- {
- myTextStats->ncrlfs = inf->count_crlfs;
- myTextStats->ncrs = inf->count_crs;
- myTextStats->nlfs = inf->count_lfs;
- }
-
- /**
- * @brief Copy both left & right text stats results back into the DiffFileData text stats
- */
- void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)
- {
- CopyTextStats(&inf[0], &diffData->m_textStats[0]);
- CopyTextStats(&inf[1], &diffData->m_textStats[1]);
- }
-
- /* diff3 algorithm. It is almost the same as GNU diff3's algorithm */
- int CDiffWrapper::Make3wayDiff(DiffList& diff3, DiffList& diff10, DiffList& diff12, DiffList& diff02)
- {
- int diff10count = diff10.GetSize();
- int diff12count = diff12.GetSize();
- int diff02count = diff02.GetSize();
-
- int diff10i = 0;
- int diff12i = 0;
- int diff02i = 0;
- int diff3i = 0;
-
- int diff10itmp;
- int diff12itmp;
- int diff02itmp = 0;
-
- bool lastDiffBlockIsDiff12;
- bool firstDiffBlockIsDiff12;
-
- DIFFRANGE dr3, dr10, dr12, dr02, dr10first, dr10last, dr12first, dr12last;
- dr3.blank[0] = dr3.blank[1] = dr3.blank[2] = -1;
-
- int linelast0 = 0;
- int linelast1 = 0;
- int linelast2 = 0;
-
- for (;;)
- {
- if (diff10i >= diff10count && diff12i >= diff12count)
- break;
-
- /*
- * merge overlapped diff blocks
- * diff10 is diff blocks between file1 and file0.
- * diff12 is diff blocks between file1 and file2.
- *
- * diff12
- * diff10 diff3
- * |~~~| |~~~|
- * firstDiffBlock | | | |
- * | | |~~~| | |
- * |___| | | | |
- * | | -> | |
- * |~~~| |___| | |
- * lastDiffBlock | | | |
- * |___| |___|
- */
-
- if (diff10i >= diff10count && diff12i < diff12count)
- {
- diff12.GetDiff(diff12i, dr12first);
- dr12last = dr12first;
- firstDiffBlockIsDiff12 = true;
- }
- else if (diff10i < diff10count && diff12i >= diff12count)
- {
- diff10.GetDiff(diff10i, dr10first);
- dr10last = dr10first;
- firstDiffBlockIsDiff12 = false;
- }
- else
- {
- diff10.GetDiff(diff10i, dr10first);
- diff12.GetDiff(diff12i, dr12first);
- dr10last = dr10first;
- dr12last = dr12first;
- if (dr12first.begin[0] <= dr10first.begin[0])
- firstDiffBlockIsDiff12 = true;
- else
- firstDiffBlockIsDiff12 = false;
- }
- lastDiffBlockIsDiff12 = firstDiffBlockIsDiff12;
-
- diff10itmp = diff10i;
- diff12itmp = diff12i;
- for (;;)
- {
- if (diff10itmp >= diff10count || diff12itmp >= diff12count)
- break;
-
- diff10.GetDiff(diff10itmp, dr10);
- diff12.GetDiff(diff12itmp, dr12);
-
- if (dr10.end[0] == dr12.end[0])
- {
- diff10itmp++;
- lastDiffBlockIsDiff12 = true;
-
- dr10last = dr10;
- dr12last = dr12;
- break;
- }
-
- if (lastDiffBlockIsDiff12)
- {
- if (dr12.end[0] + 1 < dr10.begin[0])
- break;
- }
- else
- {
- if (dr10.end[0] + 1 < dr12.begin[0])
- break;
- }
-
- if (dr12.end[0] > dr10.end[0])
- {
- diff10itmp++;
- lastDiffBlockIsDiff12 = true;
- }
- else
- {
- diff12itmp++;
- lastDiffBlockIsDiff12 = false;
- }
-
- dr10last = dr10;
- dr12last = dr12;
- }
-
- if (lastDiffBlockIsDiff12)
- diff12itmp++;
- else
- diff10itmp++;
-
- if (firstDiffBlockIsDiff12)
- {
- dr3.begin[1] = dr12first.begin[0];
- dr3.begin[2] = dr12first.begin[1];
- if (diff10itmp == diff10i)
- dr3.begin[0] = dr3.begin[1] - linelast1 + linelast0;
- else
- dr3.begin[0] = dr3.begin[1] - dr10first.begin[0] + dr10first.begin[1];
- }
- else
- {
- dr3.begin[0] = dr10first.begin[1];
- dr3.begin[1] = dr10first.begin[0];
- if (diff12itmp == diff12i)
- dr3.begin[2] = dr3.begin[1] - linelast1 + linelast2;
- else
- dr3.begin[2] = dr3.begin[1] - dr12first.begin[0] + dr12first.begin[1];
- }
-
- if (lastDiffBlockIsDiff12)
- {
- dr3.end[1] = dr12last.end[0];
- dr3.end[2] = dr12last.end[1];
- if (diff10itmp == diff10i)
- dr3.end[0] = dr3.end[1] - linelast1 + linelast0;
- else
- dr3.end[0] = dr3.end[1] - dr10last.end[0] + dr10last.end[1];
- }
- else
- {
- dr3.end[0] = dr10last.end[1];
- dr3.end[1] = dr10last.end[0];
- if (diff12itmp == diff12i)
- dr3.end[2] = dr3.end[1] - linelast1 + linelast2;
- else
- dr3.end[2] = dr3.end[1] - dr12last.end[0] + dr12last.end[1];
- }
-
- linelast0 = dr3.end[0] + 1;
- linelast1 = dr3.end[1] + 1;
- linelast2 = dr3.end[2] + 1;
-
- if (diff10i == diff10itmp)
- dr3.op = OP_3RDONLY;
- else if (diff12i == diff12itmp)
- dr3.op = OP_1STONLY;
- else
- {
- dr3.op = OP_2NDONLY;
- for (diff02itmp = diff02i; diff02itmp < diff02count; diff02itmp++)
- {
- diff02.GetDiff(diff02itmp, dr02);
- if (dr02.end[1] < dr3.begin[2])
- continue;
-
- if (dr02.begin[1] <= dr3.end[2])
- dr3.op = OP_DIFF;
- break;
- }
- }
-
- if (ignore_regexp_list)
- {
- bool bTrivialDiff10 = true;
- bool bTrivialDiff12 = true;
- int i;
-
- for (i = diff10i; i < diff10itmp; i++)
- {
- diff10.GetDiff(i, dr10);
- if (dr10.op != OP_TRIVIAL)
- {
- bTrivialDiff10 = false;
- break;
- }
- }
-
- for (i = diff12i; i < diff12itmp; i++)
- {
- diff12.GetDiff(i, dr12);
- if (dr12.op != OP_TRIVIAL)
- {
- bTrivialDiff12 = false;
- break;
- }
- }
-
- if (bTrivialDiff10 && bTrivialDiff12)
- dr3.op = OP_TRIVIAL;
- }
-
- diff3.AddDiff(dr3);
-
- TRACE(_T("left=%d,%d middle=%d,%d right=%d,%d op=%d\n"),
- dr3.begin[0], dr3.end[0], dr3.begin[1], dr3.end[1], dr3.begin[2], dr3.end[2], dr3.op);
-
- diff3i++;
- diff10i = diff10itmp;
- diff12i = diff12itmp;
- diff02i = diff02itmp;
- }
- return diff3i;
- }
++\r
++/**\r
++ * @brief Set source paths for diffing two files.\r
++ * Sets full paths to two files we are diffing. Paths can be actual user files\r
++ * or temporary copies of user files. Parameter @p tempPaths tells if paths\r
++ * are temporary paths that can be deleted.\r
++ * @param [in] files Files to compare\r
++ * @param [in] tempPaths Are given paths temporary (can be deleted)?.\r
++ */\r
++void CDiffWrapper::SetPaths(const PathContext &files,\r
++ BOOL tempPaths)\r
++{\r
++ m_files = files;\r
++ m_bPathsAreTemp = tempPaths;\r
++}\r
++\r
++/**\r
++ * @brief Set source paths for original (NON-TEMP) diffing two files.\r
++ * Sets full paths to two (NON-TEMP) files we are diffing.\r
++ * @param [in] OriginalFile1 First file to compare "(NON-TEMP) file".\r
++ * @param [in] OriginalFile2 Second file to compare "(NON-TEMP) file".\r
++ */\r
++void CDiffWrapper::SetCompareFiles(const PathContext &originalFile)\r
++{\r
++ m_originalFile = originalFile;\r
++}\r
++\r
++/**\r
++ * @brief Set alternative paths for compared files.\r
++ * Sets alternative paths for diff'ed files. These alternative paths might not\r
++ * be real paths. For example when creating a patch file from folder compare\r
++ * we want to use relative paths.\r
++ * @param [in] altPaths Alternative file paths.\r
++ */\r
++void CDiffWrapper::SetAlternativePaths(const PathContext &altPaths)\r
++{\r
++ m_alternativePaths = altPaths;\r
++}\r
++\r
++/**\r
++ * @brief Runs diff-engine.\r
++ */\r
++BOOL CDiffWrapper::RunFileDiff()\r
++{\r
++ PathContext files = m_files;\r
++ int file;\r
++ for (file = 0; file < m_files.GetSize(); file++)\r
++ replace_char(&*files[file].begin(), '/', '\\');\r
++\r
++ BOOL bRet = TRUE;\r
++ String strFileTemp[3];\r
++ for (file = 0; file < m_files.GetSize(); file++)\r
++ strFileTemp[file] = files[file];\r
++\r
++ \r
++ m_options.SetToDiffUtils();\r
++\r
++ if (m_bUseDiffList)\r
++ m_nDiffs = m_pDiffList->GetSize();\r
++\r
++ for (file = 0; file < files.GetSize(); file++)\r
++ {\r
++ if (m_bPluginsEnabled)\r
++ {\r
++ // Do the preprocessing now, overwrite the temp files\r
++ // NOTE: FileTransform_UCS2ToUTF8() may create new temp\r
++ // files and return new names, those created temp files\r
++ // are deleted in end of function.\r
++ if (m_infoPrediffer->bToBeScanned)\r
++ {\r
++ // this can only fail if the data can not be saved back (no more\r
++ // place on disk ???) What to do then ??\r
++ FileTransform_Prediffing(strFileTemp[file], m_sToFindPrediffer.c_str(), m_infoPrediffer,\r
++ m_bPathsAreTemp);\r
++ }\r
++ else\r
++ {\r
++ // This can fail if the prediffer has a problem\r
++ if (FileTransform_Prediffing(strFileTemp[file], *m_infoPrediffer,\r
++ m_bPathsAreTemp) == FALSE)\r
++ {\r
++ // display a message box\r
++ CString sError;\r
++ LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFileTemp[file].c_str(),\r
++ m_infoPrediffer->pluginName.c_str());\r
++ AfxMessageBox(sError, MB_OK | MB_ICONSTOP);\r
++ // don't use any more this prediffer\r
++ m_infoPrediffer->bToBeScanned = FALSE;\r
++ m_infoPrediffer->pluginName.erase();\r
++ }\r
++ }\r
++ }\r
++\r
++ FileTransform_UCS2ToUTF8(strFileTemp[file], m_bPathsAreTemp);\r
++ // We use the same plugin for both files, so it must be defined before\r
++ // second file\r
++ ASSERT(m_infoPrediffer->bToBeScanned == FALSE);\r
++ }\r
++\r
++ struct change *script = NULL;\r
++ struct change *script10 = NULL;\r
++ struct change *script12 = NULL;\r
++ struct change *script02 = NULL;\r
++ DiffFileData diffdata, diffdata10, diffdata12, diffdata02;\r
++ int bin_flag = 0, bin_flag10 = 0, bin_flag12 = 0, bin_flag02 = 0;\r
++\r
++ if (files.GetSize() == 2)\r
++ {\r
++ diffdata.SetDisplayFilepaths(files[0].c_str(), files[1].c_str()); // store true names for diff utils patch file\r
++ // This opens & fstats both files (if it succeeds)\r
++ if (!diffdata.OpenFiles(strFileTemp[0].c_str(), strFileTemp[1].c_str()))\r
++ {\r
++ return FALSE;\r
++ }\r
++\r
++ // Compare the files, if no error was found.\r
++ // Last param (bin_file) is NULL since we don't\r
++ // (yet) need info about binary sides.\r
++ bRet = Diff2Files(&script, &diffdata, &bin_flag, NULL);\r
++\r
++ // We don't anymore create diff-files for every rescan.\r
++ // User can create patch-file whenever one wants to.\r
++ // We don't need to waste time. But lets keep this as\r
++ // debugging aid. Sometimes it is very useful to see\r
++ // what differences diff-engine sees!\r
++#ifdef _DEBUG\r
++ // throw the diff into a temp file\r
++ String sTempPath = env_GetTempPath(); // get path to Temp folder\r
++ String path = paths_ConcatPath(sTempPath, _T("Diff.txt"));\r
++\r
++ outfile = _tfopen(path.c_str(), _T("w+"));\r
++ if (outfile != NULL)\r
++ {\r
++ print_normal_script(script);\r
++ fclose(outfile);\r
++ outfile = NULL;\r
++ }\r
++#endif\r
++ }\r
++ else\r
++ {\r
++ diffdata10.SetDisplayFilepaths(files[1].c_str(), files[0].c_str()); // store true names for diff utils patch file\r
++ diffdata02.SetDisplayFilepaths(files[0].c_str(), files[2].c_str()); // store true names for diff utils patch file\r
++ diffdata12.SetDisplayFilepaths(files[1].c_str(), files[2].c_str()); // store true names for diff utils patch file\r
++\r
++ if (!diffdata10.OpenFiles(strFileTemp[1].c_str(), strFileTemp[0].c_str()))\r
++ {\r
++ return FALSE;\r
++ }\r
++\r
++ bRet = Diff2Files(&script10, &diffdata10, &bin_flag10, NULL);\r
++\r
++ if (!diffdata12.OpenFiles(strFileTemp[1].c_str(), strFileTemp[2].c_str()))\r
++ {\r
++ return FALSE;\r
++ }\r
++\r
++ bRet = Diff2Files(&script12, &diffdata12, &bin_flag12, NULL);\r
++\r
++ if (!diffdata02.OpenFiles(strFileTemp[0].c_str(), strFileTemp[2].c_str()))\r
++ {\r
++ return FALSE;\r
++ }\r
++\r
++ bRet = Diff2Files(&script02, &diffdata02, &bin_flag02, NULL);\r
++ }\r
++\r
++ // First determine what happened during comparison\r
++ // If there were errors or files were binaries, don't bother\r
++ // creating diff-lists or patches\r
++ \r
++ // diff_2_files set bin_flag to -1 if different binary\r
++ // diff_2_files set bin_flag to +1 if same binary\r
++\r
++ file_data * inf = diffdata.m_inf;\r
++ file_data * inf10 = diffdata10.m_inf;\r
++ file_data * inf12 = diffdata12.m_inf;\r
++ file_data * inf02 = diffdata02.m_inf;\r
++\r
++ if (files.GetSize() == 2)\r
++ {\r
++ if (bin_flag != 0)\r
++ {\r
++ m_status.bBinaries = TRUE;\r
++ if (bin_flag != -1)\r
++ m_status.Identical = IDENTLEVEL_ALL;\r
++ else\r
++ m_status.Identical = IDENTLEVEL_NONE;\r
++ }\r
++ else\r
++ { // text files according to diffutils, so change script exists\r
++ m_status.Identical = (script == 0) ? IDENTLEVEL_ALL : IDENTLEVEL_NONE;\r
++ m_status.bBinaries = FALSE;\r
++ }\r
++ m_status.bMissingNL[0] = inf[0].missing_newline;\r
++ m_status.bMissingNL[1] = inf[1].missing_newline;\r
++ }\r
++ else\r
++ {\r
++ m_status.Identical = IDENTLEVEL_NONE;\r
++ if (bin_flag10 != 0 || bin_flag12 != 0 || bin_flag02 != 0)\r
++ {\r
++ m_status.bBinaries = TRUE;\r
++ if (bin_flag10 != -1 && bin_flag12 != -1)\r
++ m_status.Identical = IDENTLEVEL_ALL;\r
++ else if (bin_flag10 != -1)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTRIGHT;\r
++ else if (bin_flag12 != -1)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTLEFT;\r
++ else if (bin_flag02 != -1)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTMIDDLE;\r
++ }\r
++ else\r
++ { // text files according to diffutils, so change script exists\r
++ m_status.bBinaries = FALSE;\r
++ if (script10 == 0 && script12 == 0)\r
++ m_status.Identical = IDENTLEVEL_ALL;\r
++ else if (script10 == 0)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTRIGHT;\r
++ else if (script12 == 0)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTLEFT;\r
++ else if (script02 == 0)\r
++ m_status.Identical = IDENTLEVEL_EXCEPTMIDDLE;\r
++ }\r
++ m_status.bMissingNL[0] = inf02[0].missing_newline;\r
++ m_status.bMissingNL[1] = inf12[0].missing_newline;\r
++ m_status.bMissingNL[2] = inf12[1].missing_newline;\r
++ }\r
++\r
++\r
++ // Create patch file\r
++ if (!m_status.bBinaries && m_bCreatePatchFile && files.GetSize() == 2)\r
++ {\r
++ WritePatchFile(script, &inf[0]);\r
++ }\r
++ \r
++ // Go through diffs adding them to WinMerge's diff list\r
++ // This is done on every WinMerge's doc rescan!\r
++ if (!m_status.bBinaries && m_bUseDiffList)\r
++ {\r
++ if (files.GetSize() == 2)\r
++ LoadWinMergeDiffsFromDiffUtilsScript(script, diffdata.m_inf);\r
++ else\r
++ LoadWinMergeDiffsFromDiffUtilsScript3(\r
++ script10, script12, script02,\r
++ diffdata10.m_inf, diffdata12.m_inf, diffdata02.m_inf);\r
++ } \r
++\r
++ // cleanup the script\r
++ if (files.GetSize() == 2)\r
++ FreeDiffUtilsScript(script);\r
++ else\r
++ FreeDiffUtilsScript3(script10, script12, script02);\r
++\r
++ // Done with diffutils filedata\r
++ if (files.GetSize() == 2)\r
++ {\r
++ diffdata.Close();\r
++ }\r
++ else\r
++ {\r
++ diffdata10.Close();\r
++ diffdata12.Close();\r
++ diffdata02.Close();\r
++ }\r
++\r
++ if (m_bPluginsEnabled)\r
++ {\r
++ // Delete temp files transformation functions possibly created\r
++ for (file = 0; file < files.GetSize(); file++)\r
++ {\r
++ if (lstrcmpi(files[file].c_str(), strFileTemp[file].c_str()) != 0)\r
++ {\r
++ if (!::DeleteFile(strFileTemp[file].c_str()))\r
++ {\r
++ LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),\r
++ strFileTemp[file], GetSysError(GetLastError()).c_str()));\r
++ }\r
++ strFileTemp[file].erase();\r
++ }\r
++ }\r
++ }\r
++ return bRet;\r
++}\r
++\r
++/**\r
++ * @brief Add diff to external diff-list\r
++ */\r
++void CDiffWrapper::AddDiffRange(DiffList *pDiffList, UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op)\r
++{\r
++ TRY {\r
++ DIFFRANGE dr;\r
++ dr.begin[0] = begin0;\r
++ dr.end[0] = end0;\r
++ dr.begin[1] = begin1;\r
++ dr.end[1] = end1;\r
++ dr.begin[2] = -1;\r
++ dr.end[2] = -1;\r
++ dr.op = op;\r
++ dr.blank[0] = dr.blank[1] = dr.blank[2] = -1;\r
++ pDiffList->AddDiff(dr);\r
++ }\r
++ CATCH_ALL(e)\r
++ {\r
++ TCHAR msg[1024] = {0};\r
++ e->GetErrorMessage(msg, 1024);\r
++ AfxMessageBox(msg, MB_ICONSTOP);\r
++ }\r
++ END_CATCH_ALL;\r
++}\r
++\r
++void CDiffWrapper::AddDiffRange(DiffList *pDiffList, DIFFRANGE &dr)\r
++{\r
++ TRY {\r
++ pDiffList->AddDiff(dr);\r
++ }\r
++ CATCH_ALL(e)\r
++ {\r
++ TCHAR msg[1024] = {0};\r
++ e->GetErrorMessage(msg, 1024);\r
++ AfxMessageBox(msg, MB_ICONSTOP);\r
++ }\r
++ END_CATCH_ALL;\r
++}\r
++\r
++/**\r
++ * @brief Expand last DIFFRANGE of file by one line to contain last line after EOL.\r
++ * @param [in] leftBufferLines size of array pane left\r
++ * @param [in] rightBufferLines size of array pane right\r
++ * @param [in] left on whitch side we have to insert\r
++ * @param [in] bIgnoreBlankLines, if true we allways add a new diff and make as trivial\r
++ */\r
++void CDiffWrapper::FixLastDiffRange(int nFiles, int bufferLines[], int bMissingNL[], bool bIgnoreBlankLines)\r
++{\r
++ DIFFRANGE dr;\r
++ const int count = m_pDiffList->GetSize();\r
++ if (count > 0 && !bIgnoreBlankLines)\r
++ {\r
++ m_pDiffList->GetDiff(count - 1, dr);\r
++\r
++ for (int file = 0; file < nFiles; file++)\r
++ {\r
++ if (!bMissingNL[file])\r
++ dr.end[file]++;\r
++ }\r
++\r
++ m_pDiffList->SetDiff(count - 1, dr);\r
++ }\r
++ else \r
++ {\r
++ // we have to create the DIFF\r
++ for (int file = 0; file < nFiles; file++)\r
++ {\r
++ dr.end[file] = bufferLines[file] - 1;\r
++ if (bMissingNL[file])\r
++ dr.begin[file] = dr.end[file];\r
++ else\r
++ dr.begin[file] = dr.end[file] + 1;\r
++ dr.op = OP_DIFF;\r
++ ASSERT(dr.begin[0] == dr.begin[file]);\r
++ }\r
++ if (bIgnoreBlankLines)\r
++ dr.op = OP_TRIVIAL;\r
++\r
++ AddDiffRange(m_pDiffList, dr); \r
++ }\r
++}\r
++\r
++/**\r
++ * @brief Returns status-data from diff-engine last run\r
++ */\r
++void CDiffWrapper::GetDiffStatus(DIFFSTATUS *status)\r
++{\r
++ CopyMemory(status, &m_status, sizeof(DIFFSTATUS));\r
++}\r
++\r
++/**\r
++ * @brief Formats command-line for diff-engine last run (like it was called from command-line)\r
++ */\r
++String CDiffWrapper::FormatSwitchString()\r
++{\r
++ String switches;\r
++ TCHAR tmpNum[5] = {0};\r
++ \r
++ switch (m_options.m_outputStyle)\r
++ {\r
++ case OUTPUT_CONTEXT:\r
++ switches = _T(" C");\r
++ break;\r
++ case OUTPUT_UNIFIED:\r
++ switches = _T(" U");\r
++ break;\r
++ case OUTPUT_ED:\r
++ switches = _T(" e");\r
++ break;\r
++ case OUTPUT_FORWARD_ED:\r
++ switches = _T(" f");\r
++ break;\r
++ case OUTPUT_RCS:\r
++ switches = _T(" n");\r
++ break;\r
++ case OUTPUT_NORMAL:\r
++ switches = _T(" ");\r
++ break;\r
++ case OUTPUT_IFDEF:\r
++ switches = _T(" D");\r
++ break;\r
++ case OUTPUT_SDIFF:\r
++ switches = _T(" y");\r
++ break;\r
++ }\r
++\r
++ if (m_options.m_contextLines > 0)\r
++ {\r
++ _itot(m_options.m_contextLines, tmpNum, 10);\r
++ switches += tmpNum;\r
++ }\r
++\r
++ if (ignore_all_space_flag > 0)\r
++ switches += _T("w");\r
++\r
++ if (ignore_blank_lines_flag > 0)\r
++ switches += _T("B");\r
++\r
++ if (ignore_case_flag > 0)\r
++ switches += _T("i");\r
++\r
++ if (ignore_space_change_flag > 0)\r
++ switches += _T("b");\r
++\r
++ return switches;\r
++}\r
++\r
++/**\r
++ * @brief Enables/disables patch-file appending.\r
++ * If the file for patch already exists then the patch will be appended to\r
++ * existing file.\r
++ * @param [in] bAppendFiles If TRUE patch will be appended to existing file.\r
++ */\r
++void CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)\r
++{\r
++ m_bAppendFiles = bAppendFiles;\r
++}\r
++\r
++/**\r
++ * @brief Compare two files using diffutils.\r
++ *\r
++ * Compare two files (in DiffFileData param) using diffutils. Run diffutils\r
++ * inside SEH so we can trap possible error and exceptions. If error or\r
++ * execption is trapped, return compare failure.\r
++ * @param [out] diffs Pointer to list of change structs where diffdata is stored.\r
++ * @param [in] diffData files to compare.\r
++ * @param [out] bin_status used to return binary status from compare.\r
++ * @param [out] bin_file Returns which file was binary file as bitmap.\r
++ So if first file is binary, first bit is set etc. Can be NULL if binary file\r
++ info is not needed (faster compare since diffutils don't bother checking\r
++ second file if first is binary).\r
++ * @return TRUE when compare succeeds, FALSE if error happened during compare.\r
++ * @note This function is used in file compare, not folder compare. Similar\r
++ * folder compare function is in DiffFileData.cpp.\r
++ */\r
++BOOL CDiffWrapper::Diff2Files(struct change ** diffs, DiffFileData *diffData,\r
++ int * bin_status, int * bin_file)\r
++{\r
++ BOOL bRet = TRUE;\r
++ __try\r
++ {\r
++ // Diff files. depth is zero because we are not 6comparing dirs\r
++ *diffs = diff_2_files (diffData->m_inf, 0, bin_status,\r
++ (m_pMovedLines[0] != NULL), bin_file);\r
++ CopyDiffutilTextStats(diffData->m_inf, diffData);\r
++ }\r
++ __except (EXCEPTION_EXECUTE_HANDLER)\r
++ {\r
++ *diffs = NULL;\r
++ bRet = FALSE;\r
++ }\r
++ return bRet;\r
++}\r
++\r
++/**\r
++ * @brief Free script (the diffutils linked list of differences)\r
++ */\r
++static void\r
++FreeDiffUtilsScript(struct change * & script)\r
++{\r
++ if (!script) return;\r
++ struct change *e=0, *p=0;\r
++ // cleanup the script\r
++ for (e = script; e; e = p)\r
++ {\r
++ p = e->link;\r
++ free(e);\r
++ }\r
++ script = 0;\r
++}\r
++\r
++/**\r
++ * @brief Free script (the diffutils linked list of differences)\r
++ */\r
++static void\r
++FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02)\r
++{\r
++ struct change *e=0, *p=0;\r
++ for (e = script10; e; e = p)\r
++ {\r
++ p = e->link;\r
++ free (e);\r
++ }\r
++ for (e = script12; e; e = p)\r
++ {\r
++ p = e->link;\r
++ free (e);\r
++ }\r
++ for (e = script02; e; e = p)\r
++ {\r
++ p = e->link;\r
++ free (e);\r
++ }\r
++}\r
++\r
++void\r
++CDiffWrapper::FreeDiffUtilsScript3(struct change * & script10, struct change * & script12, struct change * & script02)\r
++{\r
++ ::FreeDiffUtilsScript3(script10, script12, script02);\r
++}\r
++\r
++/**\r
++ * @brief Match regular expression list against given difference.\r
++ * This function matches the regular expression list against the difference\r
++ * (given as start line and end line). Matching the diff requires that all\r
++ * lines in difference match.\r
++ * @param [in] StartPos First line of the difference.\r
++ * @param [in] endPos Last line of the difference.\r
++ * @param [in] FileNo File to match.\r
++ * return true if any of the expressions matches.\r
++ */\r
++bool CDiffWrapper::RegExpFilter(int StartPos, int EndPos, int FileNo)\r
++{\r
++ if (m_pFilterList == NULL)\r
++ { \r
++ _RPTF0(_CRT_ERROR, "CDiffWrapper::RegExpFilter() called when "\r
++ "filterlist doesn't exist (=NULL)");\r
++ return false;\r
++ }\r
++\r
++ bool linesMatch = true; // set to false when non-matching line is found.\r
++ int line = StartPos;\r
++\r
++ while (line <= EndPos && linesMatch == true)\r
++ {\r
++ size_t len = files[FileNo].linbuf[line + 1] - files[FileNo].linbuf[line];\r
++ const char *string = files[FileNo].linbuf[line];\r
++ size_t stringlen = linelen(string, len);\r
++ if (!m_pFilterList->Match(stringlen, string, m_codepage))\r
++\r
++ {\r
++ linesMatch = false;\r
++ }\r
++ ++line;\r
++ }\r
++ return linesMatch;\r
++}\r
++\r
++/**\r
++ * @brief Walk the diff utils change script, building the WinMerge list of diff blocks\r
++ */\r
++void\r
++CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const file_data * inf)\r
++{\r
++ //Logic needed for Ignore comment option\r
++ DIFFOPTIONS options;\r
++ GetOptions(&options);\r
++ String asLwrCaseExt;\r
++ if (options.bFilterCommentsLines)\r
++ {\r
++ String LowerCaseExt = m_originalFile.GetLeft();\r
++ int PosOfDot = LowerCaseExt.rfind('.');\r
++ if (PosOfDot != -1)\r
++ {\r
++ LowerCaseExt.erase(0, PosOfDot + 1);\r
++ CharLower(&*LowerCaseExt.begin());\r
++ asLwrCaseExt = LowerCaseExt;\r
++ }\r
++ }\r
++\r
++ struct change *next = script;\r
++ struct change *thisob=0, *end=0;\r
++ \r
++ while (next)\r
++ {\r
++ /* Find a set of changes that belong together. */\r
++ thisob = next;\r
++ end = find_change(next);\r
++ \r
++ /* Disconnect them from the rest of the changes,\r
++ making them a hunk, and remember the rest for next iteration. */\r
++ next = end->link;\r
++ end->link = 0;\r
++#ifdef DEBUG\r
++ debug_script(thisob);\r
++#endif\r
++\r
++ /* Print thisob hunk. */\r
++ //(*printfun) (thisob);\r
++ { \r
++ /* Determine range of line numbers involved in each file. */\r
++ int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;\r
++ analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts, inf);\r
++ int op=0;\r
++ if (deletes || inserts || thisob->trivial)\r
++ {\r
++ if (deletes && inserts)\r
++ op = OP_DIFF;\r
++ else if (deletes || inserts)\r
++ op = OP_DIFF;\r
++ else\r
++ op = OP_TRIVIAL;\r
++ \r
++ /* Print the lines that the first file has. */\r
++ int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;\r
++ translate_range(&inf[0], first0, last0, &trans_a0, &trans_b0);\r
++ translate_range(&inf[1], first1, last1, &trans_a1, &trans_b1);\r
++\r
++ // Store information about these blocks in moved line info\r
++ if (GetDetectMovedBlocks())\r
++ {\r
++ if (thisob->match0>=0)\r
++ {\r
++ ASSERT(thisob->inserted);\r
++ for (int i=0; i<thisob->inserted; ++i)\r
++ {\r
++ int line0 = i+thisob->match0 + (trans_a0-first0-1);\r
++ int line1 = i+thisob->line1 + (trans_a1-first1-1);\r
++ GetMovedLines(1)->Add(MovedLines::SIDE_LEFT, line1, line0);\r
++ }\r
++ }\r
++ if (thisob->match1>=0)\r
++ {\r
++ ASSERT(thisob->deleted);\r
++ for (int i=0; i<thisob->deleted; ++i)\r
++ {\r
++ int line0 = i+thisob->line0 + (trans_a0-first0-1);\r
++ int line1 = i+thisob->match1 + (trans_a1-first1-1);\r
++ GetMovedLines(0)->Add(MovedLines::SIDE_RIGHT, line0, line1);\r
++ }\r
++ }\r
++ }\r
++\r
++ if (options.bFilterCommentsLines)\r
++ {\r
++ int QtyLinesLeft = (trans_b0 - trans_a0) + 1; //Determine quantity of lines in this block for left side\r
++ int QtyLinesRight = (trans_b1 - trans_a1) + 1;//Determine quantity of lines in this block for right side\r
++ PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());\r
++ }\r
++\r
++ if (m_pFilterList && m_pFilterList->HasRegExps())\r
++ {\r
++ //Determine quantity of lines in this block for both sides\r
++ int QtyLinesLeft = (trans_b0 - trans_a0);\r
++ int QtyLinesRight = (trans_b1 - trans_a1);\r
++ \r
++ // Match lines against regular expression filters\r
++ // Our strategy is that every line in both sides must\r
++ // match regexp before we mark difference as ignored.\r
++ bool match2 = false;\r
++ bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);\r
++ if (match1)\r
++ match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);\r
++ if (match1 && match2)\r
++ op = OP_TRIVIAL;\r
++ }\r
++\r
++ AddDiffRange(m_pDiffList, trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);\r
++ TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),\r
++ trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);\r
++ }\r
++ }\r
++ \r
++ /* Reconnect the script so it will all be freed properly. */\r
++ end->link = next;\r
++ }\r
++}\r
++\r
++/**\r
++ * @brief Walk the diff utils change script, building the WinMerge list of diff blocks\r
++ */\r
++void\r
++CDiffWrapper::LoadWinMergeDiffsFromDiffUtilsScript3(\r
++ struct change * script10, \r
++ struct change * script12, \r
++ struct change * script02, \r
++ const file_data * inf10, \r
++ const file_data * inf12, \r
++ const file_data * inf02)\r
++{\r
++ DiffList diff10, diff12, diff02, *pdiff;\r
++ diff10.Clear();\r
++ diff12.Clear();\r
++ diff02.Clear();\r
++\r
++ for (int file = 0; file < 3; file++)\r
++ {\r
++ struct change *next;\r
++ int trans_a0, trans_b0, trans_a1, trans_b1;\r
++ int first0, last0, first1, last1, deletes, inserts, op;\r
++ struct change *thisob, *end;\r
++ const file_data *pinf;\r
++\r
++ switch (file)\r
++ {\r
++ case 0: next = script10; pdiff = &diff10; pinf = inf10; break;\r
++ case 1: next = script12; pdiff = &diff12; pinf = inf12; break;\r
++ case 2: next = script02; pdiff = &diff02; pinf = inf02; break;\r
++ }\r
++\r
++ while (next)\r
++ {\r
++ /* Find a set of changes that belong together. */\r
++ thisob = next;\r
++ end = find_change(next);\r
++ \r
++ /* Disconnect them from the rest of the changes,\r
++ making them a hunk, and remember the rest for next iteration. */\r
++ next = end->link;\r
++ end->link = 0;\r
++#ifdef DEBUG\r
++ debug_script(thisob);\r
++#endif\r
++\r
++ /* Print thisob hunk. */\r
++ //(*printfun) (thisob);\r
++ { \r
++ /* Determine range of line numbers involved in each file. */\r
++ analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts, pinf);\r
++ if (deletes || inserts || thisob->trivial)\r
++ {\r
++ if (deletes && inserts)\r
++ op = OP_DIFF;\r
++ else if (deletes || inserts)\r
++ op = OP_DIFF;\r
++ else\r
++ op = OP_TRIVIAL;\r
++ \r
++ /* Print the lines that the first file has. */\r
++ translate_range (&pinf[0], first0, last0, &trans_a0, &trans_b0);\r
++ translate_range (&pinf[1], first1, last1, &trans_a1, &trans_b1);\r
++\r
++ // Store information about these blocks in moved line info\r
++ if (GetDetectMovedBlocks())\r
++ {\r
++ int index1 = -1;\r
++ int index2 = -1;\r
++ MovedLines::ML_SIDE side1;\r
++ MovedLines::ML_SIDE side2;\r
++ if (file == 0 /* diff10 */)\r
++ {\r
++ index1 = 0;\r
++ index2 = 1;\r
++ side1 = MovedLines::SIDE_RIGHT;\r
++ side2 = MovedLines::SIDE_LEFT;\r
++ }\r
++ else if (file == 1 /* diff12 */)\r
++ {\r
++ index1 = 2;\r
++ index2 = 1;\r
++ side1 = MovedLines::SIDE_LEFT;\r
++ side2 = MovedLines::SIDE_RIGHT;\r
++ }\r
++ if (index1 != -1 && index2 != -1)\r
++ {\r
++ if (thisob->match0>=0)\r
++ {\r
++ ASSERT(thisob->inserted);\r
++ for (int i=0; i<thisob->inserted; ++i)\r
++ {\r
++ int line0 = i+thisob->match0 + (trans_a0-first0-1);\r
++ int line1 = i+thisob->line1 + (trans_a1-first1-1);\r
++ GetMovedLines(index1)->Add(side1, line1, line0);\r
++ }\r
++ }\r
++ if (thisob->match1>=0)\r
++ {\r
++ ASSERT(thisob->deleted);\r
++ for (int i=0; i<thisob->deleted; ++i)\r
++ {\r
++ int line0 = i+thisob->line0 + (trans_a0-first0-1);\r
++ int line1 = i+thisob->match1 + (trans_a1-first1-1);\r
++ GetMovedLines(index2)->Add(side2, line0, line1);\r
++ }\r
++ }\r
++ }\r
++ }\r
++\r
++ AddDiffRange(pdiff, trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);\r
++ TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),\r
++ trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);\r
++ }\r
++ }\r
++ \r
++ /* Reconnect the script so it will all be freed properly. */\r
++ end->link = next;\r
++ }\r
++ }\r
++\r
++ Make3wayDiff(*m_pDiffList, diff10, diff12, diff02);\r
++}\r
++\r
++void CDiffWrapper::WritePatchFileHeader(enum output_style output_style, BOOL bAppendFiles)\r
++{\r
++ outfile = NULL;\r
++ if (!m_sPatchFile.empty())\r
++ {\r
++ LPCTSTR mode = (bAppendFiles ? _T("a+") : _T("w+"));\r
++ outfile = _tfopen(m_sPatchFile.c_str(), mode);\r
++ }\r
++\r
++ if (!outfile)\r
++ {\r
++ m_status.bPatchFileFailed = TRUE;\r
++ return;\r
++ }\r
++\r
++ // Output patchfile\r
++ switch (output_style)\r
++ {\r
++ case OUTPUT_CONTEXT:\r
++ case OUTPUT_UNIFIED:\r
++ case OUTPUT_ED:\r
++ case OUTPUT_FORWARD_ED:\r
++ case OUTPUT_RCS:\r
++ case OUTPUT_NORMAL:\r
++ case OUTPUT_IFDEF:\r
++ case OUTPUT_SDIFF:\r
++ break;\r
++ case OUTPUT_HTML:\r
++ print_html_header();\r
++ break;\r
++ }\r
++ \r
++ fclose(outfile);\r
++ outfile = NULL;\r
++}\r
++\r
++void CDiffWrapper::WritePatchFileTerminator(enum output_style output_style)\r
++{\r
++ outfile = NULL;\r
++ if (!m_sPatchFile.empty())\r
++ {\r
++ outfile = _tfopen(m_sPatchFile.c_str(), _T("a+"));\r
++ }\r
++\r
++ if (!outfile)\r
++ {\r
++ m_status.bPatchFileFailed = TRUE;\r
++ return;\r
++ }\r
++\r
++ // Output patchfile\r
++ switch (output_style)\r
++ {\r
++ case OUTPUT_CONTEXT:\r
++ case OUTPUT_UNIFIED:\r
++ case OUTPUT_ED:\r
++ case OUTPUT_FORWARD_ED:\r
++ case OUTPUT_RCS:\r
++ case OUTPUT_NORMAL:\r
++ case OUTPUT_IFDEF:\r
++ case OUTPUT_SDIFF:\r
++ break;\r
++ case OUTPUT_HTML:\r
++ print_html_terminator();\r
++ break;\r
++ }\r
++ \r
++ fclose(outfile);\r
++ outfile = NULL;\r
++}\r
++\r
++/**\r
++ * @brief Write out a patch file.\r
++ * Writes patch file using already computed diffutils script. Converts path\r
++ * delimiters from \ to / since we want to keep compatibility with patch-tools.\r
++ * @param [in] script list of changes.\r
++ * @param [in] inf file_data table containing filenames\r
++ */\r
++void CDiffWrapper::WritePatchFile(struct change * script, file_data * inf)\r
++{\r
++ file_data inf_patch[2] = {0};\r
++ CopyMemory(&inf_patch, inf, sizeof(file_data) * 2);\r
++ \r
++ // Get paths, primarily use alternative paths, only if they are empty\r
++ // use full filepaths\r
++ String path1(m_alternativePaths[0]);\r
++ String path2(m_alternativePaths[1]);\r
++ if (path1.empty())\r
++ path1 = m_files[0];\r
++ if (path2.empty())\r
++ path2 = m_files[1];\r
++ replace_char(&*path1.begin(), '\\', '/');\r
++ replace_char(&*path2.begin(), '\\', '/');\r
++ inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());\r
++ inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());\r
++\r
++ // If paths in m_s1File and m_s2File point to original files, then we can use\r
++ // them to fix potentially meaningless stats from potentially temporary files,\r
++ // resulting from whatever transforms may have taken place.\r
++ // If not, then we can't help it, and hence ASSERT that this won't happen.\r
++ if (!m_bPathsAreTemp)\r
++ {\r
++ _tstat(m_files[0].c_str(), &inf_patch[0].stat);\r
++ _tstat(m_files[1].c_str(), &inf_patch[1].stat);\r
++ }\r
++ else\r
++ {\r
++ ASSERT(FALSE);\r
++ }\r
++\r
++ outfile = NULL;\r
++ if (!m_sPatchFile.empty())\r
++ {\r
++ LPCTSTR mode = (m_bAppendFiles ? _T("a+") : _T("w+"));\r
++ outfile = _tfopen(m_sPatchFile.c_str(), mode);\r
++ }\r
++\r
++ if (!outfile)\r
++ {\r
++ m_status.bPatchFileFailed = TRUE;\r
++ return;\r
++ }\r
++\r
++ // Print "command line"\r
++ if (m_bAddCmdLine && output_style != OUTPUT_HTML)\r
++ {\r
++ String switches = FormatSwitchString();\r
++ _ftprintf(outfile, _T("diff%s %s %s\n"),\r
++ switches.c_str(), \r
++ path1 == _T("NUL") ? _T("/dev/null") : path1.c_str(),\r
++ path2 == _T("NUL") ? _T("/dev/null") : path2.c_str());\r
++ }\r
++\r
++ if (strcmp(inf[0].name, "NUL") == 0)\r
++ {\r
++ free((void *)inf[0].name);\r
++ inf[0].name = strdup("/dev/null");\r
++ }\r
++ if (strcmp(inf[1].name, "NUL") == 0)\r
++ {\r
++ free((void *)inf[1].name);\r
++ inf[1].name = strdup("/dev/null");\r
++ }\r
++\r
++ // Output patchfile\r
++ switch (output_style)\r
++ {\r
++ case OUTPUT_CONTEXT:\r
++ print_context_header(inf_patch, 0);\r
++ print_context_script(script, 0);\r
++ break;\r
++ case OUTPUT_UNIFIED:\r
++ print_context_header(inf_patch, 1);\r
++ print_context_script(script, 1);\r
++ break;\r
++ case OUTPUT_ED:\r
++ print_ed_script(script);\r
++ break;\r
++ case OUTPUT_FORWARD_ED:\r
++ pr_forward_ed_script(script);\r
++ break;\r
++ case OUTPUT_RCS:\r
++ print_rcs_script(script);\r
++ break;\r
++ case OUTPUT_NORMAL:\r
++ print_normal_script(script);\r
++ break;\r
++ case OUTPUT_IFDEF:\r
++ print_ifdef_script(script);\r
++ break;\r
++ case OUTPUT_SDIFF:\r
++ print_sdiff_script(script);\r
++ break;\r
++ case OUTPUT_HTML:\r
++ print_html_diff_header(inf_patch);\r
++ print_html_script(script);\r
++ print_html_diff_terminator();\r
++ }\r
++ \r
++ fclose(outfile);\r
++ outfile = NULL;\r
++\r
++ free((void *)inf_patch[0].name);\r
++ free((void *)inf_patch[1].name);\r
++}\r
++\r
++/**\r
++ * @brief Set line filters, given as one string.\r
++ * @param [in] filterStr Filters.\r
++ */\r
++void CDiffWrapper::SetFilterList(LPCTSTR filterStr)\r
++{\r
++ // Remove filterlist if new filter is empty\r
++ if (*filterStr == '\0')\r
++ {\r
++ delete m_pFilterList;\r
++ m_pFilterList = NULL;\r
++ return;\r
++ }\r
++\r
++ // Adding new filter without previous filter\r
++ if (m_pFilterList == NULL)\r
++ {\r
++ m_pFilterList = new FilterList;\r
++ }\r
++\r
++ m_pFilterList->RemoveAllFilters();\r
++\r
++ char * regexp_str;\r
++ FilterList::EncodingType type;\r
++ \r
++#ifdef UNICODE\r
++ regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);\r
++ type = FilterList::ENC_UTF8;\r
++#else\r
++ CString tmp_str(filterStr);\r
++ regexp_str = tmp_str.LockBuffer();\r
++ type = FilterList::ENC_ANSI;\r
++#endif\r
++\r
++ // Add every "line" of regexps to regexp list\r
++ char * token;\r
++ const char sep[] = "\r\n";\r
++ token = strtok(regexp_str, sep);\r
++ while (token)\r
++ {\r
++ m_pFilterList->AddRegExp(token, type);\r
++ token = strtok(NULL, sep);\r
++ }\r
++#ifdef UNICODE\r
++ UCS2UTF8_Dealloc(regexp_str);\r
++#else\r
++ tmp_str.UnlockBuffer();\r
++#endif\r
++}\r
++\r
++/**\r
++ * @brief Copy text stat results from diffutils back into the FileTextStats structure\r
++ */\r
++void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)\r
++{\r
++ myTextStats->ncrlfs = inf->count_crlfs;\r
++ myTextStats->ncrs = inf->count_crs;\r
++ myTextStats->nlfs = inf->count_lfs;\r
++}\r
++\r
++/**\r
++ * @brief Copy both left & right text stats results back into the DiffFileData text stats\r
++ */\r
++void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData)\r
++{\r
++ CopyTextStats(&inf[0], &diffData->m_textStats[0]);\r
++ CopyTextStats(&inf[1], &diffData->m_textStats[1]);\r
++}\r
++\r
++/* diff3 algorithm. It is almost the same as GNU diff3's algorithm */\r
++int CDiffWrapper::Make3wayDiff(DiffList& diff3, DiffList& diff10, DiffList& diff12, DiffList& diff02)\r
++{\r
++ int diff10count = diff10.GetSize();\r
++ int diff12count = diff12.GetSize();\r
++ int diff02count = diff02.GetSize();\r
++\r
++ int diff10i = 0;\r
++ int diff12i = 0;\r
++ int diff02i = 0;\r
++ int diff3i = 0;\r
++\r
++ int diff10itmp;\r
++ int diff12itmp;\r
++ int diff02itmp = 0;\r
++\r
++ bool lastDiffBlockIsDiff12;\r
++ bool firstDiffBlockIsDiff12;\r
++\r
++ DIFFRANGE dr3, dr10, dr12, dr02, dr10first, dr10last, dr12first, dr12last;\r
++ dr3.blank[0] = dr3.blank[1] = dr3.blank[2] = -1;\r
++\r
++ int linelast0 = 0;\r
++ int linelast1 = 0;\r
++ int linelast2 = 0;\r
++\r
++ for (;;)\r
++ {\r
++ if (diff10i >= diff10count && diff12i >= diff12count)\r
++ break;\r
++\r
++ /* \r
++ * merge overlapped diff blocks\r
++ * diff10 is diff blocks between file1 and file0.\r
++ * diff12 is diff blocks between file1 and file2.\r
++ *\r
++ * diff12\r
++ * diff10 diff3\r
++ * |~~~| |~~~|\r
++ * firstDiffBlock | | | |\r
++ * | | |~~~| | |\r
++ * |___| | | | |\r
++ * | | -> | |\r
++ * |~~~| |___| | |\r
++ * lastDiffBlock | | | |\r
++ * |___| |___|\r
++ */\r
++\r
++ if (diff10i >= diff10count && diff12i < diff12count)\r
++ {\r
++ diff12.GetDiff(diff12i, dr12first);\r
++ dr12last = dr12first;\r
++ firstDiffBlockIsDiff12 = true;\r
++ }\r
++ else if (diff10i < diff10count && diff12i >= diff12count)\r
++ {\r
++ diff10.GetDiff(diff10i, dr10first); \r
++ dr10last = dr10first;\r
++ firstDiffBlockIsDiff12 = false;\r
++ }\r
++ else\r
++ {\r
++ diff10.GetDiff(diff10i, dr10first); \r
++ diff12.GetDiff(diff12i, dr12first);\r
++ dr10last = dr10first;\r
++ dr12last = dr12first;\r
++ if (dr12first.begin[0] <= dr10first.begin[0])\r
++ firstDiffBlockIsDiff12 = true;\r
++ else\r
++ firstDiffBlockIsDiff12 = false;\r
++ }\r
++ lastDiffBlockIsDiff12 = firstDiffBlockIsDiff12;\r
++\r
++ diff10itmp = diff10i;\r
++ diff12itmp = diff12i;\r
++ for (;;)\r
++ {\r
++ if (diff10itmp >= diff10count || diff12itmp >= diff12count)\r
++ break;\r
++\r
++ diff10.GetDiff(diff10itmp, dr10);\r
++ diff12.GetDiff(diff12itmp, dr12);\r
++\r
++ if (dr10.end[0] == dr12.end[0])\r
++ {\r
++ diff10itmp++;\r
++ lastDiffBlockIsDiff12 = true;\r
++\r
++ dr10last = dr10;\r
++ dr12last = dr12;\r
++ break;\r
++ }\r
++\r
++ if (lastDiffBlockIsDiff12)\r
++ {\r
++ if (dr12.end[0] + 1 < dr10.begin[0])\r
++ break;\r
++ }\r
++ else\r
++ {\r
++ if (dr10.end[0] + 1 < dr12.begin[0])\r
++ break;\r
++ }\r
++\r
++ if (dr12.end[0] > dr10.end[0])\r
++ {\r
++ diff10itmp++;\r
++ lastDiffBlockIsDiff12 = true;\r
++ }\r
++ else\r
++ {\r
++ diff12itmp++;\r
++ lastDiffBlockIsDiff12 = false;\r
++ }\r
++\r
++ dr10last = dr10;\r
++ dr12last = dr12;\r
++ }\r
++\r
++ if (lastDiffBlockIsDiff12)\r
++ diff12itmp++;\r
++ else\r
++ diff10itmp++;\r
++\r
++ if (firstDiffBlockIsDiff12)\r
++ {\r
++ dr3.begin[1] = dr12first.begin[0];\r
++ dr3.begin[2] = dr12first.begin[1];\r
++ if (diff10itmp == diff10i)\r
++ dr3.begin[0] = dr3.begin[1] - linelast1 + linelast0;\r
++ else\r
++ dr3.begin[0] = dr3.begin[1] - dr10first.begin[0] + dr10first.begin[1];\r
++ }\r
++ else\r
++ {\r
++ dr3.begin[0] = dr10first.begin[1];\r
++ dr3.begin[1] = dr10first.begin[0];\r
++ if (diff12itmp == diff12i)\r
++ dr3.begin[2] = dr3.begin[1] - linelast1 + linelast2;\r
++ else\r
++ dr3.begin[2] = dr3.begin[1] - dr12first.begin[0] + dr12first.begin[1];\r
++ }\r
++\r
++ if (lastDiffBlockIsDiff12)\r
++ {\r
++ dr3.end[1] = dr12last.end[0];\r
++ dr3.end[2] = dr12last.end[1];\r
++ if (diff10itmp == diff10i)\r
++ dr3.end[0] = dr3.end[1] - linelast1 + linelast0;\r
++ else\r
++ dr3.end[0] = dr3.end[1] - dr10last.end[0] + dr10last.end[1];\r
++ }\r
++ else\r
++ {\r
++ dr3.end[0] = dr10last.end[1];\r
++ dr3.end[1] = dr10last.end[0];\r
++ if (diff12itmp == diff12i)\r
++ dr3.end[2] = dr3.end[1] - linelast1 + linelast2;\r
++ else\r
++ dr3.end[2] = dr3.end[1] - dr12last.end[0] + dr12last.end[1];\r
++ }\r
++\r
++ linelast0 = dr3.end[0] + 1;\r
++ linelast1 = dr3.end[1] + 1;\r
++ linelast2 = dr3.end[2] + 1;\r
++\r
++ if (diff10i == diff10itmp)\r
++ dr3.op = OP_3RDONLY;\r
++ else if (diff12i == diff12itmp)\r
++ dr3.op = OP_1STONLY;\r
++ else \r
++ {\r
++ dr3.op = OP_2NDONLY;\r
++ for (diff02itmp = diff02i; diff02itmp < diff02count; diff02itmp++)\r
++ {\r
++ diff02.GetDiff(diff02itmp, dr02);\r
++ if (dr02.end[1] < dr3.begin[2])\r
++ continue;\r
++ \r
++ if (dr02.begin[1] <= dr3.end[2])\r
++ dr3.op = OP_DIFF;\r
++ break;\r
++ }\r
++ }\r
++\r
++ if (ignore_regexp_list)\r
++ {\r
++ bool bTrivialDiff10 = true;\r
++ bool bTrivialDiff12 = true;\r
++ int i;\r
++\r
++ for (i = diff10i; i < diff10itmp; i++)\r
++ {\r
++ diff10.GetDiff(i, dr10);\r
++ if (dr10.op != OP_TRIVIAL)\r
++ {\r
++ bTrivialDiff10 = false;\r
++ break;\r
++ }\r
++ }\r
++\r
++ for (i = diff12i; i < diff12itmp; i++)\r
++ {\r
++ diff12.GetDiff(i, dr12);\r
++ if (dr12.op != OP_TRIVIAL)\r
++ {\r
++ bTrivialDiff12 = false;\r
++ break;\r
++ }\r
++ }\r
++\r
++ if (bTrivialDiff10 && bTrivialDiff12)\r
++ dr3.op = OP_TRIVIAL;\r
++ }\r
++\r
++ diff3.AddDiff(dr3);\r
++\r
++ TRACE(_T("left=%d,%d middle=%d,%d right=%d,%d op=%d\n"),\r
++ dr3.begin[0], dr3.end[0], dr3.begin[1], dr3.end[1], dr3.begin[2], dr3.end[2], dr3.op);\r
++\r
++ diff3i++;\r
++ diff10i = diff10itmp;\r
++ diff12i = diff12itmp;\r
++ diff02i = diff02itmp;\r
++ }\r
++ return diff3i;\r
++}\r
ON_WM_CLOSE()
ON_WM_SIZE()
ON_WM_MDIACTIVATE()
- ON_MESSAGE(WM_SETMESSAGESTRING, OnSetMessageString)\r
++ ON_MESSAGE(WM_SETMESSAGESTRING, OnSetMessageString)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
m_wndStatusBar.SetPaneText(PANE_FILTER, szFilter);
}
- /**\r
- * @brief Update statusbar\r
- */\r
- LRESULT CDirFrame::OnSetMessageString(WPARAM wParam, LPARAM lParam)\r
- {\r
- LRESULT ret;\r
- UINT nID = (UINT)wParam;\r
- if (nID == AFX_IDS_IDLEMESSAGE)\r
- {\r
- wParam = 0;\r
- String msg = theApp.LoadString(AFX_IDS_IDLEMESSAGE);\r
- TCHAR *szMsg = new TCHAR[lstrlen(msg.c_str())+1];\r
- lstrcpy(szMsg, msg.c_str());\r
- lParam = (LPARAM)szMsg;\r
- ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);\r
- delete szMsg;\r
- }\r
- else\r
- {\r
- ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);\r
- }\r
- return ret;\r
- }\r
+ /**
++ * @brief Update statusbar
++ */
++ LRESULT CDirFrame::OnSetMessageString(WPARAM wParam, LPARAM lParam)
++{
++ LRESULT ret;
++ UINT nID = (UINT)wParam;
++ if (nID == AFX_IDS_IDLEMESSAGE)
++ {
++ wParam = 0;
++ String msg = theApp.LoadString(AFX_IDS_IDLEMESSAGE);
++ TCHAR *szMsg = new TCHAR[lstrlen(msg.c_str())+1];
++ lstrcpy(szMsg, msg.c_str());
++ lParam = (LPARAM)szMsg;
++ ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);
++ delete szMsg;
++ }
++ else
++ {
++ ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);
++ }
++ return ret;
++}
+
+/**
* @brief Get the interface to the header (path) bar
*/
IHeaderBar * CDirFrame::GetHeaderInterface() {
strFileName = strFileName + _T(".");
char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName.c_str());
- bool match = m_pMaskFilter->Match(name_utf);
+#ifdef UNICODE
- bool match = m_pMaskFilter->Match(name_utf, GetACP());
+ bool match = m_pMaskFilter->Match(strlen(name_utf), name_utf);
+#else
++ bool match = m_pMaskFilter->Match(strlen(name_utf), name_utf, GetACP());
+#endif
UCS2UTF8_Dealloc(name_utf);
return match;
}
if (nCompMethod == CMP_CONTENT)
{
- if (m_pDiffUtilsEngine == NULL)
- m_pDiffUtilsEngine = new CompareEngines::DiffUtils();
- m_pDiffUtilsEngine->SetCodepage(
- m_diffFileData.m_FileLocation[0].encoding.m_unicoding ?
- CP_UTF8 : m_diffFileData.m_FileLocation[0].encoding.m_codepage);
- bool success = m_pDiffUtilsEngine->SetCompareOptions(
- *m_pCtx->GetCompareOptions(CMP_CONTENT));
- if (success)
+ if (files.GetSize() == 2)
{
- if (m_pCtx->m_pFilterList != NULL)
- m_pDiffUtilsEngine->SetFilterList(m_pCtx->m_pFilterList);
+ if (m_pDiffUtilsEngine == NULL)
+ m_pDiffUtilsEngine = new CompareEngines::DiffUtils();
+ m_pDiffUtilsEngine->SetCodepage(m_codepage);
- bool success = m_pDiffUtilsEngine->SetCompareOptions(\r
- *m_pCtx->GetCompareOptions(CMP_CONTENT));\r
++ bool success = m_pDiffUtilsEngine->SetCompareOptions(
++ *m_pCtx->GetCompareOptions(CMP_CONTENT));
+ if (success)
+ {
+ if (m_pCtx->m_pFilterList != NULL)
+ m_pDiffUtilsEngine->SetFilterList(m_pCtx->m_pFilterList);
+ else
+ m_pDiffUtilsEngine->ClearFilterList();
+ m_pDiffUtilsEngine->SetFileData(2, m_diffFileData.m_inf);
+ code = m_pDiffUtilsEngine->diffutils_compare_files();
+ m_pDiffUtilsEngine->GetDiffCounts(m_ndiffs, m_ntrivialdiffs);
+ m_pDiffUtilsEngine->GetTextStats(0, &m_diffFileData.m_textStats[0]);
+ m_pDiffUtilsEngine->GetTextStats(1, &m_diffFileData.m_textStats[1]);
+ }
else
- m_pDiffUtilsEngine->ClearFilterList();
- m_pDiffUtilsEngine->SetFileData(2, m_diffFileData.m_inf);
- code = m_pDiffUtilsEngine->diffutils_compare_files();
- m_pDiffUtilsEngine->GetDiffCounts(m_ndiffs, m_ntrivialdiffs);
- m_pDiffUtilsEngine->GetTextStats(0, &m_diffFileData.m_textStats0);
- m_pDiffUtilsEngine->GetTextStats(1, &m_diffFileData.m_textStats1);
+ code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
+
+ // If unique item, it was being compared to itself to determine encoding
+ // and the #diffs is invalid
+ if (di.diffcode.isSideSecondOnly() || di.diffcode.isSideFirstOnly())
+ {
+ m_ndiffs = CDiffContext::DIFFS_UNKNOWN;
+ m_ntrivialdiffs = CDiffContext::DIFFS_UNKNOWN;
+ }
+ if (DIFFCODE::isResultError(code))
+ di.errorDesc = _T("DiffUtils Error");
}
else
- code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
-
- // If unique item, it was being compared to itself to determine encoding
- // and the #diffs is invalid
- if (di.diffcode.isSideRightOnly() || di.diffcode.isSideLeftOnly())
{
- m_ndiffs = CDiffContext::DIFFS_UNKNOWN;
- m_ntrivialdiffs = CDiffContext::DIFFS_UNKNOWN;
+ if (m_pDiffUtilsEngine == NULL)
+ m_pDiffUtilsEngine = new CompareEngines::DiffUtils();
+ m_pDiffUtilsEngine->SetCodepage(m_codepage);
- bool success = m_pByteCompare->SetCompareOptions(\r
- *m_pCtx->GetCompareOptions(CMP_QUICK_CONTENT));
++ bool success = m_pDiffUtilsEngine->SetCompareOptions(
++ *m_pCtx->GetCompareOptions(CMP_CONTENT));
+ if (success)
+ {
+ if (m_pCtx->m_pFilterList != NULL)
+ m_pDiffUtilsEngine->SetFilterList(m_pCtx->m_pFilterList);
+ else
+ m_pDiffUtilsEngine->ClearFilterList();
+
+ BOOL bRet;
+ int bin_flag = 0, bin_flag10 = 0, bin_flag12 = 0, bin_flag02 = 0;
+
+ m_pDiffUtilsEngine->SetFileData(2, diffdata10.m_diffFileData.m_inf);
+ bRet = m_pDiffUtilsEngine->Diff2Files(&script10, 0, &bin_flag10, FALSE, NULL);
+ m_pDiffUtilsEngine->SetFileData(2, diffdata12.m_diffFileData.m_inf);
+ bRet = m_pDiffUtilsEngine->Diff2Files(&script12, 0, &bin_flag12, FALSE, NULL);
+ m_pDiffUtilsEngine->SetFileData(2, diffdata02.m_diffFileData.m_inf);
+ bRet = m_pDiffUtilsEngine->Diff2Files(&script02, 0, &bin_flag02, FALSE, NULL);
+ code = DIFFCODE::FILE;
+
+ CDiffWrapper dw;
+ DiffList diffList;
+ DIFFSTATUS status;
+
+ diffList.Clear();
+ dw.SetCreateDiffList(&diffList);
+ dw.LoadWinMergeDiffsFromDiffUtilsScript3(
+ script10, script12, script02,
+ diffdata10.m_diffFileData.m_inf, diffdata12.m_diffFileData.m_inf, diffdata02.m_diffFileData.m_inf);
+ m_ndiffs = diffList.GetSignificantDiffs();
+ m_ntrivialdiffs = diffList.GetSize() - m_ndiffs;
+
+ if (m_ndiffs > 0)
+ code |= DIFFCODE::DIFF;
+ else
+ code |= DIFFCODE::SAME;
+ if (bin_flag10 || bin_flag12 || bin_flag02)
+ code |= DIFFCODE::BIN;
+ else
+ code |= DIFFCODE::TEXT;
+
+ // If unique item, it was being compared to itself to determine encoding
+ // and the #diffs is invalid
+ if (di.diffcode.isSideFirstOnly() || di.diffcode.isSideSecondOnly() || di.diffcode.isSideThirdOnly())
+ {
+ m_ndiffs = CDiffContext::DIFFS_UNKNOWN;
+ m_ntrivialdiffs = CDiffContext::DIFFS_UNKNOWN;
+ }
+ if (DIFFCODE::isResultError(code))
+ di.errorDesc = _T("DiffUtils Error");
+
+ dw.FreeDiffUtilsScript3(script10, script12, script02);
+ }
+ else
+ code = DIFFCODE::FILE | DIFFCODE::CMPERR;
}
- if (DIFFCODE::isResultError(code))
- di.errorDesc = _T("DiffUtils Error");
+
}
else if (nCompMethod == CMP_QUICK_CONTENT)
{
/**
* @brief Load files and initialize frame's compare result icon
*/
-HRESULT CHexMergeDoc::OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight)
+HRESULT CHexMergeDoc::OpenDocs(const PathContext &paths, BOOL bRO[])
{
+ CHexMergeFrame *pf = GetParentFrame();
+ ASSERT(pf);
HRESULT hr;
- if (SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_LEFT, pathLeft, bROLeft)) &&
- SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight)))
+ int nBuffer;
+ for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
+ {
+ if (FAILED(hr = LoadOneFile(nBuffer, paths.GetPath(nBuffer).c_str(), bRO[nBuffer])))
+ break;
+ }
+ if (nBuffer == m_nBuffers)
{
UpdateDiffItem(0);
+ pf->Invalidate();
if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
- m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
+ m_pView[0]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
}
else
{
ProgramDatabaseFile=""
SubSystem="2"
EntryPointSymbol="wWinMainCRTStartup"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeUnicodeRelease/Merge.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetDir)\..\heksedit\release\heksedit.dll $(TargetDir)
- copy $(TargetDir)\..\expat\lib\release\libexpat.dll $(TargetDir)
++ CommandLine="copy $(TargetDir)\..\expat\lib\release\libexpat.dll $(TargetDir)
+copy $(TargetDir)\..\pcre\minsizerel\pcre.dll $(TargetDir)
+"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
- EmbedManifest="true"
- />
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCWebDeploymentTool"
- />
+ Name="VCManagedWrapperGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
- />
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="UnicodeDebug|Win32"
ProgramDatabaseFile=".\..\BuildTmp\MergeUnicodeDebug/WinMergeU.pdb"
SubSystem="2"
EntryPointSymbol="wWinMainCRTStartup"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeUnicodeDebug/Merge.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
- EmbedManifest="true"
- />
+ Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetDir)\..\heksedit\debug\heksedit.dll $(TargetDir)
- copy $(TargetDir)\..\expat\lib\debug\libexpat.dll $(TargetDir)
++ CommandLine="copy $(TargetDir)\..\expat\lib\debug\libexpat.dll $(TargetDir)
+copy $(TargetDir)\..\pcre\debug\pcre.dll $(TargetDir)
+"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
- />
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
ProgramDataBaseFileName=".\..\BuildTmp\MergeDebug/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
+ CompileAs="0"/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
- />
+ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew_d.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib "
OutputFile="..\Build\MergeDebug/WinMerge.exe"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\BuildTmp\MergeDebug/WinMerge.pdb"
SubSystem="2"
- TargetMachine="1"
- />
+ StackReserveSize="0"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeDebug/Merge.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetDir)\..\heksedit\debug\heksedit.dll $(TargetDir)
- copy $(TargetDir)\..\expat\lib\debug\libexpat.dll $(TargetDir)
++ CommandLine="copy $(TargetDir)\..\expat\lib\debug\libexpat.dll $(TargetDir)
+copy $(TargetDir)\..\pcre\debug\pcre.dll $(TargetDir)
+
+"/>
<Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
- EmbedManifest="true"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"
- />
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
- />
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
<Tool
Name="VCLinkerTool"
AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib "
OutputFile="..\Build\MergeRelease/WinMerge.exe"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
IgnoreDefaultLibraryNames=""
- GenerateDebugInformation="false"
+ GenerateDebugInformation="FALSE"
ProgramDatabaseFile=""
SubSystem="2"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeRelease/Merge.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetDir)\..\heksedit\release\heksedit.dll $(TargetDir)
- copy $(TargetDir)\..\expat\lib\release\libexpat.dll $(TargetDir)
++ CommandLine="copy $(TargetDir)\..\expat\lib\release\libexpat.dll $(TargetDir)
+copy $(TargetDir)\..\pcre\minsizerel\pcre.dll $(TargetDir)
+"/>
<Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
- EmbedManifest="true"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreLinkEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"
- />
+ Name="VCWebDeploymentTool"/>
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
- />
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</Filter>
<Filter
Name="Batch files"
- >
+ Filter="">
<File
- RelativePath=".\Languages\BuildMergeLangDll.bat">
- RelativePath="..\Translations\WinMerge\BuildMergeLangDll.bat"
- >
++ RelativePath="..\Translations\WinMerge\BuildMergeLangDll.bat">
</File>
<File
- RelativePath=".\Languages\CreateMasterPotFile.vbs">
- RelativePath="..\Translations\WinMerge\CreateMasterPotFile.vbs"
- >
++ RelativePath="..\Translations\WinMerge\CreateMasterPotFile.vbs">
</File>
<File
- RelativePath=".\Languages\GetTranslationsStatus.vbs">
- RelativePath="..\Translations\WinMerge\GetTranslationsStatus.vbs"
- >
++ RelativePath="..\Translations\WinMerge\GetTranslationsStatus.vbs">
</File>
<File
- RelativePath=".\PostBuild.bat"
- >
+ RelativePath=".\PostBuild.bat">
</File>
<File
- RelativePath=".\PreLink.bat"
- >
+ RelativePath=".\PreLink.bat">
</File>
<File
- RelativePath=".\SetResourceVersions.bat"
- >
+ RelativePath=".\SetResourceVersions.bat">
</File>
<File
- RelativePath=".\Languages\UpdatePoFilesFromPotFile.vbs">
- RelativePath="..\Translations\WinMerge\UpdatePoFilesFromPotFile.vbs"
- >
++ RelativePath="..\Translations\WinMerge\UpdatePoFilesFromPotFile.vbs">
</File>
</Filter>
</Files>
}
BOOL bBinary = FALSE;
- nRescanResult = Rescan(bBinary, identical, TRUE);
- nRescanResult = Rescan(bBinary, bIdentical);
++ nRescanResult = Rescan(bBinary, identical);
// Open filed if rescan succeed and files are not binaries
if (nRescanResult == RESCAN_OK)
--- /dev/null
-#: Merge.rc:512
+ # This file is part from WinMerge <http://winmerge.org/>
+ # Released under the "GNU General Public License"
+ #
+ # Translators:
+ # * Ozzii <ivanstar61 at gmail.com>
+ #
+ # ID line follows -- this is updated by SVN
+ # $Id$
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: WinMerge\n"
+ "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
+ "POT-Creation-Date: 2010-06-17 17:00+0000\n"
+ "PO-Revision-Date: \n"
+ "Last-Translator: Èâàí Ñòàð÷åâè\9e <ivanstar61@gmail.com> è Ozzii\n"
+ "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=CP1251\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Poedit-Language: Serbian\n"
+ "X-Poedit-SourceCharset: CP1251\n"
+ "X-Poedit-Basepath: ../../Src/\n"
+
+ #. LANGUAGE, SUBLANGUAGE
+ #: Merge.rc:22
+ #: Merge.rc:51
+ #, c-format
+ msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
+ msgstr "LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC"
+
+ #. Codepage
+ #: Merge.rc:23
+ #: Merge.rc:52
+ #, c-format
+ msgid "1252"
+ msgstr "1251"
+
+ #: Merge.rc:72
+ #: Merge.rc:99
+ #, c-format
+ msgid "C&opy to Right"
+ msgstr "Óìí&îæè ó äåñíó"
+
+ #: Merge.rc:73
+ #: Merge.rc:100
+ #, c-format
+ msgid "Cop&y to Left"
+ msgstr "Óì&íîæè ó ëåâó"
+
+ #: Merge.rc:75
+ #, c-format
+ msgid "&Select Line Difference"
+ msgstr "&Èçàáåðè ðàçëè÷èòå ðåäîâå"
+
+ #: Merge.rc:77
+ #, c-format
+ msgid "&Undo"
+ msgstr "&Îïîçîâè"
+
+ #: Merge.rc:78
+ #, c-format
+ msgid "&Redo"
+ msgstr "&Ïîíîâè"
+
+ #: Merge.rc:80
+ #: Merge.rc:102
+ #, c-format
+ msgid "Cu&t"
+ msgstr "Èñ&åöè"
+
+ #: Merge.rc:81
+ #: Merge.rc:103
-#: Merge.rc:593
++#: Merge.rc:568
+ #, c-format
+ msgid "&Copy"
+ msgstr "&Óìíîæè"
+
+ #: Merge.rc:82
+ #: Merge.rc:104
+ #, c-format
+ msgid "&Paste"
+ msgstr "&Íàëåïè"
+
+ #: Merge.rc:84
-#: Merge.rc:535
-#: Merge.rc:541
++#: Merge.rc:654
+ #, c-format
+ msgid "&Goto..."
+ msgstr "&Èäè íà..."
+
+ #: Merge.rc:86
+ #, c-format
+ msgid "Op&en"
+ msgstr "&Îòâîðè"
+
+ #: Merge.rc:88
-#: Merge.rc:536
-#: Merge.rc:542
++#: Merge.rc:591
++#: Merge.rc:597
+ #, c-format
+ msgid "with &Registered Application"
+ msgstr "ñà èíñ&òàëèðàíèì ïðîãðàìîì"
+
+ #: Merge.rc:89
-#: Merge.rc:537
-#: Merge.rc:543
++#: Merge.rc:592
++#: Merge.rc:598
+ #, c-format
+ msgid "with &External Editor"
+ msgstr "ñà äð&óãèì óðå\90èâà÷åì"
+
+ #: Merge.rc:90
-#: Merge.rc:194
-#: Merge.rc:315
++#: Merge.rc:593
++#: Merge.rc:599
+ #, c-format
+ msgid "&with..."
+ msgstr "&ñà"
+
+ #: Merge.rc:110
-#: Merge.rc:196
-#: Merge.rc:317
++#: Merge.rc:195
++#: Merge.rc:321
+ #, c-format
+ msgid "&File"
+ msgstr "&Äàòîòåêà"
+
+ #: Merge.rc:112
-#: Merge.rc:197
-#: Merge.rc:318
++#: Merge.rc:197
++#: Merge.rc:323
+ #, c-format
+ msgid "&New\tCtrl+N"
+ msgstr "&Íîâà\tCtrl+N"
+
+ #: Merge.rc:113
-#: Merge.rc:114
-#: Merge.rc:198
-#: Merge.rc:319
++#: Merge.rc:198
++#: Merge.rc:324
++#, c-format
++msgid "New (&3 panes)"
++msgstr ""
++
++#: Merge.rc:114
++#: Merge.rc:199
++#: Merge.rc:325
+ #, c-format
+ msgid "&Open...\tCtrl+O"
+ msgstr "&Óïîðåäè...\tCtrl+O"
+
-#: Merge.rc:116
-#: Merge.rc:200
-#: Merge.rc:321
++#: Merge.rc:115
++#: Merge.rc:200
++#: Merge.rc:326
+ #, c-format
+ msgid "Op&en Conflict File..."
+ msgstr "Îòâîðè ïðîáë&åìàòè÷íå..."
+
-#: Merge.rc:117
-#: Merge.rc:201
-#: Merge.rc:322
++#: Merge.rc:117
++#: Merge.rc:202
++#: Merge.rc:328
+ #, c-format
+ msgid "Open Pro&ject...\tCtrl+J"
+ msgstr "Îòâîðè ïîðå&\90å\9cå...\tCtrl+J"
+
-#: Merge.rc:119
++#: Merge.rc:118
++#: Merge.rc:203
++#: Merge.rc:329
+ #, c-format
+ msgid "Sa&ve Project..."
+ msgstr "Ñà÷ó&â༠ïîðå\90å\9cå..."
+
-#: Merge.rc:121
-#: Merge.rc:208
-#: Merge.rc:354
++#: Merge.rc:120
+ #, c-format
+ msgid "Recent Projects"
+ msgstr "Ïîñëåä\9cå ïîðå\90å\9cå"
+
-#: Merge.rc:123
-#: Merge.rc:210
-#: Merge.rc:356
++#: Merge.rc:122
++#: Merge.rc:214
++#: Merge.rc:368
+ #, c-format
+ msgid "E&xit"
+ msgstr "Èçëà&ç"
+
-#: Merge.rc:125
-#: Merge.rc:214
-#: Merge.rc:390
++#: Merge.rc:124
++#: Merge.rc:216
++#: Merge.rc:370
+ #, c-format
+ msgid "&Edit"
+ msgstr "Óð&åäè"
+
-#: Merge.rc:127
-#: Merge.rc:216
-#: Merge.rc:392
++#: Merge.rc:126
++#: Merge.rc:220
++#: Merge.rc:399
+ #, c-format
+ msgid "&Options..."
+ msgstr "Èçá&îð..."
+
-#: Merge.rc:129
-#: Merge.rc:231
-#: Merge.rc:394
++#: Merge.rc:128
++#: Merge.rc:222
++#: Merge.rc:401
+ #, c-format
+ msgid "&View"
+ msgstr "Ïðè&êàç"
+
-#: Merge.rc:130
-#: Merge.rc:232
-#: Merge.rc:395
++#: Merge.rc:130
++#: Merge.rc:237
++#: Merge.rc:403
+ #, c-format
+ msgid "Select &Font..."
+ msgstr "Èçàáåðè &ñëîâà..."
+
-#: Merge.rc:132
-#: Merge.rc:234
-#: Merge.rc:416
++#: Merge.rc:131
++#: Merge.rc:238
++#: Merge.rc:404
+ #, c-format
+ msgid "Use Default F&ont"
+ msgstr "Êîðèñòè ïîäðàçóìåâàíà ñëîâà"
+
-#: Merge.rc:134
-#: Merge.rc:236
-#: Merge.rc:418
++#: Merge.rc:133
++#: Merge.rc:240
++#: Merge.rc:436
+ #, c-format
+ msgid "&Toolbar"
+ msgstr "&Òðàêà àëàòà"
+
-#: Merge.rc:135
-#: Merge.rc:237
-#: Merge.rc:419
++#: Merge.rc:135
++#: Merge.rc:242
++#: Merge.rc:438
+ #, c-format
+ msgid "&None"
+ msgstr "&Íèøòà"
+
-#: Merge.rc:136
-#: Merge.rc:238
-#: Merge.rc:420
++#: Merge.rc:136
++#: Merge.rc:243
++#: Merge.rc:439
+ #, c-format
+ msgid "&Small"
+ msgstr "&Ìàëà"
+
-#: Merge.rc:138
-#: Merge.rc:240
-#: Merge.rc:422
++#: Merge.rc:137
++#: Merge.rc:244
++#: Merge.rc:440
+ #, c-format
+ msgid "&Big"
+ msgstr "&Âåëèêà"
+
-#: Merge.rc:139
-#: Merge.rc:241
-#: Merge.rc:423
++#: Merge.rc:139
++#: Merge.rc:246
++#: Merge.rc:442
+ #, c-format
+ msgid "&Status Bar"
+ msgstr "&Ñòàòóñíà òðàêà"
+
-#: Merge.rc:141
-#: Merge.rc:244
-#: Merge.rc:427
++#: Merge.rc:140
++#: Merge.rc:247
++#: Merge.rc:443
+ #, c-format
+ msgid "Ta&b Bar"
+ msgstr "Òðà&êà ¼åçè÷àêà"
+
-#: Merge.rc:143
-#: Merge.rc:265
-#: Merge.rc:449
++#: Merge.rc:142
++#: Merge.rc:250
++#: Merge.rc:447
+ #, c-format
+ msgid "&Language..."
+ msgstr "&£åçèê..."
+
-#: Merge.rc:145
-#: Merge.rc:268
-#: Merge.rc:451
++#: Merge.rc:144
++#: Merge.rc:271
++#: Merge.rc:493
+ #, c-format
+ msgid "&Tools"
+ msgstr "Àëàòêå"
+
-#: Merge.rc:146
-#: Merge.rc:269
-#: Merge.rc:452
++#: Merge.rc:146
++#: Merge.rc:274
++#: Merge.rc:495
+ #, c-format
+ msgid "&Filters..."
+ msgstr "&Ôèëòåðè..."
+
-#: Merge.rc:148
-#: Merge.rc:272
-#: Merge.rc:455
++#: Merge.rc:147
++#: Merge.rc:275
++#: Merge.rc:496
+ #, c-format
+ msgid "&Generate Patch..."
+ msgstr "Ñà÷óâ༠ðà&çëèêå..."
+
-#: Merge.rc:150
-#: Merge.rc:274
-#: Merge.rc:457
++#: Merge.rc:149
++#: Merge.rc:278
++#: Merge.rc:499
+ #, c-format
+ msgid "&Plugins"
+ msgstr "Äîäà&öè"
+
-#: Merge.rc:152
++#: Merge.rc:151
++#: Merge.rc:280
++#: Merge.rc:501
+ #, c-format
+ msgid "&List..."
+ msgstr "Ñï&èñàê"
+
-#: Merge.rc:153
++#: Merge.rc:153
+ #, c-format
+ msgid "Ma&nual Prediffer"
+ msgstr ""
+
-#: Merge.rc:155
-#: Merge.rc:276
-#: Merge.rc:459
++#: Merge.rc:154
+ #, c-format
+ msgid "A&utomatic Prediffer"
+ msgstr ""
+
-#: Merge.rc:156
-#: Merge.rc:277
-#: Merge.rc:460
++#: Merge.rc:156
++#: Merge.rc:282
++#: Merge.rc:503
+ #, c-format
+ msgid "&Manual Unpacking"
+ msgstr "&Ðàñïàêó¼ ðó÷íî"
+
-#: Merge.rc:158
-#: Merge.rc:279
-#: Merge.rc:462
++#: Merge.rc:157
++#: Merge.rc:283
++#: Merge.rc:504
+ #, c-format
+ msgid "&Automatic Unpacking"
+ msgstr "Ðàñïàêó¼ &àóòîìàòñêè"
+
-#: Merge.rc:160
-#: Merge.rc:281
-#: Merge.rc:469
++#: Merge.rc:159
++#: Merge.rc:285
++#: Merge.rc:506
+ #, c-format
+ msgid "&Edit with Unpacker"
+ msgstr "Óðåäè ó àð&õèâåðó"
+
-#: Merge.rc:162
-#: Merge.rc:283
-#: Merge.rc:471
++#: Merge.rc:161
++#: Merge.rc:287
++#: Merge.rc:518
+ #, c-format
+ msgid "&Reload plugins"
+ msgstr "Ïîíîâî &ó÷èò༠äîäàòêå"
+
-#: Merge.rc:164
-#: Merge.rc:285
-#: Merge.rc:473
++#: Merge.rc:163
++#: Merge.rc:289
++#: Merge.rc:520
+ #, c-format
+ msgid "&Debug"
+ msgstr "Îòêëî&íè ãðåøêó"
+
-#: Merge.rc:165
-#: Merge.rc:286
-#: Merge.rc:474
++#: Merge.rc:165
++#: Merge.rc:291
++#: Merge.rc:522
+ #, c-format
+ msgid "&Load Config..."
+ msgstr "Ó&÷èò༠ïîñòàâêå..."
+
-#: Merge.rc:167
-#: Merge.rc:288
-#: Merge.rc:476
++#: Merge.rc:166
++#: Merge.rc:292
++#: Merge.rc:523
+ #, c-format
+ msgid "&Reset Options"
+ msgstr "Ïî÷åòíå ï&îñòàâêå"
+
-#: Merge.rc:169
-#: Merge.rc:290
-#: Merge.rc:478
++#: Merge.rc:168
++#: Merge.rc:294
++#: Merge.rc:525
+ #, c-format
+ msgid "&Window"
+ msgstr "Ïð&îçîð"
+
-#: Merge.rc:170
-#: Merge.rc:291
-#: Merge.rc:479
++#: Merge.rc:170
++#: Merge.rc:296
++#: Merge.rc:527
+ #, c-format
+ msgid "Cl&ose"
+ msgstr "&Çàòâîðè"
+
-#: Merge.rc:172
-#: Merge.rc:293
-#: Merge.rc:481
++#: Merge.rc:171
++#: Merge.rc:297
++#: Merge.rc:528
+ #, c-format
+ msgid "Clo&se All"
+ msgstr "Çàòâîðè &ñâå"
+
-#: Merge.rc:174
-#: Merge.rc:295
-#: Merge.rc:483
++#: Merge.rc:173
++#: Merge.rc:299
++#: Merge.rc:530
+ #, c-format
+ msgid "Change &Pane\tF6"
+ msgstr "Çàìåíè &òàáëå\tF6"
+
-#: Merge.rc:175
-#: Merge.rc:296
-#: Merge.rc:484
++#: Merge.rc:175
++#: Merge.rc:301
++#: Merge.rc:532
+ #, c-format
+ msgid "Tile &Horizontally"
+ msgstr "Ïðîçîðå &âîäîðàâíî"
+
-#: Merge.rc:176
-#: Merge.rc:297
-#: Merge.rc:485
++#: Merge.rc:176
++#: Merge.rc:302
++#: Merge.rc:533
+ #, c-format
+ msgid "Tile &Vertically"
+ msgstr "Ïðîçîðå &óñïðàâíî"
+
-#: Merge.rc:178
-#: Merge.rc:299
-#: Merge.rc:487
-#: Merge.rc:1945
++#: Merge.rc:177
++#: Merge.rc:303
++#: Merge.rc:534
+ #, c-format
+ msgid "&Cascade"
+ msgstr "Ïðîçîðå ïîðå&\90àíî"
+
-#: Merge.rc:180
-#: Merge.rc:301
-#: Merge.rc:489
++#: Merge.rc:179
++#: Merge.rc:305
++#: Merge.rc:536
++#: Merge.rc:2100
+ #, c-format
+ msgid "&Help"
+ msgstr "Ïîìî&\9e"
+
-#: Merge.rc:182
-#: Merge.rc:303
-#: Merge.rc:491
++#: Merge.rc:181
++#: Merge.rc:307
++#: Merge.rc:538
+ #, c-format
+ msgid "&WinMerge Help\tF1"
+ msgstr "&WinMerge Ïîìî\9e\tF1"
+
-#: Merge.rc:183
-#: Merge.rc:304
-#: Merge.rc:492
++#: Merge.rc:183
++#: Merge.rc:309
++#: Merge.rc:540
+ #, c-format
+ msgid "R&elease Notes"
+ msgstr "Á&åëåøêå óç èçäà\9cå"
+
-#: Merge.rc:184
-#: Merge.rc:305
-#: Merge.rc:493
++#: Merge.rc:184
++#: Merge.rc:310
++#: Merge.rc:541
+ #, c-format
+ msgid "&Translations"
+ msgstr "&Ïðåâîäèîöè"
+
-#: Merge.rc:185
-#: Merge.rc:306
-#: Merge.rc:494
++#: Merge.rc:185
++#: Merge.rc:311
++#: Merge.rc:542
+ #, c-format
+ msgid "C&onfiguration"
+ msgstr "&Ïîñòàâêå"
+
-#: Merge.rc:187
-#: Merge.rc:308
-#: Merge.rc:496
++#: Merge.rc:186
++#: Merge.rc:312
++#: Merge.rc:543
+ #, c-format
+ msgid "A&rchive Support disabled..."
+ msgstr "Ïîä&ðøêà àðõèâå îíåìîãó\9eåíà..."
+
-#: Merge.rc:188
-#: Merge.rc:309
-#: Merge.rc:497
++#: Merge.rc:188
++#: Merge.rc:314
++#: Merge.rc:545
+ #, c-format
+ msgid "&GNU General Public License"
+ msgstr "&GNU ¼àâíà ëèöåíöà"
+
-#: Merge.rc:203
-#: Merge.rc:340
++#: Merge.rc:189
++#: Merge.rc:315
++#: Merge.rc:546
+ #, c-format
+ msgid "&About WinMerge..."
+ msgstr "&Î WinMerge..."
+
-#: Merge.rc:204
-#: Merge.rc:341
++#: Merge.rc:205
++#: Merge.rc:349
++#, c-format
++msgid "&Read-only"
++msgstr ""
++
++#: Merge.rc:207
++#: Merge.rc:351
+ #, c-format
+ msgid "L&eft Read-only"
+ msgstr "Ñàìî çà ÷èòà\9cå - ë&åâà"
+
-#: Merge.rc:206
++#: Merge.rc:208
++#: Merge.rc:352
++#, c-format
++msgid "M&iddle Read-only"
++msgstr ""
++
++#: Merge.rc:209
++#: Merge.rc:353
+ #, c-format
+ msgid "Ri&ght Read-only"
+ msgstr "Ñàìî çà ÷èòà\9cå - ä&åñíà"
+
-msgid "File En&coding"
-msgstr "&Êîäèðà\9cå äàòîòåêå"
++#: Merge.rc:212
+ #, c-format
-#: Merge.rc:212
-#: Merge.rc:366
++msgid "File En&coding..."
++msgstr ""
+
-#: Merge.rc:218
++#: Merge.rc:218
++#: Merge.rc:380
+ #, c-format
+ msgid "Select &All\tCtrl+A"
+ msgstr "Èçàáåðè &ñâå\tCtrl+A"
+
-#: Merge.rc:219
++#: Merge.rc:224
+ #, c-format
+ msgid "Show &Identical Items"
+ msgstr "Ïðèêàæè &ïîäóäàðíå ñòàâêå"
+
-#: Merge.rc:220
++#: Merge.rc:225
+ #, c-format
+ msgid "Show &Different Items"
+ msgstr "Ïðèêàæè ðàçëè&÷èòå ñòàâêå"
+
-#: Merge.rc:221
++#: Merge.rc:226
+ #, c-format
+ msgid "Show L&eft Unique Items"
+ msgstr "Ïðèêàæè ë&åâî ¼åäèíñòâåíå ñòàâêå"
+
-#: Merge.rc:222
++#: Merge.rc:227
+ #, c-format
+ msgid "Show Ri&ght Unique Items"
+ msgstr "Ïðèêàæè äå&ñíî ¼åäèíñòâåíå ñòàâêå"
+
-#: Merge.rc:223
++#: Merge.rc:228
+ #, c-format
+ msgid "Show S&kipped Items"
+ msgstr "Ïðèêàæè &èçîñòàâ\9aåíå ñòàâêå"
+
-#: Merge.rc:225
++#: Merge.rc:229
+ #, c-format
+ msgid "S&how Binary Files"
+ msgstr "Ïðèêà&æè áèíàðíå äàòîòåêå"
+
-#: Merge.rc:227
++#: Merge.rc:231
+ #, c-format
+ msgid "Show Hidd&en Items"
+ msgstr "Ïðèêàæè ñêðèâ&åíå ñòàâêå"
+
-#: Merge.rc:228
++#: Merge.rc:233
+ #, c-format
+ msgid "Tree &Mode"
+ msgstr "&Ìîäåë ñòàáëà"
+
-#: Merge.rc:229
++#: Merge.rc:234
+ #, c-format
+ msgid "E&xpand All Subfolders"
+ msgstr "Ïðî&øèðè ñâå ïîòôàñöèêëå"
+
-#: Merge.rc:242
++#: Merge.rc:235
+ #, c-format
+ msgid "&Collapse All Subfolders"
+ msgstr "Çàòâîðè ñâå ïîòôàñöèêëå"
+
-#: Merge.rc:246
-#: Merge.rc:429
++#: Merge.rc:248
+ #, c-format
+ msgid "Compa&re Statistics"
+ msgstr "Óïîðåäè ñòàòèñòèêó"
+
-#: Merge.rc:247
++#: Merge.rc:252
++#: Merge.rc:449
+ #, c-format
+ msgid "Refre&sh\tF5"
+ msgstr "Î&ñâåæè\tF5"
+
-#: Merge.rc:249
-#: Merge.rc:431
++#: Merge.rc:253
+ #, c-format
+ msgid "&Refresh Selected\tCtrl+F5"
+ msgstr "Îñâå&æè îäàáðàíî\tCtrl+F5"
+
-#: Merge.rc:251
++#: Merge.rc:255
++#: Merge.rc:451
+ #, c-format
+ msgid "&Merge"
+ msgstr "Ïîðå&\90å\9cå"
+
-#: Merge.rc:253
-#: Merge.rc:433
++#: Merge.rc:257
+ #, c-format
+ msgid "Co&mpare\tEnter"
+ msgstr "&Óïîðåäèòè\tEnter"
+
-#: Merge.rc:254
-#: Merge.rc:434
++#: Merge.rc:259
++#: Merge.rc:453
+ #, c-format
+ msgid "&Next Difference\tAlt+Down"
+ msgstr "&Ñëåäå\9eà ðàçëèêà\tAlt+Down"
+
-#: Merge.rc:256
-#: Merge.rc:436
++#: Merge.rc:260
++#: Merge.rc:454
+ #, c-format
+ msgid "&Previous Difference\tAlt+Up"
+ msgstr "&Ïðåòõîäíà ðàçëèêà\tAlt+Up"
+
-#: Merge.rc:257
-#: Merge.rc:437
++#: Merge.rc:262
++#: Merge.rc:480
+ #, c-format
+ msgid "&First Difference\tAlt+Home"
+ msgstr "Ïð&âà ðàçëèêà\tAlt+Home"
+
-#: Merge.rc:258
-#: Merge.rc:438
++#: Merge.rc:263
++#: Merge.rc:481
+ #, c-format
+ msgid "&Current Difference\tAlt+Enter"
+ msgstr "&Òðåíóòíà ðàçëèêà\tAlt+Enter"
+
-#: Merge.rc:260
-#: Merge.rc:440
++#: Merge.rc:264
++#: Merge.rc:482
+ #, c-format
+ msgid "&Last Difference\tAlt+End"
+ msgstr "&Çàä\9cà ðàçëèêà\tAlt+End"
+
-#: Merge.rc:261
-#: Merge.rc:441
++#: Merge.rc:266
++#: Merge.rc:484
+ #, c-format
+ msgid "Copy to &Right\tAlt+Right"
+ msgstr "Óìíîæè ó &äåñíó\tAlt+Right"
+
-#: Merge.rc:263
++#: Merge.rc:267
++#: Merge.rc:485
+ #, c-format
+ msgid "Copy to L&eft\tAlt+Left"
+ msgstr "Óìíîæè ó ë&åâó\tAlt+Left"
+
-#: Merge.rc:267
-#: Merge.rc:566
++#: Merge.rc:269
+ #, c-format
+ msgid "&Delete\tDel"
+ msgstr "&Èçáðèøè\tDel"
+
-#: Merge.rc:270
-#: Merge.rc:453
++#: Merge.rc:273
++#: Merge.rc:627
+ #, c-format
+ msgid "&Customize Columns..."
+ msgstr "Ïîäåñè &ñòóáöå..."
+
-#: Merge.rc:324
++#: Merge.rc:276
++#: Merge.rc:497
+ #, c-format
+ msgid "Generate &Report..."
+ msgstr "Íàï&ðàâè èçâåøòà¼..."
+
-#: Merge.rc:325
++#: Merge.rc:331
+ #, c-format
+ msgid "&Save\tCtrl+S"
+ msgstr "&Ñà÷óâà¼\tCtrl+S"
+
-msgid "Save &Left"
-msgstr "Ñà÷óâ༠&ëåâó"
++#: Merge.rc:332
+ #, c-format
-#: Merge.rc:327
-#: Merge.rc:332
++msgid "Sav&e"
++msgstr ""
+
-msgid "&Save"
-msgstr "&Ñà÷óâà¼"
++#: Merge.rc:334
+ #, c-format
-#: Merge.rc:328
-#: Merge.rc:333
++msgid "Save &Left"
++msgstr "Ñà÷óâ༠&ëåâó"
+
-msgid "Save &As..."
-msgstr "Ñà÷óâ༠&êàî"
++#: Merge.rc:335
+ #, c-format
-#: Merge.rc:330
++msgid "Save &Middle"
++msgstr ""
+
-#: Merge.rc:336
++#: Merge.rc:336
+ #, c-format
+ msgid "Save &Right"
+ msgstr "Ñà÷óâ༠&äåñíó"
+
-#: Merge.rc:337
++#: Merge.rc:338
++#, c-format
++msgid "Save &As"
++msgstr ""
++
++#: Merge.rc:340
++#, c-format
++msgid "Save &Left As..."
++msgstr ""
++
++#: Merge.rc:341
++#, c-format
++msgid "Save &Middle As..."
++msgstr ""
++
++#: Merge.rc:342
++#, c-format
++msgid "Save &Right As..."
++msgstr ""
++
++#: Merge.rc:345
+ #, c-format
+ msgid "&Print..."
+ msgstr "&Îäøòàìïà¼..."
+
-#: Merge.rc:338
++#: Merge.rc:346
+ #, c-format
+ msgid "Page Se&tup"
+ msgstr "Ïîäåñè ñ&òðàíèöó"
+
-#: Merge.rc:343
++#: Merge.rc:347
+ #, c-format
+ msgid "Print Previe&w"
+ msgstr "Ïðåãëåä ïðå øòàìïà&\9cà"
+
-#: Merge.rc:345
++#: Merge.rc:356
+ #, c-format
+ msgid "&Convert Line Endings to"
+ msgstr "Çàâðøè ðåä ïðåìà"
+
-#: Merge.rc:346
++#: Merge.rc:358
+ #, c-format
+ msgid "&Windows (CRLF)"
+ msgstr "&Windows (CRLF)"
+
-#: Merge.rc:347
++#: Merge.rc:359
+ #, c-format
+ msgid "&Unix (LF)"
+ msgstr "&Unix (LF)"
+
-#: Merge.rc:350
++#: Merge.rc:360
+ #, c-format
+ msgid "&Mac (CR)"
+ msgstr "&Mac (CR)"
+
-#: Merge.rc:352
++#: Merge.rc:363
+ #, c-format
+ msgid "&Merge Mode\tF9"
+ msgstr "&Íà÷èí ïîðå\90å\9cà\tF9"
+
-#: Merge.rc:358
++#: Merge.rc:365
++#, c-format
++msgid "Re&load\tCtrl+F5"
++msgstr ""
++
++#: Merge.rc:366
+ #, c-format
+ msgid "&File Encoding..."
+ msgstr "Äå&êîäèðà\9cå äàòîòåêå..."
+
-#: Merge.rc:359
++#: Merge.rc:372
+ #, c-format
+ msgid "&Undo\tCtrl+Z"
+ msgstr "Îïî&çîâè\tCtrl+Z"
+
-#: Merge.rc:361
++#: Merge.rc:373
+ #, c-format
+ msgid "&Redo\tCtrl+Y"
+ msgstr "&Ïîíîâè\tCtrl+Y"
+
-#: Merge.rc:362
++#: Merge.rc:375
+ #, c-format
+ msgid "Cu&t\tCtrl+X"
+ msgstr "Èñå&öè\tCtrl+X"
+
-#: Merge.rc:363
++#: Merge.rc:376
+ #, c-format
+ msgid "&Copy\tCtrl+C"
+ msgstr "Óìíî&æè\tCtrl+C"
+
-#: Merge.rc:365
++#: Merge.rc:377
+ #, c-format
+ msgid "&Paste\tCtrl+V"
+ msgstr "&Íàëåïè\tCtrl+V"
+
-#: Merge.rc:368
++#: Merge.rc:379
+ #, c-format
+ msgid "Select Line &Difference\tF4"
+ msgstr "Èñòàêíè &ðàçëèêó ðåäà\tF4"
+
-#: Merge.rc:369
++#: Merge.rc:382
+ #, c-format
+ msgid "F&ind...\tCtrl+F"
+ msgstr "Ïðåòðàæ&è...\tCtrl+F"
+
-#: Merge.rc:371
-#, c-format
-msgid "&Scripts"
-msgstr "&Ñêðèïòå "
-
-#: Merge.rc:373
-#: Merge.rc:2705
-#, c-format
-msgid "< Empty >"
-msgstr "< Ïðàçàí >"
-
-#: Merge.rc:376
++#: Merge.rc:383
+ #, c-format
+ msgid "Repla&ce...\tCtrl+H"
+ msgstr "Çàìåíè...\tCtrl+H"
+
-#: Merge.rc:378
++#: Merge.rc:385
+ #, c-format
+ msgid "Advanced"
+ msgstr "Íàïðåäíî"
+
-#: Merge.rc:381
++#: Merge.rc:387
+ #, c-format
+ msgid "&Copy With Line Numbers\tCtrl+Shift+C"
+ msgstr "&Óìíîæè ðåäîâå ñà áðî¼åâèìà\tCtrl+Shift+C"
+
-#: Merge.rc:383
++#: Merge.rc:390
+ #, c-format
+ msgid "&Bookmarks"
+ msgstr "Ç&àáåëåøêå"
+
-#: Merge.rc:384
++#: Merge.rc:392
+ #, c-format
+ msgid "&Toggle Bookmark\tCtrl+F2"
+ msgstr "&Çàìåíè çàáåëåøêå\tCtrl+F2"
+
-#: Merge.rc:385
++#: Merge.rc:393
+ #, c-format
+ msgid "&Next Bookmark\tF2"
+ msgstr "&Ñëåäå\9eà çàáåëåøêà\tF2"
+
-#: Merge.rc:386
++#: Merge.rc:394
+ #, c-format
+ msgid "&Previous bookmark\tShift+F2"
+ msgstr "&Ïðåòõîäíà çàáåëåøêà\tShift+F2"
+
-#: Merge.rc:388
++#: Merge.rc:395
+ #, c-format
+ msgid "&Clear All Bookmarks"
+ msgstr "Î÷èñòè ñâå çàáåëåøêå"
+
-msgid "&Go To...\tCtrl+G"
-msgstr "&Èäè íà...\tCtrl+G"
++#: Merge.rc:397
++#, c-format
++msgid "&Go To...\tCtrl+G"
++msgstr "&Èäè íà...\tCtrl+G"
++
++#: Merge.rc:405
++#, c-format
++msgid "&Zoom"
++msgstr "&Ïîâå\9eà¼"
++
++#: Merge.rc:407
++#, c-format
++msgid "Zoom &In\tCtrl++"
++msgstr "Óâå&\9eà¼\tCtrl++"
++
++#: Merge.rc:408
++#, c-format
++msgid "Zoom &Out\tCtrl+-"
++msgstr "Óìà&\9cè\tCtrl+-"
++
++#. Zoom to normal
++#: Merge.rc:409
++#, c-format
++msgid "&Normal\tCtrl+*"
++msgstr "Èçâîðíî\tCtrl+*"
++
++#: Merge.rc:411
++#, c-format
++msgid "Syntax Highlight"
++msgstr "Íàãëàñèòå ñêëîï ðå÷è"
++
++#: Merge.rc:416
++#, c-format
++msgid "&Diff Context"
++msgstr ""
++
++#: Merge.rc:418
++#, c-format
++msgid "&All"
++msgstr ""
++
++#: Merge.rc:419
+ #, c-format
-#: Merge.rc:396
++msgid "&0"
++msgstr ""
+
-msgid "&Zoom"
-msgstr "&Ïîâå\9eà¼"
++#: Merge.rc:420
+ #, c-format
-#: Merge.rc:398
++msgid "&1"
++msgstr ""
+
-msgid "Zoom &In\tCtrl++"
-msgstr "Óâå&\9eà¼\tCtrl++"
++#: Merge.rc:421
+ #, c-format
-#: Merge.rc:399
++msgid "&3"
++msgstr ""
+
-msgid "Zoom &Out\tCtrl+-"
-msgstr "Óìà&\9cè\tCtrl+-"
++#: Merge.rc:422
+ #, c-format
-#. Zoom to normal
-#: Merge.rc:400
++msgid "&5"
++msgstr ""
+
-msgid "&Normal\tCtrl+*"
-msgstr "Èçâîðíî\tCtrl+*"
++#: Merge.rc:423
+ #, c-format
-#: Merge.rc:402
++msgid "&7"
++msgstr ""
+
-msgid "Syntax Highlight"
-msgstr "Íàãëàñèòå ñêëîï ðå÷è"
++#: Merge.rc:424
+ #, c-format
-#: Merge.rc:407
++msgid "&9"
++msgstr ""
+
-#: Merge.rc:408
++#: Merge.rc:427
+ #, c-format
+ msgid "&Lock Panes"
+ msgstr "Çàê\9aó÷༠òàáëå"
+
-#: Merge.rc:409
++#: Merge.rc:428
+ #, c-format
+ msgid "&View Whitespace"
+ msgstr "Ïðèêà&ç ðàçìàêà"
+
-#: Merge.rc:410
++#: Merge.rc:429
+ #, c-format
+ msgid "Vie&w Line Differences"
+ msgstr "Ïðèêàç ðàçëè&÷èòèõ ðåäîâà"
+
-#: Merge.rc:411
++#: Merge.rc:430
+ #, c-format
+ msgid "View Line &Numbers"
+ msgstr "Ïðèêàç áðî¼à ðå&äîâà"
+
-#: Merge.rc:412
++#: Merge.rc:431
+ #, c-format
+ msgid "View &Margins"
+ msgstr "Ïðèêàç èâè&öà"
+
-#: Merge.rc:414
++#: Merge.rc:432
+ #, c-format
+ msgid "W&rap Lines"
+ msgstr "Çàâðøåòàê ðåäîâà"
+
-#: Merge.rc:424
++#: Merge.rc:434
+ #, c-format
+ msgid "Sw&ap Panes"
+ msgstr "Ç&àìåíè òàáëå"
+
-#: Merge.rc:425
++#: Merge.rc:444
+ #, c-format
+ msgid "Diff &Pane"
+ msgstr "&Ðàçëèêà òàáëè"
+
-#: Merge.rc:443
++#: Merge.rc:445
+ #, c-format
+ msgid "Lo&cation Pane"
+ msgstr "Ïîëî&æ༠òàáëå"
+
-#: Merge.rc:444
++#: Merge.rc:456
++#, c-format
++msgid "A&dvanced"
++msgstr ""
++
++#: Merge.rc:458
++#, c-format
++msgid "Copy &Left to Middle\tAlt+4"
++msgstr ""
++
++#: Merge.rc:459
++#, c-format
++msgid "Copy &Right to Middle\tAlt+6"
++msgstr ""
++
++#: Merge.rc:461
++#, c-format
++msgid "Next Difference Between Left and Middle\tAlt+1"
++msgstr ""
++
++#: Merge.rc:462
++#, c-format
++msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
++msgstr ""
++
++#: Merge.rc:464
++#, c-format
++msgid "Next Difference Between Left and Right\tAlt+2"
++msgstr ""
++
++#: Merge.rc:465
++#, c-format
++msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
++msgstr ""
++
++#: Merge.rc:467
++#, c-format
++msgid "Next Difference Between Middle and Right\tAlt+3"
++msgstr ""
++
++#: Merge.rc:468
++#, c-format
++msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
++msgstr ""
++
++#: Merge.rc:470
++#, c-format
++msgid "Next Left Only Difference\tAlt+7"
++msgstr ""
++
++#: Merge.rc:471
++#, c-format
++msgid "Previous Left Only Difference\tAlt+Shift+7"
++msgstr ""
++
++#: Merge.rc:473
++#, c-format
++msgid "Next Middle Only Difference\tAlt+8"
++msgstr ""
++
++#: Merge.rc:474
++#, c-format
++msgid "Previous Middle Only Difference\tAlt+Shift+8"
++msgstr ""
++
++#: Merge.rc:476
++#, c-format
++msgid "Next Right Only Difference\tAlt+9"
++msgstr ""
++
++#: Merge.rc:477
++#, c-format
++msgid "Previous Right Only Difference\tAlt+Shift+9"
++msgstr ""
++
++#: Merge.rc:487
+ #, c-format
+ msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
+ msgstr "Óìíîæè ó äåñí&î è íàñòàâè\tAlt+Ctrl+Right"
+
-#: Merge.rc:446
++#: Merge.rc:488
+ #, c-format
+ msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
+ msgstr "Óì&íîæè ó ëåâî è íàñòàâè\tAlt+Ctrl+Left"
+
-#: Merge.rc:447
++#: Merge.rc:490
+ #, c-format
+ msgid "Copy &All to Right"
+ msgstr "Óìíî&æè ñâå ó äåñíî"
+
-#: Merge.rc:464
++#: Merge.rc:491
+ #, c-format
+ msgid "Cop&y All to Left"
+ msgstr "Óìíîæ&è ñâå ó ëåâî"
+
-#: Merge.rc:505
++#: Merge.rc:508
+ #, c-format
+ msgid "&Prediffer"
+ msgstr "&Äåôèíèñàíî ïîðå\90å\9cå"
+
-#: Merge.rc:506
++#: Merge.rc:513
++#, c-format
++msgid "&Scripts"
++msgstr "&Ñêðèïòå "
++
++#: Merge.rc:515
++#: Merge.rc:2917
++#, c-format
++msgid "< Empty >"
++msgstr "< Ïðàçàí >"
++
++#: Merge.rc:554
+ #, c-format
+ msgid "Comp&are"
+ msgstr "&Óïîðåäè"
+
-#: Merge.rc:508
++#: Merge.rc:555
++#, c-format
++msgid "Compare Non-hor&izontally"
++msgstr ""
++
++#: Merge.rc:557
++#, c-format
++msgid "First &left item with second left item"
++msgstr ""
++
++#: Merge.rc:558
++#, c-format
++msgid "First &right item with second right item"
++msgstr ""
++
++#: Merge.rc:559
++#, c-format
++msgid "&First left item with second right item"
++msgstr ""
++
++#: Merge.rc:560
++#, c-format
++msgid "&Second left item with first right item"
++msgstr ""
++
++#: Merge.rc:562
+ #, c-format
+ msgid "Co&mpare Special"
+ msgstr "Ïîñå&áíî ïîðå\90å\9cå"
+
-#: Merge.rc:509
++#: Merge.rc:564
+ #, c-format
+ msgid "&XML"
+ msgstr "&XML"
+
-#: Merge.rc:514
++#: Merge.rc:565
+ #, c-format
+ msgid "&HEX"
+ msgstr ""
+
-#: Merge.rc:515
++#: Merge.rc:570
+ #, c-format
+ msgid "&Left to Right"
+ msgstr "&Ëåâó ó äåñíî"
+
-#: Merge.rc:516
++#: Merge.rc:571
+ #, c-format
+ msgid "L&eft to..."
+ msgstr "Ë&åâà ó..."
+
-#: Merge.rc:517
++#: Merge.rc:572
+ #, c-format
+ msgid "&Right to Left"
+ msgstr "&Äåñíà ó ëåâî"
+
-#: Merge.rc:519
++#: Merge.rc:573
+ #, c-format
+ msgid "R&ight to..."
+ msgstr "Ä&åñíà ó..."
+
-#: Merge.rc:521
++#: Merge.rc:575
+ #, c-format
+ msgid "&Move"
+ msgstr "Ïî&ìåðè"
+
-#: Merge.rc:522
++#: Merge.rc:577
+ #, c-format
+ msgid "&Left to..."
+ msgstr "&Ëåâà ó..."
+
-#: Merge.rc:524
++#: Merge.rc:578
+ #, c-format
+ msgid "&Right to..."
+ msgstr "&Äåñíà ó..."
+
-#: Merge.rc:526
-#: Merge.rc:1144
-#: Merge.rc:1511
++#: Merge.rc:580
+ #, c-format
+ msgid "&Delete"
+ msgstr "&Èçáðèøè"
+
-#: Merge.rc:527
-#: Merge.rc:1146
-#: Merge.rc:1514
++#: Merge.rc:582
++#: Merge.rc:1271
++#: Merge.rc:1659
+ #, c-format
+ msgid "&Left"
+ msgstr "&Ëåâà"
+
-#: Merge.rc:528
++#: Merge.rc:583
++#: Merge.rc:1275
++#: Merge.rc:1665
+ #, c-format
+ msgid "&Right"
+ msgstr "&Äåñíà"
+
-#: Merge.rc:530
++#: Merge.rc:584
+ #, c-format
+ msgid "&Both"
+ msgstr "Îáå "
+
-#: Merge.rc:531
++#: Merge.rc:586
+ #, c-format
+ msgid "Re&name"
+ msgstr "Ïðåèìå&íó¼"
+
-#: Merge.rc:533
++#: Merge.rc:587
+ #, c-format
+ msgid "&Hide Items"
+ msgstr "&Ñàêðè¼ ñòàâêå"
+
-#: Merge.rc:539
++#: Merge.rc:589
+ #, c-format
+ msgid "&Open Left"
+ msgstr "&Îòâîðè ëåâó"
+
-#: Merge.rc:546
++#: Merge.rc:595
+ #, c-format
+ msgid "O&pen Right"
+ msgstr "Îòâî&ðè äåñíó"
+
-#: Merge.rc:548
++#: Merge.rc:602
+ #, c-format
+ msgid "Cop&y Pathnames"
+ msgstr "Óìíîæè ïóòà&\9có"
+
-#: Merge.rc:549
++#: Merge.rc:604
++#: Merge.rc:611
+ #, c-format
+ msgid "&Left (%1 of %2)"
+ msgstr "&Ëåâà (%1 îä %2) "
+
-#: Merge.rc:550
++#: Merge.rc:605
++#: Merge.rc:612
+ #, c-format
+ msgid "&Right (%1 of %2)"
+ msgstr "&Äåñíà (%1 îä %2)"
+
-#: Merge.rc:552
++#: Merge.rc:606
+ #, c-format
+ msgid "&Both (%1 of %2)"
+ msgstr "Î&áå (%1 îä %2)"
+
-#: Merge.rc:554
++#: Merge.rc:608
+ #, c-format
+ msgid "Copy &Filenames"
+ msgstr "Óìíîæè íàçèâå äàòîòåêà"
+
-#: Merge.rc:556
++#: Merge.rc:609
++#, c-format
++msgid "Copy Items To Clip&board"
++msgstr ""
++
++#: Merge.rc:615
+ #, c-format
+ msgid "&Zip"
+ msgstr "&Çèï"
+
-#: Merge.rc:557
++#: Merge.rc:617
+ #, c-format
+ msgid "&Left... (%1 of %2)"
+ msgstr "Ëåâà...(%1 îä %2)"
+
-#: Merge.rc:558
++#: Merge.rc:618
+ #, c-format
+ msgid "&Right... (%1 of %2)"
+ msgstr "&Äåñíà...(%1 îä %2)"
+
-#: Merge.rc:559
++#: Merge.rc:619
+ #, c-format
+ msgid "&Both... (%1 of %2)"
+ msgstr "Îáå...(%1 îä %2)"
+
-#: Merge.rc:562
++#: Merge.rc:620
+ #, c-format
+ msgid "&Differences... (%1 of %2)"
+ msgstr "&Ðàçëèêå...(%1 îä %2)"
+
-#: Merge.rc:574
++#: Merge.rc:623
+ #, c-format
+ msgid "&Refresh"
+ msgstr "&Îñâåæè"
+
-#: Merge.rc:575
++#: Merge.rc:635
+ #, c-format
+ msgid "&Copy Full Path"
+ msgstr "&Óìíîæè ïóòà\9có"
+
-#: Merge.rc:581
++#: Merge.rc:636
+ #, c-format
+ msgid "Copy &Filename"
+ msgstr "Óìíîæè íà&çèâ äàòîòåêå"
+
-#: Merge.rc:583
++#: Merge.rc:642
+ #, c-format
+ msgid "Prediffer Settings"
+ msgstr "Ñâî¼ñòâà äåôèíèñàíîã ïîðå\90å\9cà"
+
-#: Merge.rc:584
++#: Merge.rc:644
+ #, c-format
+ msgid "&No prediffer"
+ msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà"
+
-#: Merge.rc:592
++#: Merge.rc:645
+ #, c-format
+ msgid "Auto prediffer"
+ msgstr "Àóòîìàòñêè äåôèíèøè ïîðå\90å\9cå"
+
-#: Merge.rc:595
++#: Merge.rc:653
+ #, c-format
+ msgid "G&oto Diff"
+ msgstr "Èäè &íà ðàçëèêó"
+
-#: Merge.rc:596
++#: Merge.rc:656
+ #, c-format
+ msgid "&No Moved Blocks"
+ msgstr "&Íå ïðåìåøò༠ãðóïå"
+
-#: Merge.rc:597
++#: Merge.rc:657
+ #, c-format
+ msgid "&All Moved Blocks"
+ msgstr "Ïðåìåñòè &ñâå ãðóïå"
+
-#: Merge.rc:668
++#: Merge.rc:658
+ #, c-format
+ msgid "Moved Block for &Current Diff"
+ msgstr "Ïðåìåñòè òðåíóòíå ðàçëèêå &ãðóïå"
+
-#: Merge.rc:674
++#: Merge.rc:745
+ #, c-format
+ msgid "About WinMerge"
+ msgstr "Î WinMerge"
+
-#: Merge.rc:675
++#: Merge.rc:751
+ #, c-format
+ msgid "(Private Build)"
+ msgstr "(Ëè÷íè èçðàäàê)"
+
-#: Merge.rc:676
++#: Merge.rc:752
+ #, c-format
+ msgid "All rights reserved."
+ msgstr "Ñâà ïðàâà ñó ïðèäðæàíà"
+
-#: Merge.rc:679
-#: Merge.rc:711
-#: Merge.rc:803
-#: Merge.rc:992
-#: Merge.rc:1063
-#: Merge.rc:1092
-#: Merge.rc:1102
-#: Merge.rc:1253
-#: Merge.rc:1317
-#: Merge.rc:1330
-#: Merge.rc:1422
-#: Merge.rc:1437
-#: Merge.rc:1659
++#: Merge.rc:753
+ #, c-format
+ msgid "Visit the WinMerge HomePage!"
+ msgstr "Ïîñåòèòå WinMerge-îâ ñà¼ò"
+
-#: Merge.rc:680
++#: Merge.rc:756
++#: Merge.rc:793
++#: Merge.rc:885
++#: Merge.rc:1113
++#: Merge.rc:1187
++#: Merge.rc:1219
++#: Merge.rc:1229
++#: Merge.rc:1390
++#: Merge.rc:1460
++#: Merge.rc:1473
++#: Merge.rc:1565
++#: Merge.rc:1580
++#: Merge.rc:1810
+ #, c-format
+ msgid "OK"
+ msgstr "Ó ðåäó"
+
-#: Merge.rc:687
++#: Merge.rc:757
+ #, c-format
+ msgid "Contributors"
+ msgstr "Ñàðàäíèöè"
+
-#: Merge.rc:690
-#: Merge.rc:1588
++#: Merge.rc:764
+ #, c-format
+ msgid "Select Files or Folders"
+ msgstr "Èçàáåðè äàòîòåêå èëè ôàñöèêëå"
+
-msgid "&Left:"
-msgstr "&Ëåâa:"
++#: Merge.rc:767
+ #, c-format
-#: Merge.rc:694
-#: Merge.rc:755
-#: Merge.rc:1006
-#: Merge.rc:1028
++msgid "&1:"
++msgstr ""
+
-#: Merge.rc:695
-#: Merge.rc:1592
++#: Merge.rc:771
++#: Merge.rc:837
++#: Merge.rc:1127
++#: Merge.rc:1149
+ #, c-format
+ msgid "&Browse..."
+ msgstr "&Ïðåãëåäà¼..."
+
-msgid "&Right:"
-msgstr "&Äåñía:"
++#: Merge.rc:772
+ #, c-format
-#: Merge.rc:699
-#: Merge.rc:1039
++msgid "&2:"
++msgstr ""
+
-#: Merge.rc:700
-#: Merge.rc:1596
++#: Merge.rc:776
++#: Merge.rc:1160
+ #, c-format
+ msgid "Bro&wse..."
+ msgstr "Ïðå&ãëåäà¼..."
+
-#: Merge.rc:703
-#: Merge.rc:1598
++#: Merge.rc:777
++#, c-format
++msgid "&3(Optional):"
++msgstr ""
++
++#: Merge.rc:781
++#: Merge.rc:1137
++#: Merge.rc:1153
++#, c-format
++msgid "Br&owse..."
++msgstr "Ïð&åãëåäà¼..."
++
++#: Merge.rc:782
++#: Merge.rc:1747
+ #, c-format
+ msgid "&Filter:"
+ msgstr "&Ôèëòåð:"
+
-#: Merge.rc:704
++#: Merge.rc:785
++#: Merge.rc:1749
+ #, c-format
+ msgid "Select..."
+ msgstr "Èçàáåðè..."
+
-#: Merge.rc:707
++#: Merge.rc:786
+ #, c-format
+ msgid "&Unpacker:"
+ msgstr "&Àðõèâåð:"
+
-#: Merge.rc:708
-#: Merge.rc:1599
++#: Merge.rc:789
+ #, c-format
+ msgid "&Select..."
+ msgstr "&Èçàáåðè..."
+
-#: Merge.rc:710
++#: Merge.rc:790
++#: Merge.rc:1750
+ #, c-format
+ msgid "&Include Subfolders"
+ msgstr "Óê\9aó÷è è ïîòôàñöèêëå"
+
-#: Merge.rc:712
-#: Merge.rc:742
-#: Merge.rc:804
-#: Merge.rc:834
-#: Merge.rc:866
-#: Merge.rc:876
-#: Merge.rc:1064
-#: Merge.rc:1093
-#: Merge.rc:1103
-#: Merge.rc:1154
-#: Merge.rc:1254
-#: Merge.rc:1331
-#: Merge.rc:1423
-#: Merge.rc:1438
-#: Merge.rc:1660
++#: Merge.rc:792
+ #, c-format
+ msgid "Status:"
+ msgstr "Ñòà\9cå"
+
-#: Merge.rc:713
-#: Merge.rc:1332
++#: Merge.rc:794
++#: Merge.rc:824
++#: Merge.rc:886
++#: Merge.rc:916
++#: Merge.rc:935
++#: Merge.rc:967
++#: Merge.rc:977
++#: Merge.rc:1188
++#: Merge.rc:1220
++#: Merge.rc:1230
++#: Merge.rc:1283
++#: Merge.rc:1391
++#: Merge.rc:1474
++#: Merge.rc:1566
++#: Merge.rc:1581
++#: Merge.rc:1811
+ #, c-format
+ msgid "Cancel"
+ msgstr "Îòêàæè"
+
-#: Merge.rc:714
++#: Merge.rc:795
++#: Merge.rc:1475
+ #, c-format
+ msgid "Help"
+ msgstr "Ïîìî\9e"
+
-#: Merge.rc:721
++#: Merge.rc:796
+ #, c-format
+ msgid "Files or Folders to Compare"
+ msgstr "Óïîðåäè äàòîòåêå èëè ôàñöèêëå"
+
-#: Merge.rc:726
++#: Merge.rc:803
+ #, c-format
+ msgid "Visual SourceSafe"
+ msgstr "Visual SourceSafe"
+
-#: Merge.rc:729
++#: Merge.rc:808
+ #, c-format
+ msgid "Database:"
+ msgstr "Áàçà ïîäàòàêà:"
+
-#: Merge.rc:732
++#: Merge.rc:811
+ #, c-format
+ msgid "Project:"
+ msgstr "Ïîðå\90å\9cå:"
+
-#: Merge.rc:734
++#: Merge.rc:814
+ #, c-format
+ msgid "User:"
+ msgstr "Êîðèñíèê:"
+
-#: Merge.rc:736
++#: Merge.rc:816
+ #, c-format
+ msgid "Password:"
+ msgstr "Ëîçèíêà:"
+
-#: Merge.rc:738
-#: Merge.rc:881
++#: Merge.rc:818
+ #, c-format
+ msgid "Link to Destination VSS project"
+ msgstr "Âåçà äî îäðåäèøòà VSS ïðî¼åêòà"
+
-#: Merge.rc:740
++#: Merge.rc:820
++#: Merge.rc:982
+ #, c-format
+ msgid "Apply to all items"
+ msgstr "Ïðèìåíè íà ñâå ñòàâêå"
+
-#: Merge.rc:741
-#: Merge.rc:877
++#: Merge.rc:822
+ #, c-format
+ msgid "Check Out"
+ msgstr "Ïðîâåðà"
+
-#: Merge.rc:747
++#: Merge.rc:823
++#: Merge.rc:978
+ #, c-format
+ msgid "Save As..."
+ msgstr "Ñà÷óâ༠êàî..."
+
-#: Merge.rc:750
++#: Merge.rc:829
+ #, c-format
+ msgid "Versioning System"
+ msgstr "Èçäà\9cå ïðîãðàìà"
+
-#: Merge.rc:753
-#: Merge.rc:2080
++#: Merge.rc:832
+ #, c-format
+ msgid "&Versioning System:"
+ msgstr "&Èçáîð ïðîãðàìà"
+
-#: Merge.rc:760
-#: Merge.rc:1953
-#: Merge.rc:1966
++#: Merge.rc:835
++#: Merge.rc:2235
+ #, c-format
+ msgid "&Path to cleartool.exe:"
+ msgstr "&Ïóòà\9cà äî cleartool.exe"
+
-#: Merge.rc:763
++#: Merge.rc:842
++#: Merge.rc:2108
++#: Merge.rc:2121
+ #, c-format
+ msgid "General"
+ msgstr "Îïøòè èçáîð"
+
-#: Merge.rc:766
++#: Merge.rc:845
+ #, c-format
+ msgid "Automatically &scroll to first difference"
+ msgstr "Óâåê êðåíè îä &ïðâå ðàçëèêå"
+
-#: Merge.rc:768
++#: Merge.rc:848
+ #, c-format
+ msgid "&Disable Splash Screen"
+ msgstr "&Îíåìîãó\9eè óâîäíè åêðàí"
+
-#: Merge.rc:770
++#: Merge.rc:850
+ #, c-format
+ msgid "Cl&ose windows with ESC"
+ msgstr "Çàòâîðè ïð&îçîð ñà ESC"
+
-#: Merge.rc:773
++#: Merge.rc:852
+ #, c-format
+ msgid "&Automatically verify paths in Open-dialog"
+ msgstr "Ïðîâåðèòå ïóòà\9cå ó èçáîðíîì äè¼àëîãó "
+
-#: Merge.rc:775
++#: Merge.rc:855
+ #, c-format
+ msgid "All&ow only one instance to run"
+ msgstr "Äîçâîëè ñàìî ¼åäíó ïîêðåíóòó íàäëåæíîñò"
+
-#: Merge.rc:777
++#: Merge.rc:857
+ #, c-format
+ msgid "As&k when closing multiple windows"
+ msgstr "Óïèò༠&êàä çàòâàðàø âèøå ïðîçîðà"
+
-#: Merge.rc:780
++#: Merge.rc:859
+ #, c-format
+ msgid "&Preserve file time in file compare"
+ msgstr "&Çàäðæè îçíàêå âðåìåíà è äàòóìà ó ïîðå\90å\9có "
+
-#: Merge.rc:782
++#: Merge.rc:862
+ #, c-format
+ msgid "Show \"Select Files or Folders\" Dialog on Startup"
+ msgstr "Ïðèêàæè \"Îäàáðàíå äàòîòåêå èëè ôàñöèêëå\" äè¼àëîã ïðè ïîêðåòà\9có."
+
-#: Merge.rc:785
++#: Merge.rc:864
+ #, c-format
+ msgid "O&pen-dialog Auto-Completion:"
+ msgstr "Îòâîðè äè¼àëîã ñàìîäîâðøå\9cà"
+
-#: Merge.rc:787
-#: Merge.rc:1611
++#: Merge.rc:867
+ #, c-format
+ msgid "Enable multiple compare windows for"
+ msgstr "Îìîãó\9eè âèøåñòðóêî ïîðå\90å\9cå "
+
-#: Merge.rc:789
-#: Merge.rc:1613
++#: Merge.rc:869
++#: Merge.rc:1762
+ #, c-format
+ msgid "&Folder compare"
+ msgstr "Óïîðåäè &ôàñöèêëó"
+
-#: Merge.rc:791
++#: Merge.rc:871
++#: Merge.rc:1764
+ #, c-format
+ msgid "Fil&e compare"
+ msgstr "Óïîð&åäè äàòîòåêå"
+
-#: Merge.rc:793
++#: Merge.rc:873
+ #, c-format
+ msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+ msgstr "WinMerge îìîãó\9eàâà ñêðèâà\9cå íåêèõ óîáè÷à¼åíèõ ïîðóêà.Ïðèòèñíèòå 'Ïî÷åòíè'äà ïîðóêå îïåò áóäó âèä\9aèâå"
+
-#: Merge.rc:800
++#: Merge.rc:875
+ #, c-format
+ msgid "Reset"
+ msgstr "Ïî÷åòíè"
+
-#: Merge.rc:807
++#: Merge.rc:882
+ #, c-format
+ msgid "Language"
+ msgstr "£åçèê"
+
-#: Merge.rc:813
++#: Merge.rc:889
+ #, c-format
+ msgid "Available languages:"
+ msgstr "Äîñòóïíè ¼åçèöè:"
+
-#: Merge.rc:816
-#: Merge.rc:843
++#: Merge.rc:895
++#: Merge.rc:922
+ #, c-format
+ msgid "Find"
+ msgstr "Íà\90è"
+
-#: Merge.rc:819
-#: Merge.rc:849
++#: Merge.rc:898
++#: Merge.rc:925
++#: Merge.rc:944
+ #, c-format
+ msgid "Fi&nd what:"
+ msgstr "Ïðåòðà&æè:"
+
-#: Merge.rc:821
-#: Merge.rc:851
++#: Merge.rc:901
++#: Merge.rc:928
++#: Merge.rc:950
+ #, c-format
+ msgid "Match &whole word only"
+ msgstr "Óïîðåäè &öåî èçðàç"
+
-#: Merge.rc:823
-#: Merge.rc:853
++#: Merge.rc:903
++#: Merge.rc:930
++#: Merge.rc:952
+ #, c-format
+ msgid "Match &case"
+ msgstr "Óïîðåäè ñòà&\9cå"
+
-#: Merge.rc:825
++#: Merge.rc:905
++#: Merge.rc:932
++#: Merge.rc:954
+ #, c-format
+ msgid "Regular &expression"
+ msgstr "Ïðàâèëàí èçðàç"
+
-#: Merge.rc:828
++#: Merge.rc:907
+ #, c-format
+ msgid "D&on't wrap end of file"
+ msgstr "Áåç ïðåë&îìà òåêñòà"
+
-#: Merge.rc:829
++#: Merge.rc:910
+ #, c-format
+ msgid "Direction"
+ msgstr "Ñìåð"
+
-#: Merge.rc:831
++#: Merge.rc:911
+ #, c-format
+ msgid "&Up"
+ msgstr "&Ãîðå"
+
-#: Merge.rc:833
-#: Merge.rc:863
++#: Merge.rc:913
+ #, c-format
+ msgid "&Down"
+ msgstr "&Äîëå"
+
-#: Merge.rc:840
++#: Merge.rc:915
++#: Merge.rc:964
+ #, c-format
+ msgid "&Find Next"
+ msgstr "&Íà\90è ñëåäå\9eå"
+
-#: Merge.rc:846
++#: Merge.rc:934
++#: Merge.rc:2082
++#, c-format
++msgid "&Ok"
++msgstr "&Ó ðåäó"
++
++#: Merge.rc:941
+ #, c-format
+ msgid "Replace"
+ msgstr "Çàìåíè"
+
-#: Merge.rc:855
++#: Merge.rc:947
+ #, c-format
+ msgid "Re&place with:"
+ msgstr "Çà&ìåíè ñà:"
+
-#: Merge.rc:858
++#: Merge.rc:956
+ #, c-format
+ msgid "&Don't wrap end of file"
+ msgstr "&Áåç ïðåëîìà òåêñòà"
+
-#: Merge.rc:859
++#: Merge.rc:959
+ #, c-format
+ msgid "Replace in"
+ msgstr "Çàìåíè ó"
+
-#: Merge.rc:861
++#: Merge.rc:960
+ #, c-format
+ msgid "&Selection"
+ msgstr "Èçàáðàíèì"
+
-#: Merge.rc:864
++#: Merge.rc:962
+ #, c-format
+ msgid "Wh&ole file"
+ msgstr "Öåëî¼ äàò&îòåöè"
+
-#: Merge.rc:865
++#: Merge.rc:965
+ #, c-format
+ msgid "&Replace"
+ msgstr "&Çàìåíè"
+
-#: Merge.rc:872
-#: Merge.rc:2202
++#: Merge.rc:966
+ #, c-format
+ msgid "Replace &All"
+ msgstr "Çàìåíè ñâ&å"
+
-#: Merge.rc:875
++#: Merge.rc:973
++#: Merge.rc:2366
+ #, c-format
+ msgid "Rational ClearCase"
+ msgstr "Ïðàêòè÷íî ¼àñàí ñëó÷à¼"
+
-#: Merge.rc:880
-#: Merge.rc:1172
++#: Merge.rc:976
+ #, c-format
+ msgid "CheckOut"
+ msgstr "Ïðîâåðà"
+
-#: Merge.rc:883
++#: Merge.rc:981
++#: Merge.rc:1301
+ #, c-format
+ msgid "Comments"
+ msgstr "Íàïîìåíå"
+
-#: Merge.rc:889
++#: Merge.rc:984
+ #, c-format
+ msgid "CheckIn after checkout"
+ msgstr "Ïðîâåðèòå ïîíîâî"
+
-#: Merge.rc:892
++#: Merge.rc:990
+ #, c-format
+ msgid "Linefilters"
+ msgstr "Ôèëòåð ðåäîâà"
+
-#: Merge.rc:895
++#: Merge.rc:993
+ #, c-format
+ msgid "Enable Line Filters"
+ msgstr "Îìîãó\9eè ôèëòðèðà\9cå ðåäà"
+
-#: Merge.rc:900
++#: Merge.rc:996
+ #, c-format
+ msgid "Regular Expressions (one per line):"
+ msgstr "Èñïðàâàí èçðàç (¼åäàí ïî ðåäó):"
+
-#: Merge.rc:901
++#: Merge.rc:1001
+ #, c-format
+ msgid "New"
+ msgstr "Íîâè"
+
-#: Merge.rc:902
++#: Merge.rc:1002
+ #, c-format
+ msgid "Edit"
+ msgstr "Óðåäè"
+
-#: Merge.rc:907
-#: Merge.rc:1956
++#: Merge.rc:1003
+ #, c-format
+ msgid "Remove"
+ msgstr "Óêëîíè"
+
-#: Merge.rc:910
++#: Merge.rc:1008
++#: Merge.rc:2111
+ #, c-format
+ msgid "Colors"
+ msgstr "Áî¼å"
+
-#: Merge.rc:914
++#: Merge.rc:1011
+ #, c-format
+ msgid "Difference:"
+ msgstr "Ðàçëèêå"
+
-#: Merge.rc:918
-#: Merge.rc:1563
++#: Merge.rc:1015
+ #, c-format
+ msgid "Selected Difference:"
+ msgstr "Îáåëåæè ðàçëèêå"
+
-#: Merge.rc:919
++#: Merge.rc:1019
++#: Merge.rc:1714
+ #, c-format
+ msgid "Background"
+ msgstr "Ïîçàäèíà"
+
-#: Merge.rc:932
-#: Merge.rc:1358
-#: Merge.rc:1564
-#: Merge.rc:1957
++#: Merge.rc:1020
+ #, c-format
+ msgid "Deleted"
+ msgstr "Èçáðèñàíî"
+
-#: Merge.rc:936
++#: Merge.rc:1033
++#: Merge.rc:1501
++#: Merge.rc:1715
++#: Merge.rc:2112
+ #, c-format
+ msgid "Text"
+ msgstr "Òåêñò"
+
-#: Merge.rc:946
++#: Merge.rc:1037
+ #, c-format
+ msgid "Ignored Difference:"
+ msgstr "Çàíåìàðè ðàçëèêå"
+
-#: Merge.rc:956
++#: Merge.rc:1047
+ #, c-format
+ msgid "Moved:"
+ msgstr "Ïðåìåøòåíî:"
+
-#: Merge.rc:963
++#: Merge.rc:1057
+ #, c-format
+ msgid "Selected Moved:"
+ msgstr "Ïðåìåøòà\9cå èçàáðàíîã"
+
-#: Merge.rc:973
++#: Merge.rc:1064
++#, c-format
++msgid "Same As The Next(3 panes):"
++msgstr ""
++
++#: Merge.rc:1074
++#, c-format
++msgid "Same As The Next(Selected):"
++msgstr ""
++
++#: Merge.rc:1084
+ #, c-format
+ msgid "Word Difference:"
+ msgstr "Ðàçëè÷èòå ðå÷è:"
+
-#: Merge.rc:983
-#: Merge.rc:1062
-#: Merge.rc:1091
-#: Merge.rc:1174
-#: Merge.rc:1404
-#: Merge.rc:1696
++#: Merge.rc:1094
+ #, c-format
+ msgid "Selected Word Diff:"
+ msgstr "Îäàáåðè ðàçëè÷èòå ðå÷è:"
+
-#: Merge.rc:989
-#: Merge.rc:1346
-#: Merge.rc:1552
++#: Merge.rc:1104
++#: Merge.rc:1186
++#: Merge.rc:1218
++#: Merge.rc:1304
++#: Merge.rc:1547
++#: Merge.rc:1849
+ #, c-format
+ msgid "Defaults"
+ msgstr "Ïîäðàçóìåâàíî"
+
-#: Merge.rc:999
-#: Merge.rc:1959
++#: Merge.rc:1110
++#: Merge.rc:1489
++#: Merge.rc:1703
+ #, c-format
+ msgid "Dialog"
+ msgstr "Ðàçãîâîð"
+
-#: Merge.rc:1002
++#: Merge.rc:1120
++#: Merge.rc:2114
+ #, c-format
+ msgid "System"
+ msgstr "Ñèñòåì"
+
-#: Merge.rc:1004
++#: Merge.rc:1123
+ #, c-format
+ msgid "&Send deleted files to Recycle Bin"
+ msgstr "Ïîøà\9aè èçáðè&ñàíî ó êîðïó"
+
-#: Merge.rc:1007
++#: Merge.rc:1125
+ #, c-format
+ msgid "&External editor:"
+ msgstr "Ñïî\9a\9cè óð&å\90èâà÷:"
+
-#: Merge.rc:1009
++#: Merge.rc:1128
+ #, c-format
+ msgid "&Filter folder:"
+ msgstr "Ôàñöèêëà ôèëòåðà:"
+
-#: Merge.rc:1010
++#: Merge.rc:1130
+ #, c-format
+ msgid "B&rowse..."
+ msgstr "Ï&ðåãëåäà¼..."
+
-#: Merge.rc:1011
++#: Merge.rc:1131
+ #, c-format
+ msgid "Temporary files folder"
+ msgstr "Ôàñöèêëà ïðèâðåìåíèõ äàòîòåêà"
+
-#: Merge.rc:1013
++#: Merge.rc:1132
+ #, c-format
+ msgid "S&ystem's temp folder"
+ msgstr "Ïðèâðåìåíà ñèñòåìñêà ôàñöèêëà"
+
-#: Merge.rc:1016
-#: Merge.rc:1032
-#, c-format
-msgid "Br&owse..."
-msgstr "Ïð&åãëåäà¼..."
-
-#: Merge.rc:1022
++#: Merge.rc:1134
+ #, c-format
+ msgid "C&ustom folder:"
+ msgstr "Ïîäåøåíà ôàñöèêëà"
+
-#: Merge.rc:1025
++#: Merge.rc:1143
+ #, c-format
+ msgid "Patch Generator"
+ msgstr "Ñòâîðåíå ðàçëèêå"
+
-#: Merge.rc:1029
++#: Merge.rc:1146
+ #, c-format
+ msgid "File&1:"
+ msgstr "Äàòîòåêà&1:"
+
-#: Merge.rc:1033
++#: Merge.rc:1150
+ #, c-format
+ msgid "File&2:"
+ msgstr "Äàòîòåêà&2:"
+
-#: Merge.rc:1034
++#: Merge.rc:1154
+ #, c-format
+ msgid "&Swap"
+ msgstr "&Çàìåíè"
+
-#: Merge.rc:1036
++#: Merge.rc:1155
+ #, c-format
+ msgid "&Append to existing file"
+ msgstr "Ïðèê\9aó÷è ïîñòî¼å\9eî¼ äàòîòåöè"
+
-#: Merge.rc:1040
++#: Merge.rc:1157
+ #, c-format
+ msgid "&Result:"
+ msgstr "&Èçõîä:"
+
-#: Merge.rc:1041
++#: Merge.rc:1161
+ #, c-format
+ msgid "&Format"
+ msgstr "&Îáëèê"
+
-#: Merge.rc:1044
++#: Merge.rc:1162
+ #, c-format
+ msgid "St&yle:"
+ msgstr "Íà&÷èí"
+
-#: Merge.rc:1047
++#: Merge.rc:1165
+ #, c-format
+ msgid "&Context:"
+ msgstr "Ó &îêâèðó"
+
-#: Merge.rc:1048
++#: Merge.rc:1168
+ #, c-format
+ msgid "W&hitespaces"
+ msgstr "Ð&àçìàê"
+
-#: Merge.rc:1050
++#: Merge.rc:1169
+ #, c-format
+ msgid "Com&pare"
+ msgstr "Ó&ïîðåäè"
+
-#: Merge.rc:1052
++#: Merge.rc:1171
+ #, c-format
+ msgid "I&gnore changes"
+ msgstr "&Çàíåìàðè èçìåíå"
+
-#: Merge.rc:1054
++#: Merge.rc:1173
+ #, c-format
+ msgid "Ig&nore all"
+ msgstr "Çà&íåìàðè ñâå"
+
-#: Merge.rc:1056
++#: Merge.rc:1175
+ #, c-format
+ msgid "Ignor&e blank lines"
+ msgstr "Çàí&åìàðè ïðàçíå ðåäîâå"
+
-#: Merge.rc:1058
++#: Merge.rc:1177
+ #, c-format
+ msgid "Case sensi&tive"
+ msgstr "Ïîäóäàðà&\9cå ñëîâà"
+
-#: Merge.rc:1060
++#: Merge.rc:1179
++#: Merge.rc:1297
++#, c-format
++msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
++msgstr "Çàíåìàðè &ðàçëèêå îçíàêà çàâðøåòêà ðåäà (Windows/Unix/Mac)"
++
++#: Merge.rc:1182
+ #, c-format
+ msgid "Inclu&de command line"
+ msgstr "Óê\9aó÷è íàðåäáåíè ðåä"
+
-#: Merge.rc:1082
++#: Merge.rc:1184
+ #, c-format
+ msgid "Open to e&xternal editor"
+ msgstr "Îòâîðè ó äðóãîì óðå&\90èâà÷ó"
+
-#: Merge.rc:1088
++#: Merge.rc:1209
+ #, c-format
+ msgid "Display Columns"
+ msgstr "Ïðèêàæè ñòóáöå"
+
-#: Merge.rc:1089
++#: Merge.rc:1215
+ #, c-format
+ msgid "Move &Up"
+ msgstr "Ïîìåðè &ãîðå"
+
-#: Merge.rc:1099
++#: Merge.rc:1216
+ #, c-format
+ msgid "Move &Down"
+ msgstr "Ïîìåðè &äîëå"
+
-#: Merge.rc:1104
++#: Merge.rc:1226
+ #, c-format
+ msgid "Select Unpacker"
+ msgstr "Èçáîð àðõèâåðà"
+
-#: Merge.rc:1107
++#: Merge.rc:1231
+ #, c-format
+ msgid "File unpacker:"
+ msgstr "Àðõèâåð äàòîòåêà"
+
-#: Merge.rc:1110
++#: Merge.rc:1234
+ #, c-format
+ msgid "Display all unpackers, don't check the extension"
+ msgstr "Ïðèêàæè ñâå àðõèâåðå áåç ïðîâåðå íàñòàâêà"
+
-#: Merge.rc:1111
++#: Merge.rc:1237
+ #, c-format
+ msgid "Extensions list:"
+ msgstr "Ïîïèñ íàñòàâàêà:"
+
-#: Merge.rc:1122
++#: Merge.rc:1238
+ #, c-format
+ msgid "Description:"
+ msgstr "Îïèñ:"
+
-#: Merge.rc:1125
-#: Merge.rc:1906
++#: Merge.rc:1249
+ #, c-format
+ msgid " Folder Compare Progress"
+ msgstr " Íàïðåäàê óïîðå\90èâà\9cà ôàñöèêëè"
+
-#: Merge.rc:1130
++#: Merge.rc:1252
++#: Merge.rc:2060
+ #, c-format
+ msgid "Stop"
+ msgstr "Ñòàíè"
+
-#: Merge.rc:1131
++#: Merge.rc:1257
+ #, c-format
+ msgid "Comparing items..."
+ msgstr "Óïîðå\90èâà\9cå ñòàâêè..."
+
-#: Merge.rc:1132
++#: Merge.rc:1258
+ #, c-format
+ msgid "Items compared:"
+ msgstr "Ïîðå\90å\9cå ñòàâêè:"
+
-#: Merge.rc:1138
++#: Merge.rc:1259
+ #, c-format
+ msgid "Items total:"
+ msgstr "Óêóïíî ñòàâêè :"
+
-#: Merge.rc:1141
++#: Merge.rc:1265
+ #, c-format
+ msgid "Go To"
+ msgstr "Èäè íà"
+
-#: Merge.rc:1143
++#: Merge.rc:1268
+ #, c-format
+ msgid "G&oto:"
+ msgstr "Èäè &íà:"
+
-#: Merge.rc:1148
++#: Merge.rc:1270
+ #, c-format
+ msgid "File"
+ msgstr "Äàòîòåêà"
+
-#: Merge.rc:1149
++#: Merge.rc:1273
++#: Merge.rc:1662
++#, c-format
++msgid "&Middle"
++msgstr ""
++
++#: Merge.rc:1277
+ #, c-format
+ msgid "Goto what"
+ msgstr "Ó äàòîòåöè"
+
-#: Merge.rc:1151
++#: Merge.rc:1278
+ #, c-format
+ msgid "Li&ne"
+ msgstr "Ðå&ä"
+
-#: Merge.rc:1153
++#: Merge.rc:1280
+ #, c-format
+ msgid "&Difference"
+ msgstr "Ðàç&ëèêà"
+
-#: Merge.rc:1159
-#: Merge.rc:1954
++#: Merge.rc:1282
+ #, c-format
+ msgid "&Go To"
+ msgstr "&Èäè íà"
+
-#: Merge.rc:1162
++#: Merge.rc:1288
++#: Merge.rc:2109
+ #, c-format
+ msgid "Compare"
+ msgstr "Óïîðå\90èâà\9cå"
+
-#: Merge.rc:1163
++#: Merge.rc:1291
+ #, c-format
+ msgid "Whitespace"
+ msgstr "Ðàçìàê"
+
-#: Merge.rc:1164
++#: Merge.rc:1292
+ #, c-format
+ msgid "&Compare"
+ msgstr "&Óïîðåäè"
+
-#: Merge.rc:1165
++#: Merge.rc:1293
+ #, c-format
+ msgid "&Ignore change"
+ msgstr "Çàíåìàð&è ïðîìåíå"
+
-#: Merge.rc:1166
++#: Merge.rc:1294
+ #, c-format
+ msgid "I&gnore all"
+ msgstr "Çàíå&ìàðè ñâå"
+
-#: Merge.rc:1167
++#: Merge.rc:1295
+ #, c-format
+ msgid "Ignore blan&k lines"
+ msgstr "Çàíåìàðè ïðà&çíå ðåäîâå"
+
-#: Merge.rc:1168
-#, c-format
-msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Çàíåìàðè &ðàçëèêå îçíàêà çàâðøåòêà ðåäà (Windows/Unix/Mac)"
-
-#: Merge.rc:1170
++#: Merge.rc:1296
+ #, c-format
+ msgid "Ignore &case"
+ msgstr "Çàíåìàðè ïîä&óäàðíîñò"
+
-#: Merge.rc:1171
++#: Merge.rc:1299
+ #, c-format
+ msgid "E&nable moved block detection"
+ msgstr "Îìîãó\9eè îòêðèâà\9cå ïðåìåøòåíèõ ãðóïà"
+
-#: Merge.rc:1173
++#: Merge.rc:1300
+ #, c-format
+ msgid "&Match similar lines"
+ msgstr "Óïîðåäè ñëè÷íå ðåäîâå"
+
-#: Merge.rc:1179
-#: Merge.rc:1955
++#: Merge.rc:1302
+ #, c-format
+ msgid "Filter Comments"
+ msgstr "Ôèëòðèð༠íàïîìåíå"
+
-#: Merge.rc:1182
++#: Merge.rc:1309
++#: Merge.rc:2110
+ #, c-format
+ msgid "Editor"
+ msgstr "Óðå\90èâà÷"
+
-#: Merge.rc:1184
++#: Merge.rc:1312
+ #, c-format
+ msgid "&Highlight syntax"
+ msgstr "Íàãëàñè ñêëîï ðå÷è"
+
-#: Merge.rc:1186
++#: Merge.rc:1314
+ #, c-format
+ msgid "&Automatic rescan"
+ msgstr "&Àóòîìàòñêè ïîíîâî ïðåòðàæè"
+
-#: Merge.rc:1188
++#: Merge.rc:1316
+ #, c-format
+ msgid "&Preserve original EOL chars"
+ msgstr "Çàäð&æè èçâîðíî îçíà÷àâà\9cå êðà¼à ðåäà"
+
-#: Merge.rc:1189
++#: Merge.rc:1318
+ #, c-format
+ msgid "Tabs"
+ msgstr "£åçè÷öè"
+
-#: Merge.rc:1192
++#: Merge.rc:1319
+ #, c-format
+ msgid "&Tab size:"
+ msgstr "Âåëè÷èíà &¼åçè÷àêà"
+
-#: Merge.rc:1194
++#: Merge.rc:1322
+ #, c-format
+ msgid "&Insert Tabs"
+ msgstr "Óìåòíè ¼åçè÷êå"
+
-#: Merge.rc:1196
++#: Merge.rc:1324
+ #, c-format
+ msgid "Insert &Spaces"
+ msgstr "Óìåòíè ðàçìàê"
+
-#: Merge.rc:1198
++#: Merge.rc:1326
+ #, c-format
+ msgid "Line Difference Coloring"
+ msgstr "Îáî¼è ðàçëè÷èòå ðåäîâå "
+
-#: Merge.rc:1200
++#: Merge.rc:1328
+ #, c-format
+ msgid "View line differences"
+ msgstr "Ïðèêàç ðàçëè÷èòèõ ðåäîâà"
+
-#: Merge.rc:1202
++#: Merge.rc:1330
+ #, c-format
+ msgid "&Character level"
+ msgstr "Ðàíã &çíàêà"
+
-#: Merge.rc:1206
++#: Merge.rc:1332
+ #, c-format
+ msgid "&Word-level:"
+ msgstr "Ðàíã ðå&÷è:"
+
-#: Merge.rc:1219
++#: Merge.rc:1336
+ #, c-format
+ msgid "W&ord break characters:"
+ msgstr ""
+
-#: Merge.rc:1225
++#: Merge.rc:1349
+ #, c-format
+ msgid "Filefilters"
+ msgstr "Ôèëòåð äàòîòåêà"
+
-#: Merge.rc:1226
++#: Merge.rc:1355
+ #, c-format
+ msgid "Test"
+ msgstr "Ïðîâåðà"
+
-#: Merge.rc:1227
++#: Merge.rc:1356
+ #, c-format
+ msgid "Install..."
+ msgstr "Èíñòàëèðà¼..."
+
-#: Merge.rc:1228
++#: Merge.rc:1357
+ #, c-format
+ msgid "New..."
+ msgstr "Íîâè..."
+
-#: Merge.rc:1229
++#: Merge.rc:1358
+ #, c-format
+ msgid "Edit..."
+ msgstr "Óðåäè..."
+
-#: Merge.rc:1235
++#: Merge.rc:1359
+ #, c-format
+ msgid "Delete..."
+ msgstr "Èçáðèøè..."
+
-#: Merge.rc:1238
++#: Merge.rc:1365
+ #, c-format
+ msgid "Save modified files?"
+ msgstr "Ñà÷óâ༠èçìå\9cåíó äàòîòåêó?"
+
-#: Merge.rc:1241
++#: Merge.rc:1368
+ #, c-format
+ msgid "Left side file"
+ msgstr "Ëåâà äàòîòåêà"
+
-#: Merge.rc:1243
++#: Merge.rc:1371
+ #, c-format
+ msgid "&Save changes"
+ msgstr "&Ñà÷óâ༠ïðîìåíå"
+
-#: Merge.rc:1245
++#: Merge.rc:1373
+ #, c-format
+ msgid "&Discard changes"
+ msgstr "&Îäóñòàíè îä èçìåíà"
+
-#: Merge.rc:1248
++#: Merge.rc:1375
++#, c-format
++msgid "Middle side file"
++msgstr ""
++
++#: Merge.rc:1378
++#, c-format
++msgid "Sa&ve changes"
++msgstr ""
++
++#: Merge.rc:1380
++#, c-format
++msgid "Disca&rd changes"
++msgstr ""
++
++#: Merge.rc:1382
+ #, c-format
+ msgid "Right side file"
+ msgstr "Äåñíà äàòîòåêà"
+
-#: Merge.rc:1250
++#: Merge.rc:1385
+ #, c-format
+ msgid "S&ave changes"
+ msgstr "Ñ&à÷óâ༠ïðîìåíå"
+
-#: Merge.rc:1252
++#: Merge.rc:1387
+ #, c-format
+ msgid "Dis&card changes"
+ msgstr "Îäóñ&òàíè îä èçìåíà"
+
-#: Merge.rc:1259
-#: Merge.rc:1507
-#: Merge.rc:1961
++#: Merge.rc:1389
+ #, c-format
+ msgid "Disca&rd All"
+ msgstr ""
+
-#: Merge.rc:1262
++#: Merge.rc:1396
++#: Merge.rc:1655
++#: Merge.rc:2116
+ #, c-format
+ msgid "Codepage"
+ msgstr "Êîäíà ñòðàíèöà"
+
-#: Merge.rc:1263
++#: Merge.rc:1399
+ #, c-format
+ msgid "Default Codepage"
+ msgstr "Ïîäðàçóìåâàíà êîäíà ñòðàíèöà"
+
-#: Merge.rc:1265
++#: Merge.rc:1400
+ #, c-format
+ msgid "Select the default codepage assumed when loading non-Unicode files:"
+ msgstr "Îäàáåðè ïîäðàçóìåâàíó êîäíó ñòðàíèöó êàä ó÷èòàíà Óíèêîä äàòîòåêà íè¼å ïðèõâà\9eåíà"
+
-#: Merge.rc:1268
++#: Merge.rc:1402
+ #, c-format
+ msgid ""
+ "Detect codepage info for these files: .html, .rc, .xml \n"
+ "need to restart session"
+ msgstr ""
+ "Ä༠îáàâåøòå\9cà êîäíå ñòðàíå çà îâå äàòîòåêå:.html, .rc, .xml \n"
+ " Íè¼å ïîòðåáíî ïîíîâî ïîêðåòà\9cå ñåñè¼å"
+
-#: Merge.rc:1270
++#: Merge.rc:1405
++#, c-format
++msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
++msgstr ""
++
++#: Merge.rc:1410
+ #, c-format
+ msgid "System codepage"
+ msgstr "Êîäíà ñòðàíèöà ñèñòåìà"
+
-#: Merge.rc:1272
++#: Merge.rc:1412
+ #, c-format
+ msgid "According to WinMerge User Interface"
+ msgstr "Ïðåìà êîðèñíè÷êîì ñó÷å\9aó WinMerge-à"
+
-#: Merge.rc:1280
++#: Merge.rc:1414
+ #, c-format
+ msgid "Custom codepage:"
+ msgstr "Ïîäåøåíà êîäíà ñòðàíèöà"
+
-#: Merge.rc:1283
++#: Merge.rc:1423
+ #, c-format
+ msgid "WinMerge - Archive support disabled"
+ msgstr "WinMerge - îíåìîãó\9eåíà ïîäðøêà àðõèâà"
+
-#: Merge.rc:1286
++#: Merge.rc:1426
+ #, c-format
+ msgid "Unable to detect 7-Zip version (not installed?)"
+ msgstr "Íå ìîæå äà íà\90å 7-Zip (íè¼å èíñòàëèðàí)"
+
-#: Merge.rc:1288
++#: Merge.rc:1429
+ #, c-format
+ msgid ""
+ "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
+ "essential components to be copied to the program directory for standalone operation."
+ msgstr ""
+ "Ðàä ñ àðõèâàìà çàõòåâà 7-Zip 3.11 èëè \9cåãîâî íîâè¼å èçäà\9cå èíñòàëèðàíî íà ðà÷óíàðó.\n "
+ "Âàæíå êîìïîíåíòå \9eå ñå êîïèðàòè ó ôàñöèêëè ïðîãðàìà çà ñàìîñòàëàí ðàä."
+
-#: Merge.rc:1290
++#: Merge.rc:1431
+ #, c-format
+ msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
+ msgstr "Òàêî\90å, ìîðà ïîñòî¼àòè îäãîâàðà¼ó\9eè äîäàòàê (Merge7z*.dll) è ïóòà\9cà äî \9cåãà"
+
-#: Merge.rc:1292
++#: Merge.rc:1433
+ #, c-format
+ msgid ""
+ "Please use the version of 7-Zip recommended below until interface plugins for later\n"
+ "versions become available."
+ msgstr ""
+ "Ìîëèì Âàñ äà êîðèñòèòå èçäà\9cå 7-Zip è ïðåïîðó÷åíå äîäàòêå òîã èçäà\9cà,\n"
+ "äîê íîâè¼å èçäà\9cå íå áóäå äîñòóïíî"
+
-#: Merge.rc:1294
++#: Merge.rc:1435
+ #, c-format
+ msgid "Version"
+ msgstr "Èçäà\9cå"
+
-#: Merge.rc:1296
++#: Merge.rc:1437
+ #, c-format
+ msgid ""
+ "Plugin required\n"
+ "(dllbuild %04u)"
+ msgstr ""
+ "Ïîòðåáàí äîäàòàê \n"
+ "(dllbuild %04u)"
+
-#: Merge.rc:1299
-#: Merge.rc:1302
++#: Merge.rc:1439
+ #, c-format
+ msgid "Recommended version of 7-Zip:"
+ msgstr "Ïðåïîðó÷åíî èçäà\9cå ïðîãðàìà 7-Zip"
+
-#: Merge.rc:1300
++#: Merge.rc:1442
++#: Merge.rc:1445
+ #, c-format
+ msgid "present"
+ msgstr "ïðèñóòàí"
+
-#: Merge.rc:1303
++#: Merge.rc:1443
+ #, c-format
+ msgid "Merge7z000U.dll"
+ msgstr "Ñïî¼è 7z000U.dll"
+
-#: Merge.rc:1305
-#: Merge.rc:1310
++#: Merge.rc:1446
+ #, c-format
+ msgid "7-Zip software installed on your computer:"
+ msgstr "7-Zip ¼å èíñòàëèðàí íà Âàøåì ðà÷óíàðó"
+
-#: Merge.rc:1307
++#: Merge.rc:1448
++#: Merge.rc:1453
+ #, c-format
+ msgid "none"
+ msgstr "ïðàçíà"
+
-#: Merge.rc:1308
++#: Merge.rc:1450
+ #, c-format
+ msgid "missing"
+ msgstr "Íåäîñòà¼å"
+
-#: Merge.rc:1312
++#: Merge.rc:1451
+ #, c-format
+ msgid "7-Zip components for standalone operation:"
+ msgstr "7-Zip äåëîâè çà ñàìîñòàëíî èçâî\90å\9cå"
+
-#: Merge.rc:1313
++#: Merge.rc:1455
+ #, c-format
+ msgid "outdated"
+ msgstr "çàñòàðåî"
+
-#: Merge.rc:1314
++#: Merge.rc:1456
+ #, c-format
+ msgid "Plugins on path:"
+ msgstr "Ïóòà\9cà äî äîäàòàêà"
+
-#: Merge.rc:1318
++#: Merge.rc:1457
+ #, c-format
+ msgid ""
+ "Don't display this &message again.\n"
+ "(You can always recall this message from the Help menu.)"
+ msgstr ""
+ "Íå ïðèêàçó¼ âèøå îâó ïîðóêó.\n"
+ "(Ìîæåòå óâåê îïîçâàòè îâó ïîðóêó ïðåêî èçáîðíèêà ïîìî\9eè.)"
+
-#: Merge.rc:1327
++#: Merge.rc:1461
+ #, c-format
+ msgid "Plugin Download"
+ msgstr "Ïðåóçìè äîäàòêå"
+
-#: Merge.rc:1338
++#: Merge.rc:1470
+ #, c-format
+ msgid "Options"
+ msgstr "Ïîñòàâêå"
+
-#: Merge.rc:1340
++#: Merge.rc:1481
+ #, c-format
+ msgid " Categories"
+ msgstr "Êàòåãîðè¼å"
+
-#: Merge.rc:1341
++#: Merge.rc:1483
+ #, c-format
+ msgid "Import..."
+ msgstr "Óâåçè..."
+
-#: Merge.rc:1349
++#: Merge.rc:1484
+ #, c-format
+ msgid "Export..."
+ msgstr "Èçâåçè..."
+
-#: Merge.rc:1350
++#: Merge.rc:1492
+ #, c-format
+ msgid "Keywords:"
+ msgstr "Ê\9aó÷íå ðå÷è:"
+
-#: Merge.rc:1351
++#: Merge.rc:1493
+ #, c-format
+ msgid "Function names:"
+ msgstr "Èìåíà ôóíêöè¼à:"
+
-#: Merge.rc:1352
++#: Merge.rc:1494
+ #, c-format
+ msgid "Comments:"
+ msgstr "Íàïîìåíå:"
+
-#: Merge.rc:1353
++#: Merge.rc:1495
+ #, c-format
+ msgid "Numbers:"
+ msgstr "Áðî¼åâè:"
+
-#: Merge.rc:1354
++#: Merge.rc:1496
+ #, c-format
+ msgid "Operators:"
+ msgstr "Îïåðàòåðè:"
+
-#: Merge.rc:1355
++#: Merge.rc:1497
+ #, c-format
+ msgid "Strings:"
+ msgstr "Ïî¼ìîâè:"
+
-#: Merge.rc:1356
++#: Merge.rc:1498
+ #, c-format
+ msgid "Preprocessor:"
+ msgstr "Ïðåòïðîöåñîð:"
+
-#: Merge.rc:1357
++#: Merge.rc:1499
+ #, c-format
+ msgid "User 1:"
+ msgstr "Êîðèñíèê 1:"
+
-#: Merge.rc:1362
-#: Merge.rc:1367
-#: Merge.rc:1372
-#: Merge.rc:1377
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
++#: Merge.rc:1500
+ #, c-format
+ msgid "User 2:"
+ msgstr "Êîðèñíèê 2:"
+
-#: Merge.rc:1410
++#: Merge.rc:1505
++#: Merge.rc:1510
++#: Merge.rc:1515
++#: Merge.rc:1520
++#: Merge.rc:1525
++#: Merge.rc:1530
++#: Merge.rc:1535
++#: Merge.rc:1540
++#: Merge.rc:1545
+ #, c-format
+ msgid "Bold"
+ msgstr "Ïîäåá\9aàíî"
+
-#: Merge.rc:1413
++#: Merge.rc:1553
+ #, c-format
+ msgid "Folder Compare Report"
+ msgstr "Èçâåøò༠óïîðå\90åíèõ ôàñöèêëè"
+
-#: Merge.rc:1416
-#: Merge.rc:1590
-#: Merge.rc:1594
-#: Merge.rc:1621
++#: Merge.rc:1556
+ #, c-format
+ msgid "Report &File:"
+ msgstr "Äàòîòåêà èçâå&øòà¼à:"
+
-#: Merge.rc:1417
++#: Merge.rc:1559
++#: Merge.rc:1741
++#: Merge.rc:1745
++#: Merge.rc:1772
+ #, c-format
+ msgid "Browse..."
+ msgstr "Ïðåãëåä..."
+
-#: Merge.rc:1420
++#: Merge.rc:1560
+ #, c-format
+ msgid "&Style:"
+ msgstr "&Íà÷èí"
+
-#: Merge.rc:1428
++#: Merge.rc:1563
+ #, c-format
+ msgid "&Copy to Clipboard"
+ msgstr "Ñà÷óâ༠ó îñòàâè"
+
-#: Merge.rc:1431
++#: Merge.rc:1571
+ #, c-format
+ msgid "Shared or Private Filter"
+ msgstr "Çà¼åäíè÷êè èëè ëè÷íè ôèëòåð"
+
-#: Merge.rc:1433
++#: Merge.rc:1574
+ #, c-format
+ msgid "Which type of filter do you want to create?"
+ msgstr "Êî¼ó âðñòó ôèëòåðà æåëèòå äà èìàòå?"
+
-#: Merge.rc:1435
++#: Merge.rc:1576
+ #, c-format
+ msgid "Shared Filter (for all users on this machine)"
+ msgstr "Çà¼åäíè÷êè ôèëòåð (çà ñâå êîðèñíèêå ðà÷óíàðà)"
+
-#: Merge.rc:1443
-#: Merge.rc:1962
++#: Merge.rc:1578
+ #, c-format
+ msgid "Private Filter (only for current user)"
+ msgstr "Ëè÷íè ôèëòåð (ñàìî çà òðåíóòíîã êîðèñíèêà)"
+
-#: Merge.rc:1446
++#: Merge.rc:1586
++#: Merge.rc:2117
+ #, c-format
+ msgid "Archive Support"
+ msgstr "Ðàä ñà àðõèâàìà"
+
-#: Merge.rc:1448
++#: Merge.rc:1589
+ #, c-format
+ msgid "Archive support requires 7-Zip plugin installed:"
+ msgstr "Àðõèâà çàõòåâà ïîäðøêó èíñòàëèðàíèõ 7-Zip äîäàòàêà"
+
-#: Merge.rc:1449
++#: Merge.rc:1591
+ #, c-format
+ msgid "Download 7-zip Plugin"
+ msgstr "Ïðåóçìè 7-Zip äîäàòêå"
+
-#: Merge.rc:1451
++#: Merge.rc:1592
+ #, c-format
+ msgid "&Enable archive file support"
+ msgstr "&Îìîãó\9eè ïîäðøêó àðõèâè"
+
-#: Merge.rc:1454
++#: Merge.rc:1594
+ #, c-format
+ msgid "&Use stand-alone 7-Zip if available"
+ msgstr "&Êîðèñòèòå ñàìîñòàëíî 7-Zip àêî ¼å ìîãó\9eå"
+
-#: Merge.rc:1456
++#: Merge.rc:1597
+ #, c-format
+ msgid "U&se local 7-Zip from WinMerge folder"
+ msgstr "Êîðèñòè 7-Zip çà WinMerge"
+
-#: Merge.rc:1464
++#: Merge.rc:1599
+ #, c-format
+ msgid "&Detect archive type from file signature"
+ msgstr "Îòêðè¼ âðñòó àðõèâå èç çàãëàâ\9aà äàòîòåêå"
+
-#: Merge.rc:1467
++#: Merge.rc:1607
+ #, c-format
+ msgid "Compare Statistics"
+ msgstr "Óïîðåäíà ñòàòèñòèêà"
+
-#: Merge.rc:1468
++#: Merge.rc:1610
+ #, c-format
+ msgid "Folders:"
+ msgstr "Ôàñöèêëå"
+
-#: Merge.rc:1469
-#: Merge.rc:2356
++#: Merge.rc:1611
+ #, c-format
+ msgid "Files:"
+ msgstr "Äàòîòåêå"
+
-#: Merge.rc:1470
++#: Merge.rc:1612
++#: Merge.rc:2537
+ #, c-format
+ msgid "Different"
+ msgstr "Ðàçëèêà"
+
-#: Merge.rc:1473
-#: Merge.rc:1492
++#: Merge.rc:1613
+ #, c-format
+ msgid "Text:"
+ msgstr "Òåêñò"
+
-#: Merge.rc:1476
++#: Merge.rc:1616
++#: Merge.rc:1640
+ #, c-format
+ msgid "Binary:"
+ msgstr "Áèíàðíè"
+
-#: Merge.rc:1477
++#: Merge.rc:1619
+ #, c-format
+ msgid "Unique"
+ msgstr "£åäèíñòâåí"
+
-#: Merge.rc:1482
++#: Merge.rc:1620
+ #, c-format
+ msgid "Left:"
+ msgstr "Ëåâà:"
+
-#: Merge.rc:1487
-#: Merge.rc:2350
++#: Merge.rc:1625
++#, c-format
++msgid "Middle:"
++msgstr ""
++
++#: Merge.rc:1630
+ #, c-format
+ msgid "Right:"
+ msgstr "Äåñíà:"
+
-#: Merge.rc:1496
++#: Merge.rc:1635
++#: Merge.rc:2527
+ #, c-format
+ msgid "Identical"
+ msgstr "Èñòå"
+
-#: Merge.rc:1501
++#: Merge.rc:1644
+ #, c-format
+ msgid "Total:"
+ msgstr "Óêóïíî:"
+
-#: Merge.rc:1510
++#: Merge.rc:1649
+ #, c-format
+ msgid "Close"
+ msgstr "Çàòâîðè"
+
-#: Merge.rc:1513
-#: Merge.rc:1516
++#: Merge.rc:1658
+ #, c-format
+ msgid "Affects"
+ msgstr "Óñìåðèòå"
+
-#: Merge.rc:1517
++#: Merge.rc:1661
++#: Merge.rc:1664
++#: Merge.rc:1667
+ #, c-format
+ msgid "(Affects)"
+ msgstr "(Óñìåðèòå)"
+
-#: Merge.rc:1518
++#: Merge.rc:1668
+ #, c-format
+ msgid "Select Codepage for"
+ msgstr "Îäàáåðè êîäíó ñòðàíó çà"
+
-#: Merge.rc:1520
-#: Merge.rc:1523
-#, c-format
-msgid "..."
-msgstr "..."
-
-#: Merge.rc:1521
++#: Merge.rc:1669
+ #, c-format
+ msgid "&File Loading:"
+ msgstr "Ó&÷èòàâà\9cå äàòîòåêå:"
+
-#: Merge.rc:1524
++#: Merge.rc:1672
+ #, c-format
+ msgid "File &Saving:"
+ msgstr "Äàòîòåêà ¼å &ñà÷óâàíà:"
+
-#: Merge.rc:1527
++#: Merge.rc:1675
+ #, c-format
+ msgid "&Use same codepage for both"
+ msgstr "Êîðèñòè èñò&ó êîäíó ñòðàíó çà îáå"
+
-#: Merge.rc:1528
-#: Merge.rc:1928
++#: Merge.rc:1678
+ #, c-format
+ msgid "&Apply"
+ msgstr "Ï&ðèìåíè"
+
-#: Merge.rc:1533
++#: Merge.rc:1679
++#: Merge.rc:2083
+ #, c-format
+ msgid "&Cancel"
+ msgstr "Îòêàæè"
+
-#: Merge.rc:1536
++#: Merge.rc:1684
+ #, c-format
+ msgid "Test Filter"
+ msgstr "Ïðîâåðà ôèëòåðà"
+
-#: Merge.rc:1538
++#: Merge.rc:1687
+ #, c-format
+ msgid "Testing filter ..."
+ msgstr "Ïðîâåðàâà\9cå ôèëòåðà..."
+
-#: Merge.rc:1540
++#: Merge.rc:1689
+ #, c-format
+ msgid "&Enter text to test:"
+ msgstr "Óí&åñè òåêñò çà ïðîâåðó"
+
-#: Merge.rc:1542
++#: Merge.rc:1691
+ #, c-format
+ msgid "&Folder Name"
+ msgstr "Èìå &ôàñöèêëå"
+
-#: Merge.rc:1546
++#: Merge.rc:1693
+ #, c-format
+ msgid "Result:"
+ msgstr "Èñõîä:"
+
-#: Merge.rc:1547
++#: Merge.rc:1697
+ #, c-format
+ msgid "&Test"
+ msgstr "&Ïðîâåðà"
+
-#: Merge.rc:1555
++#: Merge.rc:1698
+ #, c-format
+ msgid "&Close"
+ msgstr "&Çàòâîðè"
+
-#: Merge.rc:1558
++#: Merge.rc:1706
+ #, c-format
+ msgid "&Use customized text colors"
+ msgstr "Êîðèñòè æå\9aåíå áî¼å òåêñòà"
+
-#: Merge.rc:1560
++#: Merge.rc:1709
+ #, c-format
+ msgid "Custom text colors"
+ msgstr "Æå\9aåíå áî¼å òåêñòà"
+
-#: Merge.rc:1561
++#: Merge.rc:1711
+ #, c-format
+ msgid "Whitespace:"
+ msgstr "Ðàçìàê:"
+
-#: Merge.rc:1562
++#: Merge.rc:1712
+ #, c-format
+ msgid "Regular text:"
+ msgstr "Ïðàâèëàí òåêñò:"
+
-#: Merge.rc:1585
++#: Merge.rc:1713
+ #, c-format
+ msgid "Selection:"
+ msgstr "Èçàáåðè:"
+
-#: Merge.rc:1591
++#: Merge.rc:1736
+ #, c-format
+ msgid "Paths"
+ msgstr "Ïóòà\9cå"
+
-#: Merge.rc:1595
++#: Merge.rc:1739
++#, c-format
++msgid "&Left:"
++msgstr "&Ëåâa:"
++
++#: Merge.rc:1742
+ #, c-format
+ msgid "R&ead-only"
+ msgstr "Ñàìî çà ÷èòà\9c&å"
+
-#: Merge.rc:1601
++#: Merge.rc:1743
++#, c-format
++msgid "&Right:"
++msgstr "&Äåñía:"
++
++#: Merge.rc:1746
+ #, c-format
+ msgid "Re&ad-only"
+ msgstr "Ñ&àìî çà ÷èòà\9cå"
+
-#: Merge.rc:1602
++#: Merge.rc:1752
+ #, c-format
+ msgid "Open..."
+ msgstr "Îòâîðè..."
+
-#: Merge.rc:1607
-#: Merge.rc:1963
++#: Merge.rc:1753
+ #, c-format
+ msgid "Save..."
+ msgstr "Ñà÷óâà¼..."
+
-#: Merge.rc:1610
++#: Merge.rc:1758
++#: Merge.rc:2118
+ #, c-format
+ msgid "Backup Files"
+ msgstr "Ðåçåðâíå äàòîòåêå"
+
-#: Merge.rc:1615
++#: Merge.rc:1761
+ #, c-format
+ msgid "Create backup files in:"
+ msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:"
+
-#: Merge.rc:1616
++#: Merge.rc:1766
+ #, c-format
+ msgid "Create backup files into:"
+ msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:"
+
-#: Merge.rc:1618
++#: Merge.rc:1767
+ #, c-format
+ msgid "&Original file's folder"
+ msgstr "Èçâ&îðíà ôàñöèêëà äàòîòåêå"
+
-#: Merge.rc:1622
++#: Merge.rc:1769
+ #, c-format
+ msgid "&Global backup folder:"
+ msgstr "Îïøòà ðåçåðâíà ôàñöèêëà "
+
-#: Merge.rc:1623
++#: Merge.rc:1773
+ #, c-format
+ msgid "Backup filename:"
+ msgstr "Èìå ðåçåðâíå äàòîòåêå"
+
-#: Merge.rc:1625
++#: Merge.rc:1774
+ #, c-format
+ msgid "&Append .bak -extension"
+ msgstr "Äîä&༠.bak íàñòàâàê"
+
-#: Merge.rc:1632
-#: Merge.rc:2258
++#: Merge.rc:1776
+ #, c-format
+ msgid "A&ppend timestamp"
+ msgstr "Äî&ä༠äàòóì/âðåìå"
+
-#: Merge.rc:1636
++#: Merge.rc:1783
++#: Merge.rc:2422
+ #, c-format
+ msgid "Confirm Copy"
+ msgstr "Ïîòâðäè êîïèðà\9cå"
+
-#: Merge.rc:1638
++#: Merge.rc:1787
+ #, c-format
+ msgid "Are you sure you want to copy XXX items?"
+ msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå êîïèðàòè XXX ñòàâêè"
+
-#: Merge.rc:1641
++#: Merge.rc:1789
+ #, c-format
+ msgid "From left"
+ msgstr "Ñ ëåâà"
+
-#: Merge.rc:1644
++#: Merge.rc:1792
+ #, c-format
+ msgid "To right"
+ msgstr "Ó äåñíî"
+
-#: Merge.rc:1645
++#: Merge.rc:1795
+ #, c-format
+ msgid "Yes"
+ msgstr "Äà"
+
-#: Merge.rc:1651
++#: Merge.rc:1796
+ #, c-format
+ msgid "No"
+ msgstr "Íå"
+
-#: Merge.rc:1654
++#: Merge.rc:1802
+ #, c-format
+ msgid "Plugins"
+ msgstr "Äîäàöè"
+
-#: Merge.rc:1665
-#: Merge.rc:1964
++#: Merge.rc:1805
+ #, c-format
+ msgid "&Enable plugins"
+ msgstr "Îìîãó\9eè äîäàòê&å"
+
-#: Merge.rc:1668
++#: Merge.rc:1816
++#: Merge.rc:2119
+ #, c-format
+ msgid "Shell Integration"
+ msgstr "Èíòåãðèøè ó '\9aóñêó'"
+
-#: Merge.rc:1669
++#: Merge.rc:1819
+ #, c-format
+ msgid "Explorer"
+ msgstr "Èñòðàæèâà÷"
+
-#: Merge.rc:1671
++#: Merge.rc:1820
+ #, c-format
+ msgid "E&nable advanced menu"
+ msgstr "Îìîãó\9eè &íàïðåäíè èçáîð"
+
-#: Merge.rc:1673
++#: Merge.rc:1822
+ #, c-format
+ msgid "In&clude subfolders by default"
+ msgstr "Óâåê óê\9aó÷è ïîòôàñ&öèêëå "
+
-#: Merge.rc:1675
++#: Merge.rc:1824
+ #, c-format
+ msgid "&Add to context menu"
+ msgstr "Äîä༠ó 'èçáîðíè îêâèð'"
+
-#: Merge.rc:1676
++#: Merge.rc:1826
+ #, c-format
+ msgid "Folder compare"
+ msgstr "Óïîðåäè ôàñöèêëå"
+
-#: Merge.rc:1683
-#: Merge.rc:1967
-#: Merge.rc:2304
++#: Merge.rc:1827
+ #, c-format
+ msgid "Add &Shell menu to context menu"
+ msgstr "Äîä༠èçáîðíèê '\9aóñêå' ó èçáîðíè îêâèð"
+
-#: Merge.rc:1686
++#: Merge.rc:1834
++#: Merge.rc:2122
++#: Merge.rc:2471
+ #, c-format
+ msgid "Folder"
+ msgstr "Ôàñöèêëà"
+
-#: Merge.rc:1688
++#: Merge.rc:1837
+ #, c-format
+ msgid "&Compare method:"
+ msgstr ""
+
-#: Merge.rc:1690
++#: Merge.rc:1839
+ #, c-format
+ msgid "S&top after first difference"
+ msgstr "Ñ&òàíè ïîñëå ïðâå ðàçëèêå"
+
-#: Merge.rc:1692
++#: Merge.rc:1841
+ #, c-format
+ msgid "Ign&ore time differences less than 3 seconds"
+ msgstr "Çàíåìàðè ðàçëèêå âðåìåíà ìà\9cå &îä 3 ñåêóíäå"
+
-#: Merge.rc:1694
++#: Merge.rc:1843
+ #, c-format
+ msgid "&Include unique subfolders contents"
+ msgstr ""
+
-#: Merge.rc:1720
++#: Merge.rc:1845
++#, c-format
++msgid "&Automatically expand all subfolders"
++msgstr ""
++
++#: Merge.rc:1847
+ #, c-format
+ msgid "&Quick compare limit (MB):"
+ msgstr ""
+
+ #. StringFileInfo.Block
-#: Merge.rc:1736
++#: Merge.rc:1873
+ #, c-format
+ msgid "040904e4"
+ msgstr "041904e3"
+
+ #. VarFileInfo.Translation
-#: Merge.rc:1751
++#: Merge.rc:1889
+ #, c-format
+ msgid "0x409, 1252"
+ msgstr "0x419, 1251"
+
-#: Merge.rc:1757
++#: Merge.rc:1904
+ #, c-format
+ msgid "Ready"
+ msgstr "Ñïðåìàí"
+
-#: Merge.rc:1758
++#: Merge.rc:1910
+ #, c-format
+ msgid "EXT"
+ msgstr "EXT"
+
-#: Merge.rc:1759
++#: Merge.rc:1911
+ #, c-format
+ msgid "CAP"
+ msgstr "CAP"
+
-#: Merge.rc:1760
++#: Merge.rc:1912
+ #, c-format
+ msgid "NUM"
+ msgstr "NUM"
+
-#: Merge.rc:1761
++#: Merge.rc:1913
+ #, c-format
+ msgid "SCRL"
+ msgstr "SCRL"
+
-#: Merge.rc:1762
++#: Merge.rc:1914
+ #, c-format
+ msgid "OVR"
+ msgstr "OVR"
+
-#: Merge.rc:1768
++#: Merge.rc:1915
+ #, c-format
+ msgid "REC"
+ msgstr "REC"
+
-"Ñòâàðà ïðàçàí äîêóìåíò\n"
-" Íîâè äîêóìåíò(Ctrl+N)"
++#: Merge.rc:1921
+ #, c-format
+ msgid ""
+ "Create empty documents\n"
+ "New Documents (Ctrl+N)"
+ msgstr ""
-#: Merge.rc:1769
++"Ñòâàðà ïðàçàí äîêóìåíò\n"
++" Íîâè äîêóìåíò(Ctrl+N)"
++
++#: Merge.rc:1922
++#, c-format
++msgid "Create empty documents (3 panes)\nNew Documents"
++msgstr ""
+
-#: Merge.rc:1770
++#: Merge.rc:1923
+ #, c-format
+ msgid ""
+ "Open an existing document\n"
+ "Open (Ctrl+O)"
+ msgstr ""
+ "Îòâîðè òðåíóòíó äàòîòåêó\n"
+ "Îòâîðè(Ctrl+O)"
+
-#: Merge.rc:1771
++#: Merge.rc:1924
+ #, c-format
+ msgid ""
+ "Close the active document\n"
+ "Close"
+ msgstr ""
+ "Çàòâîðè òðåíóòíè äîêóìåíò\n"
+ "Çàòâîðè"
+
-#: Merge.rc:1772
++#: Merge.rc:1925
+ #, c-format
+ msgid ""
+ "Save the active document\n"
+ "Save (Ctrl+S)"
+ msgstr ""
+ "Ñà÷óâ༠òðåíóòíè äîêóìåíò\n"
+ "Ñà÷óâ༠(Ctrl+S)"
+
-#: Merge.rc:1773
++#: Merge.rc:1926
+ #, c-format
+ msgid ""
+ "Save the active document with a new name\n"
+ "Save As"
+ msgstr ""
+ "Ñà÷óâ༠òðåíóòíè äîêóìåíò ñà íîâèì èìåíîì\n"
+ "Ñà÷óâ༠êàî..."
+
-#: Merge.rc:1774
++#: Merge.rc:1927
+ #, c-format
+ msgid ""
+ "Change the printing options\n"
+ "Page Setup"
+ msgstr ""
+ "Ïðîìåíè ïîñòàâêå øòàìïå\n"
+ "Ïîäåñè ñòðàíó"
+
-#: Merge.rc:1775
++#: Merge.rc:1928
+ #, c-format
+ msgid ""
+ "Change the printer and printing options\n"
+ "Print Setup"
+ msgstr ""
+ "Ïðîìåíè ïîñòàâêå øòàìïà÷à\n"
+ "Ïîäåñè øòàìïà÷"
+
-#: Merge.rc:1776
++#: Merge.rc:1929
+ #, c-format
+ msgid ""
+ "Print the active document\n"
+ "Print"
+ msgstr ""
+ "Îäøòàìï༠òðåíóòíè äîêóìåíò\n"
+ "Îäøòàìïà¼"
+
-#: Merge.rc:1781
++#: Merge.rc:1930
+ #, c-format
+ msgid ""
+ "Display full pages\n"
+ "Print Preview"
+ msgstr ""
+ "Ïðèêàç öåëå ñòðàíå\n"
+ "Ïðåãëåä ïðå øòàìïà\9cà"
+
-#: Merge.rc:1782
++#: Merge.rc:1935
+ #, c-format
+ msgid "Make all hidden items visible again"
+ msgstr "Ïîíîâî ïðèêàæè ñâå ñêðèâåíå ñòàâêå"
+
-#: Merge.rc:1783
++#: Merge.rc:1936
+ #, c-format
+ msgid "Toggle tree mode"
+ msgstr "Çàìåíè ïðèêàç ñòàáëà"
+
-#: Merge.rc:1784
++#: Merge.rc:1937
+ #, c-format
+ msgid "Expand all subfolders"
+ msgstr "Ïðîøèðè ñâå ïîòôàñöèêëå"
+
-#: Merge.rc:1790
++#: Merge.rc:1938
+ #, c-format
+ msgid "Collapse all subfolders"
+ msgstr "Çàòâîðè ñâå ïîòôàñöèêëè"
+
-#: Merge.rc:1791
++#: Merge.rc:1944
+ #, c-format
+ msgid ""
+ "Open project file\n"
+ "Project file (Ctrl+J)"
+ msgstr ""
+ "Îòâîðè ïîðå\90å\9cå\n"
+ "Äàòîòåêà ïîðå\90å\9cà(Ctrl+J)"
+
-#: Merge.rc:1792
++#: Merge.rc:1945
+ #, c-format
+ msgid "Unknown error attempting to open project file"
+ msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðà\9có ïîðå\90å\9cà"
+
-#: Merge.rc:1793
++#: Merge.rc:1946
+ #, c-format
+ msgid "Unknown error attempting to save project file"
+ msgstr "Íåïîçíàòà ãðåøêà ïðè ïîêóøà¼ó ÷óâà\9cà ïîðå\90å\9cà"
+
-#: Merge.rc:1794
++#: Merge.rc:1947
+ #, c-format
+ msgid "Project File"
+ msgstr "Ïîðå\90å\9cå"
+
-#: Merge.rc:1795
++#: Merge.rc:1948
+ #, c-format
+ msgid "Project file successfully loaded."
+ msgstr "Ïîðå\90å\9cå ¼å óñïåøíî ó÷èòàíî"
+
-#: Merge.rc:1796
++#: Merge.rc:1949
+ #, c-format
+ msgid "Project file successfully saved."
+ msgstr "Ïîðå\90å\9cå ¼å óñïåøíî ñà÷óâàíî"
+
-#: Merge.rc:1801
++#: Merge.rc:1950
+ #, c-format
+ msgid ""
+ "Save current paths and options to project file\n"
+ "Save Project File"
+ msgstr ""
+ "Ñà÷óâàíà ¼å òðåíóòíà ñòàçà è ïîðå\90å\9cå\n"
+ "Ñà÷óâ༠ïîðå\90å\9cå"
+
-#: Merge.rc:1802
++#: Merge.rc:1955
+ #, c-format
+ msgid ""
+ "Display program information, version number and copyright\n"
+ "About"
+ msgstr ""
+ "Ïðèêàç îáàâåøòå\9cà î ïðîãðàìó, èçäà\9có è àóòîðèìà\n"
+ "Î ïðîãðàìó"
+
-#: Merge.rc:1808
-#: Merge.rc:1809
-#: Merge.rc:1810
-#: Merge.rc:1811
-#: Merge.rc:1812
-#: Merge.rc:1813
-#: Merge.rc:1814
-#: Merge.rc:1815
-#: Merge.rc:1816
-#: Merge.rc:1817
-#: Merge.rc:1818
-#: Merge.rc:1819
-#: Merge.rc:1820
-#: Merge.rc:1821
-#: Merge.rc:1822
-#: Merge.rc:1823
++#: Merge.rc:1956
+ #, c-format
+ msgid ""
+ "Quit the application; prompts to save documents\n"
+ "Exit"
+ msgstr ""
+ "Çàòâîðè ïðîãðàì;óïóòñòâî çà ÷óâà\9cå äîêóìåíòà\n"
+ "Èçëàç"
+
-#: Merge.rc:1828
++#: Merge.rc:1962
++#: Merge.rc:1963
++#: Merge.rc:1964
++#: Merge.rc:1965
++#: Merge.rc:1966
++#: Merge.rc:1967
++#: Merge.rc:1968
++#: Merge.rc:1969
++#: Merge.rc:1970
++#: Merge.rc:1971
++#: Merge.rc:1972
++#: Merge.rc:1973
++#: Merge.rc:1974
++#: Merge.rc:1975
++#: Merge.rc:1976
++#: Merge.rc:1977
+ #, c-format
+ msgid "Open this document"
+ msgstr "Îòâîðè îâ༠äîêóìåíò"
+
-#: Merge.rc:1829
++#: Merge.rc:1982
+ #, c-format
+ msgid ""
+ "Switch to the next window pane\n"
+ "Next Pane"
+ msgstr ""
+ "Áèð༠ñëåäå\9eè ïðîçîð\n"
+ "Ñëåäå\9eà òàáëà"
+
-#: Merge.rc:1835
++#: Merge.rc:1983
+ #, c-format
+ msgid ""
+ "Switch back to the previous window pane\n"
+ "Previous Pane"
+ msgstr ""
+ "Âðà\9eà\9cå íà ïðåòõîäíó òàáëó\n"
+ "Ïðåòõîäíà òàáëà"
+
-#: Merge.rc:1836
++#: Merge.rc:1989
+ #, c-format
+ msgid ""
+ "Arrange windows so they overlap\n"
+ "Cascade Windows"
+ msgstr ""
+ "Óðåäè ïðîçîðå òàêî äà ñå ïðåêëàïà¼ó\n"
+ "Ïðîçîðå ïîðå\90àíî"
+
-#: Merge.rc:1837
++#: Merge.rc:1990
+ #, c-format
+ msgid ""
+ "Arrange windows as non-overlapping tiles horizontally\n"
+ "Tile Windows Horizontally"
+ msgstr ""
+ "Óðåäè ïðîçîðå âîäîðàâíî,áåç ïðåêëàïà\9cà\n"
+ "Ïîðå\90༠ïðîçîðå âîäîðàâíî"
+
-#: Merge.rc:1843
++#: Merge.rc:1991
+ #, c-format
+ msgid ""
+ "Arrange windows as non-overlapping tiles vertically\n"
+ "Tile Windows Vertically"
+ msgstr ""
+ "Óðåäè ïðîçîðå óñïðàâíî áåç ïðåêëàïà\9cà\n"
+ "Ïîðå\90༠ïðîçîðå óñïðàâíî"
+
-#: Merge.rc:1844
++#: Merge.rc:1997
+ #, c-format
+ msgid ""
+ "Copy the selection and put it on the Clipboard\n"
+ "Copy"
+ msgstr ""
+ "Óìíîæè îäàáðàíî è ïîñòàâè ó îñòàâó\n"
+ "Óìíîæè"
+
-#: Merge.rc:1845
++#: Merge.rc:1998
+ #, c-format
+ msgid ""
+ "Cut the selection and put it on the Clipboard\n"
+ "Cut"
+ msgstr ""
+ "Èñåöè îäàáðàíî è ïîñòàâè ó îñòàâó\n"
+ "Èñåöè"
+
-#: Merge.rc:1846
++#: Merge.rc:1999
+ #, c-format
+ msgid ""
+ "Find the specified text\n"
+ "Find"
+ msgstr ""
+ "Íà\90è îäðå\90åíè ïî¼àì\n"
+ "Íà\90è"
+
-#: Merge.rc:1847
++#: Merge.rc:2000
+ #, c-format
+ msgid ""
+ "Insert Clipboard contents\n"
+ "Paste"
+ msgstr ""
+ "Óìåòíè èç îñòàâå\n"
+ "Íàëåïè"
+
-#: Merge.rc:1848
++#: Merge.rc:2001
+ #, c-format
+ msgid ""
+ "Repeat the last action\n"
+ "Repeat"
+ msgstr ""
+ "Ïîíîâè ïîñëåä\9có ðàä\9có\n"
+ "Ïîíîâè"
+
-#: Merge.rc:1849
++#: Merge.rc:2002
+ #, c-format
+ msgid ""
+ "Replace specific text with different text\n"
+ "Replace"
+ msgstr ""
+ "Çàìåíè îäðå\90åíè òåêñò ñà äðóãèì\n"
+ "Çàìåíè"
+
-#: Merge.rc:1850
++#: Merge.rc:2003
+ #, c-format
+ msgid ""
+ "Select the entire document\n"
+ "Select All"
+ msgstr ""
+ "Èçàáåðè öåî òåêñò\n"
+ "Èçàáåðè ñâå"
+
-#: Merge.rc:1851
++#: Merge.rc:2004
+ #, c-format
+ msgid ""
+ "Undo the last action\n"
+ "Undo (Ctrl+Z)"
+ msgstr ""
+ "Îïîçîâè çàä\9có ðàä\9có\n"
+ "Ïîíèøòè(Ctrl+Z)"
+
-#: Merge.rc:1857
++#: Merge.rc:2005
+ #, c-format
+ msgid ""
+ "Redo the previously undone action\n"
+ "Redo (Ctrl+Y)"
+ msgstr ""
+ "Ïîíîâè ïðåòõîäíî îïîçâàòè ðàä\9có\n"
+ "Ïîíîâè (Ctrl+Y)"
+
-#: Merge.rc:1858
++#: Merge.rc:2011
+ #, c-format
+ msgid ""
+ "Show or hide the toolbar\n"
+ "Toggle ToolBar"
+ msgstr ""
+ "Ïðèêàæè èëè ñàêðè¼ òðàêó àëàòà\n"
+ "Òðàêà àëàòà"
+
-#: Merge.rc:1859
++#: Merge.rc:2012
+ #, c-format
+ msgid ""
+ "Show or hide the status bar\n"
+ "Toggle StatusBar"
+ msgstr ""
+ "Ïðèêàæè èëè ñàêðè¼ ñòàòóñíó òðàêó\n"
+ "Ñòàòóñíà òðàêà"
+
-#: Merge.rc:1860
++#: Merge.rc:2013
+ #, c-format
+ msgid ""
+ "Show or hide the tab bar\n"
+ "Toggle TabBar"
+ msgstr ""
+ "Ïðèêàæè èëè ñàêðè¼ òðàêó ¼åçè÷àêà\n"
+ "Òðàêà îçíàêà"
+
-#: Merge.rc:1866
++#: Merge.rc:2014
+ #, c-format
+ msgid ""
+ "Automatically resize panes\n"
+ "Lock Panes"
+ msgstr ""
+ "Àóòîìàòñêè ïðèëàãîäè âåëè÷èíó òàáëè\n"
+ "Çàê\9aó÷༠òàáëå"
+
-#: Merge.rc:1867
++#: Merge.rc:2020
+ #, c-format
+ msgid "Change the window size"
+ msgstr "Ïðîìåíè âåëè÷èíó ïðîçîðà"
+
-#: Merge.rc:1868
++#: Merge.rc:2021
+ #, c-format
+ msgid "Change the window position"
+ msgstr "Ïðîìåíè ïîëîæ༠ïðîçîðà"
+
-#: Merge.rc:1869
++#: Merge.rc:2022
+ #, c-format
+ msgid "Reduce the window to an icon"
+ msgstr "Ñìà\9cè ïðîçîð íà èêîíó"
+
-#: Merge.rc:1870
++#: Merge.rc:2023
+ #, c-format
+ msgid "Enlarge the window to full size"
+ msgstr "Ïîâå\9e༠ïðåêî öåëîã åêðàíà"
+
-#: Merge.rc:1871
++#: Merge.rc:2024
+ #, c-format
+ msgid "Switch to the next document window"
+ msgstr "Áèð༠ñëåäå\9eè ïðîçîð ïîðå\90å\9cà"
+
-#: Merge.rc:1872
++#: Merge.rc:2025
+ #, c-format
+ msgid "Switch to the previous document window"
+ msgstr "Áèð༠ïðåòõîäíè ïðîçîð ïîðå\90å\9cà"
+
-#: Merge.rc:1877
++#: Merge.rc:2026
+ #, c-format
+ msgid "Close the active window and prompts to save the documents"
+ msgstr "Çàòâîðè òðåíóòíè ïðîçîð è òðàæè äà ñå ñà÷óâà äîêóìåíò"
+
-#: Merge.rc:1878
++#: Merge.rc:2031
+ #, c-format
+ msgid "Restore the window to normal size"
+ msgstr "Âðàòè ïðîçîð íà ïðàâó âåëè÷èíó"
+
-#: Merge.rc:1879
++#: Merge.rc:2032
+ #, c-format
+ msgid "Activate Task List"
+ msgstr "Ñïèñàê àêòèâíèõ çàäàòàêà"
+
-#: Merge.rc:1885
++#: Merge.rc:2033
+ #, c-format
+ msgid "Activate this window"
+ msgstr "Ïîêðåíè îâ༠ïðîçîð"
+
-#: Merge.rc:1892
++#: Merge.rc:2039
+ #, c-format
+ msgid ""
+ "Close print preview mode\n"
+ "Cancel Preview"
+ msgstr ""
+ "Çàòâîðè ïðåãëåä ïðå øòàìïà\9cà\n"
+ "Çàòâîðè ïðåãëåä"
+
-#: Merge.rc:1893
++#: Merge.rc:2046
+ #, c-format
+ msgid ""
+ "\n"
+ "FileCompare\n"
+ "\n"
+ "\n"
+ "\n"
+ "WinMerge.FileCompare\n"
+ "WinMerge File Compare"
+ msgstr ""
+ "\n"
+ "Óïîðåäè äàòîòåêó\n"
+ "\n"
+ "\n"
+ "\n"
+ "WinMerge.Óïîðåäè äàòîòåêó\n"
+ "WinMerge óïîðåäè äàòîòåêó"
+
-#: Merge.rc:1900
++#: Merge.rc:2047
+ #, c-format
+ msgid ""
+ "\n"
+ "FolderCompare\n"
+ "\n"
+ "\n"
+ "\n"
+ "WinMerge.FolderCompare\n"
+ "WinMerge Folder Compare"
+ msgstr ""
+ "\n"
+ "Óïîðåäè ôàñöèêëó\n"
+ "\n"
+ "\n"
+ "\n"
+ "WinMerge.Óïîðåäè ôàñöèêëó\n"
+ "WinMerge óïîðåäè ôàñöèêëó"
+
-#: Merge.rc:1907
++#: Merge.rc:2054
+ #, c-format
+ msgid "Preserve original EOL chars"
+ msgstr "Çàäðæè èçâîðíå çíàêîâå êðà¼à ðåäà"
+
-#: Merge.rc:1913
-#: Merge.rc:1914
++#: Merge.rc:2061
+ #, c-format
+ msgid "Press any key"
+ msgstr "Ïðèòèñíè íåêè òàñòåð"
+
-#: Merge.rc:1920
++#: Merge.rc:2067
++#: Merge.rc:2068
++#: Merge.rc:2069
+ #, c-format
+ msgid "Right click on the path to copy"
+ msgstr "Äåñíè êëèê íà ïóòà\9có êî¼ó òðåáà óìíîæèòè"
+
-#: Merge.rc:1921
++#: Merge.rc:2075
+ #, c-format
+ msgid ""
+ "Developers:\n"
+ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+ msgstr ""
+ "Ïðîãðàìåðè:\n"
+ "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+
-#: Merge.rc:1927
-#, c-format
-msgid "&Ok"
-msgstr "&Ó ðåäó"
-
-#: Merge.rc:1929
++#: Merge.rc:2076
+ #, 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 "WinMerge ¼å ïðîãðàì ÁÅÇ ÃÀÐÀÍÖÈ£Å.Îâî ¼å áåñïëàòàí ïðîãðàì êî¼è ìîæåòå äà\9aå äåëèòè ïðåìà GNU ¼àâíî¼ ëèöåíöè êî¼ó ïîãëåäà¼òå ó äàòîòåöè /Ïîìî\9e/"
+
-#: Merge.rc:1930
++#: Merge.rc:2084
+ #, c-format
+ msgid "&Abort"
+ msgstr "&Ïðåêèíè"
+
-#: Merge.rc:1931
++#: Merge.rc:2085
+ #, c-format
+ msgid "&Retry"
+ msgstr "Ï&îíîâè"
+
-#: Merge.rc:1932
++#: Merge.rc:2086
+ #, c-format
+ msgid "&Ignore"
+ msgstr "Çàíåìàð&è"
+
-#: Merge.rc:1933
++#: Merge.rc:2087
+ #, c-format
+ msgid "Ignore &all"
+ msgstr "Ç&àíåìàðè ñâå"
+
-#: Merge.rc:1939
++#: Merge.rc:2088
+ #, c-format
+ msgid "&Yes"
+ msgstr "&Äà"
+
-#: Merge.rc:1940
++#: Merge.rc:2094
+ #, c-format
+ msgid "Yes to &all"
+ msgstr "Ä&à çà ñâå"
+
-#: Merge.rc:1941
++#: Merge.rc:2095
+ #, c-format
+ msgid "&No"
+ msgstr "&Íå"
+
-#: Merge.rc:1942
++#: Merge.rc:2096
+ #, c-format
+ msgid "No to a&ll"
+ msgstr "Íå çà ñ&âå"
+
-#: Merge.rc:1943
++#: Merge.rc:2097
+ #, c-format
+ msgid "&Continue"
+ msgstr "Íàñòà&âè"
+
-#: Merge.rc:1944
++#: Merge.rc:2098
+ #, c-format
+ msgid "&Skip"
+ msgstr "Èçî&ñòàâè"
+
-#: Merge.rc:1946
++#: Merge.rc:2099
+ #, c-format
+ msgid "Skip &all"
+ msgstr "Èçîñò&àâè ñâå"
+
-#: Merge.rc:1947
++#: Merge.rc:2101
+ #, c-format
+ msgid "Don't display this &message again."
+ msgstr "Íå ïðèêàçó¼ îâó ïîðóêó ïîíîâî"
+
-#: Merge.rc:1958
++#: Merge.rc:2102
+ #, c-format
+ msgid "Don't ask this &question again."
+ msgstr "Íå ïèò༠ïîíîâî"
+
-#: Merge.rc:1960
++#: Merge.rc:2113
+ #, c-format
+ msgid "Syntax"
+ msgstr ""
+
-#: Merge.rc:1965
-#: Merge.rc:2336
++#: Merge.rc:2115
+ #, c-format
+ msgid "Version Control"
+ msgstr "Ïðîãðàìè"
+
-#: Merge.rc:1974
++#: Merge.rc:2120
++#: Merge.rc:2511
+ #, c-format
+ msgid "Differences"
+ msgstr "Ðàçëèêå"
+
-#: Merge.rc:1975
++#: Merge.rc:2129
+ #, c-format
+ msgid "To:"
+ msgstr "Äî:"
+
-#: Merge.rc:1976
++#: Merge.rc:2130
+ #, c-format
+ msgid "From left:"
+ msgstr "Ñ ëåâà:"
+
-#: Merge.rc:1977
++#: Merge.rc:2131
+ #, c-format
+ msgid "To left:"
+ msgstr "Ó ëåâî:"
+
-#: Merge.rc:1978
++#: Merge.rc:2132
+ #, c-format
+ msgid "From right:"
+ msgstr "Ñ äåñíà:"
+
-#: Merge.rc:1984
++#: Merge.rc:2133
+ #, c-format
+ msgid "To right:"
+ msgstr "Ó äåñíî:"
+
-#: Merge.rc:1985
++#: Merge.rc:2139
+ #, c-format
+ msgid "Version %1"
+ msgstr "Èçäà\9cå %1"
+
-#: Merge.rc:1986
++#: Merge.rc:2140
+ #, c-format
+ msgid "Unicode"
+ msgstr "Óíèêîä"
+
-#: Merge.rc:1992
++#: Merge.rc:2141
+ #, c-format
+ msgid "X64"
+ msgstr "X64"
+
-#: Merge.rc:1993
++#: Merge.rc:2147
+ #, c-format
+ msgid "Options (%1)"
+ msgstr "Ïîñòàâêå (%1)"
+
-#: Merge.rc:1994
++#: Merge.rc:2148
+ #, c-format
+ msgid "All message boxes are now displayed again."
+ msgstr "Ïîíîâè ïðèêàç ñâèõ ïîðóêà"
+
-#: Merge.rc:1995
++#: Merge.rc:2149
+ #, 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 "Ïðîìåíå ñó íàïðàâ\9aåíå ó òðåíóòíî¼ äàòîòåöè êðîç ïîðå\90å\9cå.Íåêà ïîäåøàâà\9cà ñå íå ìîãó èçâðøèòè äîê ñå òðåíóòíà äàòîòåêà ïîíîâî íå ïîêðåíå"
+
-#: Merge.rc:1997
++#: Merge.rc:2150
+ #, c-format
+ msgid "The selected font change will not be applied to any currently visible difference windows."
+ msgstr "Ïðîìåíà èçàáðàíèõ ñëîâà íè¼å ïðèìå\9cåíà ó òðåíóòíèì âèä\9aèâèì ïðîçîðèìà"
+
-#: Merge.rc:1999
++#: Merge.rc:2152
+ #, c-format
+ msgid ""
+ "Value in Tab size -field is not in range WinMerge accepts.\n"
+ "\n"
+ "Please use values 1 - %1."
+ msgstr ""
+ "Âåëè÷èíà îçíàêå íè¼å ó ïðèõâàò\9aèâîì ðàñïîíó.\n"
+ "\n"
+ "Ìîëèìî êîðèñòèòå âðåäíîñòè 1 - %1"
+
-#: Merge.rc:2005
++#: Merge.rc:2154
+ #, c-format
+ msgid ""
+ "Are you sure you want to reset all WinMerge options to default values?\n"
+ "\n"
+ "Please re-start WinMerge after the reset."
+ msgstr ""
+ "Äà ëè ñòå ñèãóðíè äà æåëèòå âðà\9eà\9cå íà ïîäðàçóìåâàíî ñòà\9cå?\n"
+ "\n"
+ "Ìîëèì, ïîêðåíèòå WinMerge ïîñëå âðà\9eà\9cà"
+
-#: Merge.rc:2006
++#: Merge.rc:2160
+ #, c-format
+ msgid "Open"
+ msgstr "Îòâîðè"
+
-#: Merge.rc:2007
++#: Merge.rc:2161
+ #, c-format
+ msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+ msgstr "Ïðîãðàìè |*.exe;*.bat;*.cmd|Ñâå äàòîòåêå (*.*)|*.*||"
+
-#: Merge.rc:2008
++#: Merge.rc:2162
+ #, c-format
+ msgid "All Files (*.*)|*.*||"
+ msgstr "Ñâå äàòîòåêå(*.*)|*.*||"
+
-#: Merge.rc:2010
++#: Merge.rc:2163
+ #, c-format
+ msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ msgstr "WinMerge äàòîòåêå (*.WinMerge)|*.WinMerge||"
+
-#: Merge.rc:2016
++#: Merge.rc:2165
+ #, c-format
+ msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
+ msgstr "Ïîñòàâêå äàòîòåêà (*.ini)|*.ini|All Files (*.*)|*.*||"
+
-#: Merge.rc:2017
++#: Merge.rc:2171
+ #, c-format
+ msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
+ msgstr "Òåêñò äàòîòåêå (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Ñâå äàòîòåêå (*.*)|*.*||"
+
-#: Merge.rc:2018
++#: Merge.rc:2172
+ #, c-format
+ msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
+ msgstr "HTML äàòîòåêå (*.htm,*.html)|*.htm;*.html|Ñâå äàòîòåêå (*.*)|*.*||"
+
-#: Merge.rc:2024
++#: Merge.rc:2173
+ #, c-format
+ msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
+ msgstr "XML äàòîòåêå (*.xml)|*.xml|Ñâå äàòîòåêå (*.*)|*.*||"
+
-#: Merge.rc:2025
++#: Merge.rc:2179
+ #, c-format
+ msgid "UTF-8"
+ msgstr "UTF-8"
+
-#: Merge.rc:2026
++#: Merge.rc:2180
+ #, c-format
+ msgid "UTF-8 (B)"
+ msgstr "UTF-8 (B)"
+
-#: Merge.rc:2027
++#: Merge.rc:2181
+ #, c-format
+ msgid "UCS-2 LE"
+ msgstr "UCS-2 LE"
+
-#: Merge.rc:2033
++#: Merge.rc:2182
+ #, c-format
+ msgid "UCS-2 BE"
+ msgstr "UCS-2 BE"
+
-#: Merge.rc:2034
++#: Merge.rc:2188
+ #, c-format
+ msgid "Full Contents"
+ msgstr "Öåî ñàäðæà¼"
+
-#: Merge.rc:2035
++#: Merge.rc:2189
+ #, c-format
+ msgid "Quick Contents"
+ msgstr "Ñêðà\9eåíè ñàäðæà¼"
+
-#: Merge.rc:2036
++#: Merge.rc:2190
+ #, c-format
+ msgid "Modified Date"
+ msgstr "Äàòóì ïðîìåíå"
+
-#: Merge.rc:2037
++#: Merge.rc:2191
+ #, c-format
+ msgid "Modified Date and Size"
+ msgstr "Èçìå\9cåí äàòóì è âåëè÷èíà"
+
-#: Merge.rc:2043
-#: Merge.rc:2569
++#: Merge.rc:2192
+ #, c-format
+ msgid "Size"
+ msgstr "Âåëè÷èíà"
+
-#: Merge.rc:2044
++#: Merge.rc:2198
++#: Merge.rc:2766
+ #, c-format
+ msgid "Name"
+ msgstr "Èìå"
+
-#: Merge.rc:2045
++#: Merge.rc:2199
+ #, c-format
+ msgid "Location"
+ msgstr "Ïîëîæà¼"
+
-#: Merge.rc:2046
++#: Merge.rc:2200
+ #, c-format
+ msgid "Filters"
+ msgstr "Ôèëòåðè"
+
-#: Merge.rc:2047
-#: Merge.rc:2571
++#: Merge.rc:2201
+ #, c-format
+ msgid "[F] "
+ msgstr "[F]"
+
-#: Merge.rc:2048
++#: Merge.rc:2202
++#: Merge.rc:2768
+ #, c-format
+ msgid "Description"
+ msgstr "Îïèñ"
+
-#: Merge.rc:2049
++#: Merge.rc:2203
+ #, c-format
+ msgid "Select filename for new filter"
+ msgstr "Èçàáåðè äàòîòåêó çà íîâè ôèëòåð"
+
-#: Merge.rc:2051
++#: Merge.rc:2204
+ #, c-format
+ msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
+ msgstr "Äàòîòåêà ôèëòåðà (*.flt)|*.flt|All Files (*.*)|*.*||"
+
-#: Merge.rc:2053
++#: Merge.rc:2206
+ #, c-format
+ msgid ""
+ "Cannot find file filter template file!\n"
+ "\n"
+ "Please copy file %1 to WinMerge/Filters -folder:\n"
+ "%2."
+ msgstr ""
+ "Íåìîãó\9eå ¼å ïðîíà\9eè ôèëòðèðàíó äàòîòåêó øàáëîíà!\n"
+ "\n"
+ "Ìîëèì óìíîæèòå äàòîòåêó %1 ó WinMerge/Ôèëòåð -ôàñöèêëó:\n"
+ "%2."
+
-#: Merge.rc:2055
++#: Merge.rc:2208
+ #, c-format
+ msgid ""
+ "Cannot copy filter template file to filter folder:\n"
+ "%1\n"
+ "\n"
+ "Please make sure the folder exists and is writable."
+ msgstr ""
+ "Íåìîãó\9eå ¼å ñà÷óâàòè ôèëòðèðàíó äàòîòåêó øàáëîíà ó ôèëòðèðàíî¼ ôàñöèêëè:\n"
+ "%1\n"
+ "\n"
+ "Ìîëèì, ïðîâåðèòå äà ëè ïîñòî¼è ôàñöèêëà è \9cåíó äîñòóïíîñò"
+
-#: Merge.rc:2057
++#: Merge.rc:2210
+ #, c-format
+ msgid ""
+ "User's filter file folder is not defined!\n"
+ "\n"
+ "Please select filter folder in Options/System."
+ msgstr ""
+ "Êîðèñíèêîâà ôàñöèêëà ôèëòåðà íè¼å îäðå\90åíà!\n"
+ "\n"
+ "Ìîëèì, èçàáåðèòå ôàñöèêëó ôèëòåðà ó /Ïîñòàâêå/Ñèñòåì/"
+
-#: Merge.rc:2058
++#: Merge.rc:2212
+ #, c-format
+ msgid ""
+ "Failed to delete the filter file:\n"
+ "%1\n"
+ "\n"
+ "Maybe the file is read-only?"
+ msgstr ""
+ "Ãðåøêà ïðè áðèñà\9có ôèëòðèðàíå äàòîòåêå:\n"
+ "%1\n"
+ "\n"
+ "Ìîæäà ¼å äàòîòåêà ñàìî çà ÷èòà\9cå?"
+
-#: Merge.rc:2060
++#: Merge.rc:2213
+ #, c-format
+ msgid "Locate filter file to install"
+ msgstr "Ïðîíà\90è ôàñöèêëó ôèëòåðà çà èíñòàëàöè¼ó"
+
-#: Merge.rc:2062
++#: Merge.rc:2215
+ #, c-format
+ msgid ""
+ "Installing filter file failed.\n"
+ "\n"
+ "Could not copy new filter file to filter folder."
+ msgstr ""
+ "Èíñòàëèðà\9cå ôèëòåðà íè¼å óñïåëî.\n"
+ "\n"
+ "Íå ìîãó óìíîæèòè íîâè ôèëòåð ó ôàñöèêëè ôèëòåðà"
+
-#: Merge.rc:2068
++#: Merge.rc:2217
+ #, c-format
+ msgid "Filter file already exists. Overwrite existing filter?"
+ msgstr "Ôèëòåð âå\9e ïîñòî¼è.Çàìåíè ïîñòî¼å\9eè ôèëòåð"
+
-#: Merge.rc:2074
++#: Merge.rc:2223
+ #, c-format
+ msgid "Regular expression"
+ msgstr "Ïðàâèëàí èçðàç"
+
-#: Merge.rc:2081
++#: Merge.rc:2229
+ #, c-format
+ 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 ""
+ "Ôèòåðè ñó îñâåæåíè. Äà ëè æåëèòå îñâåæèòè ñâà îòâîðåíà ïîðå\90å\9cà?\n"
+ "\n"
+ "Àêî èçàáåðåòå /Íå/ òî ìîæåòå è êàñíè¼å óðàäèòè"
+
-#: Merge.rc:2087
++#: Merge.rc:2236
+ #, c-format
+ msgid "&Path to SS.EXE:"
+ msgstr "&Ïóòà\9cà äî SS.EXE:"
+
-#: Merge.rc:2088
++#: Merge.rc:2242
+ #, c-format
+ msgid "Folder Comparison Results"
+ msgstr "Èñõîäè ïîðå\90å\9cà ôàñöèêëè"
+
-#: Merge.rc:2089
++#: Merge.rc:2243
+ #, c-format
+ msgid "File Comparison"
+ msgstr "Óïîðåäè äàòîòåêå"
+
-#: Merge.rc:2090
++#: Merge.rc:2244
+ #, c-format
+ msgid "Untitled left"
+ msgstr "Íåèìåíîâàíà ëåâà"
+
-#: Merge.rc:2091
++#: Merge.rc:2245
++#, c-format
++msgid "Untitled middle"
++msgstr ""
++
++#: Merge.rc:2246
+ #, c-format
+ msgid "Untitled right"
+ msgstr "Íåèìåíîâàíà äåñíà"
+
-#: Merge.rc:2092
++#: Merge.rc:2247
+ #, c-format
+ msgid "Theirs File"
+ msgstr "\8cèõîâå äàòîòåêå"
+
-#: Merge.rc:2098
++#: Merge.rc:2248
+ #, c-format
+ msgid "Mine File"
+ msgstr "Ìî¼å äàòîòåêå"
+
-#: Merge.rc:2099
++#: Merge.rc:2254
+ #, c-format
+ msgid "Scanning files..."
+ msgstr "Ïðåòðàæèâà\9cå äàòîòåêå"
+
-#: Merge.rc:2100
++#: Merge.rc:2255
+ #, c-format
+ msgid "Opening selection"
+ msgstr "Îòâàðà\9cå îäàáðàíîã"
+
-#: Merge.rc:2101
++#: Merge.rc:2256
+ #, c-format
+ msgid "Copying Left to Right"
+ msgstr "Óìíîæèòå ëåâó ó äåñíî"
+
-#: Merge.rc:2102
++#: Merge.rc:2257
+ #, c-format
+ msgid "Copying Right to Left"
+ msgstr "Óìíîæèòå äåñíó ó ëåâî"
+
-#: Merge.rc:2103
++#: Merge.rc:2258
++#, c-format
++msgid "Copying Left to Middle"
++msgstr ""
++
++#: Merge.rc:2259
++#, c-format
++msgid "Copying Right to Middle"
++msgstr ""
++
++#: Merge.rc:2260
+ #, c-format
+ msgid "Copying All to Left"
+ msgstr "Óìíîæèòå ñâå ó ëåâî"
+
-#: Merge.rc:2104
++#: Merge.rc:2261
+ #, c-format
+ msgid "Copying All to Right"
+ msgstr "Óìíîæèòå ñâå ó äåñíî"
+
-#: Merge.rc:2105
++#: Merge.rc:2262
+ #, c-format
+ msgid "Copying files..."
+ msgstr "Óìíîæèòå äàòîòåêå"
+
-#: Merge.rc:2106
++#: Merge.rc:2263
+ #, c-format
+ msgid "Deleting files..."
+ msgstr "Áðèñà\9cå äàòîòåêå"
+
-#: Merge.rc:2107
++#: Merge.rc:2264
+ #, c-format
+ msgid "Moving files..."
+ msgstr "Ïðåìåøòà\9cå äàòîòåêà"
+
-#: Merge.rc:2108
++#: Merge.rc:2265
+ #, c-format
+ msgid "Creating the report..."
+ msgstr "Ïðàâ\9aå\9cå èçâåøòà¼à"
+
-#: Merge.rc:2109
++#: Merge.rc:2266
+ #, c-format
+ msgid "Undoing the last operation..."
+ msgstr "Ïîíèøòàâà\9cå çàä\9cå ðàä\9cå..."
+
-#: Merge.rc:2115
++#: Merge.rc:2267
+ #, c-format
+ msgid "Redoing the previous operation..."
+ msgstr "Ïîíàâ\9aà\9cå ïðåòõîäíå ðàä\9cå..."
+
-msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Ðåä: %s Áðî¼: %d/%d Çíàê: %d/%d Êðà¼: %s"
++#: Merge.rc:2273
+ #, c-format
-#: Merge.rc:2116
++msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)"
++msgstr ""
+
-#: Merge.rc:2117
++#: Merge.rc:2274
+ #, c-format
+ msgid "Line: %s"
+ msgstr "Ðåä: %s"
+
-msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr "Ðåä: %s Áðî¼: %d/%d Çíàê: %d/%d"
++#: Merge.rc:2275
+ #, c-format
-#: Merge.rc:2118
++msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)"
++msgstr ""
+
-#: Merge.rc:2119
++#: Merge.rc:2276
+ #, c-format
+ msgid "Merge"
+ msgstr "Óïîðåäè"
+
-#: Merge.rc:2120
++#: Merge.rc:2277
+ #, c-format
+ msgid "Difference %1 of %2"
+ msgstr "Ðàçëèêå %1 îä %2"
+
-#: Merge.rc:2121
++#: Merge.rc:2278
+ #, c-format
+ msgid "%1 Differences Found"
+ msgstr "Íà\90åíî ðàçëèêà %1"
+
-#: Merge.rc:2122
++#: Merge.rc:2279
+ #, c-format
+ msgid "1 Difference Found"
+ msgstr "Íà\90åíî ðàçëèêà 1"
+
+ #. Abbreviation from "Read Only"
-#: Merge.rc:2128
++#: Merge.rc:2280
+ #, c-format
+ msgid "RO"
+ msgstr "RO"
+
-#: Merge.rc:2129
++#: Merge.rc:2286
+ #, c-format
+ msgid "Item %1 of %2"
+ msgstr "Ñòàâêå %1 îä %2"
+
-#: Merge.rc:2135
++#: Merge.rc:2287
+ #, c-format
+ msgid "Items: %1"
+ msgstr "Ñòàâêå: %1"
+
-#: Merge.rc:2136
++#: Merge.rc:2293
+ #, c-format
+ msgid "Select two existing folders or files to compare"
+ msgstr "Îäàáåðè äâå ïîñòî¼å\9eå äàòîòåêå èëè ôàñöèêëå çà ïîðå\90å\9cå"
+
-#: Merge.rc:2137
++#: Merge.rc:2294
+ #, c-format
+ msgid "Folder Selection"
+ msgstr "Èçàáåðè ôàñöèêëó"
+
-#: Merge.rc:2138
++#: Merge.rc:2295
+ #, c-format
+ msgid "Select two folders or two files to compare."
+ msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðå\90å\9cå"
+
-#: Merge.rc:2139
++#: Merge.rc:2296
+ #, c-format
+ msgid "Left path is invalid!"
+ msgstr "Ëåâà ïóòà\9cà ¼å íåâàæå\9eà!"
+
-#: Merge.rc:2140
++#: Merge.rc:2297
++#, c-format
++msgid "Middle path is invalid!"
++msgstr ""
++
++#: Merge.rc:2298
+ #, c-format
+ msgid "Right path is invalid!"
+ msgstr "Äåñíà ïóòà\9cà ¼å íåâàæå\9eà!"
+
-#: Merge.rc:2141
++#: Merge.rc:2299
+ #, c-format
+ msgid "Both paths are invalid!"
+ msgstr "Îáå ïóòà\9cå ñó íåâàæå\9eå!"
+
-#: Merge.rc:2142
++#: Merge.rc:2300
++#, c-format
++msgid "Left and middle path is invalid!"
++msgstr ""
++
++#: Merge.rc:2301
++#, c-format
++msgid "Left and right path is invalid!"
++msgstr ""
++
++#: Merge.rc:2302
++#, c-format
++msgid "Middle and right path is invalid!"
++msgstr ""
++
++#: Merge.rc:2303
++#, c-format
++msgid "All paths are invalid!"
++msgstr ""
++
++#: Merge.rc:2304
+ #, c-format
+ msgid "Choose two files to enable unpacker selection."
+ msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð"
+
-#: Merge.rc:2148
++#: Merge.rc:2305
+ #, c-format
+ msgid "Cannot compare file and folder!"
+ msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!"
+
-#: Merge.rc:2149
++#: Merge.rc:2311
+ #, c-format
+ msgid "File not found: %1"
+ msgstr "Äàòîòåêà íè¼å ïðîíà\90åíà"
+
-#: Merge.rc:2150
++#: Merge.rc:2312
+ #, c-format
+ msgid "File not unpacked: %1"
+ msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1"
+
-#: Merge.rc:2151
++#: Merge.rc:2313
+ #, c-format
+ msgid ""
+ "Cannot open file\n"
+ "%1\n"
+ "\n"
+ "%2"
+ msgstr ""
+ "Íå ìîæå îòâîðèòè äàòîòåêó\n"
+ "%1\n"
+ "\n"
+ "%2"
+
-#: Merge.rc:2152
++#: Merge.rc:2314
+ #, c-format
+ msgid "Failed to parse conflict file."
+ msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó"
+
-#: Merge.rc:2158
++#: Merge.rc:2315
+ #, c-format
+ msgid ""
+ "The file\n"
+ "%1\n"
+ "is not a conflict file."
+ msgstr ""
+ "Äàòîòåêà\n"
+ "%1\n"
+ "íè¼å ïðîáëåìàòè÷íà"
+
-#: Merge.rc:2159
++#: Merge.rc:2321
+ #, c-format
+ msgid "Save As"
+ msgstr "Ñà÷óâ༠êàî"
+
-#: Merge.rc:2160
++#: Merge.rc:2322
+ #, c-format
+ msgid "Save changes to %1?"
+ msgstr "Ñà÷óâ༠èçìåíå %1? "
+
-#: Merge.rc:2161
++#: Merge.rc:2323
+ #, c-format
+ msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+ msgstr "%1 ¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å ïîíèøòèòå?(Íå, ñà÷óâàíà ¼å ïîä íîâèì èìåíîì)"
+
-#: Merge.rc:2162
++#: Merge.rc:2324
+ #, c-format
+ msgid "Error checking destination writeability"
+ msgstr "Ãðåøêà ïðè ïðîâåðè óïèñèâà\9cà íà îäðåäèøòó "
+
-#: Merge.rc:2164
++#: Merge.rc:2325
+ #, c-format
+ msgid "Error backing up file"
+ msgstr "Ãðåøêà ïðè ïðàâ\9aå\9có ðåçåðâíå äàòîòåêå"
+
-#: Merge.rc:2165
++#: Merge.rc:2327
+ #, c-format
+ msgid ""
+ "Unable to backup original file:\n"
+ "%1\n"
+ "\n"
+ "Continue anyway?"
+ msgstr ""
+ "Íè¼å ìîãó\9eå íàïðàâèòè ðåçåðâó:\n"
+ "%1\n"
+ "\n"
+ "Íàñòàâèòe?"
+
-#: Merge.rc:2166
++#: Merge.rc:2328
+ #, c-format
+ msgid ""
+ "Saving file failed.\n"
+ "%1\n"
+ "%2\n"
+ "Do you want to:\n"
+ "\t-use a different filename (Press Ok)\n"
+ "\t-abort the current operation (Press Cancel)?"
+ msgstr ""
+ "×óâà\9cå íè¼å óñïåëî.\n"
+ "%1\n"
+ "%2\n"
+ "Äà ëè æåëèòå äà :\n"
+ "\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n"
+ "\t- èëè ïðèòèñíèòå /Èçà\90è/çà ïðåêèä ïîñòóïêà?"
+
-#: Merge.rc:2167
++#: Merge.rc:2329
+ #, c-format
+ msgid ""
+ "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
+ "\n"
+ "The original file will not be changed.\n"
+ "\n"
+ "Do you want to save the unpacked version to another file?"
+ msgstr ""
+ "Äîäàòàê '%2' íå ìîæå ñïàêîâàòè ïðîìåíå ëåâå äàòîòåêå'%1'.\n"
+ "\n"
+ "Èçâîðíà äàòîòåêà íå\9eå áèòè ïðîìå\9cåíà.\n"
+ "\n"
+ "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
+
-#: Merge.rc:2168
++#: Merge.rc:2330
+ #, c-format
+ msgid ""
+ "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
+ "\n"
+ "The original file will not be changed.\n"
+ "\n"
+ "Do you want to save the unpacked version to another file?"
+ msgstr ""
+ "Äîäàòàê '%2' íå ìîæå ñïàêîâàòè ïðîìåíå äåñíå äàòîòåêå '%1'.\n"
+ "\n"
+ "Èçâîðíà äàòîòåêà íå\9eå áèòè ïðîìå\9cåíà.\n"
+ "\n"
+ "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
+
-#: Merge.rc:2169
++#: Merge.rc:2331
+ #, c-format
+ msgid ""
+ "Another application has updated file\n"
+ "%1\n"
+ "since WinMerge loaded it.\n"
+ "\n"
+ "Overwrite changed file?"
+ msgstr ""
+ "Äðóãè ïðîãðàì ¼å îñâåæèî äàòîòåêó\n"
+ "%1\n"
+ "òîêîì ðàäà ó WinMerge-ó.\n"
+ "\n"
+ "Çàìåíèòå èçìå\9cåíó äàòîòåêó?"
+
-#: Merge.rc:2170
++#: Merge.rc:2332
+ #, c-format
+ msgid ""
+ "%1\n"
+ "is marked read-only. Would you like to override the read-only item?"
+ msgstr ""
+ "%1\n"
+ "¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å çàìåíèòå?"
+
-#: Merge.rc:2171
++#: Merge.rc:2333
+ #, c-format
+ 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 ""
+ "Äðóãè ïðîãðàì ¼å îñâåæèî äàòîòåêó\n"
+ "%1\n"
+ "îä çàä\9cåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?"
+
-#: Merge.rc:2172
++#: Merge.rc:2334
+ #, c-format
+ msgid "Save Left File As"
+ msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî"
+
-#: Merge.rc:2173
++#: Merge.rc:2335
++#, c-format
++msgid "Save Middle File As"
++msgstr ""
++
++#: Merge.rc:2336
+ #, c-format
+ msgid "Save Right File As"
+ msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî"
+
-#: Merge.rc:2179
++#: Merge.rc:2337
+ #, c-format
+ msgid ""
+ "The file\n"
+ "%1\n"
+ "has disappeared. Please save a copy of the file to continue."
+ msgstr ""
+ "Äàòîòåêà\n"
+ "%1\n"
+ "¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè"
+
-#: Merge.rc:2185
++#: Merge.rc:2343
+ #, c-format
+ msgid ""
+ "Cannot merge differences when documents are not in synch.\n"
+ "\n"
+ "Refresh documents before continuing."
+ msgstr ""
+ "Íå ìîãó îá¼åäèíèòè ðàçëèêå êàäà äîêóìåíòè íèñó óñàãëàøåíè.\n"
+ "\n"
+ "Îñâåæè äîêóìåíòå ïðå íàñòàâêà"
+
-#: Merge.rc:2186
++#: Merge.rc:2349
+ #, c-format
+ msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
+ msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòà\9có àêî æåëèòå íàñòàâèòè (ie: $/MyProject)"
+
-#: Merge.rc:2187
++#: Merge.rc:2350
+ #, c-format
+ msgid "Checkout files from VSS..."
+ msgstr "Ïîâåðà äàòîòåêà íà VSS..."
+
-#: Merge.rc:2188
++#: Merge.rc:2351
+ #, c-format
+ msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
+ msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..."
+
-#: Merge.rc:2189
++#: Merge.rc:2352
+ #, c-format
+ msgid "Error executing versioning system command."
+ msgstr "Ãðåøêà ïðè èçâðøå\9có ñèñòåìñêå íàðåäáå"
+
-#: Merge.rc:2190
++#: Merge.rc:2353
+ #, c-format
+ msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
+ msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?"
+
-#: Merge.rc:2191
++#: Merge.rc:2354
+ #, c-format
+ msgid "No VSS database(s) found!"
+ msgstr "Íåìà VSS áàçå ïîäàòàêà"
+
-#: Merge.rc:2192
++#: Merge.rc:2355
+ #, c-format
+ msgid "Error from VSS:"
+ msgstr "Ãðåøêà èç VSS"
+
-#: Merge.rc:2193
++#: Merge.rc:2356
+ #, 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 ""
+ "Ñèñòåì ïîêàçó¼å ãðåøêó äîê ïîêóøàâà äà ïðîâåðè äàòîòåêó\n"
+ "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n"
+ "Îïîçîâè ïðîâåðó?"
+
-#: Merge.rc:2199
-#: Merge.rc:2553
++#: Merge.rc:2357
+ #, c-format
+ msgid ""
+ "Versioning System returned an error while attempting to undo checkout the file.\n"
+ " Please, check config spec of used view. "
+ msgstr ""
+ "Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n"
+ "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà"
+
-#: Merge.rc:2200
++#: Merge.rc:2363
++#: Merge.rc:2750
+ #, c-format
+ msgid "None"
+ msgstr "Íèøòà"
+
-#: Merge.rc:2201
++#: Merge.rc:2364
+ #, c-format
+ msgid "Visual SourceSafe (less than 5.0)"
+ msgstr "Visual SourceSafe (ìà\9cè îä 5.0)"
+
-#: Merge.rc:2203
++#: Merge.rc:2365
+ #, c-format
+ msgid "Visual SourceSafe (5.0 and above)"
+ msgstr "Visual SourceSafe (5.0 è âèøè)"
+
-#: Merge.rc:2204
++#: Merge.rc:2367
+ #, c-format
+ msgid "Break at whitespace"
+ msgstr "Ñòàíè íà ðàçìàêó"
+
-#: Merge.rc:2210
-#: Merge.rc:2212
++#: Merge.rc:2368
+ #, c-format
+ msgid "Break at whitespace or punctuation"
+ msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è"
+
-#: Merge.rc:2211
-#: Merge.rc:2213
++#: Merge.rc:2374
++#: Merge.rc:2376
+ #, c-format
+ msgid "Copy selected item to named directory"
+ msgstr "Óìíîæè îäàáðàíó ñòàâêó ó èìåíîâàíî¼ ôàñöèêëè"
+
-#: Merge.rc:2214
++#: Merge.rc:2375
++#: Merge.rc:2377
+ #, c-format
+ msgid "Copy selected item to custom directory"
+ msgstr "Óìíîæè îäàáðàíó ñòàâêó ó ïðèëàãî\90åíî¼ ôàñöèêëè"
+
-#: Merge.rc:2215
++#: Merge.rc:2378
+ #, c-format
+ msgid "Delete selected item on left"
+ msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ ëåâà"
+
-#: Merge.rc:2216
++#: Merge.rc:2379
+ #, c-format
+ msgid "Delete selected item on right"
+ msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ äåñíà"
+
-#: Merge.rc:2217
++#: Merge.rc:2380
+ #, c-format
+ msgid "Delete selected item(s) on both sides"
+ msgstr "Èçáðèøè îäàáðàíó ñòàâêó íà îáå ñòðàíå "
+
-#: Merge.rc:2218
++#: Merge.rc:2381
+ #, c-format
+ msgid "Hide selected item(s) (on the fly filter)"
+ msgstr "Ñàêðè¼ îäàáðàíó ñòàâêó (ôèëòåð ó õîäó)"
+
-#: Merge.rc:2219
++#: Merge.rc:2382
+ #, c-format
+ msgid "Rename selected item on both sides"
+ msgstr "Ïðåèìåíó¼ îäàáðàíó ñòàâêó íà îáå ñòðàíå"
+
-#: Merge.rc:2220
++#: Merge.rc:2383
+ #, c-format
+ msgid "Right to Left (%1)"
+ msgstr "Äåñíà ó ëåâî (%1)"
+
-#: Merge.rc:2221
++#: Merge.rc:2384
+ #, c-format
+ msgid "Left to Right (%1)"
+ msgstr "Ëåâà ó äåñíî (%1)"
+
-#: Merge.rc:2222
++#: Merge.rc:2385
+ #, c-format
+ msgid "Right to Left (%1 of %2)"
+ msgstr "Äåñíà ó ëåâî (%1 îä %2)"
+
-#: Merge.rc:2223
-#: Merge.rc:2239
++#: Merge.rc:2386
+ #, c-format
+ msgid "Left to Right (%1 of %2)"
+ msgstr "Ëåâà ó äåñíî (%1 îä %2)"
+
-#: Merge.rc:2224
-#: Merge.rc:2240
++#: Merge.rc:2387
++#: Merge.rc:2403
+ #, c-format
+ msgid "Left to... (%1)"
+ msgstr "Ëåâà ó... (%1)"
+
-#: Merge.rc:2225
-#: Merge.rc:2241
++#: Merge.rc:2388
++#: Merge.rc:2404
+ #, c-format
+ msgid "Right to... (%1)"
+ msgstr "Äåñíà ó... (%1)"
+
-#: Merge.rc:2226
-#: Merge.rc:2242
++#: Merge.rc:2389
++#: Merge.rc:2405
+ #, c-format
+ msgid "Left to... (%1 of %2)"
+ msgstr "Ëåâà ó... (%1 îä %2)"
+
-#: Merge.rc:2232
++#: Merge.rc:2390
++#: Merge.rc:2406
+ #, c-format
+ msgid "Right to... (%1 of %2)"
+ msgstr "Äåñíà ó... (%1 îä %2)"
+
-#: Merge.rc:2233
++#: Merge.rc:2396
+ #, c-format
+ msgid "Left (%1)"
+ msgstr "Ëåâà (%1)"
+
-#: Merge.rc:2234
++#: Merge.rc:2397
+ #, c-format
+ msgid "Right (%1)"
+ msgstr "Äåñíà (%1)"
+
-#: Merge.rc:2235
++#: Merge.rc:2398
+ #, c-format
+ msgid "Both (%1)"
+ msgstr "Îáå (%1)"
+
-#: Merge.rc:2236
++#: Merge.rc:2399
+ #, c-format
+ msgid "Left (%1 of %2)"
+ msgstr "Ëåâà (%1 îä %2)"
+
-#: Merge.rc:2237
++#: Merge.rc:2400
+ #, c-format
+ msgid "Right (%1 of %2)"
+ msgstr "Äåñíà (%1 îä %2)"
+
-#: Merge.rc:2238
++#: Merge.rc:2401
+ #, c-format
+ msgid "Both (%1 of %2)"
+ msgstr "Îáå(%1 îä %2)"
+
-#: Merge.rc:2243
++#: Merge.rc:2402
+ #, c-format
+ msgid "Select destination folder"
+ msgstr "Îäàáåðè ôàñöèêëó îäðåäèøòà:"
+
-#: Merge.rc:2244
++#: Merge.rc:2407
+ #, c-format
+ msgid "Left side - select destination folder:"
+ msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
+
-#: Merge.rc:2245
++#: Merge.rc:2408
+ #, c-format
+ msgid "Right side - select destination folder:"
+ msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
+
-#: Merge.rc:2246
++#: Merge.rc:2409
+ #, c-format
+ msgid "(%1 Files Affected)"
+ msgstr "(%1 óñìåðåíèõ äàòîòåêà)"
+
-#: Merge.rc:2252
++#: Merge.rc:2410
+ #, c-format
+ msgid "(%1 of %2 Files Affected)"
+ msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)"
+
-#: Merge.rc:2253
++#: Merge.rc:2416
+ #, c-format
+ msgid ""
+ "Are you sure you want to delete\n"
+ "\n"
+ "%1 ?"
+ msgstr ""
+ "Äà ëè ñòå ñèãóðíè äà æåëèòå äà èçáðèøåòå\n"
+ "\n"
+ "%1 ?"
+
-#: Merge.rc:2254
++#: Merge.rc:2417
+ #, c-format
+ msgid "Are you sure you want to copy:"
+ msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:"
+
-#: Merge.rc:2255
++#: Merge.rc:2418
+ #, c-format
+ msgid "Are you sure you want to copy %d items:"
+ msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:"
+
-#: Merge.rc:2256
++#: Merge.rc:2419
+ #, c-format
+ msgid ""
+ "Operation aborted!\n"
+ "\n"
+ "Folder contents at disks has changed, path\n"
+ "%1\n"
+ "was not found.\n"
+ "\n"
+ "Please refresh the compare."
+ msgstr ""
+ "Ïîñòóïàê ¼å çàóñòàâ\9aåí!\n"
+ "\n"
+ "Ïðîìå\9cåíà ¼å ôàñöèêëà èëè ïóòà\9ca\n"
+ "%1\n"
+ "íè¼å ïðîíà\90åíà.\n"
+ "\n"
+ "Ìîëèì, îñâåæèòå ïîðå\90å\9cå."
+
-#: Merge.rc:2257
++#: Merge.rc:2420
+ #, c-format
+ msgid "Are you sure you want to move:"
+ msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:"
+
-#: Merge.rc:2259
++#: Merge.rc:2421
+ #, c-format
+ msgid "Are you sure you want to move %d items:"
+ msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:"
+
-#: Merge.rc:2265
++#: Merge.rc:2423
+ #, c-format
+ msgid "Confirm Move"
+ msgstr "Ïîòâðäè ïðåìåøòà¼"
+
-#: Merge.rc:2266
++#: Merge.rc:2429
+ #, c-format
+ msgid "Open left file"
+ msgstr "Îòâîðè ëåâó äàòîòåêó"
+
-#: Merge.rc:2267
++#: Merge.rc:2430
+ #, c-format
+ msgid "Open the left file to external editor"
+ msgstr "Îòâîðè ëåâó äàòîòåêó ó äðóãîì óðå\90èâà÷ó"
+
-#: Merge.rc:2268
++#: Merge.rc:2431
+ #, c-format
+ msgid "Open left file with ..."
+ msgstr "Îòâîðè ëåâó äàòîòåêó ñà..."
+
-#: Merge.rc:2269
++#: Merge.rc:2432
+ #, c-format
+ msgid "Open right file"
+ msgstr "Îòâîðè äåñíó äàòîòåêó"
+
-#: Merge.rc:2270
++#: Merge.rc:2433
+ #, c-format
+ msgid "Open the right file to external editor"
+ msgstr "Îòâîðè äåñíó äàòîòåêó ó äðóãîì óðå\90èâà÷ó"
+
-#: Merge.rc:2271
++#: Merge.rc:2434
+ #, c-format
+ msgid "Open right file with..."
+ msgstr "Îòâîðè äåñíó äàòîòåêó ñà..."
+
-#: Merge.rc:2272
++#: Merge.rc:2435
+ #, c-format
+ msgid "Failed to execute external editor: %1"
+ msgstr "Íè¼å óñïåëî ïîêðåòà\9cå äðóãîã óðå\90èâà÷à: %1"
+
-#: Merge.rc:2273
++#: Merge.rc:2436
+ #, c-format
+ msgid "Unknown extension on external editor: %1"
+ msgstr "Íåïîçíàòà âðñòà äàòîòåêå çà äðóãè óðå\90èâà÷: %1"
+
-#: Merge.rc:2274
++#: Merge.rc:2437
+ #, c-format
+ msgid "Copy filenames to clipboard"
+ msgstr "Ñà÷óâ༠èìå äàòîòåêå ó îñòàâè"
+
-#: Merge.rc:2275
++#: Merge.rc:2438
+ #, c-format
+ msgid "Copy left side pathnames to clipboard"
+ msgstr "Ñà÷óâ༠èìå ïóòà\9cå ëåâå ñòðàíå ó îñòàâè"
+
-#: Merge.rc:2276
++#: Merge.rc:2439
+ #, c-format
+ msgid "Copy right side pathnames to clipboard"
+ msgstr "Ñà÷óâ༠èìå ïóòà\9cå äåñíå ñòðàíå ó îñòàâè"
+
-#: Merge.rc:2282
++#: Merge.rc:2440
+ #, c-format
+ msgid "Copy both sides pathnames to clipboard"
+ msgstr "Ñà÷óâ༠èìå ïóòà\9cå îáå ñòðàíå ó îñòàâè"
+
-#: Merge.rc:2283
++#: Merge.rc:2441
++#, c-format
++msgid "Copy selected left item to clipboard"
++msgstr ""
++
++#: Merge.rc:2442
++#, c-format
++msgid "Copy selected right item to clipboard"
++msgstr ""
++
++#: Merge.rc:2448
+ #, c-format
+ msgid "Left Shell menu"
+ msgstr "Ëåâè èçáîðíèê /\9aóñêå/"
+
-#: Merge.rc:2289
++#: Merge.rc:2449
++#, c-format
++msgid "Middle Shell menu"
++msgstr ""
++
++#: Merge.rc:2450
+ #, c-format
+ msgid "Right Shell menu"
+ msgstr "Äåñíè èçáîðíèê /\9aóñêå/"
+
-#: Merge.rc:2290
++#: Merge.rc:2456
+ #, c-format
+ msgid "Unknown archive format"
+ msgstr "Íåïîçíàò îáëèê àðõèâå"
+
-#: Merge.rc:2291
++#: Merge.rc:2457
+ #, c-format
+ msgid "Add items from left side to archive"
+ msgstr "Äîä༠ñòàâêå ñà ëåâå ñòðàíå ó àðõèâó"
+
-#: Merge.rc:2292
++#: Merge.rc:2458
+ #, c-format
+ msgid "Add items from right side to archive"
+ msgstr "Äîä༠ñòàâêå ñà äåñíå ñòðàíå ó àðõèâó"
+
-#: Merge.rc:2293
++#: Merge.rc:2459
+ #, c-format
+ msgid "Add items from both sides to archive"
+ msgstr "Äîä༠ñòàâêå îáå ñòðàíå ó àðõèâó"
+
-#: Merge.rc:2295
++#: Merge.rc:2460
+ #, c-format
+ msgid "Add different items to archive (both sides)"
+ msgstr "Äîä༠ðàçëè÷èòå ñòàâêå ó àðõèâó (îáå ñòðàíå)"
+
-#: Merge.rc:2297
++#: Merge.rc:2462
+ #, c-format
+ msgid "Move selected file on left to custom directory"
+ msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ ëåâà ó èçàáðàíó ôàñöèêëó"
+
-#: Merge.rc:2303
++#: Merge.rc:2464
+ #, c-format
+ msgid "Move selected file on right to custom directory"
+ msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ äåñíà ó èçàáðàíó ôàñöèêëó"
+
-#: Merge.rc:2305
++#: Merge.rc:2470
+ #, c-format
+ msgid "Filename"
+ msgstr "Èìå äàòîòåêå"
+
-#: Merge.rc:2306
++#: Merge.rc:2472
+ #, c-format
+ msgid "Comparison result"
+ msgstr "Ðåçóëòàò ïîðå\90å\9cà"
+
-#: Merge.rc:2307
++#: Merge.rc:2473
+ #, c-format
+ msgid "Left Date"
+ msgstr "Äàòóì ëåâî"
+
-#: Merge.rc:2308
++#: Merge.rc:2474
+ #, c-format
+ msgid "Right Date"
+ msgstr "Äàòóì äåñíî"
+
-#: Merge.rc:2309
++#: Merge.rc:2475
++#, c-format
++msgid "Middle Date"
++msgstr ""
++
++#: Merge.rc:2476
+ #, c-format
+ msgid "Extension"
+ msgstr "Íàñòàâàê"
+
-#: Merge.rc:2310
++#: Merge.rc:2477
+ #, c-format
+ msgid "Left Size"
+ msgstr "Âåëè÷èíà ëåâî"
+
-#: Merge.rc:2311
++#: Merge.rc:2478
+ #, c-format
+ msgid "Right Size"
+ msgstr "Âåëè÷èíà äåñíî"
+
-#: Merge.rc:2312
++#: Merge.rc:2479
++#, c-format
++msgid "Middle Size"
++msgstr ""
++
++#: Merge.rc:2480
+ #, c-format
+ msgid "Right Size (Short)"
+ msgstr "Âåëè÷èíà äåñíî (ñêðà\9eåíî)"
+
-#: Merge.rc:2318
++#: Merge.rc:2481
+ #, c-format
+ msgid "Left Size (Short)"
+ msgstr "Âåëè÷èíà ëåâî (ñêðà\9eåíî)"
+
-#: Merge.rc:2319
++#: Merge.rc:2482
++#, c-format
++msgid "Middle Size (Short)"
++msgstr ""
++
++#: Merge.rc:2488
+ #, c-format
+ msgid "Left Creation Time"
+ msgstr "Âðåìå ñòâàðà\9cà ëåâå"
+
-#: Merge.rc:2320
++#: Merge.rc:2489
+ #, c-format
+ msgid "Right Creation Time"
+ msgstr "Âðåìå ñòâàðà\9cà äåñíå"
+
-#: Merge.rc:2321
++#: Merge.rc:2490
++#, c-format
++msgid "Middle Creation Time"
++msgstr ""
++
++#: Merge.rc:2491
+ #, c-format
+ msgid "Newer File"
+ msgstr "Íîâè¼à äàòîòåêà"
+
-#: Merge.rc:2322
++#: Merge.rc:2492
+ #, c-format
+ msgid "Left File Version"
+ msgstr "Èçäà\9cå ëåâå äàòîòåêå"
+
-#: Merge.rc:2323
++#: Merge.rc:2493
+ #, c-format
+ msgid "Right File Version"
+ msgstr "Èçäà\9cå äåñíå äàòîòåêå"
+
-#: Merge.rc:2324
++#: Merge.rc:2494
++#, c-format
++msgid "Middle File Version"
++msgstr ""
++
++#: Merge.rc:2495
+ #, c-format
+ msgid "Short Result"
+ msgstr "Ñêðà\9eåíè èñõîä"
+
-#: Merge.rc:2325
++#: Merge.rc:2496
+ #, c-format
+ msgid "Left Attributes"
+ msgstr "Îñîáèíå ëåâå"
+
-#: Merge.rc:2326
++#: Merge.rc:2497
+ #, c-format
+ msgid "Right Attributes"
+ msgstr "Îñîáèíå äåñíå"
+
-#: Merge.rc:2327
++#: Merge.rc:2498
++#, c-format
++msgid "Middle Attributes"
++msgstr ""
++
++#: Merge.rc:2499
+ #, c-format
+ msgid "Left EOL"
+ msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå"
+
-#: Merge.rc:2333
++#: Merge.rc:2500
++#, c-format
++msgid "Middle EOL"
++msgstr ""
++
++#: Merge.rc:2501
+ #, c-format
+ msgid "Right EOL"
+ msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå"
+
-#: Merge.rc:2334
++#: Merge.rc:2507
+ #, c-format
+ msgid "Left Encoding"
+ msgstr "Êîäèðà\9cå ëåâå"
+
-#: Merge.rc:2335
++#: Merge.rc:2508
+ #, c-format
+ msgid "Right Encoding"
+ msgstr "Êîäèðà\9cå äåñíå"
+
-#: Merge.rc:2337
-#: Merge.rc:2549
++#: Merge.rc:2509
++#, c-format
++msgid "Middle Encoding"
++msgstr ""
++
++#: Merge.rc:2510
+ #, c-format
+ msgid "Ignored Diff."
+ msgstr "Çàíåìàðè ðàçëèêå"
+
-#: Merge.rc:2343
++#: Merge.rc:2512
++#: Merge.rc:2746
+ #, c-format
+ msgid "Binary"
+ msgstr "Áèíàðíè"
+
-#: Merge.rc:2344
++#: Merge.rc:2518
+ #, c-format
+ msgid "Unable to compare files"
+ msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå"
+
-#: Merge.rc:2345
++#: Merge.rc:2519
+ #, c-format
+ msgid "Item aborted"
+ msgstr "Îäáà÷åíà ñòàâêà"
+
-#: Merge.rc:2346
++#: Merge.rc:2520
+ #, c-format
+ msgid "File skipped"
+ msgstr "Èçîñòàâ\9aåíà äàòîòåêà"
+
-#: Merge.rc:2347
++#: Merge.rc:2521
+ #, c-format
+ msgid "Folder skipped"
+ msgstr "Èçîñòàâ\9aåíà ôàñöèêëà"
+
-#: Merge.rc:2348
++#: Merge.rc:2522
+ #, c-format
+ msgid "Left only: %1"
+ msgstr "Ñàìî ëåâà: %1"
+
-#: Merge.rc:2349
++#: Merge.rc:2523
++#, c-format
++msgid "Middle only: %1"
++msgstr ""
++
++#: Merge.rc:2524
+ #, c-format
+ msgid "Right only: %1"
+ msgstr "Ñàìî äåñíà: %"
+
-#: Merge.rc:2351
++#: Merge.rc:2525
++#, c-format
++msgid "Does not exist in %1"
++msgstr ""
++
++#: Merge.rc:2526
+ #, c-format
+ msgid "Binary files are identical"
+ msgstr "Áèíàðíå äàòîòåêå ñó èñòå"
+
-#: Merge.rc:2352
++#: Merge.rc:2528
+ #, c-format
+ msgid "Binary files are different"
+ msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå"
+
-#: Merge.rc:2353
++#: Merge.rc:2529
+ #, c-format
+ msgid "Files are different"
+ msgstr "Äàòîòåêå ñó ðàçëè÷èòå"
+
-#: Merge.rc:2354
++#: Merge.rc:2530
+ #, c-format
+ msgid "Folders are different"
+ msgstr "Ôàñöèêëå ñó ðàçëè÷èòå"
+
-#: Merge.rc:2355
++#: Merge.rc:2531
+ #, c-format
+ msgid "Left Only"
+ msgstr "Ñàìî ëåâà"
+
-#: Merge.rc:2357
++#: Merge.rc:2532
+ #, c-format
+ msgid "Right Only"
+ msgstr "Ñàìî äåñíà"
+
-#: Merge.rc:2358
++#: Merge.rc:2533
++#, c-format
++msgid "Middle Only"
++msgstr ""
++
++#: Merge.rc:2534
++#, c-format
++msgid "No item in left"
++msgstr ""
++
++#: Merge.rc:2535
++#, c-format
++msgid "No item in right"
++msgstr ""
++
++#: Merge.rc:2536
++#, c-format
++msgid "No item in middle"
++msgstr ""
++
++#: Merge.rc:2538
+ #, c-format
+ msgid "Error"
+ msgstr "Ãðåøêà"
+
-#: Merge.rc:2363
++#: Merge.rc:2539
+ #, c-format
+ msgid "Text files are identical"
+ msgstr "Òåêñòîâè äàòîòåêà ñó èñòè"
+
-#: Merge.rc:2369
++#: Merge.rc:2544
+ #, c-format
+ msgid "Text files are different"
+ msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè"
+
-#: Merge.rc:2370
++#: Merge.rc:2550
+ #, c-format
+ msgid "Elapsed time: %ld ms"
+ msgstr "Ïðîòåêëî âðåìå: %ld ms"
+
-#: Merge.rc:2371
++#: Merge.rc:2551
+ #, c-format
+ msgid "1 item selected"
+ msgstr "1 ñòàâêà ¼å îäàáðàíà"
+
-#: Merge.rc:2377
++#: Merge.rc:2552
+ #, c-format
+ msgid "%1 items selected"
+ msgstr "%1 ñòàâêà ¼å îäàáðàíà"
+
-#: Merge.rc:2378
++#: Merge.rc:2558
+ #, c-format
+ msgid "Filename or folder name."
+ msgstr "Èìå äàòîòåêå èëè ôàñöèêëå"
+
-#: Merge.rc:2379
++#: Merge.rc:2559
+ #, c-format
+ msgid "Subfolder name when subfolders are included."
+ msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óê\9aó÷åíå"
+
-#: Merge.rc:2380
++#: Merge.rc:2560
+ #, c-format
+ msgid "Comparison result, long form."
+ msgstr "Èçõîä ïîðå\90å\9cà,äóæè îáëèê"
+
-#: Merge.rc:2381
++#: Merge.rc:2561
+ #, c-format
+ msgid "Left side modification date."
+ msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå"
+
-#: Merge.rc:2382
++#: Merge.rc:2562
+ #, c-format
+ msgid "Right side modification date."
+ msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå"
+
-#: Merge.rc:2383
++#: Merge.rc:2563
++#, c-format
++msgid "Middle side modification date."
++msgstr ""
++
++#: Merge.rc:2564
+ #, c-format
+ msgid "File's extension."
+ msgstr "/Íàñòàâàê/ äàòîòåêå"
+
-#: Merge.rc:2384
++#: Merge.rc:2565
+ #, c-format
+ msgid "Left file size in bytes."
+ msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà"
+
-#: Merge.rc:2385
++#: Merge.rc:2566
+ #, c-format
+ msgid "Right file size in bytes."
+ msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà"
+
-#: Merge.rc:2386
++#: Merge.rc:2567
++#, c-format
++msgid "Middle file size in bytes."
++msgstr ""
++
++#: Merge.rc:2568
+ #, c-format
+ msgid "Left file size abbreviated."
+ msgstr "Ñêðà\9eåíà ëåâà äàòîòåêà"
+
-#: Merge.rc:2392
++#: Merge.rc:2569
+ #, c-format
+ msgid "Right file size abbreviated."
+ msgstr "Ñêðà\9eåíà äåñíà äàòîòåêà"
+
-#: Merge.rc:2393
++#: Merge.rc:2570
++#, c-format
++msgid "Middle file size abbreviated."
++msgstr ""
++
++#: Merge.rc:2576
+ #, c-format
+ msgid "Left side creation time."
+ msgstr "Âðåìå ñòâàðà\9cà ëåâå ñòðàíå"
+
-#: Merge.rc:2394
++#: Merge.rc:2577
+ #, c-format
+ msgid "Right side creation time."
+ msgstr "Âðåìå ñòâàðà\9cà äåñíå ñòðàíå"
+
-#: Merge.rc:2395
++#: Merge.rc:2578
++#, c-format
++msgid "Middle side creation time."
++msgstr ""
++
++#: Merge.rc:2579
+ #, c-format
+ msgid "Tells which side has newer modification date."
+ msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå"
+
-#: Merge.rc:2396
++#: Merge.rc:2580
+ #, c-format
+ msgid "Left side file version, only for some filetypes."
+ msgstr "Èçäà\9cå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
+
-#: Merge.rc:2397
++#: Merge.rc:2581
+ #, c-format
+ msgid "Right side file version, only for some filetypes."
+ msgstr "Èçäà\9cå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
+
-#: Merge.rc:2398
++#: Merge.rc:2582
++#, c-format
++msgid "Middle side file version, only for some filetypes."
++msgstr ""
++
++#: Merge.rc:2583
+ #, c-format
+ msgid "Short comparison result."
+ msgstr "Êðà\9eè ðåçóëòàò ïîðå\90å\9cà"
+
-#: Merge.rc:2399
++#: Merge.rc:2584
+ #, c-format
+ msgid "Left side attributes."
+ msgstr "Îñîáèíå ëåâå ñòðàíå"
+
-#: Merge.rc:2400
++#: Merge.rc:2585
+ #, c-format
+ msgid "Right side attributes."
+ msgstr "Îñîáèíå äåñíå ñòðàíå"
+
-#: Merge.rc:2401
++#: Merge.rc:2586
++#, c-format
++msgid "Middle side attributes."
++msgstr ""
++
++#: Merge.rc:2587
+ #, c-format
+ msgid "Left side file EOL type"
+ msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå"
+
-#: Merge.rc:2407
++#: Merge.rc:2588
+ #, c-format
+ msgid "Right side file EOL type"
+ msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå"
+
-#: Merge.rc:2408
++#: Merge.rc:2589
++#, c-format
++msgid "Middle side file EOL type"
++msgstr ""
++
++#: Merge.rc:2595
+ #, c-format
+ msgid "Left side encoding."
+ msgstr "Êîäèðà\9cå ëåâå ñòðàíå"
+
-#: Merge.rc:2409
++#: Merge.rc:2596
+ #, c-format
+ msgid "Right side encoding."
+ msgstr "Êîäèðà\9cå äåñíå ñòðàíå"
+
-#: Merge.rc:2410
++#: Merge.rc:2597
++#, c-format
++msgid "Middle side encoding."
++msgstr ""
++
++#: Merge.rc:2598
+ #, c-format
+ msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
+ msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäè\9cåíå"
+
-#: Merge.rc:2411
++#: Merge.rc:2599
+ #, c-format
+ msgid "Number of differences in file. This number does not include ignored differences."
+ msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óê\9aó÷ó¼å çàíåìàðåíå ðàçëèêå"
+
-#: Merge.rc:2417
++#: Merge.rc:2600
+ #, c-format
+ msgid "Shows an asterisk (*) if the file is binary."
+ msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà"
+
-#: Merge.rc:2418
++#: Merge.rc:2606
+ #, c-format
+ msgid "Compare %1 with %2"
+ msgstr "Óïîðåäè %1 ñà %2"
+
-#: Merge.rc:2419
++#: Merge.rc:2607
+ #, c-format
+ msgid "Comma-separated list"
+ msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì"
+
-#: Merge.rc:2420
++#: Merge.rc:2608
+ #, c-format
+ msgid "Tab-separated list"
+ msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì"
+
-#: Merge.rc:2421
++#: Merge.rc:2609
+ #, c-format
+ msgid "Simple HTML"
+ msgstr "£åäíîñòàâíè HTML"
+
-#: Merge.rc:2423
++#: Merge.rc:2610
+ #, c-format
+ msgid "Simple XML"
+ msgstr "£åäíîñòàâíè XML"
+
-#: Merge.rc:2424
++#: Merge.rc:2612
+ #, c-format
+ msgid "The report file already exists. Do you want to overwrite existing file?"
+ msgstr "Äàòîòåêà èçâåøòà¼à âå\9e ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼å\9eó äàòîòåêó"
+
-#: Merge.rc:2425
++#: Merge.rc:2613
+ #, c-format
+ msgid ""
+ "Error creating the report:\n"
+ "%1"
+ msgstr ""
+ "Ãðåøêà ïðè ïðàâ\9aå\9có èçâåøòà¼à:\n"
+ "%1"
+
-#: Merge.rc:2431
++#: Merge.rc:2614
+ #, c-format
+ msgid "The report has been created successfully."
+ msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâ\9aåí"
+
-#: Merge.rc:2432
++#: Merge.rc:2620
+ #, c-format
+ msgid "The same file is opened in both panels."
+ msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå"
+
-#: Merge.rc:2433
++#: Merge.rc:2621
+ #, c-format
+ msgid "The selected files are identical."
+ msgstr "Èçàáðàíå äàòîòåêå ñó èñòå"
+
-#: Merge.rc:2434
++#: Merge.rc:2622
+ #, c-format
+ msgid "An error occurred while comparing the files."
+ msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðå\90å\9có"
+
-#: Merge.rc:2435
++#: Merge.rc:2623
+ #, c-format
+ msgid "Temporary files could not be created. Check your temporary path settings."
+ msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòà\9có"
+
-#: Merge.rc:2436
++#: Merge.rc:2624
+ #, c-format
+ msgid ""
+ "These files use different carriage return types.\n"
+ "\n"
+ "Do you want to treat all carriage return types as equivalent for this comparison?\n"
+ "\n"
+ "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
+ msgstr ""
+ "Îâå äàòîòåêå ñå ðàçëèêó¼ó ïðåìà ïðåëàñêó ó äðóãè ðåä.\n"
+ "\n"
+ "Äà ëè æåëèòå çàäðæàòè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä?\n"
+ "\n"
+ "Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðå\90å\9cå ïðîçîðà (Óðå\90èâà\9cå/Ïîñòàâêå)"
+
-#: Merge.rc:2437
++#: Merge.rc:2625
+ #, 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 ""
+ "Ðå÷è ñå çàâðøàâà¼ó íà ðàçëè÷èòå íà÷èíå (Windows/Unix/Mac) ó äàòîòåöè '%1'.\n"
+ "Ïðåìà ïîñòàâêàìà ïðîìåíè\9eå ñå êàêî ¼å îäàáðàíî.\n"
+ "Äà ëè æåëèòå äà ïðîìåíèòå ïîñòàâêå è î÷óâà\9cå ðàçëè÷èòèõ íà÷èíà ïðåëàçàêà?"
+
-#: Merge.rc:2438
++#: Merge.rc:2626
+ #, c-format
+ msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
+ msgstr "Ãðåøêà ïðèëèêîì ïîðå\90å\9cà äàòîòåêå '%1' ñà äîäàòêîì'%2'.Äåôèíèñàíî ïîðå\90å\9cå ñå íå ïðèìå\9có¼å âèøå. "
+
-#: Merge.rc:2439
++#: Merge.rc:2627
+ #, c-format
+ msgid "The selected folder is invalid."
+ msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåá\9aèâà"
+
-#: Merge.rc:2440
++#: Merge.rc:2628
+ #, c-format
+ msgid "Cannot open a binary file to editor."
+ msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðå\90èâà÷ó"
+
-#: Merge.rc:2446
++#: Merge.rc:2629
+ #, c-format
+ 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 ""
+ "Ôàñöèêëà ïîñòî¼è ñàìî íà äðóãî¼ ñòðàíè è íå ìîæå ñå îòâîðèòè.\n"
+ "\n"
+ "Äà ëè æåëèòå ñòâîðèòè óïîðåäíó ôàñöèêëó:\n"
+ "%1\n"
+ "íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?"
+
-#: Merge.rc:2447
++#: Merge.rc:2635
+ #, c-format
+ msgid ""
+ "Different codepages found in left (cp%d) and right (cp%d) files. \n"
+ "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
+ "Would you like to treat both files as being in the default windows codepage (recommended)?"
+ msgstr ""
+ "Ðàçëè÷èòå êîäíå ñòðàíå íà\90åíå ñó ó ëåâî¼ (cp%d) è äåñíî¼ (cp%d) äàòîòåöè. \n"
+ "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áî\9aè àëè ñïà¼à\9cå/óìíîæàâà\9cå íîñè îïàñíîñò.\n"
+ "Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?"
+
-#: Merge.rc:2448
++#: Merge.rc:2636
+ #, c-format
+ msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
+ msgstr "Ïàæ\9cà:Äàòîòåêå ñó ðàçëè÷èòî êîäèðàíå, ëåâà=%s è äåñíà=%s,è ñïà¼à\9cå ìîæå äîâåñòè äî ãóáèòêà ïîäàòàêà. "
+
-#: Merge.rc:2449
++#: Merge.rc:2637
+ #, c-format
+ msgid "Information lost due to encoding errors: both files"
+ msgstr "Ïîäàöè ñó èçãóá\9aåíè çáîã ãðåøêå ïðè êîäèðà\9có: îáå äàòîòåêå"
+
-msgid "Information lost due to encoding errors: right file"
-msgstr "Ïîäàöè ñó èçãóá\9aåíè çáîã ãðåøêå ïðè êîäèðà\9có: äåñíà äàòîòåêà "
++#: Merge.rc:2638
+ #, c-format
-#: Merge.rc:2450
++msgid "Information lost due to encoding errors: first file"
++msgstr ""
+
-msgid "Information lost due to encoding errors: left file"
-msgstr "Ïîäàöè ñó èçãóá\9aåíè çáîã ãðåøêå ïðè êîäèðà\9có: ëåâà äàòîòåêà"
++#: Merge.rc:2639
++#, c-format
++msgid "Information lost due to encoding errors: second file"
++msgstr ""
++
++#: Merge.rc:2640
+ #, c-format
-#: Merge.rc:2456
++msgid "Information lost due to encoding errors: third file"
++msgstr ""
+
-#: Merge.rc:2457
++#: Merge.rc:2646
+ #, c-format
+ msgid "No difference"
+ msgstr "Íåìà ðàçëèêå"
+
-#: Merge.rc:2463
++#: Merge.rc:2647
+ #, c-format
+ msgid "Line difference"
+ msgstr "Ðàçëè÷èòè ðåä"
+
-#: Merge.rc:2464
++#: Merge.rc:2653
+ #, c-format
+ msgid "Replaced %1 string(s)."
+ msgstr "Çàìå\9cåí %1 ïî¼àì(à)"
+
-#: Merge.rc:2470
++#: Merge.rc:2654
+ #, c-format
+ msgid "Cannot find string \"%s\""
+ msgstr "Íå ìîãó íà\9eè ïî¼àì \"%s\""
+
-#: Merge.rc:2471
++#: Merge.rc:2660
+ #, c-format
+ msgid "Copy Full Path"
+ msgstr "Óìíîæè ïóòà\9có"
+
-#: Merge.rc:2477
++#: Merge.rc:2661
+ #, c-format
+ msgid "Copy Filename"
+ msgstr "Óìíîæè èìå äàòîòåêå"
+
-#: Merge.rc:2478
++#: Merge.rc:2667
++#, c-format
++msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
++msgstr ""
++
++#: Merge.rc:2673
+ #, c-format
+ msgid "Location Pane"
+ msgstr "Ïîëîæ༠òàáëè"
+
-#: Merge.rc:2484
++#: Merge.rc:2674
+ #, c-format
+ msgid "Diff Pane"
+ msgstr "Ðàçëè÷èòå òàáëå"
+
-#: Merge.rc:2485
++#: Merge.rc:2680
+ #, c-format
+ msgid "Patch file successfully written."
+ msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà"
+
-#: Merge.rc:2486
++#: Merge.rc:2681
+ #, c-format
+ msgid "1. item is not found or is directory!"
+ msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
+
-#: Merge.rc:2487
++#: Merge.rc:2682
+ #, c-format
+ msgid "2. item is not found or is directory!"
+ msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
+
-#: Merge.rc:2488
++#: Merge.rc:2683
+ #, c-format
+ msgid "The patch file already exists. Do you want to overwrite it?"
+ msgstr "Äàòîòåêà ðàçëèêà âå\9e ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?"
+
-#: Merge.rc:2489
++#: Merge.rc:2684
+ #, c-format
+ msgid "[%1 files selected]"
+ msgstr "[%1 îäàáðàíà äàòîòåêà"
+
-#: Merge.rc:2490
++#: Merge.rc:2685
+ #, c-format
+ msgid "Normal"
+ msgstr "Óîáè÷à¼åí"
+
-#: Merge.rc:2491
++#: Merge.rc:2686
+ #, c-format
+ msgid "Context"
+ msgstr "Ó îêâèðó"
+
-#: Merge.rc:2492
++#: Merge.rc:2687
+ #, c-format
+ msgid "Unified"
+ msgstr "Îá¼åäè\9cåí"
+
-#: Merge.rc:2493
++#: Merge.rc:2688
++#: Merge.rc:2962
++#, c-format
++msgid "HTML"
++msgstr "HTML"
++
++#: Merge.rc:2689
+ #, c-format
+ msgid "Could not write to file %1."
+ msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1"
+
-#: Merge.rc:2494
++#: Merge.rc:2690
+ #, c-format
+ msgid "The specified output path is not an absolute path: %1"
+ msgstr "Íàâåäåíà èçëàçíà ïóòà\9cà íè¼å ïîòïóíà ïóòà\9cà: %1"
+
-#: Merge.rc:2495
++#: Merge.rc:2691
+ #, c-format
+ msgid "Specify an output file"
+ msgstr "Îäðåäèòå èçëàçíó äàòîòåêó"
+
-#: Merge.rc:2496
++#: Merge.rc:2692
+ #, c-format
+ msgid "Cannot create a patch file from binary files."
+ msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà"
+
-#: Merge.rc:2497
++#: Merge.rc:2693
+ #, c-format
+ msgid "Cannot create a patch file from directories."
+ msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè"
+
-#: Merge.rc:2498
++#: Merge.rc:2694
+ #, c-format
+ msgid ""
+ "Please save all files first.\n"
+ "\n"
+ "Creating a patch requires that there are no unsaved changes in files."
+ msgstr ""
+ "Ñà÷óâà¼òå ïðâî ñâå äàòîòåêå.\n"
+ "\n"
+ "Ñòâàðà\9cå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà"
+
-#: Merge.rc:2503
++#: Merge.rc:2695
+ #, c-format
+ msgid "Folder does not exist."
+ msgstr "Ôàñöèêëà íå ïîñòî¼è"
+
-#: Merge.rc:2504
++#: Merge.rc:2700
+ #, c-format
+ msgid "Current directory comparison results will be cleared."
+ msgstr "Ðåçóëòàòè ïîðå\90å\9cà ôàñöèêëè \9eå áèòè óêëî\9cåíè"
+
-#: Merge.rc:2505
++#: Merge.rc:2701
+ #, c-format
+ msgid ""
+ "Archive support is not enabled.\n"
+ "All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
+ "See manual for more info about archive support and how to enable it."
+ msgstr ""
+ "Ðàä ñà àðõèâàìà ¼å îíåìîãó\9eåí.\n"
+ "Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íà\90åíå.\n"
+ "Ïîãëåäà¼òå óïóòñòâî êàêî îìîãó\9eèòè ðàä ñà àðõèâàìà"
+
-#: Merge.rc:2506
++#: Merge.rc:2702
+ #, c-format
+ msgid ""
+ "\n"
+ "Note: 7-Zip integration is disabled in WinMerge settings."
+ msgstr ""
+ "\n"
+ "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îíåìîãó\9eåíà ó ïîäåøàâà\9cèìà WinMerge-à"
+
-#: Merge.rc:2507
++#: Merge.rc:2703
+ #, c-format
+ msgid ""
+ "\n"
+ "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+ msgstr ""
+ "\n"
+ "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îãðàíè÷åíà íà ñàìîñòàëíî äåëîâà\9cå ó ïîäåøàâà\9cèìà WinMerge-à "
+
-#: Merge.rc:2508
++#: Merge.rc:2704
+ #, c-format
+ msgid "Select file for export"
+ msgstr "Îäàáåðè äàòîòåêó çà èçâîç"
+
-#: Merge.rc:2509
++#: Merge.rc:2705
+ #, c-format
+ msgid "Select file for import"
+ msgstr "Îäàáåðè äàòîòåêó çà óâîç"
+
-#: Merge.rc:2510
++#: Merge.rc:2706
+ #, c-format
+ msgid "Options imported from the file."
+ msgstr "Óâîç ïîñòàâêè ó äàòîòåêó"
+
-#: Merge.rc:2511
++#: Merge.rc:2707
+ #, c-format
+ msgid "Options exported to the file."
+ msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó"
+
-#: Merge.rc:2512
++#: Merge.rc:2708
+ #, c-format
+ msgid "Failed to import options from the file."
+ msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå"
+
-#: Merge.rc:2513
++#: Merge.rc:2709
+ #, c-format
+ msgid "Failed to write options to the file."
+ msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè"
+
-#: Merge.rc:2519
++#: Merge.rc:2710
+ #, c-format
+ msgid ""
+ "You are about to close several compare windows.\n"
+ "\n"
+ "Do you want to continue?"
+ msgstr ""
+ "Çàòâîðèòå íåêîëèêî ïðîçîðà ïîðå\90å\9cà.\n"
+ "\n"
+ "Äà ëè æåëèòå íàñòàâèòè?"
+
-#: Merge.rc:2520
++#: Merge.rc:2716
+ #, c-format
+ msgid "Regular expression error"
+ msgstr "Ïðàâè èçðàç ãðåøêå"
+
-#: Merge.rc:2521
++#: Merge.rc:2717
+ #, c-format
+ msgid "No match"
+ msgstr "Íåìà"
+
-#: Merge.rc:2522
++#: Merge.rc:2718
+ #, c-format
+ msgid "Invalid regular expression"
+ msgstr "Íåâàæå\9eè ïðàâè èçðàç"
+
-#: Merge.rc:2523
++#: Merge.rc:2719
+ #, c-format
+ msgid "Invalid collation character"
+ msgstr "Íåâàæå\9eè óïîðåäíè çíàê"
+
-#: Merge.rc:2524
++#: Merge.rc:2720
+ #, c-format
+ msgid "Invalid character class name"
+ msgstr "Íåâàæå\9eè çíàê íàçèâà âðñòå"
+
-#: Merge.rc:2525
++#: Merge.rc:2721
+ #, c-format
+ msgid "Trailing backslash"
+ msgstr "Çíàê îáðíóòà êîñà öðòà"
+
-#: Merge.rc:2526
++#: Merge.rc:2722
+ #, c-format
+ msgid "Invalid back reference"
+ msgstr "Ëîøà ïðåïîðóêà"
+
-#: Merge.rc:2527
++#: Merge.rc:2723
+ #, c-format
+ msgid "Unmatched [ or [^"
+ msgstr "Íåïîäåñíà [ èëè [^"
+
-#: Merge.rc:2528
++#: Merge.rc:2724
+ #, c-format
+ msgid "Unmatched ( or \\("
+ msgstr "Íåïîäåñíà ( èëè \\("
+
-#: Merge.rc:2529
++#: Merge.rc:2725
+ #, c-format
+ msgid "Unmatched \\{"
+ msgstr "Íåïîäåñíà \\{"
+
-#: Merge.rc:2530
++#: Merge.rc:2726
+ #, c-format
+ msgid "Invalid content of \\{\\}"
+ msgstr "Íåâàæå\9eè ñàäðæ༠\\{\\}"
+
-#: Merge.rc:2531
++#: Merge.rc:2727
+ #, c-format
+ msgid "Invalid range end"
+ msgstr "Íåâàæå\9eè îïñåã äå¼ñòâà"
+
-#: Merge.rc:2532
++#: Merge.rc:2728
+ #, c-format
+ msgid "Out of memory"
+ msgstr "Èçâàí ïàì\9eå\9cà"
+
-#: Merge.rc:2533
++#: Merge.rc:2729
+ #, c-format
+ msgid "Invalid preceding regular expression"
+ msgstr "Íåâàæå\9eè ïðåòõîäíè ïðàâè èçðàç"
+
-#: Merge.rc:2534
++#: Merge.rc:2730
+ #, c-format
+ msgid "Premature end of regular expression"
+ msgstr "Ïðåðàíè êð༠ïðàâîã èçðàçà "
+
-#: Merge.rc:2539
++#: Merge.rc:2731
+ #, c-format
+ msgid "Regular expression too big"
+ msgstr "Ïðàâè èçðàç ¼å ïðåâåëèê"
+
-#: Merge.rc:2545
++#: Merge.rc:2736
+ #, c-format
+ msgid "Unmatched ) or \\)"
+ msgstr "Íåîäãîâàðà¼ó\9eà ) èëè \\)"
+
-#: Merge.rc:2546
++#: Merge.rc:2742
+ #, c-format
+ msgid "Win"
+ msgstr "Win"
+
-#: Merge.rc:2547
++#: Merge.rc:2743
+ #, c-format
+ msgid "Mac"
+ msgstr "Mac"
+
-#: Merge.rc:2548
++#: Merge.rc:2744
+ #, c-format
+ msgid "Unix"
+ msgstr "Unix"
+
-#: Merge.rc:2550
++#: Merge.rc:2745
+ #, c-format
+ msgid "Mixed"
+ msgstr "Mixed"
+
-#: Merge.rc:2551
++#: Merge.rc:2747
+ #, c-format
+ msgid "LF"
+ msgstr "LF"
+
-#: Merge.rc:2552
++#: Merge.rc:2748
+ #, c-format
+ msgid "CR"
+ msgstr "CR"
+
-#: Merge.rc:2559
++#: Merge.rc:2749
+ #, c-format
+ msgid "CRLF"
+ msgstr "CRLF"
+
-#: Merge.rc:2560
++#: Merge.rc:2756
+ #, c-format
+ msgid " B"
+ msgstr "B"
+
-#: Merge.rc:2561
++#: Merge.rc:2757
+ #, c-format
+ msgid " KB"
+ msgstr "KB"
+
-#: Merge.rc:2562
++#: Merge.rc:2758
+ #, c-format
+ msgid " MB"
+ msgstr "MB"
+
-#: Merge.rc:2563
++#: Merge.rc:2759
+ #, c-format
+ msgid " GB"
+ msgstr "GB"
+
-#: Merge.rc:2564
++#: Merge.rc:2760
+ #, c-format
+ msgid " TB"
+ msgstr "TB"
+
-#: Merge.rc:2570
++#: Merge.rc:2761
+ #, c-format
+ msgid " PB"
+ msgstr "PB"
+
-#: Merge.rc:2572
++#: Merge.rc:2767
+ #, c-format
+ msgid "Type"
+ msgstr "Âðñòà"
+
-#: Merge.rc:2573
++#: Merge.rc:2769
+ #, c-format
+ msgid "Unpacker"
+ msgstr "Ðàñïàêèâà\9cå"
+
-#: Merge.rc:2574
++#: Merge.rc:2770
+ #, c-format
+ msgid "Prediffer"
+ msgstr "Äåôèíèñàíî ïîðå\90å\9cå"
+
-#: Merge.rc:2581
++#: Merge.rc:2771
+ #, c-format
+ msgid "Editor script"
+ msgstr "Óðå\90èâà÷ ðóêîïèñà"
+
-#: Merge.rc:2582
++#: Merge.rc:2778
+ #, c-format
+ msgid "Save the left file"
+ msgstr "Ñà÷óâ༠ëåâó äàòîòåêó"
+
-#: Merge.rc:2583
++#: Merge.rc:2779
++#, c-format
++msgid "Save the middle file"
++msgstr ""
++
++#: Merge.rc:2780
+ #, c-format
+ msgid "Save the right file"
+ msgstr "Ñà÷óâ༠äåñíó äàòîòåêó"
+
-#: Merge.rc:2584
++#: Merge.rc:2781
+ #, c-format
+ msgid "Save the left file with name..."
+ msgstr "Ñà÷óâ༠ëåâó äàòîòåêó ñà íàçèâîì"
+
-#: Merge.rc:2585
++#: Merge.rc:2782
++#, c-format
++msgid "Save the middle file with name..."
++msgstr ""
++
++#: Merge.rc:2783
+ #, c-format
+ msgid "Save the right file with name..."
+ msgstr "Ñà÷óâ༠äåñíó äàòîòåêó ñà íàçèâîì"
+
-msgid "Change left side file/folder read-only status"
-msgstr "Ïðîìåíè ëåâó ñòðàíó äàòîòåêå/ôàñöèêëå êî¼à ¼å ñàìî çà ÷èòà\9cå"
++#: Merge.rc:2784
+ #, c-format
-#: Merge.rc:2586
++msgid "Change left file/folder read-only status"
++msgstr ""
+
-msgid "Change right side file/folder read-only status"
-msgstr "Ïðîìåíè äåñíó ñòðàíó äàòîòåêå/ôàñöèêëå êî¼à ¼å ñàìî çà ÷èòà\9cå"
++#: Merge.rc:2785
+ #, c-format
-#: Merge.rc:2587
++msgid "Change middle file/folder read-only status"
++msgstr ""
+
-#: Merge.rc:2588
++#: Merge.rc:2786
++#, c-format
++msgid "Change right file/folder read-only status"
++msgstr ""
++
++#: Merge.rc:2787
+ #, c-format
+ msgid "Convert EOL to Windows mode"
+ msgstr "Ïðîìåíè êð༠ðåäà íà Windows íà÷èí"
+
-#: Merge.rc:2589
++#: Merge.rc:2788
+ #, c-format
+ msgid "Convert EOL to Unix mode"
+ msgstr "Ïðîìåíè êð༠ðåäà íà Unix íà÷èí"
+
-#: Merge.rc:2590
++#: Merge.rc:2789
+ #, c-format
+ msgid "Convert EOL to Mac mode"
+ msgstr "Ïðîìåíè êð༠ðåäà íà Mac íà÷èí"
+
-#: Merge.rc:2591
++#: Merge.rc:2790
+ #, c-format
+ msgid "Switch between editing and merging modes"
+ msgstr "Áèð༠èçìå\90ó óðå\90èâà\9cà è óïîðå\90èâà\9cà"
+
-#: Merge.rc:2592
++#: Merge.rc:2791
+ #, c-format
+ msgid ""
+ "View and adjust file encoding properties\n"
+ "File encoding properties"
+ msgstr ""
+ "Ïðèêàæè è ïîäåñè ñâî¼ñòâà êîäèðà\9cà äàòîòåêå\n"
+ "Ñâî¼ñòâà êîäèðà\9cà äàòîòåêå"
+
-#: Merge.rc:2598
++#: Merge.rc:2792
+ #, c-format
+ msgid "Open and resolve conflict file"
+ msgstr "Îòâîðè è ðåøè ïðîáëåìàòè÷íå äàòîòåêå"
+
-#: Merge.rc:2599
++#: Merge.rc:2798
+ #, c-format
+ msgid ""
+ "Select difference area in the current line\n"
+ "Difference in the Current Line"
+ msgstr ""
+ "Èçàáåðè ðàçëèêå ó òðåíóòíîì ðåäó\n"
+ "Ðàçëèêå ó òðåíóòíîì ðåäó"
+
-#: Merge.rc:2600
++#: Merge.rc:2799
+ #, c-format
+ msgid ""
+ "Go to line or difference\n"
+ "Go to (Ctrl+G)"
+ msgstr ""
+ "Èäè íà ðåä èëè ðàçëèêó\n"
+ "Èäè íà (Ctrl+G)"
+
-#: Merge.rc:2601
++#: Merge.rc:2800
+ #, c-format
+ msgid ""
+ "Set program options\n"
+ "Options"
+ msgstr ""
+ "Ïîäåñè ïðîãðàìñêå ïîñòàâêå\n"
+ "Ïîñòàâêå"
+
-#: Merge.rc:2602
++#: Merge.rc:2801
+ #, c-format
+ msgid ""
+ "Refresh display\n"
+ "Refresh (F5)"
+ msgstr ""
+ "Îñâåæè ïðèêàç\n"
+ "Îñâåæè (F5)"
+
-#: Merge.rc:2603
++#: Merge.rc:2802
+ #, c-format
+ msgid "Copy selected lines to clipboard adding linenumbers to line begin"
+ msgstr "Óìíîæè îäàáðàíå ðåäîâå ó îñòàâó äîäà¼ó\9eè îä ïî÷åòêà áðî¼åâå ðåäîâèìà "
+
-msgid "Refresh selected items"
-msgstr "Îñâåæè îäàáðàíó ñòàâêó"
++#: Merge.rc:2803
+ #, c-format
-#: Merge.rc:2604
++msgid "Refresh/Reload selected items"
++msgstr ""
+
-#: Merge.rc:2605
++#: Merge.rc:2804
+ #, c-format
+ msgid "Toggle bookmark"
+ msgstr "Çàìåíè çàáåëåøêå"
+
-#: Merge.rc:2606
++#: Merge.rc:2805
+ #, c-format
+ msgid "Go to next bookmark"
+ msgstr "Èäè íà ñëåäå\9eó çàáåëåøêó"
+
-#: Merge.rc:2607
++#: Merge.rc:2806
+ #, c-format
+ msgid "Go to previous bookmark"
+ msgstr "Èäè íà ïðåòõîäíó çàáåëåøêó"
+
-#: Merge.rc:2613
++#: Merge.rc:2807
+ #, c-format
+ msgid "Clear all bookmarks"
+ msgstr "Óêëîíè ñâå çàáåëåøêå"
+
-#: Merge.rc:2614
++#: Merge.rc:2813
+ #, c-format
+ msgid ""
+ "Displays items that are exactly the same\n"
+ "Show Identical Items"
+ msgstr ""
+ "Ïðèêàçó¼å ñòàâêå êî¼å ñó ïîòïóíî èñòå\n"
+ "Ïðèêàæè èñòå ñòàâêå"
+
-#: Merge.rc:2615
++#: Merge.rc:2814
+ #, c-format
+ msgid ""
+ "Displays items that have differences\n"
+ "Show Different Items"
+ msgstr ""
+ "Ïðèêàçó¼å ñòàâêå êî¼å ñå ðàçëèêó¼ó\n"
+ "Ïðèêàæè ðàçëè÷èòå ñòàâêå"
+
-#: Merge.rc:2616
++#: Merge.rc:2815
+ #, c-format
+ msgid ""
+ "Displays items that exist in only on the left side\n"
+ "Show Left Unique Items"
+ msgstr ""
+ "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà ëåâî¼ ñòðàíè\n"
+ "Ïðèêàæè ëåâó ¼åäèíñòâåíó ñòàâêó"
+
-#: Merge.rc:2617
++#: Merge.rc:2816
+ #, c-format
+ msgid ""
+ "Displays items that exist in only on the right side\n"
+ "Show Right Unique Items"
+ msgstr ""
+ "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà äåñíî¼ ñòðàíè\n"
+ "Ïðèêàæè äåñíó ¼åäèíñòâåíó ñòàâêó"
+
-#: Merge.rc:2618
++#: Merge.rc:2817
+ #, c-format
+ msgid ""
+ "Displays binary files\n"
+ "Show Binary Files"
+ msgstr ""
+ "Ïðèêàçó¼å áèíàðíå äàòîòåêå\n"
+ "Ïðèêàæè áèíàðíå äàòîòåêå"
+
-#: Merge.rc:2624
++#: Merge.rc:2818
+ #, c-format
+ msgid ""
+ "Displays skipped items\n"
+ "Show Skipped Items"
+ msgstr ""
+ "Ïðèêàçó¼å ïðåñêî÷åíå ñòàâêå\n"
+ "Ïðèêàæè ïðåñêî÷åíå ñòàâêå"
+
-#: Merge.rc:2625
++#: Merge.rc:2824
+ #, c-format
+ msgid ""
+ "Select the font for the view\n"
+ "Select View Font"
+ msgstr ""
+ "Èçàáåðèòå ñëîâà çà ïðèêàç\n"
+ "Èçàáåðè ñëîâà"
+
-#: Merge.rc:2626
++#: Merge.rc:2825
+ #, c-format
+ msgid ""
+ "Revert to using the default system font for view\n"
+ "Default Font"
+ msgstr ""
+ "Âðàòè ñå è êîðèñòè ïîäðàçóìåâàíà ñëîâà çà ïðèêàç\n"
+ "Ïîäðàçóìåâàíà ñëîâà "
+
-#: Merge.rc:2627
++#: Merge.rc:2826
+ #, c-format
+ msgid "Shows whitespace characters"
+ msgstr "Ïðèêàçó¼å ðàçìàêå è çíàêîâå"
+
-#: Merge.rc:2628
++#: Merge.rc:2827
+ #, c-format
+ msgid "Toggle Diff Pane"
+ msgstr "Çàìåíè ñòðàíå"
+
-#: Merge.rc:2629
++#: Merge.rc:2828
+ #, c-format
+ msgid "Location pane shows overall picture from files"
+ msgstr "Ïîëîæ༠òàáëå ïðèêàçó¼å óêóïíó ñëèêó î äàòîòåöè"
+
-#: Merge.rc:2630
++#: Merge.rc:2829
+ #, c-format
+ msgid "Show folder compare statistics dialog"
+ msgstr "Ïðèêàæè ñòàòèñòè÷êî ïîðå\90å\9cå ôàñöèêëè"
+
-#: Merge.rc:2631
++#: Merge.rc:2830
+ #, c-format
+ msgid ""
+ "Select the current user interface language\n"
+ "Language"
+ msgstr ""
+ "Èçàáåðèòå âàø ¼åçèê ñó÷å\9aà\n"
+ "£åçèê"
+
-#: Merge.rc:2632
++#: Merge.rc:2831
+ #, c-format
+ msgid ""
+ "Shows differences inside lines with different colors\n"
+ "Show Line Difference"
+ msgstr ""
+ "Ïîêàçó¼å ðàçëèêå óíóòàð ðåäîâà ñà ðàçëè÷èòèì áî¼àìà\n"
+ "Ïðèêàæè ðàçëè÷èòå ðåäîâå"
+
-#: Merge.rc:2633
++#: Merge.rc:2832
+ #, c-format
+ msgid "Swap the positions of the two panes"
+ msgstr "Çàìåíè ìåñòà òàáëàìà"
+
-#: Merge.rc:2634
++#: Merge.rc:2833
+ #, c-format
+ msgid ""
+ "Shows line numbers\n"
+ "Show Line Numbers"
+ msgstr ""
+ "Ïðèêàçó¼å áðî¼åâå ðåäîâà\n"
+ "Ïðèêàæè áðî¼åâå ðåäîâà"
+
-#: Merge.rc:2635
++#: Merge.rc:2834
+ #, c-format
+ msgid ""
+ "Enable word wrap\n"
+ "Wrap Lines"
+ msgstr ""
+ "Îìîãó\9eè ïðåëîì òåêñòà\n"
+ "Ïðåëàç ó íîâè ðåäà"
+
-#: Merge.rc:2636
++#: Merge.rc:2835
+ #, c-format
+ msgid ""
+ "Shows selection margins for both panes\n"
+ "Show Selection Margins"
+ msgstr ""
+ "Ïîêàçó¼å èçáîð ðóáà çà îáå òàáëå\n"
+ "Ïðèêàæè èçáîð ðóáîâà"
+
-#: Merge.rc:2637
++#: Merge.rc:2836
+ #, c-format
+ msgid "Increase text size"
+ msgstr "Ïîâå\9e༠âåëè÷èíó òåêñòà"
+
-#: Merge.rc:2638
++#: Merge.rc:2837
+ #, c-format
+ msgid "Decrease text size"
+ msgstr "Óìà\9cè âåëè÷èíó òåêñòà"
+
-#: Merge.rc:2644
++#: Merge.rc:2838
+ #, c-format
+ msgid "Reset text zoom to default size"
+ msgstr "Èçâîðíà âåëè÷èíà òåêñòà"
+
-#: Merge.rc:2645
++#: Merge.rc:2844
+ #, c-format
+ msgid ""
+ "Scroll to the previous difference\n"
+ "Previous Difference (Alt+Up)"
+ msgstr ""
+ "Ïîìåðè äî ïðåòõîäíå ðàçëèêå\n"
+ "Ïðåòõîäíà ðàçëèêà (Alt+Up)"
+
-#: Merge.rc:2646
++#: Merge.rc:2845
+ #, c-format
+ msgid ""
+ "Scroll to the next difference\n"
+ "Next Difference (Alt+Down)"
+ msgstr ""
+ "Ïîìåðè äî ñëåäå\9eå ðàçëèêå\n"
+ "Ñëåäå\9eà ðàçëèêà (Alt+Down)"
+
-#: Merge.rc:2647
++#: Merge.rc:2846
++#, c-format
++msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
++msgstr ""
++
++#: Merge.rc:2847
++#, c-format
++msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
++msgstr ""
++
++#: Merge.rc:2848
++#, c-format
++msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
++msgstr ""
++
++#: Merge.rc:2849
++#, c-format
++msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
++msgstr ""
++
++#: Merge.rc:2850
++#, c-format
++msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
++msgstr ""
++
++#: Merge.rc:2851
++#, c-format
++msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
++msgstr ""
++
++#: Merge.rc:2852
++#, c-format
++msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
++msgstr ""
++
++#: Merge.rc:2853
++#, c-format
++msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
++msgstr ""
++
++#: Merge.rc:2854
++#, c-format
++msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
++msgstr ""
++
++#: Merge.rc:2855
++#, c-format
++msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
++msgstr ""
++
++#: Merge.rc:2856
++#, c-format
++msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)"
++msgstr ""
++
++#: Merge.rc:2857
++#, c-format
++msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
++msgstr ""
++
++#: Merge.rc:2858
+ #, c-format
+ msgid ""
+ "Scroll to the first difference\n"
+ "First Difference (Alt+Home)"
+ msgstr ""
+ "Ïîìåðè äî ïðâå ðàçëèêå\n"
+ "Ïðâà ðàçëèêà(Alt+Home)"
+
-#: Merge.rc:2648
++#: Merge.rc:2859
+ #, c-format
+ msgid ""
+ "Scroll to the current difference\n"
+ "Current Difference (Alt+Enter)"
+ msgstr ""
+ "Ïîìåðè äî òðåíóòíå ðàçëèêå\n"
+ "Òðåíóòíà ðàçëèêà (Alt+Enter)"
+
-#: Merge.rc:2649
++#: Merge.rc:2860
+ #, c-format
+ msgid ""
+ "Scroll to the last difference\n"
+ "Last Difference (Alt+End)"
+ msgstr ""
+ "Ïîìåðè äî ñëåäå\9eå ðàçëèêå\n"
+ "Ïîñëåä\9cà ðàçëèêà (Alt+End)"
+
-#: Merge.rc:2650
++#: Merge.rc:2861
+ #, c-format
+ msgid ""
+ "Copy the selected text to the right file\n"
+ "Copy Right (Alt+Right)"
+ msgstr ""
+ "Óìíîæè îçíà÷åíè òåêñò ó äåñíó äàòîòåêó\n"
+ "Óìíîæè ó äåñíó (Alt+Right)"
+
-#: Merge.rc:2651
++#: Merge.rc:2862
+ #, c-format
+ msgid ""
+ "Copy the selected text to the left file\n"
+ "Copy Left (Alt+Left)"
+ msgstr ""
+ "Óìíîæè îçíà÷åíè òåêñò ó ëåâó äàòîòåêó\n"
+ "Óìíîæè ó ëåâó (Alt+Left)"
+
-#: Merge.rc:2652
++#: Merge.rc:2863
+ #, c-format
+ msgid ""
+ "Copy difference to right and advance to next\n"
+ "Copy Right and Advance (Ctrl+Alt+Right)"
+ msgstr ""
+ "Óìíîæè ðàçëèêå ó äåñíó è ïðå\90è íà ñëåäå\9eå\n"
+ "Óìíîæè ó äåñíó è íàñòàâè (Ctrl+Alt+Right)"
+
-#: Merge.rc:2653
++#: Merge.rc:2864
+ #, c-format
+ msgid ""
+ "Copy difference to left and advance to next\n"
+ "Copy Left and Advance (Ctrl+Alt+Left)"
+ msgstr ""
+ "Óìíîæè ðàçëèêå ó ëåâó è ïðå\90è íà ñëåäå\9eå\n"
+ "Óìíîæè ó ëåâó è íàñòàâè (Ctrl+Alt+Left)"
+
-#: Merge.rc:2654
++#: Merge.rc:2865
+ #, c-format
+ msgid ""
+ "Copy all differences to the right file\n"
+ "All Right"
+ msgstr ""
+ "Óìíîæè ñâå ðàçëèêå ó äåñíó äàòîòåêó\n"
+ "Ñâå ó äåñíó"
+
-#: Merge.rc:2655
++#: Merge.rc:2866
+ #, c-format
+ msgid ""
+ "Copy all differences to the left file\n"
+ "All Left"
+ msgstr ""
+ "Óìíîæè ñâå ðàçëèêå ó ëåâó äàòîòåêó\n"
+ "Ñâå ó ëåâó"
+
-#: Merge.rc:2656
++#: Merge.rc:2867
+ #, c-format
+ msgid "Delete selected items from both directories"
+ msgstr "Èçáðèøè èçàáðàíå ñòàâêå èç îáå ôàñöèêëå"
+
-#: Merge.rc:2662
++#: Merge.rc:2868
+ #, c-format
+ msgid "Compare selected item (compare first item if multiple items selected)"
+ msgstr "Óïîðåäè îçíà÷åíå ñòàâêå (óïîðåäèòå ïðâå ñòàâêå, àêî ¼å âèøå ñòàâêè îäàáðàíî)"
+
-#: Merge.rc:2663
++#: Merge.rc:2874
+ #, c-format
+ msgid "Select and reorder directory compare columns"
+ msgstr "Èçáîð è ðàçìåøò༠ôàñöèêëè ïðåìà óïîðå\90åíèì ñòóáöèìà"
+
-#: Merge.rc:2664
++#: Merge.rc:2875
+ #, c-format
+ msgid "Generate a patch-file"
+ msgstr "Ïðàâè ïîïðàâêå äàòîòåêà "
+
-#: Merge.rc:2665
++#: Merge.rc:2876
+ #, c-format
+ msgid "Select and modify filters"
+ msgstr "Èçàáåðèòå è ïðîìåíèòå ôèëòåðå"
+
-#: Merge.rc:2671
++#: Merge.rc:2877
+ #, c-format
+ msgid "Generates a report from compare results"
+ msgstr "Ïðàâè èçâåøòà¼å ïîðå\90å\9cà "
+
-#: Merge.rc:2672
++#: Merge.rc:2883
+ #, c-format
+ msgid "Shows a list of available plugins"
+ msgstr "Ïðèêàçó¼å ñïèñàê äîñòóïíèõ äîäàòàêà"
+
-#: Merge.rc:2673
++#: Merge.rc:2884
+ #, c-format
+ msgid "The user selects the unpacker (no unpacking when comparing dir)"
+ msgstr "Êîðèñíèê áèðà ðàñïàêèâà\9cå (íå ðàñïàêó¼ êàä ñå óïîðå\90ó¼ó ôàñöèêëå)"
+
-#: Merge.rc:2674
++#: Merge.rc:2885
+ #, c-format
+ msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
+ msgstr "Ïðèëàãî\90åíî ðàñïàêèâà\9cå \9eå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)"
+
-#: Merge.rc:2675
++#: Merge.rc:2886
+ #, c-format
+ msgid "Select an unpacker to edit this file"
+ msgstr "Èçàáåðèòå àðõèâåð äà ïðîìåíèòå îâó äàòîòåêó"
+
-#: Merge.rc:2676
++#: Merge.rc:2887
+ #, c-format
+ msgid "No prediffer (normal)"
+ msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà (óîáè÷à¼åíî)"
+
-#: Merge.rc:2677
++#: Merge.rc:2888
+ #, c-format
+ msgid "Suggested plugins"
+ msgstr "Ïðåïîðó÷åíè äîäàöè"
+
-#: Merge.rc:2678
++#: Merge.rc:2889
+ #, c-format
+ msgid "Other plugins"
+ msgstr "Îñòàëè äîäàöè"
+
-#: Merge.rc:2684
++#: Merge.rc:2890
+ #, c-format
+ msgid "Unload all plugins and reload them (for developers)"
+ msgstr "Óêëîíè è ïîíîâî ó÷èò༠ñâå äîäàòêå (çà íàïðåäíå)"
+
-#: Merge.rc:2685
++#: Merge.rc:2896
+ #, c-format
+ msgid ""
+ "Activates next visible file\n"
+ "Activate next File"
+ msgstr "Ïîêðåíè ñëåäå\9eó âèä\9aèâó äàòîòåêó"
+
-#: Merge.rc:2691
++#: Merge.rc:2897
+ #, c-format
+ msgid "Closes all open windows"
+ msgstr "Çàòâîðè ñâå ïðîçîðå"
+
-#: Merge.rc:2692
++#: Merge.rc:2903
+ #, c-format
+ msgid ""
+ "Opens the WinMerge Help\n"
+ "WinMerge Help"
+ msgstr ""
+ "Îòâàðà WinMerge ïîìî\9e\n"
+ "WinMerge /ïîìî\9e/"
+
-#: Merge.rc:2693
++#: Merge.rc:2904
+ #, c-format
+ msgid "Outputs current WinMerge version info and configuration to text file"
+ msgstr "Èçëàçè îáàâåøòå\9cå î òðåíóòíîì èçäà\9có WinMerge-à è ïîäåøåíîñòè ó òåêñòóàëíî¼ äàòîòåöè"
+
-#: Merge.rc:2694
++#: Merge.rc:2905
+ #, c-format
+ msgid "Display the GNU General Public License"
+ msgstr "Ïðèêàç GNU ¼àâíå ëèöåíöå"
+
-#: Merge.rc:2695
++#: Merge.rc:2906
+ #, c-format
+ msgid "Private Build: %1"
+ msgstr "Ëè÷íà èçðàäà: %1"
+
-#: Merge.rc:2696
++#: Merge.rc:2907
+ #, c-format
+ msgid ""
+ "Opens the release notes document\n"
+ "Release Notes"
+ msgstr ""
+ "Îòâàðà áåëåøêå î èçäà\9có äîêóìåíòa\n"
+ "Áåëåøêå î èçäà\9có"
+
-#: Merge.rc:2702
++#: Merge.rc:2908
+ #, c-format
+ msgid ""
+ "Opens the translations website\n"
+ "Translations"
+ msgstr ""
+ "Îòâîðè âåá ñà¼ò ïðåâîäà\n"
+ "Ïðåâîäè"
+
-#: Merge.rc:2703
++#: Merge.rc:2914
+ #, c-format
+ msgid "Plugin Settings"
+ msgstr "Ïîäåøàâà\9cà äîäàòàêà"
+
-#: Merge.rc:2704
++#: Merge.rc:2915
+ #, c-format
+ msgid "No prediffer"
+ msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà"
+
-#: Merge.rc:2706
++#: Merge.rc:2916
+ #, c-format
+ msgid "Prediff if possible"
+ msgstr "Äåôèíèøè ïîðå\90å\9cå,àêî ¼å ìîãó\9eå"
+
-#: Merge.rc:2707
++#: Merge.rc:2918
+ #, c-format
+ msgid "WSH not found - .sct scripts disabled"
+ msgstr "WSH íè¼å íà\90åí - .sct ñêðèïòå ñó îíåìîãó\9eåíå"
+
-#: Merge.rc:2708
++#: Merge.rc:2919
+ #, c-format
+ msgid "<None>"
+ msgstr "<Íèøòà>"
+
-#: Merge.rc:2714
++#: Merge.rc:2920
+ #, c-format
+ msgid "<Automatic>"
+ msgstr "<Àóòîìàòñêè>"
+
-#: Merge.rc:2715
++#: Merge.rc:2926
+ #, c-format
+ msgid "Open the file with registered application"
+ msgstr "Îòâîðè äàòîòåêó ñà ðåãèñòðîâàíèì ïðîãðàìîì"
+
-#: Merge.rc:2716
++#: Merge.rc:2927
+ #, c-format
+ msgid "Open the file with external editor"
+ msgstr "Îòâîðè äàòîòåêó ñà äðóãèì óðå\90èâà÷åì"
+
-#: Merge.rc:2722
++#: Merge.rc:2928
+ #, c-format
+ msgid "Open the file with a particular program"
+ msgstr "Îòâîðè äàòîòåêó ñà ïîñåáíèì ïðîãðàìîì"
+
-#: Merge.rc:2723
++#: Merge.rc:2934
+ #, c-format
+ msgid "Do not display moved blocks"
+ msgstr "Íå ïðèêàçó¼ ïðåìåøòåíå ãðóïå"
+
-#: Merge.rc:2724
++#: Merge.rc:2935
+ #, c-format
+ msgid "Display all moved blocks"
+ msgstr "Ïðèêàæè ñâå ïðåìåøòåíå ãðóïå"
+
-#: Merge.rc:2725
++#: Merge.rc:2936
+ #, c-format
+ msgid "Display moved blocks only from current diff"
+ msgstr "Ïðèêàæè ïðåìåøòåíå ãðóïå ñàìî òðåíóòíèõ ðàçëèêà"
+
-#: Merge.rc:2726
++#: Merge.rc:2937
+ #, c-format
+ msgid "Go to diff under cursor"
+ msgstr "Èäè íà ðàçëèêå ïîä /ïîêàçèâà÷åì/"
+
-#: Merge.rc:2727
++#: Merge.rc:2938
+ #, c-format
+ msgid "G&oto Diff %1 of %2"
+ msgstr "È&äè íà ðàçëèêå %1 îä %2"
+
-#: Merge.rc:2733
++#: Merge.rc:2939
+ #, c-format
+ msgid "G&oto Line %1"
+ msgstr "È&äè íà ðåä %1"
+
-#: Merge.rc:2734
++#: Merge.rc:2945
+ #, c-format
+ msgid "Disabled"
+ msgstr "Îíåìîãó\9eè"
+
-#: Merge.rc:2735
++#: Merge.rc:2946
+ #, c-format
+ msgid "From file system"
+ msgstr "Îä ñèñòåìà"
+
-#: Merge.rc:2741
++#: Merge.rc:2947
+ #, c-format
+ msgid "From MRU list"
+ msgstr "Èç MRU ñïèñêà"
+
-#: Merge.rc:2742
++#: Merge.rc:2953
+ #, c-format
+ msgid "No Highlighting"
+ msgstr "Íè¼å îçíà÷åíî"
+
-#: Merge.rc:2743
++#: Merge.rc:2954
+ #, c-format
+ msgid "ASP"
+ msgstr "ASP"
+
-#: Merge.rc:2744
++#: Merge.rc:2955
+ #, c-format
+ msgid "Basic"
+ msgstr "Basic"
+
-#: Merge.rc:2745
++#: Merge.rc:2956
+ #, c-format
+ msgid "Batch"
+ msgstr "Batch"
+
-#: Merge.rc:2746
++#: Merge.rc:2957
+ #, c-format
+ msgid "C/C++"
+ msgstr "C/C++"
+
-#: Merge.rc:2747
++#: Merge.rc:2958
+ #, c-format
+ msgid "C#"
+ msgstr "C#"
+
-#: Merge.rc:2748
++#: Merge.rc:2959
+ #, c-format
+ msgid "CSS"
+ msgstr "CSS"
+
-#: Merge.rc:2749
++#: Merge.rc:2960
+ #, c-format
+ msgid "DCL"
+ msgstr "DCL"
+
-#: Merge.rc:2750
-#, c-format
-msgid "HTML"
-msgstr "HTML"
-
-#: Merge.rc:2751
++#: Merge.rc:2961
+ #, c-format
+ msgid "Fortran"
+ msgstr "Fortran"
+
-#: Merge.rc:2752
++#: Merge.rc:2963
+ #, c-format
+ msgid "INI"
+ msgstr "INI"
+
-#: Merge.rc:2753
++#: Merge.rc:2964
+ #, c-format
+ msgid "InnoSetup"
+ msgstr "InnoSetup"
+
-#: Merge.rc:2754
++#: Merge.rc:2965
+ #, c-format
+ msgid "InstallShield"
+ msgstr "InstallShield"
+
-#: Merge.rc:2755
++#: Merge.rc:2966
+ #, c-format
+ msgid "Java"
+ msgstr "Java"
+
-#: Merge.rc:2756
++#: Merge.rc:2967
+ #, c-format
+ msgid "AutoLISP"
+ msgstr "AutoLISP"
+
-#: Merge.rc:2757
++#: Merge.rc:2968
+ #, c-format
+ msgid "NSIS"
+ msgstr "NSIS"
+
-#: Merge.rc:2758
++#: Merge.rc:2969
+ #, c-format
+ msgid "Pascal"
+ msgstr "Pascal"
+
-#: Merge.rc:2759
++#: Merge.rc:2970
+ #, c-format
+ msgid "Perl"
+ msgstr "Perl"
+
-#: Merge.rc:2760
++#: Merge.rc:2971
+ #, c-format
+ msgid "PHP"
+ msgstr "PHP"
+
-#: Merge.rc:2761
++#: Merge.rc:2972
+ #, c-format
+ msgid "Portable Object"
+ msgstr "Ïðåíîñíè îá¼åêàò"
+
-#: Merge.rc:2762
++#: Merge.rc:2973
+ #, c-format
+ msgid "PowerShell"
+ msgstr "PowerShell"
+
-#: Merge.rc:2763
++#: Merge.rc:2974
+ #, c-format
+ msgid "Python"
+ msgstr "Python"
+
-#: Merge.rc:2764
++#: Merge.rc:2975
+ #, c-format
+ msgid "REXX"
+ msgstr "REXX"
+
-#: Merge.rc:2765
++#: Merge.rc:2976
+ #, c-format
+ msgid "Resources"
+ msgstr "Resources"
+
-#: Merge.rc:2766
++#: Merge.rc:2977
+ #, c-format
+ msgid "Ruby"
+ msgstr "Ruby"
+
-#: Merge.rc:2767
++#: Merge.rc:2978
+ #, c-format
+ msgid "SGML"
+ msgstr "SGML"
+
-#: Merge.rc:2768
++#: Merge.rc:2979
+ #, c-format
+ msgid "Shell"
+ msgstr "Shell"
+
-#: Merge.rc:2769
++#: Merge.rc:2980
+ #, c-format
+ msgid "SIOD"
+ msgstr "SIOD"
+
-#: Merge.rc:2770
++#: Merge.rc:2981
+ #, c-format
+ msgid "SQL"
+ msgstr "SQL"
+
-#: Merge.rc:2771
++#: Merge.rc:2982
+ #, c-format
+ msgid "TCL"
+ msgstr "TCL"
+
-#: Merge.rc:2772
++#: Merge.rc:2983
+ #, c-format
+ msgid "TEX"
+ msgstr "TEX"
+
-#: Merge.rc:2773
++#: Merge.rc:2984
+ #, c-format
+ msgid "Verilog"
+ msgstr "Verilog"
+
-#: Merge.rc:2778
++#: Merge.rc:2985
+ #, c-format
+ msgid "XML"
+ msgstr "XML"
+
-#: Merge.rc:2779
++#: Merge.rc:2990
+ #, c-format
+ msgid "Hide the toolbar"
+ msgstr "Ñàêðè¼ òðàêó àëàòà"
+
-#: Merge.rc:2780
++#: Merge.rc:2991
+ #, c-format
+ msgid "Show small toolbar"
+ msgstr "Ìàëå èêîíå òðàêå àëàòà"
+
++#: Merge.rc:2992
+ #, c-format
+ msgid "Show big toolbar"
+ msgstr "Âåëèêå èêîíå òðàêå àëàòà"
+
--- /dev/null
- #define FILEVER 2,13,12,1\r
- #define PRODUCTVER 2,13,12,1\r
- #define STRFILEVER "2.13.12.1+-jp-1"\r
- #define STRPRODUCTVER "2.13.12.1+-jp-1"\r
++#define FILEVER 2,13,13,1\r
++#define PRODUCTVER 2,13,13,1\r
++#define STRFILEVER "2.13.13.1+-jp-1"\r
++#define STRPRODUCTVER "2.13.13.1+-jp-1"\r
OSDN Git Service
