diff options
Diffstat (limited to 'contrib/windows')
| -rwxr-xr-x | contrib/windows/installer/boxbackup.mpi.in | 2345 | ||||
| -rwxr-xr-x | contrib/windows/installer/tools/RemoteControl.exe | bin | 0 -> 156536 bytes |
2 files changed, 2345 insertions, 0 deletions
diff --git a/contrib/windows/installer/boxbackup.mpi.in b/contrib/windows/installer/boxbackup.mpi.in index dc68f235..182f8c05 100755 --- a/contrib/windows/installer/boxbackup.mpi.in +++ b/contrib/windows/installer/boxbackup.mpi.in @@ -1,5 +1,29 @@ array set info { AccountNo +<<<<<<< HEAD +10005005 + +AllowLanguageSelection +No + +AppName +<%BrandName%> + +ApplicationID +E10C6FD9-E524-28BD-B0AB3588F16C + +ApplicationURL +http://www.boxbackup.org/ + +AutoFileGroups +No + +AutoRefreshFiles +Yes + +BBVersionNo +@box_version@ +======= {10005005} AllowLanguageSelection @@ -22,6 +46,7 @@ AutoRefreshFiles BBVersionNo {@box_version@} +>>>>>>> 0.12 BrandName {Box Backup} @@ -33,7 +58,11 @@ CancelledInstallAction {Rollback and Stop} CleanupCancelledInstall +<<<<<<< HEAD +Yes +======= {Yes} +>>>>>>> 0.12 CommandLineFailureAction {Fail (recommended)} @@ -42,10 +71,17 @@ Company {Tebuco, Inc. and Ben Summers and Contributors} CompressionLevel +<<<<<<< HEAD +6 + +CompressionMethod +zlib +======= {6} CompressionMethod {zlib} +>>>>>>> 0.12 ConfigFileName {<%InstallDir%>\bbackupd.conf} @@ -54,6 +90,15 @@ ConfigFileTemplate {<%InstallDir%>\templates\template.conf} Copyright +<<<<<<< HEAD +{2003-2008 Tebuco, Inc. and Ben Summers and Contributors} + +CreateDesktopShortcut +No + +CreateQuickLaunchShortcut +No +======= {2003-2011 Tebuco, Inc. and Ben Summers and Contributors} CreateDesktopShortcut @@ -61,11 +106,24 @@ CreateDesktopShortcut CreateQuickLaunchShortcut {No} +>>>>>>> 0.12 DefaultDirectoryLocation {} DefaultLanguage +<<<<<<< HEAD +English + +EncryptedKeyFilePassword +Enter_EncryptedKeys_Password_Here + +Ext +.exe + +ExtractSolidArchivesOnStartup +No +======= {English} DefaultToSystemLanguage @@ -82,10 +140,21 @@ Ext ExtractSolidArchivesOnStartup {No} +>>>>>>> 0.12 Icon {} +<<<<<<< HEAD +Image +@build_dir@/docs/html/images/bblogo.png + +IncludeDebugging +Yes + +InstallDirSuffix +<%ShortAppName%> +======= IgnoreDirectories {} @@ -100,11 +169,48 @@ IncludeDebugging InstallDirSuffix {<%ShortAppName%>} +>>>>>>> 0.12 InstallPassword {} InstallVersion +<<<<<<< HEAD +@box_version@ + +Language,de +No + +Language,en +Yes + +Language,es +No + +Language,fr +No + +Language,hu +Yes + +Language,it +Yes + +Language,nl +Yes + +Language,pl +No + +Language,pt_br +No + +Language,ru +Yes + +LaunchApplication +No +======= {0.0.0.0} Language,ca @@ -154,6 +260,7 @@ LastIgnoreFiles LaunchApplication {No} +>>>>>>> 0.12 PackageDescription {<%BrandName%> Backup Service} @@ -165,18 +272,71 @@ PackageMaintainer {Tebuco, Inc. and Ben Summers and Contributors} PackageName +<<<<<<< HEAD +<%ShortAppName%> +======= {<%ShortAppName%>} +>>>>>>> 0.12 PackagePackager {Tebuco, Inc. and Ben Summers and Contributors} PackageRelease +<<<<<<< HEAD +<%PatchVersion%> +======= {<%PatchVersion%>} +>>>>>>> 0.12 PackageSummary {} PackageVersion +<<<<<<< HEAD +<%MajorVersion%>.<%MinorVersion%> + +PreserveFileAttributes +Yes + +PreserveFilePermissions +Yes + +ProjectID +140B9882-3327-FEA8-13415A62FBB2 + +ProjectVersion +1.2.9.0 + +SaveOnlyToplevelDirs +No + +ScriptExt +.bat + +ServiceExeName +bbackupd.exe + +ServiceName +<%BrandName%> + +ShortAppName +<%BrandName%> + +SkipUnusedFileGroups +Yes + +SystemLanguage +en_us + +Theme +Modern_Wizard + +ThemeDir +Modern_Wizard + +ThemeVersion +1 +======= {<%MajorVersion%>.<%MinorVersion%>} PreserveFileAttributes @@ -220,12 +380,17 @@ ThemeDir ThemeVersion {1} +>>>>>>> 0.12 UpgradeApplicationID {} UserInfoAcctNo +<<<<<<< HEAD +<%AccountNo%> +======= {<%AccountNo%>} +>>>>>>> 0.12 UserInfoCompany {} @@ -240,6 +405,18 @@ UserInfoPhone {} Version +<<<<<<< HEAD +@box_version@ + +ViewReadme +No + +WizardHeight +365 + +WizardWidth +500 +======= {@box_version@} ViewReadme @@ -250,6 +427,7 @@ WizardHeight WizardWidth {500} +>>>>>>> 0.12 } @@ -299,6 +477,69 @@ test {Testing Switch Yes No {} {run uninstaller without uninstalling any files}} } +<<<<<<< HEAD +FileGroup ::481451CC-F49C-D389-8645076F595B -setup Install -active Yes -platforms {Windows MacOS-X} -name {Program Files} -parent FileGroups +File ::B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 -filemethod {Update files with more recent dates} -type dir -directory <%InstallDir%> -name /home/petjal/doc/teb/cli/bu/installer/win/2.2 -location @client_parcel_dir@ -parent 481451CC-F49C-D389-8645076F595B +File ::CDDED10B-2747-DD07-5F9D-42A7FD7BB7E6 -name LICENSE.txt -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::D6E262BC-8A84-B6DB-794B-8FDC8AECB079 -name mgwz.dll -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::E56A0360-7D7F-D99E-E9A4-3C20BC4C2B99 -name mingwm10.dll -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::47602DF7-8463-AB89-E13F-11983610CAA2 -type dir -name tools -location @build_dir@/contrib/windows/installer/tools -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::F7F61231-C340-5CD5-686B-01F521994B0C -name InstallService.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::68DAE474-165D-81FE-1396-FDD2E6081B41 -name KillBackupProcess.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::2436C940-3332-13AA-7613-8EE67C35CE9B -name ReloadConfig.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::336DDAC3-F3BA-1117-73D4-11DFEF9E98AB -name RemoveService.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::0C15AE46-0FF3-3B7F-FC55-D91EF279DBD3 -name RestartService.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::58D97EDE-58F2-15D7-7113-BEE3047F0782 -name StartService.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::BE7CDB16-D3FE-30FA-2153-7C0509CD5E78 -name StopService.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::73BD5859-FB38-71F8-24BD-BDCF871F9FD3 -name Sync.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::67B3838F-4EF7-2C1C-2E86-78DB8ADD6682 -name ShowUsage.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::2646A97C-C0D9-A29C-E145-C5C371F44938 -name QueryOutputAll.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::2F41E3D2-DA4D-2FCB-B3D5-F04032D17A63 -name QueryOutputCurrent.bat -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::C6430BDD-8A07-B80E-FC0C-426C16EB4187 -name RemoteControl.exe -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 -type dir -name .svn -active 0 -parent 47602DF7-8463-AB89-E13F-11983610CAA2 +File ::31429CC4-525E-4E30-9328-4774AFA9F619 -name entries -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::A27BEFB6-1421-4030-8F11-F04316BCE57C -name format -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::C99700CE-1035-498C-9A96-B60835652077 -type dir -name prop-base -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::6FF9DFDE-4BB7-4319-AC85-BF1E88731C1C -name InstallService.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::6AAE8600-5CFC-4240-A47F-5CFCF4E571C6 -name KillBackupProcess.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::834C33D3-4B53-4B2D-9380-A05420AEE75F -name QueryOutputAll.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::854AD23A-5DDE-44C4-900C-34F5845E6747 -name QueryOutputCurrent.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::9A587DE7-B17C-4CDF-B92C-0D267E30E361 -name ReloadConfig.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::197AAEFA-C62E-4E79-890F-C2E4C8440239 -name RemoteControl.exe.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::912E0F50-53DD-4483-A4F4-CA69944A5959 -name RemoveService.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::BDD695BF-9C7E-4F06-BBCE-EC89536DCF27 -name RestartService.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::61615EE4-BF66-40E7-B89A-E6A50B92AF93 -name ShowUsage.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::A6F7C6B7-9759-4B86-9388-4A42E6F7C5C3 -name StartService.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::45D3E7F5-277B-4E52-81BA-ED6D2BB441D7 -name StopService.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::58966972-8387-4D14-A06E-15AA176633A3 -name Sync.bat.svn-base -active 0 -parent C99700CE-1035-498C-9A96-B60835652077 +File ::2A77AF5B-4761-45B5-A543-6328A7F0F39B -type dir -name props -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 -type dir -name text-base -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::D972D6B2-40E5-40B3-BC06-66B8B7F51B04 -name InstallService.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::2F14E4F3-5331-4AC5-93F7-C4748970C7F4 -name KillBackupProcess.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::9F3663B2-8BAA-4EAE-B606-53D5C922E703 -name QueryOutputAll.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::BE9BD4FB-DF44-4F4B-BB55-15285A8566BA -name QueryOutputCurrent.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::3B4E0BF4-7FDD-4903-8D43-76C43F38C6C4 -name ReloadConfig.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::038CEEA0-3F21-48F6-B109-BBE1EF7D3E96 -name RemoteControl.exe.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::0C177E04-DF2D-43AB-8A42-9E7A389AB1D1 -name RemoveService.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::9BE16F40-9D1D-4C84-843D-955A44069040 -name RestartService.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::4E503A3C-EB42-4870-9849-D508A3D9BAB7 -name ShowUsage.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::131B7D8B-1BEB-456C-8F05-386C2EAFBEAE -name StartService.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::D3D0AFC1-CB6C-42D4-8C05-21898505DA40 -name StopService.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::C89F78B2-25A7-432B-9D92-DC2AB636CFB5 -name Sync.bat.svn-base -active 0 -parent BF74F2C1-3CE7-4875-9B52-CD0F527E01C7 +File ::90695C82-0000-4F6A-8FE7-0ABDEAA17CAE -type dir -name tmp -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::7DFF0EE4-7298-4C8C-A5BC-56BBDD81CFC8 -type dir -name prop-base -active 0 -parent 90695C82-0000-4F6A-8FE7-0ABDEAA17CAE +File ::4C60E473-119E-4B0B-9B01-56240F24D9D5 -type dir -name props -active 0 -parent 90695C82-0000-4F6A-8FE7-0ABDEAA17CAE +File ::E1E25ACC-487B-4191-B8CF-9E7C8C88EA09 -type dir -name text-base -active 0 -parent 90695C82-0000-4F6A-8FE7-0ABDEAA17CAE +File ::E7258732-3D21-4E89-AA41-24AA8B8EBF29 -name all-wcprops -active 0 -parent 5EADAB59-F559-44CB-A3EE-9A56D4EF17C8 +File ::9CEBA2A0-C68B-48BA-944E-2E8EE9A35D97 -name bbackupctl.exe -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::497483A6-7264-4361-86F2-F2703F719908 -name bbackupd-config -active 0 -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::204358FC-610F-47DF-8928-1D0E39921700 -targetfilename templates/original.conf -name bbackupd.conf -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::98C376E2-A6C3-4B6C-BBD4-F70CAC2E6A7B -name bbackupd.exe -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::5C3EAB34-7CD4-4DF3-9DEB-0FC23A6F5812 -name bbackupquery.exe -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::7633DBC3-EACA-4F9B-9A87-AD3AF0EC298E -name installer.iss -active 0 -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::D3CF86E1-CAFF-4342-8730-463F96EACC39 -targetfilename templates/NotifySysAdmin.original.vbs -name NotifySysAdmin.vbs -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +File ::A702625F-29C7-4CA0-A8F8-E50DBF5C541B -name uninstall.exe -active 0 -parent B9F58CFC-EE7A-BEE4-62CB-2C10665095A2 +======= FileGroup ::481451CC-F49C-D389-8645076F595B -setup Install -active Yes -platforms {Windows} -name Binaries -parent FileGroups File ::0D5FA1BE-D208-402E-A358-978A57513DCE -name @client_parcel_dir@/bbackupctl.exe -parent 481451CC-F49C-D389-8645076F595B File ::4BE333C8-23F0-4629-82D6-E655641D4007 -name @client_parcel_dir@/bbackupd.exe -parent 481451CC-F49C-D389-8645076F595B @@ -316,10 +557,20 @@ File ::A72A7844-0245-40C8-B5AE-D10F8654318E -name @build_dir@/distribution/boxba File ::47390686-C767-4E91-AE69-4A980C67B304 -name @build_dir@/distribution/boxbackup/DOCUMENTATION.txt -parent 2C456223-3E1E-4D43-B31A-868EAD3241E1 File ::D4EF569E-F14A-41B7-853C-46C652DA51A7 -name @build_dir@/distribution/boxbackup/THANKS.txt -parent 2C456223-3E1E-4D43-B31A-868EAD3241E1 File ::143FE54A-7743-4AA5-9DF9-084ECA4ABFF9 -name @build_dir@/distribution/boxbackup/VERSION.txt -parent 2C456223-3E1E-4D43-B31A-868EAD3241E1 +>>>>>>> 0.12 Component ::4A9C852B-647E-EED5-5482FFBCC2AF -setup Install -active Yes -platforms {Windows MacOS-X} -name {Default Component} -parent Components SetupType ::8202CECC-54A0-9B6C-D24D111BA52E -setup Install -active Yes -platforms {Windows MacOS-X} -name Typical -parent SetupTypes InstallComponent AE3BD5B4-35DE-4240-B79914D43E56 -setup Install -type pane -title {Welcome Screen} -component Welcome -active No -parent StandardInstall +<<<<<<< HEAD +InstallComponent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 -setup Install -type pane -conditions 4EE35849-FAD7-170B-0E45-FA30636467B1 -title {Install Password} -component InstallPassword -command insert -active No -parent StandardInstall +Condition 4EE35849-FAD7-170B-0E45-FA30636467B1 -active Yes -parent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 -title {Password Test Condition} -component PasswordTestCondition -TreeObject::id 4EE35849-FAD7-170B-0E45-FA30636467B1 +InstallComponent B3B99E2D-C368-A921-B7BC-A71EBDE3AD4D -setup Install -type action -title {Set Install Password} -component SetInstallPassword -active Yes -parent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 +InstallComponent 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E -setup Install -type pane -title {User Information} -component UserInformation -active Yes -parent StandardInstall +InstallComponent 9013E862-8E81-5290-64F9-D8BCD13EC7E5 -setup Install -type pane -title {User Information Phone Email} -component UserInformation -active Yes -parent StandardInstall +InstallComponent F8FD4BD6-F1DF-3F8D-B857-98310E4B1143 -setup Install -type pane -title {User Information Account No} -component UserInformation -active Yes -parent StandardInstall +InstallComponent 58E1119F-639E-17C9-5D3898F385AA -setup Install -type pane -conditions 84DA7F05-9FB7-CC36-9EC98F8A6826 -title {Select Destination} -component SelectDestination -command insert -active Yes -parent StandardInstall +======= InstallComponent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 -setup Install -type pane -conditions 4EE35849-FAD7-170B-0E45-FA30636467B1 -title {Install Password} -component InstallPassword -active No -parent StandardInstall Condition 4EE35849-FAD7-170B-0E45-FA30636467B1 -active Yes -parent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 -title {Password Test Condition} -component PasswordTestCondition -TreeObject::id 4EE35849-FAD7-170B-0E45-FA30636467B1 InstallComponent B3B99E2D-C368-A921-B7BC-A71EBDE3AD4D -setup Install -type action -title {Set Install Password} -component SetInstallPassword -active Yes -parent 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8 @@ -327,12 +578,17 @@ InstallComponent 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E -setup Install -type pane InstallComponent 9013E862-8E81-5290-64F9-D8BCD13EC7E5 -setup Install -type pane -title {User Information Phone Email} -component UserInformation -active No -parent StandardInstall InstallComponent F8FD4BD6-F1DF-3F8D-B857-98310E4B1143 -setup Install -type pane -title {User Information Account No} -component UserInformation -active Yes -parent StandardInstall InstallComponent 58E1119F-639E-17C9-5D3898F385AA -setup Install -type pane -conditions 84DA7F05-9FB7-CC36-9EC98F8A6826 -title {Select Destination} -component SelectDestination -active Yes -parent StandardInstall +>>>>>>> 0.12 Condition 84DA7F05-9FB7-CC36-9EC98F8A6826 -active Yes -parent 58E1119F-639E-17C9-5D3898F385AA -title {File Permission Condition} -component FilePermissionCondition -TreeObject::id 84DA7F05-9FB7-CC36-9EC98F8A6826 InstallComponent 0FDBA082-90AB-808C-478A-A13E7C525336 -setup Install -type action -title BackupLocationNumber -component ExecuteScript -active Yes -parent 58E1119F-639E-17C9-5D3898F385AA InstallComponent 0047FF40-0139-2A59-AAC0-A44D46D6F5CC -setup Install -type action -title BackupLocationName -component ExecuteScript -active No -parent 58E1119F-639E-17C9-5D3898F385AA InstallComponent 2BB06B72-DE53-2319-B1B8-351CDCBA2008 -setup Install -type action -title AddBackupLocation -component ExecuteScript -active Yes -parent 58E1119F-639E-17C9-5D3898F385AA InstallComponent B506E7DA-E7C4-4D42-8C03-FD27BA16D078 -setup Install -type pane -title {License Agreement} -component License -active Yes -parent StandardInstall +<<<<<<< HEAD +InstallComponent B93D2216-1DDB-484C-A9AC-D6C18ED7DE23 -setup Install -type action -conditions {6D9D1ABC-7146-443F-9EE9-205D5CA6C830 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C} -title {Modify Widget} -component ModifyWidget -command insert -active Yes -parent B506E7DA-E7C4-4D42-8C03-FD27BA16D078 +======= InstallComponent B93D2216-1DDB-484C-A9AC-D6C18ED7DE23 -setup Install -type action -conditions {6D9D1ABC-7146-443F-9EE9-205D5CA6C830 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C} -title {Modify Widget} -component ModifyWidget -active Yes -parent B506E7DA-E7C4-4D42-8C03-FD27BA16D078 +>>>>>>> 0.12 Condition 6D9D1ABC-7146-443F-9EE9-205D5CA6C830 -active Yes -parent B93D2216-1DDB-484C-A9AC-D6C18ED7DE23 -title {String Is Condition} -component StringIsCondition -TreeObject::id 6D9D1ABC-7146-443F-9EE9-205D5CA6C830 Condition 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C -active Yes -parent B93D2216-1DDB-484C-A9AC-D6C18ED7DE23 -title {String Is Condition} -component StringIsCondition -TreeObject::id 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C InstallComponent 37E627F2-E04B-AEF2-D566C017A4D6 -setup Install -type pane -title {Copying Files} -component CopyFiles -active Yes -parent StandardInstall @@ -349,7 +605,11 @@ InstallComponent 5F2C1F1C-B9F7-1642-59D9-A18318C1D70B -setup Install -type actio InstallComponent 2EC82FBD-8294-A3E4-7F39-1CBA0582FA64 -setup Install -type action -title {Write Text To File} -component WriteTextToFile -active Yes -parent 37E627F2-E04B-AEF2-D566C017A4D6 InstallComponent 28E76C8B-2605-4739-9FFE-9C2880C17E59 -setup Install -type action -title {Edit config file} -component ExecuteExternalProgram -active No -parent 37E627F2-E04B-AEF2-D566C017A4D6 InstallComponent 52F0A238-57E1-A578-2CE4DA177B32 -setup Install -type action -title {Move Forward} -component MoveForward -active Yes -parent 37E627F2-E04B-AEF2-D566C017A4D6 +<<<<<<< HEAD +InstallComponent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 -setup Install -type pane -title SetBackupLocations -component CustomBlankPane2 -command reorder -active Yes -parent StandardInstall +======= InstallComponent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 -setup Install -type pane -title SetBackupLocations -component CustomBlankPane2 -active Yes -parent StandardInstall +>>>>>>> 0.12 InstallComponent 614C45B2-7515-780C-E444-7F165CF02DD7 -setup Install -type action -title {Execute Script} -component ExecuteScript -active No -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 InstallComponent A5B32DA1-B2FE-C1FA-6057-FBC3059EF076 -setup Install -type action -title {Execute Script} -component ExecuteScript -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 InstallComponent F9E38720-6ABA-8B99-2471-496902E4CBC2 -setup Install -type action -title {Execute Script} -component ExecuteScript -active No -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 @@ -363,12 +623,20 @@ InstallComponent 9892B25C-689B-5B8F-F0C9-B14FF6ACC40C -setup Install -type actio InstallComponent 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37 -setup Install -type action -title AddAnother -component AddWidget -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 InstallComponent C7762473-273F-E3CA-17E3-65789B14CDB0 -setup Install -type action -title {Write Text To File} -component WriteTextToFile -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 InstallComponent D7FBBEBB-2186-5674-BA87-BB7151859D4E -setup Install -type action -title BackupLocationNumber -component ExecuteScript -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 +<<<<<<< HEAD +InstallComponent 49E80443-62DB-1C10-392D-1091AEA5ED88 -setup Install -type action -conditions EB532611-5F30-3C24-66EB-F3826D9054FD -title {Move to Pane} -component MoveToPane -command insert -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 +======= InstallComponent 49E80443-62DB-1C10-392D-1091AEA5ED88 -setup Install -type action -conditions EB532611-5F30-3C24-66EB-F3826D9054FD -title {Move to Pane} -component MoveToPane -active Yes -parent 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 +>>>>>>> 0.12 Condition EB532611-5F30-3C24-66EB-F3826D9054FD -active Yes -parent 49E80443-62DB-1C10-392D-1091AEA5ED88 -title {String Is Condition} -component StringIsCondition -TreeObject::id EB532611-5F30-3C24-66EB-F3826D9054FD InstallComponent 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266 -setup Install -type pane -title {Click Next to Continue} -component CustomBlankPane2 -active Yes -parent StandardInstall InstallComponent DDBBD8A9-13D7-9509-9202-419E989F60A9 -setup Install -type action -title {Add Widget} -component AddWidget -active No -parent 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266 InstallComponent 8E095096-F018-A880-429D-A2177A9B70EA -setup Install -type action -title {Add Widget} -component AddWidget -active No -parent 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266 +<<<<<<< HEAD +InstallComponent 88A50FD5-480F-19A5-DA74-C915EB0A9765 -setup Install -type action -conditions 5EE78EF7-37CA-D440-3DB5-09136CD566B3 -title {Move to Pane} -component MoveToPane -command insert -active No -parent 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266 +======= InstallComponent 88A50FD5-480F-19A5-DA74-C915EB0A9765 -setup Install -type action -conditions 5EE78EF7-37CA-D440-3DB5-09136CD566B3 -title {Move to Pane} -component MoveToPane -active No -parent 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266 +>>>>>>> 0.12 Condition 5EE78EF7-37CA-D440-3DB5-09136CD566B3 -active Yes -parent 88A50FD5-480F-19A5-DA74-C915EB0A9765 -title {String Is Condition} -component StringIsCondition -TreeObject::id 5EE78EF7-37CA-D440-3DB5-09136CD566B3 InstallComponent 908CE221-5A3D-0A78-24A1-E7C91EBE38D4 -setup Install -type pane -title {Next-Build Config} -component CustomBlankPane2 -active No -parent StandardInstall InstallComponent DA33B826-E633-A845-4646-76DFA78B907B -setup Install -type pane -title {Custom Blank Pane 2} -component CustomBlankPane2 -active Yes -parent StandardInstall @@ -383,6 +651,18 @@ InstallComponent 8A761DBD-0640-D98C-9B3AD7672A8F -setup Install -type action -ti InstallComponent 6E70FB1F-6A43-6C23-3242E965A0D0 -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent 574198A7-7322-2F5E-02EF185D965C InstallComponent 8E1A5944-5AF5-5906-16D395E386D8 -setup Install -type action -title {Move Forward} -component MoveForward -active Yes -parent 574198A7-7322-2F5E-02EF185D965C InstallComponent 1F0926EE-6884-1330-B4A1DB11C1BF -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent DefaultInstall +<<<<<<< HEAD +InstallComponent 3B6E2E7C-1A26-27F1-D578E383B128 -setup Install -type action -conditions {13BD88FE-CD71-5AC7-E99C10B6CB28 E02368C5-95B5-03A7-3282740037B0} -title {View Readme Checkbutton} -component AddWidget -command insert -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF +Condition 13BD88FE-CD71-5AC7-E99C10B6CB28 -active Yes -parent 3B6E2E7C-1A26-27F1-D578E383B128 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 13BD88FE-CD71-5AC7-E99C10B6CB28 +Condition E02368C5-95B5-03A7-3282740037B0 -active Yes -parent 3B6E2E7C-1A26-27F1-D578E383B128 -title {String Is Condition} -component StringIsCondition -TreeObject::id E02368C5-95B5-03A7-3282740037B0 +InstallComponent CFFA27AF-A641-E41C-B4A0E3BB3CBB -setup Install -type action -conditions {592F46AE-8CEE-01F3-0BA7EBDCA4F4 793D8178-0F51-7F07-BC5886586D3C} -title {Launch Application Checkbutton} -component AddWidget -command insert -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF +Condition 592F46AE-8CEE-01F3-0BA7EBDCA4F4 -active Yes -parent CFFA27AF-A641-E41C-B4A0E3BB3CBB -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 592F46AE-8CEE-01F3-0BA7EBDCA4F4 +Condition 793D8178-0F51-7F07-BC5886586D3C -active Yes -parent CFFA27AF-A641-E41C-B4A0E3BB3CBB -title {String Is Condition} -component StringIsCondition -TreeObject::id 793D8178-0F51-7F07-BC5886586D3C +InstallComponent 16D53E40-546B-54C3-088B1B5E3BBB -setup Install -type action -conditions {4E643D8A-CA31-018D-57D7053C2CE8 B39C0455-D1B6-7DDC-E2717F83463E} -title {Desktop Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF +Condition 4E643D8A-CA31-018D-57D7053C2CE8 -active Yes -parent 16D53E40-546B-54C3-088B1B5E3BBB -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 4E643D8A-CA31-018D-57D7053C2CE8 +Condition B39C0455-D1B6-7DDC-E2717F83463E -active Yes -parent 16D53E40-546B-54C3-088B1B5E3BBB -title {String Is Condition} -component StringIsCondition -TreeObject::id B39C0455-D1B6-7DDC-E2717F83463E +InstallComponent 937C3FDD-FB28-98BD-3DAB276E59ED -setup Install -type action -conditions {6B966959-05D9-DB32-8D9C4AD2A3DF 748D673B-DFE6-5F74-329903ACE4DB 3379F80B-36D6-73DC-6FC1D6223A26} -title {Quick Launch Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF +======= InstallComponent 3B6E2E7C-1A26-27F1-D578E383B128 -setup Install -type action -conditions {13BD88FE-CD71-5AC7-E99C10B6CB28 E02368C5-95B5-03A7-3282740037B0} -title {View Readme Checkbutton} -component AddWidget -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF Condition 13BD88FE-CD71-5AC7-E99C10B6CB28 -active Yes -parent 3B6E2E7C-1A26-27F1-D578E383B128 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 13BD88FE-CD71-5AC7-E99C10B6CB28 Condition E02368C5-95B5-03A7-3282740037B0 -active Yes -parent 3B6E2E7C-1A26-27F1-D578E383B128 -title {String Is Condition} -component StringIsCondition -TreeObject::id E02368C5-95B5-03A7-3282740037B0 @@ -393,13 +673,20 @@ InstallComponent 16D53E40-546B-54C3-088B1B5E3BBB -setup Install -type action -co Condition 4E643D8A-CA31-018D-57D7053C2CE8 -active Yes -parent 16D53E40-546B-54C3-088B1B5E3BBB -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 4E643D8A-CA31-018D-57D7053C2CE8 Condition B39C0455-D1B6-7DDC-E2717F83463E -active Yes -parent 16D53E40-546B-54C3-088B1B5E3BBB -title {String Is Condition} -component StringIsCondition -TreeObject::id B39C0455-D1B6-7DDC-E2717F83463E InstallComponent 937C3FDD-FB28-98BD-3DAB276E59ED -setup Install -type action -conditions {6B966959-05D9-DB32-8D9C4AD2A3DF 748D673B-DFE6-5F74-329903ACE4DB 3379F80B-36D6-73DC-6FC1D6223A26} -title {Quick Launch Shortcut Checkbutton} -component AddWidget -active Yes -parent 1F0926EE-6884-1330-B4A1DB11C1BF +>>>>>>> 0.12 Condition 6B966959-05D9-DB32-8D9C4AD2A3DF -active Yes -parent 937C3FDD-FB28-98BD-3DAB276E59ED -title {Platform Condition} -component PlatformCondition -TreeObject::id 6B966959-05D9-DB32-8D9C4AD2A3DF Condition 748D673B-DFE6-5F74-329903ACE4DB -active Yes -parent 937C3FDD-FB28-98BD-3DAB276E59ED -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 748D673B-DFE6-5F74-329903ACE4DB Condition 3379F80B-36D6-73DC-6FC1D6223A26 -active Yes -parent 937C3FDD-FB28-98BD-3DAB276E59ED -title {String Is Condition} -component StringIsCondition -TreeObject::id 3379F80B-36D6-73DC-6FC1D6223A26 InstallComponent 3FE82C17-A3E2-4A57-A563-F80818B00B81 -setup Install -type action -title {Console Ask Yes Or No} -component ConsoleAskYesOrNo -active Yes -parent ConsoleInstall +<<<<<<< HEAD +InstallComponent 56EE5149-6AA2-4E0C-8841-F66A2EF9276E -setup Install -type action -conditions 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 -title Exit -component Exit -command insert -active Yes -parent ConsoleInstall +Condition 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 -active Yes -parent 56EE5149-6AA2-4E0C-8841-F66A2EF9276E -title {String Is Condition} -component StringIsCondition -TreeObject::id 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 +InstallComponent 0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5 -setup Install -type action -conditions BC4EA5FD-50BD-4D6E-953F-5E3EDB957360 -title {Console Get User Input} -component ConsoleGetUserInput -command insert -active Yes -parent ConsoleInstall +======= InstallComponent 56EE5149-6AA2-4E0C-8841-F66A2EF9276E -setup Install -type action -conditions 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 -title Exit -component Exit -active Yes -parent ConsoleInstall Condition 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 -active Yes -parent 56EE5149-6AA2-4E0C-8841-F66A2EF9276E -title {String Is Condition} -component StringIsCondition -TreeObject::id 241BBFCE-4EB1-432F-94DD-69D444DDB6C0 InstallComponent 0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5 -setup Install -type action -conditions BC4EA5FD-50BD-4D6E-953F-5E3EDB957360 -title {Console Get User Input} -component ConsoleGetUserInput -active Yes -parent ConsoleInstall +>>>>>>> 0.12 Condition BC4EA5FD-50BD-4D6E-953F-5E3EDB957360 -active Yes -parent 0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5 -title {File Permission Condition} -component FilePermissionCondition -TreeObject::id BC4EA5FD-50BD-4D6E-953F-5E3EDB957360 InstallComponent B002A311-F8E7-41DE-B039-521391924E5B -setup Install -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleInstall InstallComponent D4FC6EB5-DDEE-4E4A-B8E1-D4B588A7928B -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent ConsoleInstall @@ -408,16 +695,26 @@ InstallComponent 6B4CB3C2-4799-4C9F-BA8E-1EE47C4606E1 -setup Install -type actio InstallComponent D8F0AA0F-AD79-C566-15CC508F503B -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent SilentInstall InstallComponent 175CBE81-9EBE-1E21-A91479BEEFAE -setup Install -type action -title Exit -component Exit -active Yes -parent SilentInstall InstallComponent A1DD1DC2-85D7-9BC6-998AC3D4A3A9 -setup Install -type actiongroup -title {Startup Actions} -active Yes -parent ActionGroupsInstall +<<<<<<< HEAD +InstallComponent 1F9E8CB8-02C1-0416-1F7445B4147F -setup Install -type action -conditions {3D0D1898-4C65-3E66-F82F56581E87 32F5B0AF-EB83-7A03-D8FAE1ECE473} -title Exit -component Exit -command insert -active Yes -parent A1DD1DC2-85D7-9BC6-998AC3D4A3A9 +======= InstallComponent 1F9E8CB8-02C1-0416-1F7445B4147F -setup Install -type action -conditions {3D0D1898-4C65-3E66-F82F56581E87 32F5B0AF-EB83-7A03-D8FAE1ECE473} -title Exit -component Exit -active Yes -parent A1DD1DC2-85D7-9BC6-998AC3D4A3A9 +>>>>>>> 0.12 Condition 3D0D1898-4C65-3E66-F82F56581E87 -active Yes -parent 1F9E8CB8-02C1-0416-1F7445B4147F -title {String Is Condition} -component StringIsCondition -TreeObject::id 3D0D1898-4C65-3E66-F82F56581E87 Condition 32F5B0AF-EB83-7A03-D8FAE1ECE473 -active Yes -parent 1F9E8CB8-02C1-0416-1F7445B4147F -title {Ask Yes or No} -component AskYesOrNo -TreeObject::id 32F5B0AF-EB83-7A03-D8FAE1ECE473 InstallComponent 32DC8FB1-A04B-71AA-EC18496D4BD0 -setup Install -type action -title {Create Install Panes} -component CreateInstallPanes -active Yes -parent A1DD1DC2-85D7-9BC6-998AC3D4A3A9 InstallComponent 198905FB-9FAC-23DE-7422D25B8ECA -setup Install -type actiongroup -title {Install Actions} -active Yes -parent ActionGroupsInstall InstallComponent 4D4A7BF0-7CCE-46E6-BDE5222F82D7 -setup Install -type action -title {Install Selected Files} -component InstallSelectedFiles -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA InstallComponent 53588803-6B41-D9FC-A385906A5106 -setup Install -type action -title {Install Uninstaller} -component InstallUninstaller -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA +<<<<<<< HEAD +InstallComponent 73EA65C1-3BE3-B190-55C3E99F6269 -setup Install -type action -conditions 4EF787E3-0643-DE46-15E64BAF0816 -title {Windows Uninstall Registry} -component AddWindowsUninstallEntry -command insert -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA +Condition 4EF787E3-0643-DE46-15E64BAF0816 -active Yes -parent 73EA65C1-3BE3-B190-55C3E99F6269 -title {Platform Condition} -component PlatformCondition -TreeObject::id 4EF787E3-0643-DE46-15E64BAF0816 +InstallComponent 39B2B666-78D8-75E6-6EA071594D34 -setup Install -type action -conditions 18C00430-D6B1-151F-307762B3A045 -title {Uninstall Shortcut} -component InstallWindowsShortcut -command insert -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA +======= InstallComponent 73EA65C1-3BE3-B190-55C3E99F6269 -setup Install -type action -conditions 4EF787E3-0643-DE46-15E64BAF0816 -title {Windows Uninstall Registry} -component AddWindowsUninstallEntry -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA Condition 4EF787E3-0643-DE46-15E64BAF0816 -active Yes -parent 73EA65C1-3BE3-B190-55C3E99F6269 -title {Platform Condition} -component PlatformCondition -TreeObject::id 4EF787E3-0643-DE46-15E64BAF0816 InstallComponent 39B2B666-78D8-75E6-6EA071594D34 -setup Install -type action -conditions 18C00430-D6B1-151F-307762B3A045 -title {Uninstall Shortcut} -component InstallWindowsShortcut -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA +>>>>>>> 0.12 Condition 18C00430-D6B1-151F-307762B3A045 -active Yes -parent 39B2B666-78D8-75E6-6EA071594D34 -title {Platform Condition} -component PlatformCondition -TreeObject::id 18C00430-D6B1-151F-307762B3A045 InstallComponent 6652193C-5D4B-44B6-ABC6-D6E96D89E5DC -setup Install -type action -title {Install Program Folder Shortcut} -component InstallProgramFolderShortcut -active No -parent 198905FB-9FAC-23DE-7422D25B8ECA InstallComponent 9D101299-B80C-441B-8685-6E3AC61808E8 -setup Install -type action -title {RemoteControl Shortcut} -component InstallProgramFolderShortcut -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA @@ -435,6 +732,20 @@ InstallComponent 9A663209-495B-ED16-09BE-457B61148022 -setup Install -type actio InstallComponent C0AF7C05-A31A-8376-BCB9-BA8B3A666252 -setup Install -type action -title SafeQueryAll -component InstallProgramFolderShortcut -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA InstallComponent 32B08FB1-99DF-234E-8BAF-333E80AAC9F5 -setup Install -type action -title Usage -component InstallProgramFolderShortcut -active Yes -parent 198905FB-9FAC-23DE-7422D25B8ECA InstallComponent FEFD090D-C133-BC95-B3564F693CD3 -setup Install -type actiongroup -title {Finish Actions} -active Yes -parent ActionGroupsInstall +<<<<<<< HEAD +InstallComponent DECC120D-6904-7F17-45A49184A5A3 -setup Install -type action -conditions {E44CFF46-6302-C518-B9C30D2E43F7 B0AA6839-AAB6-A602-C0E4ECA2E4FF} -title {Install Desktop Shortcut} -component InstallDesktopShortcut -command insert -active No -parent FEFD090D-C133-BC95-B3564F693CD3 +Condition E44CFF46-6302-C518-B9C30D2E43F7 -active Yes -parent DECC120D-6904-7F17-45A49184A5A3 -title {String Is Condition} -component StringIsCondition -TreeObject::id E44CFF46-6302-C518-B9C30D2E43F7 +Condition B0AA6839-AAB6-A602-C0E4ECA2E4FF -active Yes -parent DECC120D-6904-7F17-45A49184A5A3 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id B0AA6839-AAB6-A602-C0E4ECA2E4FF +InstallComponent 7B770A07-A785-5215-956FA82CF14E -setup Install -type action -conditions {6F94698F-0839-3ABF-0CF2DF05A4C8 738DD098-7E3B-BC89-875CDB93CBE2 8C866252-8760-9B08-FE569C25B60D} -title {Install Quick Launch Shortcut} -component InstallWindowsShortcut -command insert -active No -parent FEFD090D-C133-BC95-B3564F693CD3 +Condition 6F94698F-0839-3ABF-0CF2DF05A4C8 -active Yes -parent 7B770A07-A785-5215-956FA82CF14E -title {String Is Condition} -component StringIsCondition -TreeObject::id 6F94698F-0839-3ABF-0CF2DF05A4C8 +Condition 738DD098-7E3B-BC89-875CDB93CBE2 -active Yes -parent 7B770A07-A785-5215-956FA82CF14E -title {Platform Condition} -component PlatformCondition -TreeObject::id 738DD098-7E3B-BC89-875CDB93CBE2 +Condition 8C866252-8760-9B08-FE569C25B60D -active Yes -parent 7B770A07-A785-5215-956FA82CF14E -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 8C866252-8760-9B08-FE569C25B60D +InstallComponent C105AAAE-7C16-2C9E-769FE4535B60 -setup Install -type action -conditions {2583A547-11DE-1C27-B6D04B023CC0 A6E1B027-A1B4-5848-4F868D028D00 0357FAE9-FCFD-26D8-6541D810CD61} -title {View Readme Window} -component TextWindow -command insert -active No -parent FEFD090D-C133-BC95-B3564F693CD3 +Condition 2583A547-11DE-1C27-B6D04B023CC0 -active Yes -parent C105AAAE-7C16-2C9E-769FE4535B60 -title {String Is Condition} -component StringIsCondition -TreeObject::id 2583A547-11DE-1C27-B6D04B023CC0 +Condition A6E1B027-A1B4-5848-4F868D028D00 -active Yes -parent C105AAAE-7C16-2C9E-769FE4535B60 -title {String Is Condition} -component StringIsCondition -TreeObject::id A6E1B027-A1B4-5848-4F868D028D00 +Condition 0357FAE9-FCFD-26D8-6541D810CD61 -active Yes -parent C105AAAE-7C16-2C9E-769FE4535B60 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 0357FAE9-FCFD-26D8-6541D810CD61 +InstallComponent C33D74B2-26FA-16F5-433A10C6A747 -setup Install -type action -conditions {CC4337CC-F3B5-757C-DFCF5D1D365A 795EE61F-6C0D-4A8B-93E02AA3894A 1528F4F0-145C-A48D-A8526DBB6289} -title {Launch Application} -component ExecuteExternalProgram -command insert -active No -parent FEFD090D-C133-BC95-B3564F693CD3 +======= InstallComponent DECC120D-6904-7F17-45A49184A5A3 -setup Install -type action -conditions {E44CFF46-6302-C518-B9C30D2E43F7 B0AA6839-AAB6-A602-C0E4ECA2E4FF} -title {Install Desktop Shortcut} -component InstallDesktopShortcut -active No -parent FEFD090D-C133-BC95-B3564F693CD3 Condition E44CFF46-6302-C518-B9C30D2E43F7 -active Yes -parent DECC120D-6904-7F17-45A49184A5A3 -title {String Is Condition} -component StringIsCondition -TreeObject::id E44CFF46-6302-C518-B9C30D2E43F7 Condition B0AA6839-AAB6-A602-C0E4ECA2E4FF -active Yes -parent DECC120D-6904-7F17-45A49184A5A3 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id B0AA6839-AAB6-A602-C0E4ECA2E4FF @@ -447,6 +758,7 @@ Condition 2583A547-11DE-1C27-B6D04B023CC0 -active Yes -parent C105AAAE-7C16-2C9E Condition A6E1B027-A1B4-5848-4F868D028D00 -active Yes -parent C105AAAE-7C16-2C9E-769FE4535B60 -title {String Is Condition} -component StringIsCondition -TreeObject::id A6E1B027-A1B4-5848-4F868D028D00 Condition 0357FAE9-FCFD-26D8-6541D810CD61 -active Yes -parent C105AAAE-7C16-2C9E-769FE4535B60 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 0357FAE9-FCFD-26D8-6541D810CD61 InstallComponent C33D74B2-26FA-16F5-433A10C6A747 -setup Install -type action -conditions {CC4337CC-F3B5-757C-DFCF5D1D365A 795EE61F-6C0D-4A8B-93E02AA3894A 1528F4F0-145C-A48D-A8526DBB6289} -title {Launch Application} -component ExecuteExternalProgram -active No -parent FEFD090D-C133-BC95-B3564F693CD3 +>>>>>>> 0.12 Condition CC4337CC-F3B5-757C-DFCF5D1D365A -active Yes -parent C33D74B2-26FA-16F5-433A10C6A747 -title {String Is Condition} -component StringIsCondition -TreeObject::id CC4337CC-F3B5-757C-DFCF5D1D365A Condition 795EE61F-6C0D-4A8B-93E02AA3894A -active Yes -parent C33D74B2-26FA-16F5-433A10C6A747 -title {String Is Condition} -component StringIsCondition -TreeObject::id 795EE61F-6C0D-4A8B-93E02AA3894A Condition 1528F4F0-145C-A48D-A8526DBB6289 -active Yes -parent C33D74B2-26FA-16F5-433A10C6A747 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 1528F4F0-145C-A48D-A8526DBB6289 @@ -457,6 +769,17 @@ InstallComponent 7A983CD8-302C-4942-BE59-525C5B5FA2F2 -setup Uninstall -type act InstallComponent E4DEA723-FC78-45D7-BAB1-A3E4C4C96EA1 -setup Uninstall -type action -title {Stop Service} -component ExecuteExternalProgram -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D InstallComponent B4D31D1E-ADB1-DE8F-18EB7294DDA8 -setup Uninstall -type action -title {Remove Service} -component ExecuteExternalProgram -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D InstallComponent D55BA4AF-E73B-60D1-E26F79175227 -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D +<<<<<<< HEAD +InstallComponent 69FD7409-5E2A-143B-DABD1C3B1E67 -setup Uninstall -type action -conditions {96A68CAC-9ED7-806C-086B104720FD E161F216-E597-B340-C1A71C476E2C} -title {Uninstall Leftover Files} -component UninstallLeftoverFiles -command insert -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D +Condition 96A68CAC-9ED7-806C-086B104720FD -active Yes -parent 69FD7409-5E2A-143B-DABD1C3B1E67 -title {String Is Condition} -component StringIsCondition -TreeObject::id 96A68CAC-9ED7-806C-086B104720FD +Condition E161F216-E597-B340-C1A71C476E2C -active Yes -parent 69FD7409-5E2A-143B-DABD1C3B1E67 -title {Ask Yes or No} -component AskYesOrNo -TreeObject::id E161F216-E597-B340-C1A71C476E2C +InstallComponent 05060263-E852-87AB-8D0F2954CAA6 -setup Uninstall -type action -title {Move Forward} -component MoveForward -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D +InstallComponent 41D3E165-C263-5F80-0FEEC0AEE47A -setup Uninstall -type pane -conditions EB2B31A1-C111-3582-0C8A5656692A -title {Uninstall Details} -component UninstallDetails -command insert -active Yes -parent StandardUninstall +Condition EB2B31A1-C111-3582-0C8A5656692A -active Yes -parent 41D3E165-C263-5F80-0FEEC0AEE47A -title {String Is Condition} -component StringIsCondition -TreeObject::id EB2B31A1-C111-3582-0C8A5656692A +InstallComponent 3D33AA8C-0037-204B-39A339FD38BD -setup Uninstall -type pane -title {Uninstall Complete} -component UninstallComplete -active Yes -parent StandardUninstall +InstallComponent 49E59F91-27F7-46D1-A1C1-19865C2392D3 -setup Uninstall -type action -title {Console Ask Yes Or No} -component ConsoleAskYesOrNo -active Yes -parent ConsoleUninstall +InstallComponent ADA6EB2F-8820-4366-BBEF-ED1335B7F828 -setup Uninstall -type action -conditions 87DE6D78-81E1-495B-A214-B3FF3E7E5614 -title Exit -component Exit -command insert -active Yes -parent ConsoleUninstall +======= InstallComponent 69FD7409-5E2A-143B-DABD1C3B1E67 -setup Uninstall -type action -conditions {96A68CAC-9ED7-806C-086B104720FD E161F216-E597-B340-C1A71C476E2C} -title {Uninstall Leftover Files} -component UninstallLeftoverFiles -active Yes -parent 3B8CDC8E-1239-D2E9-DF4CA6B1756D Condition 96A68CAC-9ED7-806C-086B104720FD -active Yes -parent 69FD7409-5E2A-143B-DABD1C3B1E67 -title {String Is Condition} -component StringIsCondition -TreeObject::id 96A68CAC-9ED7-806C-086B104720FD Condition E161F216-E597-B340-C1A71C476E2C -active Yes -parent 69FD7409-5E2A-143B-DABD1C3B1E67 -title {Ask Yes or No} -component AskYesOrNo -TreeObject::id E161F216-E597-B340-C1A71C476E2C @@ -466,6 +789,7 @@ Condition EB2B31A1-C111-3582-0C8A5656692A -active Yes -parent 41D3E165-C263-5F80 InstallComponent 3D33AA8C-0037-204B-39A339FD38BD -setup Uninstall -type pane -title {Uninstall Complete} -component UninstallComplete -active Yes -parent StandardUninstall InstallComponent 49E59F91-27F7-46D1-A1C1-19865C2392D3 -setup Uninstall -type action -title {Console Ask Yes Or No} -component ConsoleAskYesOrNo -active Yes -parent ConsoleUninstall InstallComponent ADA6EB2F-8820-4366-BBEF-ED1335B7F828 -setup Uninstall -type action -conditions 87DE6D78-81E1-495B-A214-B3FF3E7E5614 -title Exit -component Exit -active Yes -parent ConsoleUninstall +>>>>>>> 0.12 Condition 87DE6D78-81E1-495B-A214-B3FF3E7E5614 -active Yes -parent ADA6EB2F-8820-4366-BBEF-ED1335B7F828 -title {String Is Condition} -component StringIsCondition -TreeObject::id 87DE6D78-81E1-495B-A214-B3FF3E7E5614 InstallComponent B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174 -setup Uninstall -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleUninstall InstallComponent 3C7130B3-3206-403D-B09E-59D4A758FBAD -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent ConsoleUninstall @@ -474,7 +798,11 @@ InstallComponent 7F85263E-CAE2-46BA-AAC0-6B89D20FD2DE -setup Uninstall -type act InstallComponent 17D8BA8E-5992-AA5C-F5ECB73A3433 -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent SilentUninstall InstallComponent D3D73C76-D9D3-07DA-63D4163A44BE -setup Uninstall -type action -title Exit -component Exit -active Yes -parent SilentUninstall InstallComponent 848844B5-6103-9343-8B731B0BE4E0 -setup Uninstall -type actiongroup -title {Startup Actions} -active Yes -parent ActionGroupsUninstall +<<<<<<< HEAD +InstallComponent 97ACF525-C075-8635-E019202A83D8 -setup Uninstall -type action -conditions {DFFF91A9-2CA5-6ABE-8474D814AF88 4ACB0B47-42B3-2B3A-BFE9AA4EC707} -title Exit -component Exit -command insert -active Yes -parent 848844B5-6103-9343-8B731B0BE4E0 +======= InstallComponent 97ACF525-C075-8635-E019202A83D8 -setup Uninstall -type action -conditions {DFFF91A9-2CA5-6ABE-8474D814AF88 4ACB0B47-42B3-2B3A-BFE9AA4EC707} -title Exit -component Exit -active Yes -parent 848844B5-6103-9343-8B731B0BE4E0 +>>>>>>> 0.12 Condition DFFF91A9-2CA5-6ABE-8474D814AF88 -active Yes -parent 97ACF525-C075-8635-E019202A83D8 -title {String Is Condition} -component StringIsCondition -TreeObject::id DFFF91A9-2CA5-6ABE-8474D814AF88 Condition 4ACB0B47-42B3-2B3A-BFE9AA4EC707 -active Yes -parent 97ACF525-C075-8635-E019202A83D8 -title {Ask Yes or No} -component AskYesOrNo -TreeObject::id 4ACB0B47-42B3-2B3A-BFE9AA4EC707 InstallComponent F4024A3E-9A6D-2726-5E0CFFA93054 -setup Uninstall -type actiongroup -title {Uninstall Actions} -active Yes -parent ActionGroupsUninstall @@ -484,7 +812,11 @@ InstallComponent 905DA2E9-988C-2F27-BB1F5F274AC9 -setup Uninstall -type actiongr array set Properties { 0047FF40-0139-2A59-AAC0-A44D46D6F5CC,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 0047FF40-0139-2A59-AAC0-A44D46D6F5CC,Comment {set BackupLocationName "BackupLocation_${BackupLocationNumber}"} @@ -496,7 +828,11 @@ array set Properties { {Before Next Pane is Displayed} 0047FF40-0139-2A59-AAC0-A44D46D6F5CC,ResultVirtualText +<<<<<<< HEAD +BackupLocationName +======= {BackupLocationName} +>>>>>>> 0.12 0047FF40-0139-2A59-AAC0-A44D46D6F5CC,TclScript {set BackupLocationName "BackupLocation_${BackupLocationNumber}"} @@ -505,22 +841,37 @@ array set Properties { {Before Action is Executed} 0357FAE9-FCFD-26D8-6541D810CD61,Filename +<<<<<<< HEAD +<%ProgramReadme%> +======= {<%ProgramReadme%>} +>>>>>>> 0.12 05060263-E852-87AB-8D0F2954CAA6,Conditions {0 conditions} 0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5,Prompt +<<<<<<< HEAD +<%ConsoleSelectDestinationText%> + +0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5,VirtualText +InstallDir +======= {<%ConsoleSelectDestinationText%>} 0C12D2D3-AEBC-42FE-A73A-0815EFB10DA5,VirtualText {InstallDir} +>>>>>>> 0.12 0D93323D-779D-44A8-1E0614E5285D,Conditions {0 conditions} 0D93323D-779D-44A8-1E0614E5285D,State +<<<<<<< HEAD +disabled +======= {disabled} +>>>>>>> 0.12 0D93323D-779D-44A8-1E0614E5285D,Widget {Back Button;Next Button} @@ -532,7 +883,11 @@ array set Properties { {Before Next Pane is Displayed} 0FDBA082-90AB-808C-478A-A13E7C525336,ResultVirtualText +<<<<<<< HEAD +BackupLocationNumber +======= {BackupLocationNumber} +>>>>>>> 0.12 0FDBA082-90AB-808C-478A-A13E7C525336,TclScript {set BackupLocationNumber 1} @@ -541,13 +896,21 @@ array set Properties { {Before Action is Executed} 13BD88FE-CD71-5AC7-E99C10B6CB28,Filename +<<<<<<< HEAD +<%ProgramReadme%> +======= {<%ProgramReadme%>} +>>>>>>> 0.12 1528F4F0-145C-A48D-A8526DBB6289,CheckCondition {Before Action is Executed} 1528F4F0-145C-A48D-A8526DBB6289,Filename +<<<<<<< HEAD +<%ProgramExecutable%> +======= {<%ProgramExecutable%>} +>>>>>>> 0.12 1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,Alias {Stop Backup Windows Process} @@ -556,12 +919,25 @@ array set Properties { {0 conditions} 1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-killbackupprocess +======= {<%ShortAppName%>-program-killbackupprocess} +>>>>>>> 0.12 1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,ShortcutName {Stop backup process} 1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/KillBackupProcess.bat + +1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,WorkingDirectory +<%InstallDir%> + +16D53E40-546B-54C3-088B1B5E3BBB,Background +white +======= {<%InstallDir%>/tools/KillBackupProcess.bat} 1681CF85-A5D2-4D73-A3FC-52B2A6A1847D,WorkingDirectory @@ -569,11 +945,30 @@ array set Properties { 16D53E40-546B-54C3-088B1B5E3BBB,Background {white} +>>>>>>> 0.12 16D53E40-546B-54C3-088B1B5E3BBB,Conditions {2 conditions} 16D53E40-546B-54C3-088B1B5E3BBB,Text,subst +<<<<<<< HEAD +1 + +16D53E40-546B-54C3-088B1B5E3BBB,Type +checkbutton + +16D53E40-546B-54C3-088B1B5E3BBB,VirtualText +CreateDesktopShortcut + +16D53E40-546B-54C3-088B1B5E3BBB,X +185 + +16D53E40-546B-54C3-088B1B5E3BBB,Y +180 + +175CBE81-9EBE-1E21-A91479BEEFAE,ExitType +Finish +======= {1} 16D53E40-546B-54C3-088B1B5E3BBB,Type @@ -590,6 +985,7 @@ array set Properties { 175CBE81-9EBE-1E21-A91479BEEFAE,ExitType {Finish} +>>>>>>> 0.12 17D8BA8E-5992-AA5C-F5ECB73A3433,Action {Uninstall Actions} @@ -601,7 +997,11 @@ array set Properties { {Before Action is Executed} 18C00430-D6B1-151F-307762B3A045,Platform +<<<<<<< HEAD +Windows +======= {Windows} +>>>>>>> 0.12 198905FB-9FAC-23DE-7422D25B8ECA,Alias {Install Actions} @@ -613,13 +1013,21 @@ array set Properties { {0 conditions} 19ADBDDB-1690-4A57-913E32A026C4,State +<<<<<<< HEAD +disabled +======= {disabled} +>>>>>>> 0.12 19ADBDDB-1690-4A57-913E32A026C4,Widget {NextButton; CancelButton} 1AF5CD58-65C0-49CB-9A9D-994816CF414E,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 1AF5CD58-65C0-49CB-9A9D-994816CF414E,Alias {Upload File Listing} @@ -631,12 +1039,37 @@ array set Properties { {0 conditions} 1AF5CD58-65C0-49CB-9A9D-994816CF414E,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-TebucoSafeQuerypload +======= {<%ShortAppName%>-program-TebucoSafeQuerypload} +>>>>>>> 0.12 1AF5CD58-65C0-49CB-9A9D-994816CF414E,ShortcutName {Upload Filelisting to TebucoSafe for review} 1AF5CD58-65C0-49CB-9A9D-994816CF414E,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/TebucoSafeQueryUpload.bat + +1AF5CD58-65C0-49CB-9A9D-994816CF414E,WorkingDirectory +<%InstallDir%> + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Active +Yes + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,BackButton,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,CancelButton,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Caption,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,CompanyLabel,subst +0 +======= {<%InstallDir%>/tools/TebucoSafeQueryUpload.bat} 1AF5CD58-65C0-49CB-9A9D-994816CF414E,WorkingDirectory @@ -653,11 +1086,30 @@ array set Properties { 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,CompanyLabel,subst {0} +>>>>>>> 0.12 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Conditions {0 conditions} 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Message,subst +<<<<<<< HEAD +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,NextButton,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Subtitle,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,Title,subst +1 + +1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,UserNameLabel,subst +0 + +1C14291C-0971-4283-92E9-3808401303F5,Active +No +======= {1} 1BEFB82C-C073-73D4-CFCE-F5DE7A674D9E,NextButton,subst @@ -674,6 +1126,7 @@ array set Properties { 1C14291C-0971-4283-92E9-3808401303F5,Active {No} +>>>>>>> 0.12 1C14291C-0971-4283-92E9-3808401303F5,Comment {Don't start it yet, need to install keys by hand.} @@ -685,6 +1138,24 @@ array set Properties { {net start <%ServiceName%>} 1C14291C-0971-4283-92E9-3808401303F5,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> + +1F0926EE-6884-1330-B4A1DB11C1BF,BackButton,subst +1 + +1F0926EE-6884-1330-B4A1DB11C1BF,CancelButton,subst +1 + +1F0926EE-6884-1330-B4A1DB11C1BF,Caption,subst +1 + +1F0926EE-6884-1330-B4A1DB11C1BF,Message,subst +1 + +1F0926EE-6884-1330-B4A1DB11C1BF,NextButton,subst +1 +======= {<%InstallDir%>} 1F0926EE-6884-1330-B4A1DB11C1BF,BackButton,subst @@ -701,6 +1172,7 @@ array set Properties { 1F0926EE-6884-1330-B4A1DB11C1BF,NextButton,subst {1} +>>>>>>> 0.12 1F9E8CB8-02C1-0416-1F7445B4147F,Comment {Ask the user if they want to proceed with the install.} @@ -709,25 +1181,43 @@ array set Properties { {2 conditions} 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message,subst +<<<<<<< HEAD +1 +======= {1} +>>>>>>> 0.12 241BBFCE-4EB1-432F-94DD-69D444DDB6C0,CheckCondition {Before Action is Executed} 241BBFCE-4EB1-432F-94DD-69D444DDB6C0,Operator +<<<<<<< HEAD +false + +241BBFCE-4EB1-432F-94DD-69D444DDB6C0,String +<%Answer%> +======= {false} 241BBFCE-4EB1-432F-94DD-69D444DDB6C0,String {<%Answer%>} +>>>>>>> 0.12 2583A547-11DE-1C27-B6D04B023CC0,CheckCondition {Before Action is Executed} 2583A547-11DE-1C27-B6D04B023CC0,Operator +<<<<<<< HEAD +false + +2583A547-11DE-1C27-B6D04B023CC0,String +<%SilentMode%> +======= {false} 2583A547-11DE-1C27-B6D04B023CC0,String {<%SilentMode%>} +>>>>>>> 0.12 25AA533E-02FC-47D9-9273-25266B8FA1F9,Alias {Remove Backup Service} @@ -739,12 +1229,25 @@ array set Properties { {0 conditions} 25AA533E-02FC-47D9-9273-25266B8FA1F9,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-removeService +======= {<%ShortAppName%>-program-removeService} +>>>>>>> 0.12 25AA533E-02FC-47D9-9273-25266B8FA1F9,ShortcutName {Remove Service} 25AA533E-02FC-47D9-9273-25266B8FA1F9,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/RemoveService.bat + +25AA533E-02FC-47D9-9273-25266B8FA1F9,WorkingDirectory +<%InstallDir%> + +28E76C8B-2605-4739-9FFE-9C2880C17E59,Active +No +======= {<%InstallDir%>/tools/RemoveService.bat} 25AA533E-02FC-47D9-9273-25266B8FA1F9,WorkingDirectory @@ -752,6 +1255,7 @@ array set Properties { 28E76C8B-2605-4739-9FFE-9C2880C17E59,Active {No} +>>>>>>> 0.12 28E76C8B-2605-4739-9FFE-9C2880C17E59,Conditions {0 conditions} @@ -760,6 +1264,18 @@ array set Properties { {notepad <%ConfigFileName%>} 28E76C8B-2605-4739-9FFE-9C2880C17E59,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,BackButton,subst +1 + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,CancelButton,subst +1 + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Caption,subst +1 +======= {<%InstallDir%>} 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,BackButton,subst @@ -770,11 +1286,24 @@ array set Properties { 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Caption,subst {1} +>>>>>>> 0.12 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Conditions {1 condition} 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Message,subst +<<<<<<< HEAD +1 + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,NextButton,subst +1 + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Subtitle,subst +1 + +2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Title,subst +1 +======= {1} 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,NextButton,subst @@ -785,6 +1314,7 @@ array set Properties { 2AC89879-6E9D-3D4E-F28E-5985EEBFAAA8,Title,subst {1} +>>>>>>> 0.12 2BB06B72-DE53-2319-B1B8-351CDCBA2008,Conditions {0 conditions} @@ -793,12 +1323,19 @@ array set Properties { {Before Next Pane is Displayed} 2BB06B72-DE53-2319-B1B8-351CDCBA2008,ResultVirtualText +<<<<<<< HEAD +AddBackupLocation +======= {AddBackupLocation} +>>>>>>> 0.12 2BB06B72-DE53-2319-B1B8-351CDCBA2008,TclScript {set AddBackupLocation no} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message,subst +<<<<<<< HEAD +1 +======= {1} 2C456223-3E1E-4D43-B31A-868EAD3241E1,Destination @@ -806,11 +1343,27 @@ array set Properties { 2C456223-3E1E-4D43-B31A-868EAD3241E1,Name {Documents} +>>>>>>> 0.12 2E2963BD-DDBD-738D-A910-B7F3F04946F9,Conditions {0 conditions} 2E2963BD-DDBD-738D-A910-B7F3F04946F9,Text,subst +<<<<<<< HEAD +1 + +2E2963BD-DDBD-738D-A910-B7F3F04946F9,Value +<%AddBackupLocation%> + +2E2963BD-DDBD-738D-A910-B7F3F04946F9,X +400 + +2E2963BD-DDBD-738D-A910-B7F3F04946F9,Y +70 + +2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,AppendNewline +No +======= {1} 2E2963BD-DDBD-738D-A910-B7F3F04946F9,Value @@ -824,6 +1377,7 @@ array set Properties { 2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,AppendNewline {No} +>>>>>>> 0.12 2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,Comment {.conf doesn't exist yet} @@ -835,15 +1389,34 @@ array set Properties { {Append to file} 2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,Files +<<<<<<< HEAD +<%ConfigFileTemplate%> + +2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,TextToWrite,subst +1 +======= {<%ConfigFileTemplate%>} 2EC82FBD-8294-A3E4-7F39-1CBA0582FA64,TextToWrite,subst {1} +>>>>>>> 0.12 32B08FB1-99DF-234E-8BAF-333E80AAC9F5,Conditions {0 conditions} 32B08FB1-99DF-234E-8BAF-333E80AAC9F5,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-Usage + +32B08FB1-99DF-234E-8BAF-333E80AAC9F5,ShortcutName +Usage + +32B08FB1-99DF-234E-8BAF-333E80AAC9F5,TargetFileName +<%InstallDir%>/tools/ShowUsage.bat + +32B08FB1-99DF-234E-8BAF-333E80AAC9F5,WorkingDirectory +<%InstallDir%> +======= {<%ShortAppName%>-program-Usage} 32B08FB1-99DF-234E-8BAF-333E80AAC9F5,ShortcutName @@ -854,6 +1427,7 @@ array set Properties { 32B08FB1-99DF-234E-8BAF-333E80AAC9F5,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 32DC8FB1-A04B-71AA-EC18496D4BD0,Conditions {0 conditions} @@ -862,6 +1436,15 @@ array set Properties { {Before Action is Executed} 32F5B0AF-EB83-7A03-D8FAE1ECE473,Message,subst +<<<<<<< HEAD +1 + +32F5B0AF-EB83-7A03-D8FAE1ECE473,Title,subst +1 + +32F5B0AF-EB83-7A03-D8FAE1ECE473,TrueValue +No +======= {1} 32F5B0AF-EB83-7A03-D8FAE1ECE473,Title,subst @@ -869,11 +1452,21 @@ array set Properties { 32F5B0AF-EB83-7A03-D8FAE1ECE473,TrueValue {No} +>>>>>>> 0.12 3379F80B-36D6-73DC-6FC1D6223A26,CheckCondition {Before Action is Executed} 3379F80B-36D6-73DC-6FC1D6223A26,Operator +<<<<<<< HEAD +false + +3379F80B-36D6-73DC-6FC1D6223A26,String +<%InstallStopped%> + +362B6D6A-11BC-83CE-AFF6-410D8FBCF54D,Active +No +======= {false} 3379F80B-36D6-73DC-6FC1D6223A26,String @@ -881,17 +1474,31 @@ array set Properties { 362B6D6A-11BC-83CE-AFF6-410D8FBCF54D,Active {No} +>>>>>>> 0.12 362B6D6A-11BC-83CE-AFF6-410D8FBCF54D,Conditions {0 conditions} 362B6D6A-11BC-83CE-AFF6-410D8FBCF54D,ResultVirtualText +<<<<<<< HEAD +BackupLocationExclusions +======= {BackupLocationExclusions} +>>>>>>> 0.12 362B6D6A-11BC-83CE-AFF6-410D8FBCF54D,TclScript {set BackupLocationExclusions ""} 37E627F2-E04B-AEF2-D566C017A4D6,BackButton,subst +<<<<<<< HEAD +1 + +37E627F2-E04B-AEF2-D566C017A4D6,CancelButton,subst +1 + +37E627F2-E04B-AEF2-D566C017A4D6,Caption,subst +1 +======= {1} 37E627F2-E04B-AEF2-D566C017A4D6,CancelButton,subst @@ -899,11 +1506,30 @@ array set Properties { 37E627F2-E04B-AEF2-D566C017A4D6,Caption,subst {1} +>>>>>>> 0.12 37E627F2-E04B-AEF2-D566C017A4D6,Conditions {0 conditions} 37E627F2-E04B-AEF2-D566C017A4D6,FileLabel,subst +<<<<<<< HEAD +1 + +37E627F2-E04B-AEF2-D566C017A4D6,Message,subst +1 + +37E627F2-E04B-AEF2-D566C017A4D6,NextButton,subst +1 + +37E627F2-E04B-AEF2-D566C017A4D6,ProgressValue,subst +1 + +37E627F2-E04B-AEF2-D566C017A4D6,Subtitle,subst +1 + +37E627F2-E04B-AEF2-D566C017A4D6,Title,subst +1 +======= {1} 37E627F2-E04B-AEF2-D566C017A4D6,Message,subst @@ -920,6 +1546,7 @@ array set Properties { 37E627F2-E04B-AEF2-D566C017A4D6,Title,subst {1} +>>>>>>> 0.12 39270FD8-932E-6132-7EF795ED9B93,Alias {Finish Actions} @@ -934,21 +1561,56 @@ array set Properties { {Uninstall <%BrandName%>} 39B2B666-78D8-75E6-6EA071594D34,TargetFileName +<<<<<<< HEAD +<%Uninstaller%> + +39B2B666-78D8-75E6-6EA071594D34,WorkingDirectory +<%InstallDir%> +======= {<%Uninstaller%>} 39B2B666-78D8-75E6-6EA071594D34,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 39D7394E-04E9-CA70-0034DB830BFE,Conditions {0 conditions} 3B6E2E7C-1A26-27F1-D578E383B128,Background +<<<<<<< HEAD +white +======= {white} +>>>>>>> 0.12 3B6E2E7C-1A26-27F1-D578E383B128,Conditions {2 conditions} 3B6E2E7C-1A26-27F1-D578E383B128,Text,subst +<<<<<<< HEAD +1 + +3B6E2E7C-1A26-27F1-D578E383B128,Type +checkbutton + +3B6E2E7C-1A26-27F1-D578E383B128,VirtualText +ViewReadme + +3B6E2E7C-1A26-27F1-D578E383B128,X +185 + +3B6E2E7C-1A26-27F1-D578E383B128,Y +140 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,BackButton,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,CancelButton,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,Caption,subst +1 +======= {1} 3B6E2E7C-1A26-27F1-D578E383B128,Type @@ -971,11 +1633,30 @@ array set Properties { 3B8CDC8E-1239-D2E9-DF4CA6B1756D,Caption,subst {1} +>>>>>>> 0.12 3B8CDC8E-1239-D2E9-DF4CA6B1756D,Conditions {0 conditions} 3B8CDC8E-1239-D2E9-DF4CA6B1756D,FileValue,subst +<<<<<<< HEAD +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,Message,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,NextButton,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,ProgressValue,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,Subtitle,subst +1 + +3B8CDC8E-1239-D2E9-DF4CA6B1756D,Title,subst +1 +======= {1} 3B8CDC8E-1239-D2E9-DF4CA6B1756D,Message,subst @@ -992,6 +1673,7 @@ array set Properties { 3B8CDC8E-1239-D2E9-DF4CA6B1756D,Title,subst {1} +>>>>>>> 0.12 3C7130B3-3206-403D-B09E-59D4A758FBAD,Action {Uninstall Actions} @@ -1000,21 +1682,47 @@ array set Properties { {0 conditions} 3CFFF099-6122-46DD-9CE4-F5819434AC53,IgnoreErrors +<<<<<<< HEAD +Yes +======= {Yes} +>>>>>>> 0.12 3CFFF099-6122-46DD-9CE4-F5819434AC53,ProgramCommandLine {net stop <%ServiceName%>} 3CFFF099-6122-46DD-9CE4-F5819434AC53,ProgressiveOutputWidget +<<<<<<< HEAD +Message + +3CFFF099-6122-46DD-9CE4-F5819434AC53,WorkingDirectory +<%Temp%> +======= {Message} 3CFFF099-6122-46DD-9CE4-F5819434AC53,WorkingDirectory {<%Temp%>} +>>>>>>> 0.12 3D0D1898-4C65-3E66-F82F56581E87,CheckCondition {Before Action is Executed} 3D0D1898-4C65-3E66-F82F56581E87,Operator +<<<<<<< HEAD +false + +3D0D1898-4C65-3E66-F82F56581E87,String +<%SilentMode%> + +3D33AA8C-0037-204B-39A339FD38BD,BackButton,subst +1 + +3D33AA8C-0037-204B-39A339FD38BD,CancelButton,subst +1 + +3D33AA8C-0037-204B-39A339FD38BD,Caption,subst +1 +======= {false} 3D0D1898-4C65-3E66-F82F56581E87,String @@ -1028,11 +1736,33 @@ array set Properties { 3D33AA8C-0037-204B-39A339FD38BD,Caption,subst {1} +>>>>>>> 0.12 3D33AA8C-0037-204B-39A339FD38BD,Conditions {0 conditions} 3D33AA8C-0037-204B-39A339FD38BD,Message,subst +<<<<<<< HEAD +1 + +3D33AA8C-0037-204B-39A339FD38BD,NextButton,subst +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Active +Yes + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Alias +SetBackupLocations + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,BackButton,subst +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,CancelButton,subst +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Caption,subst +1 +======= {1} 3D33AA8C-0037-204B-39A339FD38BD,NextButton,subst @@ -1052,11 +1782,24 @@ array set Properties { 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Caption,subst {1} +>>>>>>> 0.12 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Conditions {0 conditions} 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Message,subst +<<<<<<< HEAD +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,NextButton,subst +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Subtitle,subst +1 + +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Title,subst +1 +======= {1} 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,NextButton,subst @@ -1067,20 +1810,40 @@ array set Properties { 3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7,Title,subst {1} +>>>>>>> 0.12 3FDB57ED-598D-8A4E-CEF7-D90833305558,Conditions {0 conditions} 3FDB57ED-598D-8A4E-CEF7-D90833305558,LabelSide +<<<<<<< HEAD +left + +3FDB57ED-598D-8A4E-CEF7-D90833305558,Text,subst +1 +======= {left} 3FDB57ED-598D-8A4E-CEF7-D90833305558,Text,subst {1} +>>>>>>> 0.12 3FDB57ED-598D-8A4E-CEF7-D90833305558,Type {browse entry} 3FDB57ED-598D-8A4E-CEF7-D90833305558,VirtualText +<<<<<<< HEAD +BackupLocationPath + +3FDB57ED-598D-8A4E-CEF7-D90833305558,Y +70 + +3FE82C17-A3E2-4A57-A563-F80818B00B81,Default +Yes + +3FE82C17-A3E2-4A57-A563-F80818B00B81,Prompt +<%InstallStartupText%> +======= {BackupLocationPath} 3FDB57ED-598D-8A4E-CEF7-D90833305558,Y @@ -1091,6 +1854,7 @@ array set Properties { 3FE82C17-A3E2-4A57-A563-F80818B00B81,Prompt {<%InstallStartupText%>} +>>>>>>> 0.12 41CDE776-2667-5CEB-312A-FC4C33A83E7F,Conditions {0 conditions} @@ -1099,6 +1863,18 @@ array set Properties { {*/*.conf;*/*.txt;*/*.pem;*/*.raw;*/*.exe;*/*.bat;*/*.dll} 41CDE776-2667-5CEB-312A-FC4C33A83E7F,RenameFiles +<<<<<<< HEAD +Yes + +41D3E165-C263-5F80-0FEEC0AEE47A,BackButton,subst +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,CancelButton,subst +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,Caption,subst +1 +======= {Yes} 41D3E165-C263-5F80-0FEEC0AEE47A,BackButton,subst @@ -1109,11 +1885,33 @@ array set Properties { 41D3E165-C263-5F80-0FEEC0AEE47A,Caption,subst {1} +>>>>>>> 0.12 41D3E165-C263-5F80-0FEEC0AEE47A,Conditions {1 condition} 41D3E165-C263-5F80-0FEEC0AEE47A,Message,subst +<<<<<<< HEAD +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,NextButton,subst +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,Subtitle,subst +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,Text,subst +1 + +41D3E165-C263-5F80-0FEEC0AEE47A,Title,subst +1 + +481451CC-F49C-D389-8645076F595B,Destination +<%InstallDir%> + +481451CC-F49C-D389-8645076F595B,FileSize +15288767 +======= {1} 41D3E165-C263-5F80-0FEEC0AEE47A,NextButton,subst @@ -1133,15 +1931,23 @@ array set Properties { 481451CC-F49C-D389-8645076F595B,FileSize {7893504} +>>>>>>> 0.12 481451CC-F49C-D389-8645076F595B,Name {Program Files} 49E59F91-27F7-46D1-A1C1-19865C2392D3,Default +<<<<<<< HEAD +Yes + +49E59F91-27F7-46D1-A1C1-19865C2392D3,Prompt +<%UninstallStartupText%> +======= {Yes} 49E59F91-27F7-46D1-A1C1-19865C2392D3,Prompt {<%UninstallStartupText%>} +>>>>>>> 0.12 49E80443-62DB-1C10-392D-1091AEA5ED88,Conditions {1 condition} @@ -1150,6 +1956,18 @@ array set Properties { {Before Next Pane is Displayed} 49E80443-62DB-1C10-392D-1091AEA5ED88,Pane +<<<<<<< HEAD +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 + +4A9C852B-647E-EED5-5482FFBCC2AF,Description,subst +1 + +4A9C852B-647E-EED5-5482FFBCC2AF,DisplayName,subst +1 + +4A9C852B-647E-EED5-5482FFBCC2AF,FileGroups +481451CC-F49C-D389-8645076F595B +======= {3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7} 4A9C852B-647E-EED5-5482FFBCC2AF,Description,subst @@ -1160,17 +1978,31 @@ array set Properties { 4A9C852B-647E-EED5-5482FFBCC2AF,FileGroups {481451CC-F49C-D389-8645076F595B} +>>>>>>> 0.12 4A9C852B-647E-EED5-5482FFBCC2AF,Name {Default Component} 4A9C852B-647E-EED5-5482FFBCC2AF,RequiredComponent +<<<<<<< HEAD +Yes +======= {Yes} +>>>>>>> 0.12 4ACB0B47-42B3-2B3A-BFE9AA4EC707,CheckCondition {Before Action is Executed} 4ACB0B47-42B3-2B3A-BFE9AA4EC707,Message,subst +<<<<<<< HEAD +1 + +4ACB0B47-42B3-2B3A-BFE9AA4EC707,Title,subst +1 + +4ACB0B47-42B3-2B3A-BFE9AA4EC707,TrueValue +No +======= {1} 4ACB0B47-42B3-2B3A-BFE9AA4EC707,Title,subst @@ -1178,42 +2010,69 @@ array set Properties { 4ACB0B47-42B3-2B3A-BFE9AA4EC707,TrueValue {No} +>>>>>>> 0.12 4D4A7BF0-7CCE-46E6-BDE5222F82D7,Conditions {0 conditions} 4D4A7BF0-7CCE-46E6-BDE5222F82D7,UpdateFilePercentage +<<<<<<< HEAD +Yes + +4D4A7BF0-7CCE-46E6-BDE5222F82D7,UpdateFileText +Yes +======= {Yes} 4D4A7BF0-7CCE-46E6-BDE5222F82D7,UpdateFileText {Yes} +>>>>>>> 0.12 4E643D8A-CA31-018D-57D7053C2CE8,CheckCondition {Before Action is Executed} 4E643D8A-CA31-018D-57D7053C2CE8,Filename +<<<<<<< HEAD +<%ProgramExecutable%> +======= {<%ProgramExecutable%>} +>>>>>>> 0.12 4EE35849-FAD7-170B-0E45-FA30636467B1,CheckCondition {Before Next Pane is Displayed} 4EE35849-FAD7-170B-0E45-FA30636467B1,EncryptedPassword +<<<<<<< HEAD +<%InstallPasswordEncrypted%> +======= {<%InstallPasswordEncrypted%>} +>>>>>>> 0.12 4EE35849-FAD7-170B-0E45-FA30636467B1,FailureFocus {Password Entry} 4EE35849-FAD7-170B-0E45-FA30636467B1,FailureMessage +<<<<<<< HEAD +<%PasswordIncorrectText%> + +4EE35849-FAD7-170B-0E45-FA30636467B1,UnencryptedPassword +<%InstallPassword%> +======= {<%PasswordIncorrectText%>} 4EE35849-FAD7-170B-0E45-FA30636467B1,UnencryptedPassword {<%InstallPassword%>} +>>>>>>> 0.12 4EF787E3-0643-DE46-15E64BAF0816,CheckCondition {Before Action is Executed} 4EF787E3-0643-DE46-15E64BAF0816,Platform +<<<<<<< HEAD +Windows +======= {Windows} +>>>>>>> 0.12 52F0A238-57E1-A578-2CE4DA177B32,Conditions {0 conditions} @@ -1222,6 +2081,15 @@ array set Properties { {0 conditions} 574198A7-7322-2F5E-02EF185D965C,BackButton,subst +<<<<<<< HEAD +1 + +574198A7-7322-2F5E-02EF185D965C,CancelButton,subst +1 + +574198A7-7322-2F5E-02EF185D965C,Caption,subst +1 +======= {1} 574198A7-7322-2F5E-02EF185D965C,CancelButton,subst @@ -1229,11 +2097,45 @@ array set Properties { 574198A7-7322-2F5E-02EF185D965C,Caption,subst {1} +>>>>>>> 0.12 574198A7-7322-2F5E-02EF185D965C,Conditions {0 conditions} 574198A7-7322-2F5E-02EF185D965C,FileLabel,subst +<<<<<<< HEAD +1 + +574198A7-7322-2F5E-02EF185D965C,Message,subst +1 + +574198A7-7322-2F5E-02EF185D965C,NextButton,subst +1 + +574198A7-7322-2F5E-02EF185D965C,ProgressValue,subst +1 + +574198A7-7322-2F5E-02EF185D965C,Subtitle,subst +1 + +574198A7-7322-2F5E-02EF185D965C,Title,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,BackButton,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,BrowseButton,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,BrowseText,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,CancelButton,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,Caption,subst +1 +======= {1} 574198A7-7322-2F5E-02EF185D965C,Message,subst @@ -1265,10 +2167,27 @@ array set Properties { 58E1119F-639E-17C9-5D3898F385AA,Caption,subst {1} +>>>>>>> 0.12 58E1119F-639E-17C9-5D3898F385AA,Conditions {1 condition} +<<<<<<< HEAD +58E1119F-639E-17C9-5D3898F385AA,DestinationLabel,subst +0 + +58E1119F-639E-17C9-5D3898F385AA,Message,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,NextButton,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,Subtitle,subst +1 + +58E1119F-639E-17C9-5D3898F385AA,Title,subst +1 +======= 58E1119F-639E-17C9-5D3898F385AA,Destination,subst {1} @@ -1286,12 +2205,17 @@ array set Properties { 58E1119F-639E-17C9-5D3898F385AA,Title,subst {1} +>>>>>>> 0.12 592F46AE-8CEE-01F3-0BA7EBDCA4F4,CheckCondition {Before Action is Executed} 592F46AE-8CEE-01F3-0BA7EBDCA4F4,Filename +<<<<<<< HEAD +<%ProgramExecutable%> +======= {<%ProgramExecutable%>} +>>>>>>> 0.12 5CA3EA16-E37C-AABE-E576C4636EB0,Action {Install Actions} @@ -1303,7 +2227,11 @@ array set Properties { {Before Action is Executed} 5EE78EF7-37CA-D440-3DB5-09136CD566B3,String +<<<<<<< HEAD +<%AddBackupLocation%> +======= {<%AddBackupLocation%>} +>>>>>>> 0.12 5F2C1F1C-B9F7-1642-59D9-A18318C1D70B,Conditions {0 conditions} @@ -1312,7 +2240,11 @@ array set Properties { {<%ConfigFileTemplate%>;*/*.bat;<%InstallDir%>/*.vbs} 5F2C1F1C-B9F7-1642-59D9-A18318C1D70B,LineFeed +<<<<<<< HEAD +Windows +======= {Windows} +>>>>>>> 0.12 5F2C1F1C-B9F7-1642-59D9-A18318C1D70B,StringMap {"@@CUSTOMERCOMPANY@@" <%UserInfoCompany%> @@ -1325,19 +2257,31 @@ array set Properties { "@@INSTALLDIR@@" <%InstallDir%>} 614C45B2-7515-780C-E444-7F165CF02DD7,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 614C45B2-7515-780C-E444-7F165CF02DD7,Conditions {0 conditions} 614C45B2-7515-780C-E444-7F165CF02DD7,ResultVirtualText +<<<<<<< HEAD +BackupLocationShortName +======= {BackupLocationShortName} +>>>>>>> 0.12 614C45B2-7515-780C-E444-7F165CF02DD7,TclScript {set BackupLocationShortName ""} 6652193C-5D4B-44B6-ABC6-D6E96D89E5DC,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 6652193C-5D4B-44B6-ABC6-D6E96D89E5DC,Comment {PJ removed. Is this the one at the top leve?} @@ -1349,12 +2293,28 @@ array set Properties { {2 conditions} 6B4CB3C2-4799-4C9F-BA8E-1EE47C4606E1,ExitType +<<<<<<< HEAD +Finish +======= {Finish} +>>>>>>> 0.12 6B966959-05D9-DB32-8D9C4AD2A3DF,CheckCondition {Before Action is Executed} 6B966959-05D9-DB32-8D9C4AD2A3DF,Platform +<<<<<<< HEAD +Windows + +6C323815-B9AB-FA94-4F5D152EBC51,BackButton,subst +1 + +6C323815-B9AB-FA94-4F5D152EBC51,CancelButton,subst +1 + +6C323815-B9AB-FA94-4F5D152EBC51,Caption,subst +1 +======= {Windows} 6C323815-B9AB-FA94-4F5D152EBC51,BackButton,subst @@ -1365,15 +2325,23 @@ array set Properties { 6C323815-B9AB-FA94-4F5D152EBC51,Caption,subst {1} +>>>>>>> 0.12 6C323815-B9AB-FA94-4F5D152EBC51,Conditions {0 conditions} 6C323815-B9AB-FA94-4F5D152EBC51,Message,subst +<<<<<<< HEAD +1 + +6C323815-B9AB-FA94-4F5D152EBC51,NextButton,subst +1 +======= {1} 6C323815-B9AB-FA94-4F5D152EBC51,NextButton,subst {1} +>>>>>>> 0.12 6D9D1ABC-7146-443F-9EE9-205D5CA6C830,CheckCondition {Before Action is Executed} @@ -1394,25 +2362,43 @@ array set Properties { {0 conditions} 6F61CDA8-30C9-454F-82A3-9987E1203079,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-sync +======= {<%ShortAppName%>-program-sync} +>>>>>>> 0.12 6F61CDA8-30C9-454F-82A3-9987E1203079,ShortcutName {Sync now} 6F61CDA8-30C9-454F-82A3-9987E1203079,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/Sync.bat + +6F61CDA8-30C9-454F-82A3-9987E1203079,WorkingDirectory +<%InstallDir%> +======= {<%InstallDir%>/tools/Sync.bat} 6F61CDA8-30C9-454F-82A3-9987E1203079,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 6F94698F-0839-3ABF-0CF2DF05A4C8,CheckCondition {Before Action is Executed} 6F94698F-0839-3ABF-0CF2DF05A4C8,String +<<<<<<< HEAD +<%CreateQuickLaunchShortcut%> + +6FEE2889-0338-1D49-60BF-1471F465AB26,AppendNewline +No +======= {<%CreateQuickLaunchShortcut%>} 6FEE2889-0338-1D49-60BF-1471F465AB26,AppendNewline {No} +>>>>>>> 0.12 6FEE2889-0338-1D49-60BF-1471F465AB26,Comment {Closing final BackupLocations bracket} @@ -1424,6 +2410,15 @@ array set Properties { {Append to file} 6FEE2889-0338-1D49-60BF-1471F465AB26,Files +<<<<<<< HEAD +<%ConfigFileTemplate%> + +6FEE2889-0338-1D49-60BF-1471F465AB26,LineFeed +Windows + +6FEE2889-0338-1D49-60BF-1471F465AB26,TextToWrite,subst +1 +======= {<%ConfigFileTemplate%>} 6FEE2889-0338-1D49-60BF-1471F465AB26,LineFeed @@ -1431,21 +2426,33 @@ array set Properties { 6FEE2889-0338-1D49-60BF-1471F465AB26,TextToWrite,subst {1} +>>>>>>> 0.12 738DD098-7E3B-BC89-875CDB93CBE2,CheckCondition {Before Action is Executed} 738DD098-7E3B-BC89-875CDB93CBE2,Platform +<<<<<<< HEAD +Windows +======= {Windows} +>>>>>>> 0.12 73DD4D07-B1DC-BA38-2B12-07EB24A7F0C8,Conditions {0 conditions} 73DD4D07-B1DC-BA38-2B12-07EB24A7F0C8,Destination +<<<<<<< HEAD +<%ConfigFileName%> + +73DD4D07-B1DC-BA38-2B12-07EB24A7F0C8,Source +<%ConfigFileTemplate%> +======= {<%ConfigFileName%>} 73DD4D07-B1DC-BA38-2B12-07EB24A7F0C8,Source {<%ConfigFileTemplate%>} +>>>>>>> 0.12 73EA65C1-3BE3-B190-55C3E99F6269,Conditions {1 condition} @@ -1454,31 +2461,53 @@ array set Properties { {Before Action is Executed} 748D673B-DFE6-5F74-329903ACE4DB,Filename +<<<<<<< HEAD +<%ProgramExecutable%> +======= {<%ProgramExecutable%>} +>>>>>>> 0.12 793D8178-0F51-7F07-BC5886586D3C,CheckCondition {Before Action is Executed} 793D8178-0F51-7F07-BC5886586D3C,Operator +<<<<<<< HEAD +false + +793D8178-0F51-7F07-BC5886586D3C,String +<%InstallStopped%> +======= {false} 793D8178-0F51-7F07-BC5886586D3C,String {<%InstallStopped%>} +>>>>>>> 0.12 795EE61F-6C0D-4A8B-93E02AA3894A,CheckCondition {Before Action is Executed} 795EE61F-6C0D-4A8B-93E02AA3894A,String +<<<<<<< HEAD +<%LaunchApplication%> +======= {<%LaunchApplication%>} +>>>>>>> 0.12 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C,CheckCondition {Before Action is Executed} 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C,Operator +<<<<<<< HEAD +false + +79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C,String +<%LicenseAccepted%> +======= {false} 79DAC913-A33D-4ED6-9BAE-B3A2053C0F2C,String {<%LicenseAccepted%>} +>>>>>>> 0.12 7A983CD8-302C-4942-BE59-525C5B5FA2F2,Conditions {0 conditions} @@ -1487,15 +2516,34 @@ array set Properties { {ServiceControl terminate} 7A983CD8-302C-4942-BE59-525C5B5FA2F2,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> + +7B770A07-A785-5215-956FA82CF14E,Active +No +======= {<%InstallDir%>} 7B770A07-A785-5215-956FA82CF14E,Active {No} +>>>>>>> 0.12 7B770A07-A785-5215-956FA82CF14E,Conditions {3 conditions} 7B770A07-A785-5215-956FA82CF14E,ShortcutDirectory +<<<<<<< HEAD +<%QUICK_LAUNCH%> + +7B770A07-A785-5215-956FA82CF14E,ShortcutName +<%BrandName%> + +7B770A07-A785-5215-956FA82CF14E,TargetFileName +<%ProgramExecutable%> + +7B770A07-A785-5215-956FA82CF14E,WorkingDirectory +<%InstallDir%> +======= {<%QUICK_LAUNCH%>} 7B770A07-A785-5215-956FA82CF14E,ShortcutName @@ -1506,6 +2554,7 @@ array set Properties { 7B770A07-A785-5215-956FA82CF14E,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 7D8E1902-2BC4-80D8-2C18771E7C22,Conditions {0 conditions} @@ -1514,6 +2563,33 @@ array set Properties { {<%ServiceExeName%> -i -S <%ServiceName%> -c "<%ConfigFileName%>"} 7D8E1902-2BC4-80D8-2C18771E7C22,ProgressiveOutputWidget +<<<<<<< HEAD +Message + +7D8E1902-2BC4-80D8-2C18771E7C22,ShowProgressiveOutput +Yes + +7D8E1902-2BC4-80D8-2C18771E7C22,WorkingDirectory +<%InstallDir%> + +7F85263E-CAE2-46BA-AAC0-6B89D20FD2DE,ExitType +Finish + +8202CECC-54A0-9B6C-D24D111BA52E,Components +4A9C852B-647E-EED5-5482FFBCC2AF + +8202CECC-54A0-9B6C-D24D111BA52E,Description,subst +1 + +8202CECC-54A0-9B6C-D24D111BA52E,DisplayName,subst +1 + +8202CECC-54A0-9B6C-D24D111BA52E,Name +Typical + +8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Checked +No +======= {Message} 7D8E1902-2BC4-80D8-2C18771E7C22,ShowProgressiveOutput @@ -1539,11 +2615,27 @@ array set Properties { 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Checked {No} +>>>>>>> 0.12 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Conditions {0 conditions} 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Text,subst +<<<<<<< HEAD +1 + +8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Type +checkbutton + +8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Value +Yes + +8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,VirtualText +AddBackupLocation + +8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Y +250 +======= {1} 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Type @@ -1557,6 +2649,7 @@ array set Properties { 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Y {250} +>>>>>>> 0.12 848844B5-6103-9343-8B731B0BE4E0,Alias {Startup Actions} @@ -1568,10 +2661,17 @@ array set Properties { {Before Next Pane is Displayed} 84DA7F05-9FB7-CC36-9EC98F8A6826,FailureMessage +<<<<<<< HEAD +<%DirectoryPermissionText%> + +84DA7F05-9FB7-CC36-9EC98F8A6826,Filename +<%InstallDir%> +======= {<%DirectoryPermissionText%>} 84DA7F05-9FB7-CC36-9EC98F8A6826,Filename {<%InstallDir%>} +>>>>>>> 0.12 84DA7F05-9FB7-CC36-9EC98F8A6826,Permission {can create} @@ -1580,6 +2680,21 @@ array set Properties { {0 conditions} 855DE408-060E-3D35-08B5-1D9AB05C2865,Height +<<<<<<< HEAD +100 + +855DE408-060E-3D35-08B5-1D9AB05C2865,Text,subst +1 + +855DE408-060E-3D35-08B5-1D9AB05C2865,Type +text + +855DE408-060E-3D35-08B5-1D9AB05C2865,VirtualText +BackupLocationExclusions + +855DE408-060E-3D35-08B5-1D9AB05C2865,Y +130 +======= {100} 855DE408-060E-3D35-08B5-1D9AB05C2865,Text,subst @@ -1593,11 +2708,21 @@ array set Properties { 855DE408-060E-3D35-08B5-1D9AB05C2865,Y {130} +>>>>>>> 0.12 87DE6D78-81E1-495B-A214-B3FF3E7E5614,CheckCondition {Before Action is Executed} 87DE6D78-81E1-495B-A214-B3FF3E7E5614,Operator +<<<<<<< HEAD +false + +87DE6D78-81E1-495B-A214-B3FF3E7E5614,String +<%Answer%> + +88A50FD5-480F-19A5-DA74-C915EB0A9765,Active +No +======= {false} 87DE6D78-81E1-495B-A214-B3FF3E7E5614,String @@ -1605,6 +2730,7 @@ array set Properties { 88A50FD5-480F-19A5-DA74-C915EB0A9765,Active {No} +>>>>>>> 0.12 88A50FD5-480F-19A5-DA74-C915EB0A9765,Conditions {1 condition} @@ -1613,13 +2739,21 @@ array set Properties { {After Pane is Finished} 88A50FD5-480F-19A5-DA74-C915EB0A9765,Pane +<<<<<<< HEAD +3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7 +======= {3FD9BFF3-2F6E-E4FC-2FAE-98F2017916A7} +>>>>>>> 0.12 8A761DBD-0640-D98C-9B3AD7672A8F,Conditions {0 conditions} 8A761DBD-0640-D98C-9B3AD7672A8F,State +<<<<<<< HEAD +disabled +======= {disabled} +>>>>>>> 0.12 8A761DBD-0640-D98C-9B3AD7672A8F,Widget {Back Button;Next Button} @@ -1628,15 +2762,31 @@ array set Properties { {Before Action is Executed} 8C866252-8760-9B08-FE569C25B60D,Filename +<<<<<<< HEAD +<%ProgramExecutable%> + +8E095096-F018-A880-429D-A2177A9B70EA,Active +No +======= {<%ProgramExecutable%>} 8E095096-F018-A880-429D-A2177A9B70EA,Active {No} +>>>>>>> 0.12 8E095096-F018-A880-429D-A2177A9B70EA,Conditions {0 conditions} 8E095096-F018-A880-429D-A2177A9B70EA,Text,subst +<<<<<<< HEAD +1 + +8E095096-F018-A880-429D-A2177A9B70EA,X +50 + +8E095096-F018-A880-429D-A2177A9B70EA,Y +150 +======= {1} 8E095096-F018-A880-429D-A2177A9B70EA,X @@ -1644,10 +2794,27 @@ array set Properties { 8E095096-F018-A880-429D-A2177A9B70EA,Y {150} +>>>>>>> 0.12 8E1A5944-5AF5-5906-16D395E386D8,Conditions {0 conditions} +<<<<<<< HEAD +9013E862-8E81-5290-64F9-D8BCD13EC7E5,Active +Yes + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,BackButton,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,CancelButton,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,Caption,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,CompanyLabel,subst +1 +======= 9013E862-8E81-5290-64F9-D8BCD13EC7E5,BackButton,subst {1} @@ -1659,11 +2826,27 @@ array set Properties { 9013E862-8E81-5290-64F9-D8BCD13EC7E5,CompanyLabel,subst {1} +>>>>>>> 0.12 9013E862-8E81-5290-64F9-D8BCD13EC7E5,Conditions {0 conditions} 9013E862-8E81-5290-64F9-D8BCD13EC7E5,Message,subst +<<<<<<< HEAD +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,NextButton,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,Subtitle,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,Title,subst +1 + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,UserNameLabel,subst +1 +======= {1} 9013E862-8E81-5290-64F9-D8BCD13EC7E5,NextButton,subst @@ -1677,6 +2860,7 @@ array set Properties { 9013E862-8E81-5290-64F9-D8BCD13EC7E5,UserNameLabel,subst {1} +>>>>>>> 0.12 905DA2E9-988C-2F27-BB1F5F274AC9,Alias {Cancel Actions} @@ -1685,6 +2869,15 @@ array set Properties { {0 conditions} 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,BackButton,subst +<<<<<<< HEAD +1 + +908CE221-5A3D-0A78-24A1-E7C91EBE38D4,CancelButton,subst +1 + +908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Caption,subst +1 +======= {1} 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,CancelButton,subst @@ -1692,11 +2885,27 @@ array set Properties { 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Caption,subst {1} +>>>>>>> 0.12 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Conditions {0 conditions} 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Message,subst +<<<<<<< HEAD +1 + +908CE221-5A3D-0A78-24A1-E7C91EBE38D4,NextButton,subst +1 + +908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Subtitle,subst +1 + +908CE221-5A3D-0A78-24A1-E7C91EBE38D4,Title,subst +1 + +937C3FDD-FB28-98BD-3DAB276E59ED,Background +white +======= {1} 908CE221-5A3D-0A78-24A1-E7C91EBE38D4,NextButton,subst @@ -1710,11 +2919,30 @@ array set Properties { 937C3FDD-FB28-98BD-3DAB276E59ED,Background {white} +>>>>>>> 0.12 937C3FDD-FB28-98BD-3DAB276E59ED,Conditions {3 conditions} 937C3FDD-FB28-98BD-3DAB276E59ED,Text,subst +<<<<<<< HEAD +1 + +937C3FDD-FB28-98BD-3DAB276E59ED,Type +checkbutton + +937C3FDD-FB28-98BD-3DAB276E59ED,VirtualText +CreateQuickLaunchShortcut + +937C3FDD-FB28-98BD-3DAB276E59ED,X +185 + +937C3FDD-FB28-98BD-3DAB276E59ED,Y +200 + +93AA298C-B64E-5683-14D2-7B86F7DEFD2C,Active +No +======= {1} 937C3FDD-FB28-98BD-3DAB276E59ED,Type @@ -1731,6 +2959,7 @@ array set Properties { 93AA298C-B64E-5683-14D2-7B86F7DEFD2C,Active {No} +>>>>>>> 0.12 93AA298C-B64E-5683-14D2-7B86F7DEFD2C,Comment {set BackupLocationName "BackupLocation_${BackupLocationNumber}"} @@ -1739,7 +2968,11 @@ array set Properties { {0 conditions} 93AA298C-B64E-5683-14D2-7B86F7DEFD2C,ResultVirtualText +<<<<<<< HEAD +BackupLocationName +======= {BackupLocationName} +>>>>>>> 0.12 93AA298C-B64E-5683-14D2-7B86F7DEFD2C,TclScript {set BackupLocationName "BackupLocation_${BackupLocationNumber}"} @@ -1748,24 +2981,48 @@ array set Properties { {Before Action is Executed} 96A68CAC-9ED7-806C-086B104720FD,String +<<<<<<< HEAD +<%ErrorsOccurred%> +======= {<%ErrorsOccurred%>} +>>>>>>> 0.12 97ACF525-C075-8635-E019202A83D8,Comment {Ask the user if they want to proceed with the uninstall.} 9892B25C-689B-5B8F-F0C9-B14FF6ACC40C,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 9892B25C-689B-5B8F-F0C9-B14FF6ACC40C,Conditions {0 conditions} 9892B25C-689B-5B8F-F0C9-B14FF6ACC40C,ResultVirtualText +<<<<<<< HEAD +AddBackupLocation +======= {AddBackupLocation} +>>>>>>> 0.12 9892B25C-689B-5B8F-F0C9-B14FF6ACC40C,TclScript {set AddBackupLocation no} 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Active +<<<<<<< HEAD +Yes + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,BackButton,subst +1 + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,CancelButton,subst +1 + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Caption,subst +1 +======= {Yes} 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,BackButton,subst @@ -1776,11 +3033,24 @@ array set Properties { 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Caption,subst {1} +>>>>>>> 0.12 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Conditions {0 conditions} 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Message,subst +<<<<<<< HEAD +1 + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,NextButton,subst +1 + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Subtitle,subst +1 + +9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Title,subst +1 +======= {1} 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,NextButton,subst @@ -1791,21 +3061,33 @@ array set Properties { 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Title,subst {1} +>>>>>>> 0.12 9A663209-495B-ED16-09BE-457B61148022,Conditions {0 conditions} 9A663209-495B-ED16-09BE-457B61148022,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-QueryCurrent +======= {<%ShortAppName%>-program-QueryCurrent} +>>>>>>> 0.12 9A663209-495B-ED16-09BE-457B61148022,ShortcutName {Query Current Only} 9A663209-495B-ED16-09BE-457B61148022,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/QueryOutputCurrent.bat + +9A663209-495B-ED16-09BE-457B61148022,WorkingDirectory +<%InstallDir%> +======= {<%InstallDir%>/tools/QueryOutputCurrent.bat} 9A663209-495B-ED16-09BE-457B61148022,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 9D101299-B80C-441B-8685-6E3AC61808E8,Alias {Remote Control} @@ -1817,6 +3099,18 @@ array set Properties { {0 conditions} 9D101299-B80C-441B-8685-6E3AC61808E8,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-RemoteControl + +9D101299-B80C-441B-8685-6E3AC61808E8,ShortcutName +RemoteControl + +9D101299-B80C-441B-8685-6E3AC61808E8,TargetFileName +<%InstallDir%>/tools/RemoteControl.exe + +9D101299-B80C-441B-8685-6E3AC61808E8,WorkingDirectory +<%InstallDir%> +======= {<%ShortAppName%>-program-RemoteControl} 9D101299-B80C-441B-8685-6E3AC61808E8,ShortcutName @@ -1827,6 +3121,7 @@ array set Properties { 9D101299-B80C-441B-8685-6E3AC61808E8,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 A1DD1DC2-85D7-9BC6-998AC3D4A3A9,Alias {Startup Actions} @@ -1838,7 +3133,11 @@ A5B32DA1-B2FE-C1FA-6057-FBC3059EF076,Conditions {0 conditions} A5B32DA1-B2FE-C1FA-6057-FBC3059EF076,ResultVirtualText +<<<<<<< HEAD +AddBackupLocation +======= {AddBackupLocation} +>>>>>>> 0.12 A5B32DA1-B2FE-C1FA-6057-FBC3059EF076,TclScript {set AddBackupLocation no } @@ -1847,12 +3146,28 @@ A6E1B027-A1B4-5848-4F868D028D00,CheckCondition {Before Action is Executed} A6E1B027-A1B4-5848-4F868D028D00,String +<<<<<<< HEAD +<%ViewReadme%> +======= {<%ViewReadme%>} +>>>>>>> 0.12 ADA6EB2F-8820-4366-BBEF-ED1335B7F828,Conditions {1 condition} AE3BD5B4-35DE-4240-B79914D43E56,Active +<<<<<<< HEAD +No + +AE3BD5B4-35DE-4240-B79914D43E56,BackButton,subst +1 + +AE3BD5B4-35DE-4240-B79914D43E56,CancelButton,subst +1 + +AE3BD5B4-35DE-4240-B79914D43E56,Caption,subst +1 +======= {No} AE3BD5B4-35DE-4240-B79914D43E56,BackButton,subst @@ -1863,11 +3178,42 @@ AE3BD5B4-35DE-4240-B79914D43E56,CancelButton,subst AE3BD5B4-35DE-4240-B79914D43E56,Caption,subst {1} +>>>>>>> 0.12 AE3BD5B4-35DE-4240-B79914D43E56,Conditions {0 conditions} AE3BD5B4-35DE-4240-B79914D43E56,Message,subst +<<<<<<< HEAD +1 + +AE3BD5B4-35DE-4240-B79914D43E56,NextButton,subst +1 + +AIX-ppc,Active +No + +AIX-ppc,DefaultDirectoryPermission +0755 + +AIX-ppc,DefaultFilePermission +0755 + +AIX-ppc,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +AIX-ppc,FallBackToConsole +Yes + +AIX-ppc,InstallDir +<%Home%>/<%ShortAppName%> + +AIX-ppc,InstallMode +Standard + +AIX-ppc,InstallType +Typical +======= {1} AE3BD5B4-35DE-4240-B79914D43E56,NextButton,subst @@ -1899,11 +3245,21 @@ AIX-ppc,InstallMode AIX-ppc,InstallType {Typical} +>>>>>>> 0.12 AIX-ppc,ProgramExecutable {} AIX-ppc,ProgramFolderAllUsers +<<<<<<< HEAD +No + +AIX-ppc,ProgramFolderName +<%AppName%> + +AIX-ppc,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} AIX-ppc,ProgramFolderName @@ -1911,11 +3267,27 @@ AIX-ppc,ProgramFolderName AIX-ppc,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 AIX-ppc,ProgramName {} AIX-ppc,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +AIX-ppc,PromptForRoot +Yes + +AIX-ppc,RequireRoot +No + +AIX-ppc,RootInstallDir +/usr/local/<%ShortAppName%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message,subst +1 +======= {<%InstallDir%>/README.txt} AIX-ppc,PromptForRoot @@ -1929,6 +3301,7 @@ AIX-ppc,RootInstallDir B002A311-F8E7-41DE-B039-521391924E5B,Message,subst {1} +>>>>>>> 0.12 B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,Alias {Stop Backup Service} @@ -1940,31 +3313,53 @@ B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,Conditions {0 conditions} B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-stopservice +======= {<%ShortAppName%>-program-stopservice} +>>>>>>> 0.12 B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,ShortcutName {Stop Service} B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/StopService.bat + +B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,WorkingDirectory +<%InstallDir%> +======= {<%InstallDir%>/tools/StopService.bat} B01CBBB2-6A78-CA53-9ED9-C3C4CFC9239E,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 B0AA6839-AAB6-A602-C0E4ECA2E4FF,CheckCondition {Before Action is Executed} B0AA6839-AAB6-A602-C0E4ECA2E4FF,Filename +<<<<<<< HEAD +<%ProgramExecutable%> +======= {<%ProgramExecutable%>} +>>>>>>> 0.12 B39C0455-D1B6-7DDC-E2717F83463E,CheckCondition {Before Action is Executed} B39C0455-D1B6-7DDC-E2717F83463E,Operator +<<<<<<< HEAD +false + +B39C0455-D1B6-7DDC-E2717F83463E,String +<%InstallStopped%> +======= {false} B39C0455-D1B6-7DDC-E2717F83463E,String {<%InstallStopped%>} +>>>>>>> 0.12 B3B99E2D-C368-A921-B7BC-A71EBDE3AD4D,Conditions {0 conditions} @@ -1973,7 +3368,11 @@ B3B99E2D-C368-A921-B7BC-A71EBDE3AD4D,ExecuteAction {Before Next Pane is Displayed} B3B99E2D-C368-A921-B7BC-A71EBDE3AD4D,Password +<<<<<<< HEAD +<%InstallPassword%> +======= {<%InstallPassword%>} +>>>>>>> 0.12 B4D31D1E-ADB1-DE8F-18EB7294DDA8,Conditions {0 conditions} @@ -1982,6 +3381,27 @@ B4D31D1E-ADB1-DE8F-18EB7294DDA8,ProgramCommandLine {<%ServiceExeName%> -r -S <%ServiceName%>} B4D31D1E-ADB1-DE8F-18EB7294DDA8,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,AcceptRadiobutton,subst +0 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Active +Yes + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,BackButton,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,CancelButton,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Caption,subst +1 +======= {<%InstallDir%>} B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message,subst @@ -2001,11 +3421,30 @@ B506E7DA-E7C4-4D42-8C03-FD27BA16D078,CancelButton,subst B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Caption,subst {1} +>>>>>>> 0.12 B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Conditions {0 conditions} B506E7DA-E7C4-4D42-8C03-FD27BA16D078,DeclineRadiobutton,subst +<<<<<<< HEAD +0 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Message,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,NextButton,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Subtitle,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Text,subst +1 + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Title,subst +1 +======= {0} B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Message,subst @@ -2022,6 +3461,7 @@ B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Text,subst B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Title,subst {1} +>>>>>>> 0.12 B5DFEC63-92A9-4686-909E-0CE78A7069D6,Alias {Restart Backup Service} @@ -2033,7 +3473,11 @@ B5DFEC63-92A9-4686-909E-0CE78A7069D6,Conditions {0 conditions} B5DFEC63-92A9-4686-909E-0CE78A7069D6,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-restartservice +======= {<%ShortAppName%>-program-restartservice} +>>>>>>> 0.12 B5DFEC63-92A9-4686-909E-0CE78A7069D6,ShortcutName {Restart Service} @@ -2042,12 +3486,31 @@ B5DFEC63-92A9-4686-909E-0CE78A7069D6,TargetFileName {<%InstallDir%>\tools\RestartService.bat} B5DFEC63-92A9-4686-909E-0CE78A7069D6,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> +======= {<%InstallDir%>} +>>>>>>> 0.12 B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Conditions {0 conditions} B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,LabelSide +<<<<<<< HEAD +left + +B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Text,subst +1 + +B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Type +entry + +B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,VirtualText +BackupLocationShortName + +B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Y +100 +======= {left} B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Text,subst @@ -2061,24 +3524,39 @@ B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,VirtualText B927A5AF-4DFE-82A3-DCA8-35FA4D91EC5A,Y {100} +>>>>>>> 0.12 B93D2216-1DDB-484C-A9AC-D6C18ED7DE23,Conditions {2 conditions} B93D2216-1DDB-484C-A9AC-D6C18ED7DE23,State +<<<<<<< HEAD +disabled + +B93D2216-1DDB-484C-A9AC-D6C18ED7DE23,Widget +NextButton +======= {disabled} B93D2216-1DDB-484C-A9AC-D6C18ED7DE23,Widget {NextButton} +>>>>>>> 0.12 BC4EA5FD-50BD-4D6E-953F-5E3EDB957360,CheckCondition {Before Next Action is Executed} BC4EA5FD-50BD-4D6E-953F-5E3EDB957360,FailureMessage +<<<<<<< HEAD +<%DirectoryPermissionText%> + +BC4EA5FD-50BD-4D6E-953F-5E3EDB957360,Filename +<%InstallDir%> +======= {<%DirectoryPermissionText%>} BC4EA5FD-50BD-4D6E-953F-5E3EDB957360,Filename {<%InstallDir%>} +>>>>>>> 0.12 BC4EA5FD-50BD-4D6E-953F-5E3EDB957360,Permission {can create} @@ -2093,27 +3571,57 @@ C0452595-F3EB-43AD-BCA2-661437584636,Conditions {0 conditions} C0452595-F3EB-43AD-BCA2-661437584636,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-editconfig +======= {<%ShortAppName%>-program-editconfig} +>>>>>>> 0.12 C0452595-F3EB-43AD-BCA2-661437584636,ShortcutName {Edit Config File} C0452595-F3EB-43AD-BCA2-661437584636,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/EditConfig.bat + +C0452595-F3EB-43AD-BCA2-661437584636,WorkingDirectory +<%InstallDir%> +======= {<%InstallDir%>/tools/EditConfig.bat} C0452595-F3EB-43AD-BCA2-661437584636,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 C0AF7C05-A31A-8376-BCB9-BA8B3A666252,Conditions {0 conditions} C0AF7C05-A31A-8376-BCB9-BA8B3A666252,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-QueryAll +======= {<%ShortAppName%>-program-QueryAll} +>>>>>>> 0.12 C0AF7C05-A31A-8376-BCB9-BA8B3A666252,ShortcutName {Query All} C0AF7C05-A31A-8376-BCB9-BA8B3A666252,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/QueryOutputAll.bat + +C0AF7C05-A31A-8376-BCB9-BA8B3A666252,WorkingDirectory +<%InstallDir%> + +C105AAAE-7C16-2C9E-769FE4535B60,Active +No + +C105AAAE-7C16-2C9E-769FE4535B60,Caption,subst +1 + +C105AAAE-7C16-2C9E-769FE4535B60,CloseButton,subst +1 +======= {<%InstallDir%>/tools/QueryOutputAll.bat} C0AF7C05-A31A-8376-BCB9-BA8B3A666252,WorkingDirectory @@ -2127,11 +3635,24 @@ C105AAAE-7C16-2C9E-769FE4535B60,Caption,subst C105AAAE-7C16-2C9E-769FE4535B60,CloseButton,subst {1} +>>>>>>> 0.12 C105AAAE-7C16-2C9E-769FE4535B60,Conditions {3 conditions} C105AAAE-7C16-2C9E-769FE4535B60,Message,subst +<<<<<<< HEAD +1 + +C105AAAE-7C16-2C9E-769FE4535B60,TextFile +<%ProgramReadme%> + +C105AAAE-7C16-2C9E-769FE4535B60,Title,subst +1 + +C33D74B2-26FA-16F5-433A10C6A747,Active +No +======= {1} C105AAAE-7C16-2C9E-769FE4535B60,TextFile @@ -2142,11 +3663,21 @@ C105AAAE-7C16-2C9E-769FE4535B60,Title,subst C33D74B2-26FA-16F5-433A10C6A747,Active {No} +>>>>>>> 0.12 C33D74B2-26FA-16F5-433A10C6A747,Conditions {3 conditions} C33D74B2-26FA-16F5-433A10C6A747,ProgramCommandLine +<<<<<<< HEAD +<%ProgramExecutable%> + +C33D74B2-26FA-16F5-433A10C6A747,WaitForProgram +No + +C33D74B2-26FA-16F5-433A10C6A747,WorkingDirectory +<%InstallDir%> +======= {<%ProgramExecutable%>} C33D74B2-26FA-16F5-433A10C6A747,WaitForProgram @@ -2154,6 +3685,7 @@ C33D74B2-26FA-16F5-433A10C6A747,WaitForProgram C33D74B2-26FA-16F5-433A10C6A747,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 C7762473-273F-E3CA-17E3-65789B14CDB0,Conditions {0 conditions} @@ -2165,19 +3697,33 @@ C7762473-273F-E3CA-17E3-65789B14CDB0,FileOpenAction {Append to file} C7762473-273F-E3CA-17E3-65789B14CDB0,Files +<<<<<<< HEAD +<%ConfigFileTemplate%> + +C7762473-273F-E3CA-17E3-65789B14CDB0,TextToWrite,subst +1 +======= {<%ConfigFileTemplate%>} C7762473-273F-E3CA-17E3-65789B14CDB0,TextToWrite,subst {1} +>>>>>>> 0.12 CC4337CC-F3B5-757C-DFCF5D1D365A,CheckCondition {Before Action is Executed} CC4337CC-F3B5-757C-DFCF5D1D365A,Operator +<<<<<<< HEAD +false + +CC4337CC-F3B5-757C-DFCF5D1D365A,String +<%SilentMode%> +======= {false} CC4337CC-F3B5-757C-DFCF5D1D365A,String {<%SilentMode%>} +>>>>>>> 0.12 CDD84DE3-C970-458F-9162-1A3CE0AA716B,Alias {Start Backup Service} @@ -2189,7 +3735,11 @@ CDD84DE3-C970-458F-9162-1A3CE0AA716B,Conditions {0 conditions} CDD84DE3-C970-458F-9162-1A3CE0AA716B,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-startservice +======= {<%ShortAppName%>-program-startservice} +>>>>>>> 0.12 CDD84DE3-C970-458F-9162-1A3CE0AA716B,ShortcutName {Start Service} @@ -2198,15 +3748,37 @@ CDD84DE3-C970-458F-9162-1A3CE0AA716B,TargetFileName {<%InstallDir%>\tools\StartService.bat} CDD84DE3-C970-458F-9162-1A3CE0AA716B,WorkingDirectory +<<<<<<< HEAD +<%InstallDir%> + +CFFA27AF-A641-E41C-B4A0E3BB3CBB,Background +white +======= {<%InstallDir%>} CFFA27AF-A641-E41C-B4A0E3BB3CBB,Background {white} +>>>>>>> 0.12 CFFA27AF-A641-E41C-B4A0E3BB3CBB,Conditions {2 conditions} CFFA27AF-A641-E41C-B4A0E3BB3CBB,Text,subst +<<<<<<< HEAD +1 + +CFFA27AF-A641-E41C-B4A0E3BB3CBB,Type +checkbutton + +CFFA27AF-A641-E41C-B4A0E3BB3CBB,VirtualText +LaunchApplication + +CFFA27AF-A641-E41C-B4A0E3BB3CBB,X +185 + +CFFA27AF-A641-E41C-B4A0E3BB3CBB,Y +160 +======= {1} CFFA27AF-A641-E41C-B4A0E3BB3CBB,Type @@ -2220,6 +3792,7 @@ CFFA27AF-A641-E41C-B4A0E3BB3CBB,X CFFA27AF-A641-E41C-B4A0E3BB3CBB,Y {160} +>>>>>>> 0.12 D23DD94C-E517-7F34-FD59-802CB18AB887,Comment {Need to do before starting anything else.} @@ -2231,13 +3804,21 @@ D23DD94C-E517-7F34-FD59-802CB18AB887,Files {*/*.conf;*/*.txt;*/*.bat} D23DD94C-E517-7F34-FD59-802CB18AB887,LineFeed +<<<<<<< HEAD +Windows +======= {Windows} +>>>>>>> 0.12 D3D73C76-D9D3-07DA-63D4163A44BE,Conditions {0 conditions} D3D73C76-D9D3-07DA-63D4163A44BE,ExitType +<<<<<<< HEAD +Finish +======= {Finish} +>>>>>>> 0.12 D4FC6EB5-DDEE-4E4A-B8E1-D4B588A7928B,Action {Install Actions} @@ -2252,7 +3833,11 @@ D7FBBEBB-2186-5674-BA87-BB7151859D4E,Conditions {0 conditions} D7FBBEBB-2186-5674-BA87-BB7151859D4E,ResultVirtualText +<<<<<<< HEAD +BackupLocationNumber +======= {BackupLocationNumber} +>>>>>>> 0.12 D7FBBEBB-2186-5674-BA87-BB7151859D4E,TclScript {incr BackupLocationNumber} @@ -2264,16 +3849,27 @@ D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,Conditions {0 conditions} D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-reloadconfig +======= {<%ShortAppName%>-program-reloadconfig} +>>>>>>> 0.12 D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,ShortcutName {Reload configuration file} D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/ReloadConfig.bat + +D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,WorkingDirectory +<%InstallDir%> +======= {<%InstallDir%>/tools/ReloadConfig.bat} D8B8A9BF-5F2E-4236-A63E-5A8C5FFA8968,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 D8F0AA0F-AD79-C566-15CC508F503B,Action {Install Actions} @@ -2285,6 +3881,24 @@ D9F88AC1-3D2D-F6DB-871E-3A0E016770B1,Conditions {0 conditions} D9F88AC1-3D2D-F6DB-871E-3A0E016770B1,Destination +<<<<<<< HEAD +<%ConfigFileTemplate%> + +D9F88AC1-3D2D-F6DB-871E-3A0E016770B1,Source +<%InstallDir%>/templates/original.conf + +DA33B826-E633-A845-4646-76DFA78B907B,Active +Yes + +DA33B826-E633-A845-4646-76DFA78B907B,BackButton,subst +1 + +DA33B826-E633-A845-4646-76DFA78B907B,CancelButton,subst +1 + +DA33B826-E633-A845-4646-76DFA78B907B,Caption,subst +1 +======= {<%ConfigFileTemplate%>} D9F88AC1-3D2D-F6DB-871E-3A0E016770B1,Source @@ -2301,11 +3915,30 @@ DA33B826-E633-A845-4646-76DFA78B907B,CancelButton,subst DA33B826-E633-A845-4646-76DFA78B907B,Caption,subst {1} +>>>>>>> 0.12 DA33B826-E633-A845-4646-76DFA78B907B,Conditions {0 conditions} DA33B826-E633-A845-4646-76DFA78B907B,Message,subst +<<<<<<< HEAD +1 + +DA33B826-E633-A845-4646-76DFA78B907B,NextButton,subst +1 + +DA33B826-E633-A845-4646-76DFA78B907B,Subtitle,subst +1 + +DA33B826-E633-A845-4646-76DFA78B907B,Title,subst +1 + +DDBBD8A9-13D7-9509-9202-419E989F60A9,Active +No + +DDBBD8A9-13D7-9509-9202-419E989F60A9,Checked +No +======= {1} DA33B826-E633-A845-4646-76DFA78B907B,NextButton,subst @@ -2322,11 +3955,27 @@ DDBBD8A9-13D7-9509-9202-419E989F60A9,Active DDBBD8A9-13D7-9509-9202-419E989F60A9,Checked {No} +>>>>>>> 0.12 DDBBD8A9-13D7-9509-9202-419E989F60A9,Conditions {0 conditions} DDBBD8A9-13D7-9509-9202-419E989F60A9,Text,subst +<<<<<<< HEAD +1 + +DDBBD8A9-13D7-9509-9202-419E989F60A9,Type +checkbutton + +DDBBD8A9-13D7-9509-9202-419E989F60A9,VirtualText +AddBackupLocation + +DDBBD8A9-13D7-9509-9202-419E989F60A9,X +50 + +DDBBD8A9-13D7-9509-9202-419E989F60A9,Y +200 +======= {1} DDBBD8A9-13D7-9509-9202-419E989F60A9,Type @@ -2340,6 +3989,7 @@ DDBBD8A9-13D7-9509-9202-419E989F60A9,X DDBBD8A9-13D7-9509-9202-419E989F60A9,Y {200} +>>>>>>> 0.12 DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,Alias {Install Backup Service} @@ -2351,12 +4001,25 @@ DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,Conditions {0 conditions} DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,FileName +<<<<<<< HEAD +<%ShortAppName%>-program-installService +======= {<%ShortAppName%>-program-installService} +>>>>>>> 0.12 DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,ShortcutName {Install Service} DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,TargetFileName +<<<<<<< HEAD +<%InstallDir%>/tools/InstallService.bat + +DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,WorkingDirectory +<%InstallDir%> + +DECC120D-6904-7F17-45A49184A5A3,Active +No +======= {<%InstallDir%>/tools/InstallService.bat} DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,WorkingDirectory @@ -2364,11 +4027,21 @@ DE800F1C-CB1A-E1CE-AEB8-B0A6DB4818E7,WorkingDirectory DECC120D-6904-7F17-45A49184A5A3,Active {No} +>>>>>>> 0.12 DECC120D-6904-7F17-45A49184A5A3,Conditions {2 conditions} DECC120D-6904-7F17-45A49184A5A3,ShortcutName +<<<<<<< HEAD +<%AppName%> + +DECC120D-6904-7F17-45A49184A5A3,TargetFileName +<%ProgramExecutable%> + +DECC120D-6904-7F17-45A49184A5A3,WorkingDirectory +<%InstallDir%> +======= {<%AppName%>} DECC120D-6904-7F17-45A49184A5A3,TargetFileName @@ -2376,33 +4049,55 @@ DECC120D-6904-7F17-45A49184A5A3,TargetFileName DECC120D-6904-7F17-45A49184A5A3,WorkingDirectory {<%InstallDir%>} +>>>>>>> 0.12 DFFF91A9-2CA5-6ABE-8474D814AF88,CheckCondition {Before Action is Executed} DFFF91A9-2CA5-6ABE-8474D814AF88,Operator +<<<<<<< HEAD +false + +DFFF91A9-2CA5-6ABE-8474D814AF88,String +<%SilentMode%> +======= {false} DFFF91A9-2CA5-6ABE-8474D814AF88,String {<%SilentMode%>} +>>>>>>> 0.12 E02368C5-95B5-03A7-3282740037B0,CheckCondition {Before Action is Executed} E02368C5-95B5-03A7-3282740037B0,Operator +<<<<<<< HEAD +false + +E02368C5-95B5-03A7-3282740037B0,String +<%InstallStopped%> +======= {false} E02368C5-95B5-03A7-3282740037B0,String {<%InstallStopped%>} +>>>>>>> 0.12 E161F216-E597-B340-C1A71C476E2C,CheckCondition {Before Action is Executed} E161F216-E597-B340-C1A71C476E2C,Message,subst +<<<<<<< HEAD +1 + +E161F216-E597-B340-C1A71C476E2C,Title,subst +1 +======= {1} E161F216-E597-B340-C1A71C476E2C,Title,subst {1} +>>>>>>> 0.12 E23AC50D-7CFB-800E-A99C6F4068F8,Alias {Cancel Actions} @@ -2414,7 +4109,11 @@ E44CFF46-6302-C518-B9C30D2E43F7,CheckCondition {Before Action is Executed} E44CFF46-6302-C518-B9C30D2E43F7,String +<<<<<<< HEAD +<%CreateDesktopShortcut%> +======= {<%CreateDesktopShortcut%>} +>>>>>>> 0.12 E4DEA723-FC78-45D7-BAB1-A3E4C4C96EA1,Conditions {0 conditions} @@ -2432,13 +4131,21 @@ E56ADFF4-C15E-AEDB-A599-C468AF72C4BB,Source {<%InstallDir%>\templates\NotifySysAdmin.template.vbs} EB2B31A1-C111-3582-0C8A5656692A,String +<<<<<<< HEAD +<%ErrorsOccurred%> +======= {<%ErrorsOccurred%>} +>>>>>>> 0.12 EB532611-5F30-3C24-66EB-F3826D9054FD,CheckCondition {Before Action is Executed} EB532611-5F30-3C24-66EB-F3826D9054FD,String +<<<<<<< HEAD +<%AddBackupLocation%> +======= {<%AddBackupLocation%>} +>>>>>>> 0.12 F4024A3E-9A6D-2726-5E0CFFA93054,Alias {Uninstall Actions} @@ -2447,7 +4154,11 @@ F4024A3E-9A6D-2726-5E0CFFA93054,Conditions {0 conditions} F5F21749-8B3A-49C6-9138-9C4D6D703D26,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 F5F21749-8B3A-49C6-9138-9C4D6D703D26,Conditions {0 conditions} @@ -2456,6 +4167,30 @@ F5F21749-8B3A-49C6-9138-9C4D6D703D26,ProgramCommandLine {cmd /k tools/7za.exe encrypted_keys.exe -p<%InstallPassword%>} F5F21749-8B3A-49C6-9138-9C4D6D703D26,ProgressiveOutputWidget +<<<<<<< HEAD +Message + +F5F21749-8B3A-49C6-9138-9C4D6D703D26,ShowProgressiveOutput +Yes + +F5F21749-8B3A-49C6-9138-9C4D6D703D26,WorkingDirectory +<%InstallDir%> + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Active +Yes + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,BackButton,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,CancelButton,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Caption,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,CompanyLabel,subst +0 +======= {Message} F5F21749-8B3A-49C6-9138-9C4D6D703D26,ShowProgressiveOutput @@ -2478,11 +4213,30 @@ F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Caption,subst F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,CompanyLabel,subst {0} +>>>>>>> 0.12 F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Conditions {0 conditions} F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Message,subst +<<<<<<< HEAD +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,NextButton,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Subtitle,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,Title,subst +1 + +F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,UserNameLabel,subst +1 + +F9E38720-6ABA-8B99-2471-496902E4CBC2,Active +No +======= {1} F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,NextButton,subst @@ -2499,39 +4253,63 @@ F8FD4BD6-F1DF-3F8D-B857-98310E4B1143,UserNameLabel,subst F9E38720-6ABA-8B99-2471-496902E4CBC2,Active {No} +>>>>>>> 0.12 F9E38720-6ABA-8B99-2471-496902E4CBC2,Conditions {0 conditions} F9E38720-6ABA-8B99-2471-496902E4CBC2,ResultVirtualText +<<<<<<< HEAD +BackupLocationPath +======= {BackupLocationPath} +>>>>>>> 0.12 F9E38720-6ABA-8B99-2471-496902E4CBC2,TclScript {set BackupLocationPath "" } FB697A88-2842-468E-9776-85E84B009340,Active +<<<<<<< HEAD +No +======= {No} +>>>>>>> 0.12 FB697A88-2842-468E-9776-85E84B009340,Conditions {0 conditions} FB697A88-2842-468E-9776-85E84B009340,IgnoreErrors +<<<<<<< HEAD +Yes +======= {Yes} +>>>>>>> 0.12 FB697A88-2842-468E-9776-85E84B009340,ProgramCommandLine {"<%InstallDir%>\<%ServiceExeName%> -r -S <%ServiceName%>} FB697A88-2842-468E-9776-85E84B009340,WorkingDirectory +<<<<<<< HEAD +<%Temp%> + +FDF68FD6-BEA8-4A74-867D-5139F4D9E793,Active +No +======= {<%Temp%>} FDF68FD6-BEA8-4A74-867D-5139F4D9E793,Active {No} +>>>>>>> 0.12 FDF68FD6-BEA8-4A74-867D-5139F4D9E793,Conditions {0 conditions} FDF68FD6-BEA8-4A74-867D-5139F4D9E793,WaitTime +<<<<<<< HEAD +2000 +======= {2000} +>>>>>>> 0.12 FEFD090D-C133-BC95-B3564F693CD3,Alias {Finish Actions} @@ -2540,6 +4318,30 @@ FEFD090D-C133-BC95-B3564F693CD3,Conditions {0 conditions} FreeBSD-4-x86,Active +<<<<<<< HEAD +No + +FreeBSD-4-x86,DefaultDirectoryPermission +0755 + +FreeBSD-4-x86,DefaultFilePermission +0755 + +FreeBSD-4-x86,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +FreeBSD-4-x86,FallBackToConsole +Yes + +FreeBSD-4-x86,InstallDir +<%Home%>/<%ShortAppName%> + +FreeBSD-4-x86,InstallMode +Standard + +FreeBSD-4-x86,InstallType +Typical +======= {No} FreeBSD-4-x86,BuildSeparateArchives @@ -2565,11 +4367,21 @@ FreeBSD-4-x86,InstallMode FreeBSD-4-x86,InstallType {Typical} +>>>>>>> 0.12 FreeBSD-4-x86,ProgramExecutable {} FreeBSD-4-x86,ProgramFolderAllUsers +<<<<<<< HEAD +No + +FreeBSD-4-x86,ProgramFolderName +<%AppName%> + +FreeBSD-4-x86,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} FreeBSD-4-x86,ProgramFolderName @@ -2577,11 +4389,99 @@ FreeBSD-4-x86,ProgramFolderName FreeBSD-4-x86,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 FreeBSD-4-x86,ProgramName {} FreeBSD-4-x86,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +FreeBSD-4-x86,PromptForRoot +Yes + +FreeBSD-4-x86,RequireRoot +No + +FreeBSD-4-x86,RootInstallDir +/usr/local/<%ShortAppName%> + +FreeBSD-x86,Active +No + +FreeBSD-x86,DefaultDirectoryPermission +0755 + +FreeBSD-x86,DefaultFilePermission +0755 + +FreeBSD-x86,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +FreeBSD-x86,FallBackToConsole +Yes + +FreeBSD-x86,InstallDir +<%Home%>/<%ShortAppName%> + +FreeBSD-x86,InstallMode +Standard + +FreeBSD-x86,InstallType +Typical + +FreeBSD-x86,ProgramExecutable +{} + +FreeBSD-x86,ProgramFolderAllUsers +No + +FreeBSD-x86,ProgramFolderName +<%AppName%> + +FreeBSD-x86,ProgramLicense +<%InstallDir%>/LICENSE.txt + +FreeBSD-x86,ProgramName +{} + +FreeBSD-x86,ProgramReadme +<%InstallDir%>/README.txt + +FreeBSD-x86,PromptForRoot +Yes + +FreeBSD-x86,RequireRoot +No + +FreeBSD-x86,RootInstallDir +/usr/local/<%ShortAppName%> + +HPUX-hppa,Active +No + +HPUX-hppa,DefaultDirectoryPermission +0755 + +HPUX-hppa,DefaultFilePermission +0755 + +HPUX-hppa,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +HPUX-hppa,FallBackToConsole +Yes + +HPUX-hppa,InstallDir +<%Home%>/<%ShortAppName%> + +HPUX-hppa,InstallMode +Standard + +HPUX-hppa,InstallType +Typical +======= {<%InstallDir%>/README.txt} FreeBSD-4-x86,PromptForRoot @@ -2781,11 +4681,21 @@ HPUX-hppa,InstallMode HPUX-hppa,InstallType {Typical} +>>>>>>> 0.12 HPUX-hppa,ProgramExecutable {} HPUX-hppa,ProgramFolderAllUsers +<<<<<<< HEAD +No + +HPUX-hppa,ProgramFolderName +<%AppName%> + +HPUX-hppa,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} HPUX-hppa,ProgramFolderName @@ -2793,11 +4703,63 @@ HPUX-hppa,ProgramFolderName HPUX-hppa,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 HPUX-hppa,ProgramName {} HPUX-hppa,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +HPUX-hppa,PromptForRoot +Yes + +HPUX-hppa,RequireRoot +No + +HPUX-hppa,RootInstallDir +/usr/local/<%ShortAppName%> + +Linux-x86,Active +No + +Linux-x86,BuildType +dynamic + +Linux-x86,DefaultDirectoryPermission +00755 + +Linux-x86,DefaultFilePermission +00755 + +Linux-x86,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +Linux-x86,FallBackToConsole +Yes + +Linux-x86,InstallDir +<%Home%>/<%ShortAppName%> + +Linux-x86,InstallMode +Standard + +Linux-x86,InstallType +Typical + +Linux-x86,ProgramExecutable +<%InstallDir%>/TebucoSafe + +Linux-x86,ProgramFolderAllUsers +No + +Linux-x86,ProgramFolderName +<%AppName%> + +Linux-x86,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {<%InstallDir%>/README.txt} HPUX-hppa,PromptForRoot @@ -2850,11 +4812,48 @@ Linux-x86,ProgramFolderName Linux-x86,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 Linux-x86,ProgramName {} Linux-x86,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +Linux-x86,PromptForRoot +Yes + +Linux-x86,RequireRoot +No + +Linux-x86,RootInstallDir +/usr/local/<%ShortAppName%> + +Solaris-sparc,Active +No + +Solaris-sparc,DefaultDirectoryPermission +0755 + +Solaris-sparc,DefaultFilePermission +0755 + +Solaris-sparc,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +Solaris-sparc,FallBackToConsole +Yes + +Solaris-sparc,InstallDir +<%Home%>/<%ShortAppName%> + +Solaris-sparc,InstallMode +Standard + +Solaris-sparc,InstallType +Typical +======= {<%InstallDir%>/README.txt} Linux-x86,PromptForRoot @@ -2946,11 +4945,21 @@ Solaris-sparc,InstallMode Solaris-sparc,InstallType {Typical} +>>>>>>> 0.12 Solaris-sparc,ProgramExecutable {} Solaris-sparc,ProgramFolderAllUsers +<<<<<<< HEAD +No + +Solaris-sparc,ProgramFolderName +<%AppName%> + +Solaris-sparc,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} Solaris-sparc,ProgramFolderName @@ -2958,11 +4967,54 @@ Solaris-sparc,ProgramFolderName Solaris-sparc,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 Solaris-sparc,ProgramName {} Solaris-sparc,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +Solaris-sparc,PromptForRoot +Yes + +Solaris-sparc,RequireRoot +No + +Solaris-sparc,RootInstallDir +/usr/local/<%ShortAppName%> + +TarArchive,Active +No + +TarArchive,CompressionLevel +6 + +TarArchive,DefaultDirectoryPermission +0755 + +TarArchive,DefaultFilePermission +0755 + +TarArchive,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +TarArchive,FallBackToConsole +Yes + +TarArchive,InstallDir +<%Home%>/<%ShortAppName%> + +TarArchive,InstallMode +Standard + +TarArchive,InstallType +Typical + +TarArchive,OutputFileName +<%ShortAppName%>-<%Version%>.tar.gz +======= {<%InstallDir%>/README.txt} Solaris-sparc,PromptForRoot @@ -3060,11 +5112,21 @@ TarArchive,InstallType TarArchive,OutputFileName {<%ShortAppName%>-<%Version%>.tar.gz} +>>>>>>> 0.12 TarArchive,ProgramExecutable {} TarArchive,ProgramFolderAllUsers +<<<<<<< HEAD +No + +TarArchive,ProgramFolderName +<%AppName%> + +TarArchive,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} TarArchive,ProgramFolderName @@ -3072,11 +5134,24 @@ TarArchive,ProgramFolderName TarArchive,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 TarArchive,ProgramName {} TarArchive,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +TarArchive,PromptForRoot +Yes + +TarArchive,RequireRoot +No + +TarArchive,RootInstallDir +/usr/local/<%ShortAppName%> +======= {<%InstallDir%>/README.txt} TarArchive,PromptForRoot @@ -3087,20 +5162,31 @@ TarArchive,RequireRoot TarArchive,RootInstallDir {/usr/local/<%ShortAppName%>} +>>>>>>> 0.12 TarArchive,VirtualTextMap {<%InstallDir%> <%ShortAppName%>} Windows,Active +<<<<<<< HEAD +Yes +======= {Yes} Windows,BuildSeparateArchives {No} +>>>>>>> 0.12 Windows,BuildType {} Windows,Executable +<<<<<<< HEAD +installer.exe + +Windows,IncludeTWAPI +No +======= {installer.exe} Windows,FileDescription @@ -3108,11 +5194,18 @@ Windows,FileDescription Windows,IncludeTWAPI {No} +>>>>>>> 0.12 Windows,InstallDir {C:\Program Files\<%BrandName%>} Windows,InstallMode +<<<<<<< HEAD +Standard + +Windows,InstallType +Typical +======= {Standard} Windows,InstallType @@ -3120,15 +5213,23 @@ Windows,InstallType Windows,LastRequireAdministrator {Yes} +>>>>>>> 0.12 Windows,ProgramExecutable {} Windows,ProgramFolderAllUsers +<<<<<<< HEAD +No + +Windows,ProgramFolderName +<%BrandName%> +======= {No} Windows,ProgramFolderName {<%BrandName%>} +>>>>>>> 0.12 Windows,ProgramLicense {<%InstallDir%>\LICENSE.txt} @@ -3139,16 +5240,49 @@ Windows,ProgramName Windows,ProgramReadme {} +<<<<<<< HEAD +======= Windows,RequireAdministrator {Yes} Windows,UseUncompressedBinaries {No} +>>>>>>> 0.12 Windows,WindowsIcon {} ZipArchive,Active +<<<<<<< HEAD +No + +ZipArchive,CompressionLevel +6 + +ZipArchive,DefaultDirectoryPermission +0755 + +ZipArchive,DefaultFilePermission +0755 + +ZipArchive,Executable +<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%> + +ZipArchive,FallBackToConsole +Yes + +ZipArchive,InstallDir +<%Home%>/<%ShortAppName%> + +ZipArchive,InstallMode +Standard + +ZipArchive,InstallType +Typical + +ZipArchive,OutputFileName +<%ShortAppName%>-<%Version%>.zip +======= {No} ZipArchive,BuildSeparateArchives @@ -3180,11 +5314,21 @@ ZipArchive,InstallType ZipArchive,OutputFileName {<%ShortAppName%>-<%Version%>.zip} +>>>>>>> 0.12 ZipArchive,ProgramExecutable {} ZipArchive,ProgramFolderAllUsers +<<<<<<< HEAD +No + +ZipArchive,ProgramFolderName +<%AppName%> + +ZipArchive,ProgramLicense +<%InstallDir%>/LICENSE.txt +======= {No} ZipArchive,ProgramFolderName @@ -3192,11 +5336,24 @@ ZipArchive,ProgramFolderName ZipArchive,ProgramLicense {<%InstallDir%>/LICENSE.txt} +>>>>>>> 0.12 ZipArchive,ProgramName {} ZipArchive,ProgramReadme +<<<<<<< HEAD +<%InstallDir%>/README.txt + +ZipArchive,PromptForRoot +Yes + +ZipArchive,RequireRoot +No + +ZipArchive,RootInstallDir +/usr/local/<%ShortAppName%> +======= {<%InstallDir%>/README.txt} ZipArchive,PromptForRoot @@ -3207,6 +5364,7 @@ ZipArchive,RequireRoot ZipArchive,RootInstallDir {/usr/local/<%ShortAppName%>} +>>>>>>> 0.12 ZipArchive,VirtualTextMap {<%InstallDir%> <%ShortAppName%>} @@ -3215,6 +5373,18 @@ ZipArchive,VirtualTextMap ::msgcat::mcmset de { 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<<<<<<< HEAD +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message +<%InstallingApplicationText%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> +======= {<%UninstallCompleteText%>} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message @@ -3225,10 +5395,20 @@ B002A311-F8E7-41DE-B039-521391924E5B,Message B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message {<%UninstallingApplicationText%>} +>>>>>>> 0.12 } ::msgcat::mcmset en { 16D53E40-546B-54C3-088B1B5E3BBB,Text +<<<<<<< HEAD +<%CreateDesktopShortcutText%> + +20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> +======= {<%CreateDesktopShortcutText%>} 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message @@ -3236,6 +5416,7 @@ B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message {<%InstallationCompleteText%>} +>>>>>>> 0.12 2E2963BD-DDBD-738D-A910-B7F3F04946F9,Text {No:<%BackupLocationNumber%> } @@ -3244,6 +5425,18 @@ B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message BackupLocations\n\{\n 32F5B0AF-EB83-7A03-D8FAE1ECE473,Message +<<<<<<< HEAD +<%InstallStartupText%> + +32F5B0AF-EB83-7A03-D8FAE1ECE473,Title +<%InstallApplicationText%> + +36FF8915-8148-0F1F-27D7239CBFA1,Text +<%ViewReadmeText%> + +3B6E2E7C-1A26-27F1-D578E383B128,Text +<%ViewReadmeText%> +======= {<%InstallStartupText%>} 32F5B0AF-EB83-7A03-D8FAE1ECE473,Title @@ -3254,6 +5447,7 @@ BackupLocations\n\{\n 3B6E2E7C-1A26-27F1-D578E383B128,Text {<%ViewReadmeText%>} +>>>>>>> 0.12 3D33AA8C-0037-204B-39A339FD38BD,Message {<%BrandName%> has been removed from your system. Thank you for using the <%BrandName%> Backup Service. If you need further assistance, please contact us at http://<%BrandName%>.com or support@<%BrandName%>.com.} @@ -3274,6 +5468,15 @@ BackupLocations\n\{\n {Backup Directory} 4A9C852B-647E-EED5-5482FFBCC2AF,Description +<<<<<<< HEAD +<%ProgramFilesDescription%> + +4ACB0B47-42B3-2B3A-BFE9AA4EC707,Message +<%UninstallStartupText%> + +4ACB0B47-42B3-2B3A-BFE9AA4EC707,Title +<%UninstallApplicationText%> +======= {<%ProgramFilesDescription%>} 4ACB0B47-42B3-2B3A-BFE9AA4EC707,Message @@ -3281,6 +5484,7 @@ BackupLocations\n\{\n 4ACB0B47-42B3-2B3A-BFE9AA4EC707,Title {<%UninstallApplicationText%>} +>>>>>>> 0.12 58E1119F-639E-17C9-5D3898F385AA,Caption {Setup will install <%ShortAppName%> in the following folder. @@ -3329,13 +5533,21 @@ You will be presented with the current configuration file so that you may make a \}\n 8202CECC-54A0-9B6C-D24D111BA52E,Description +<<<<<<< HEAD +<%TypicalInstallDescription%> +======= {<%TypicalInstallDescription%>} +>>>>>>> 0.12 8419AAAD-5860-F73E-8D11-4D1BDA4D7D37,Text {Add another backup location?} 855DE408-060E-3D35-08B5-1D9AB05C2865,Text +<<<<<<< HEAD +Exclusions +======= {Exclusions} +>>>>>>> 0.12 8E095096-F018-A880-429D-A2177A9B70EA,Text {AddAnother: <%AddBackupLocation%>} @@ -3344,6 +5556,15 @@ You will be presented with the current configuration file so that you may make a {Please enter your phone number and email address.} 9013E862-8E81-5290-64F9-D8BCD13EC7E5,CompanyLabel +<<<<<<< HEAD +Email: + +9013E862-8E81-5290-64F9-D8BCD13EC7E5,UserNameLabel +Phone: + +937C3FDD-FB28-98BD-3DAB276E59ED,Text +<%CreateQuickLaunchShortcutText%> +======= {Email:} 9013E862-8E81-5290-64F9-D8BCD13EC7E5,UserNameLabel @@ -3351,6 +5572,7 @@ You will be presented with the current configuration file so that you may make a 937C3FDD-FB28-98BD-3DAB276E59ED,Text {<%CreateQuickLaunchShortcutText%>} +>>>>>>> 0.12 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Caption {Click Next to continue...} @@ -3362,16 +5584,27 @@ You will be presented with the current configuration file so that you may make a {} 9A23D3ED-4D9D-9C57-C2A7-71DE0FFF0266,Title +<<<<<<< HEAD +Continue +======= {Continue} +>>>>>>> 0.12 9BAB328D-414B-D351-CA8D-824DF94B9DCA,Text {Add another backup location after this one?} A18C2977-1409-C1FB-892415711F72,Text +<<<<<<< HEAD +<%LaunchApplicationText%> + +AAF2142A-9FC9-4664-DFF2-13B9EB7BA0E1,CompanyLabel +Company: +======= {<%LaunchApplicationText%>} AAF2142A-9FC9-4664-DFF2-13B9EB7BA0E1,CompanyLabel {Company:} +>>>>>>> 0.12 AE3BD5B4-35DE-4240-B79914D43E56,Caption {Welcome to the Installation Wizard for <%BrandName%> Backup Service!} @@ -3389,6 +5622,34 @@ Click Next to continue or Cancel to exit Setup. } B002A311-F8E7-41DE-B039-521391924E5B,Message +<<<<<<< HEAD +<%InstallingApplicationText%> + +B4404713-AF4F-4F4B-670F3115517F,Description +<%CustomInstallDescription%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> + +B506E7DA-E7C4-4D42-8C03-FD27BA16D078,Text +{Box Backup, http://www.fluffy.co.uk/boxbackup +Copyright (c) 2003-2007 Ben Summers and contributors. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. All use of this software and associated advertising materials must display the following acknowledgement: + This product includes software developed by Ben Summers and contributors. + +4. The names of the Authors may not be used to endorse or promote products derived from this software without specific prior written permission. + +[Where legally impermissible the Authors do not disclaim liability for direct physical injury or death caused solely by defects in the software unless it is modified by a third party.] + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE} +======= {<%InstallingApplicationText%>} B4404713-AF4F-4F4B-670F3115517F,Description @@ -3475,6 +5736,7 @@ distribution The dual license text may be found in the file LICENSE-DUAL.txt, or online at: [https://www.boxbackup.org/svn/box/trunk/LICENSE-DUAL.txt]} +>>>>>>> 0.12 B57F8C91-2439-CFD3-7EB5-57D4EA48D3C6,Caption {<%BrandName%> will backup the following folder. @@ -3500,19 +5762,31 @@ B9B85EF1-1D76-4BF5-ABB9-092A8DB35851,Caption {Please enter the agreed-upon password for your encrypted key file...} B9B85EF1-1D76-4BF5-ABB9-092A8DB35851,CompanyLabel +<<<<<<< HEAD +Password: +======= {Password:} +>>>>>>> 0.12 B9B85EF1-1D76-4BF5-ABB9-092A8DB35851,Subtitle {Please enter your encrypted key file password.} C105AAAE-7C16-2C9E-769FE4535B60,Caption +<<<<<<< HEAD +<%ApplicationReadmeText%> +======= {<%ApplicationReadmeText%>} +>>>>>>> 0.12 C105AAAE-7C16-2C9E-769FE4535B60,Message {} C105AAAE-7C16-2C9E-769FE4535B60,Title +<<<<<<< HEAD +<%ApplicationReadmeText%> +======= {<%ApplicationReadmeText%>} +>>>>>>> 0.12 C7762473-273F-E3CA-17E3-65789B14CDB0,TextToWrite {<%BackupLocationShortName%> @@ -3538,10 +5812,17 @@ CB058DBA-C3B7-2F48-D985-BE2F7107A76D,Title {Choose Backup Location} CFFA27AF-A641-E41C-B4A0E3BB3CBB,Text +<<<<<<< HEAD +<%LaunchApplicationText%> + +D4625CA6-9864-D8EF-F252D7B7DC87,Text +<%CreateDesktopShortcutText%> +======= {<%LaunchApplicationText%>} D4625CA6-9864-D8EF-F252D7B7DC87,Text {<%CreateDesktopShortcutText%>} +>>>>>>> 0.12 D47BE952-79F2-844E-D2E5-8F22044E7A9D,Text {Account Number:} @@ -3556,7 +5837,11 @@ DA33B826-E633-A845-4646-76DFA78B907B,Subtitle {} DA33B826-E633-A845-4646-76DFA78B907B,Title +<<<<<<< HEAD +Continue +======= {Continue} +>>>>>>> 0.12 DDBBD8A9-13D7-9509-9202-419E989F60A9,Text {Add another Backup Location?} @@ -3565,7 +5850,11 @@ E0CADC4E-08A6-E429-3B49-BB8CFB7B097F,Text {Simple name for this Backup Location (short, no spaces or special characters)} E161F216-E597-B340-C1A71C476E2C,Message +<<<<<<< HEAD +<%UninstallLeftoverText%> +======= {<%UninstallLeftoverText%>} +>>>>>>> 0.12 E161F216-E597-B340-C1A71C476E2C,Title {Uninstall <%BrandName%>} @@ -3592,7 +5881,11 @@ F98784B1-1965-0F42-6BB0542AE1A9,Message {Click Next to install the TebucoSafe Backup Service as an operating system service on your computer (see services.msc), and start up that service. } FC678E76-6823-2E55-204CA01C35EF,Text +<<<<<<< HEAD +<%CreateQuickLaunchShortcutText%> +======= {<%CreateQuickLaunchShortcutText%>} +>>>>>>> 0.12 FF4F6EEA-F4CC-428E-AF33-EB0E88E2147E,Text { @@ -3636,6 +5929,18 @@ POSSIBILITY OF SUCH DAMAGE. } ::msgcat::mcmset es { 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<<<<<<< HEAD +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message +<%InstallingApplicationText%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> +======= {<%UninstallCompleteText%>} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message @@ -3646,10 +5951,23 @@ B002A311-F8E7-41DE-B039-521391924E5B,Message B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message {<%UninstallingApplicationText%>} +>>>>>>> 0.12 } ::msgcat::mcmset fr { 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<<<<<<< HEAD +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message +<%InstallingApplicationText%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> +======= {<%UninstallCompleteText%>} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message @@ -3660,10 +5978,23 @@ B002A311-F8E7-41DE-B039-521391924E5B,Message B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message {<%UninstallingApplicationText%>} +>>>>>>> 0.12 } ::msgcat::mcmset pl { 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<<<<<<< HEAD +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message +<%InstallingApplicationText%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> +======= {<%UninstallCompleteText%>} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message @@ -3674,10 +6005,23 @@ B002A311-F8E7-41DE-B039-521391924E5B,Message B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message {<%UninstallingApplicationText%>} +>>>>>>> 0.12 } ::msgcat::mcmset pt_br { 20CBDBEA-2217-457B-8D98-D692C4F591E9,Message +<<<<<<< HEAD +<%UninstallCompleteText%> + +2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message +<%InstallationCompleteText%> + +B002A311-F8E7-41DE-B039-521391924E5B,Message +<%InstallingApplicationText%> + +B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message +<%UninstallingApplicationText%> +======= {<%UninstallCompleteText%>} 2BF07B5A-9B06-4C1E-810D-5B5E9303D2C6,Message @@ -3688,6 +6032,7 @@ B002A311-F8E7-41DE-B039-521391924E5B,Message B4ED4636-22D8-41DC-9E3D-BD1E1CAD2174,Message {<%UninstallingApplicationText%>} +>>>>>>> 0.12 } diff --git a/contrib/windows/installer/tools/RemoteControl.exe b/contrib/windows/installer/tools/RemoteControl.exe Binary files differnew file mode 100755 index 00000000..f7667421 --- /dev/null +++ b/contrib/windows/installer/tools/RemoteControl.exe |