Windows: Wix cell names can be greater than 120 chars
[openafs.git] / src / WINNT / install / wix / lang / en_US / ui.wxi
index 49696b0..8074a8b 100644 (file)
@@ -1,4 +1,4 @@
-\feff<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <Include>
     <UI>
       <Property Id="DefaultUIFont">DlgFont8</Property>
@@ -37,6 +37,8 @@
                <Property Id="Setup">Setup</Property>
                <Property Id="ShowUserRegistrationDlg">0</Property>
                <Property Id="Wizard">Setup Wizard</Property>
+                <Property Id="RestoreIcon">restore</Property>
+                <Property Id="NewSettingsIcon">newconfig</Property>
 
       <Dialog Id="AdminBrowseDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="PathEdit" Type="PathEdit" X="84" Y="202" Width="261" Height="17" Property="TARGETDIR" />
       <Dialog Id="AdminWelcomeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">
           <Publish Property="InstallMode" Value="Server Image">1</Publish>
-          <Publish Event="NewDialog" Value="AdminRegistrationDlg">1</Publish>
+          <Publish Event="NewDialog" Value="AdminInstallPointDlg">1</Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
           <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
           <Publish Event="NewDialog" Value="SetupTypeDlg">InstallMode = "Custom"</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">
-                 <Publish Event="NewDialog" Value="ConfigClientDlg">
-                       <![CDATA[ &feaClient = 3 AND NOT ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) ))]]>
-                 </Publish>
+          <?ifndef BinsOnly ?>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">
+            <![CDATA[ &feaClient = 3 AND NOT ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) )) AND NOT SAVED_CONFIG ]]>
+          </Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">
+            <![CDATA[ &feaClient = 3 AND NOT ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) )) AND SAVED_CONFIG ]]>
+          </Publish>
           <Publish Event="NewDialog" Value="VerifyReadyDlg">
             <![CDATA[ &feaClient <> 3 AND NOT ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) ))]]>
           </Publish>
           <Publish Event="NewDialog" Value="AddServerDepsDlg">
             <![CDATA[ ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) )) ]]>
           </Publish>
+          <?else?>
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+          <?endif?>
           <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
         </Control>
       </Dialog>
 
+      <?ifndef BinsOnly ?>
       <Dialog Id="AddServerDepsDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
           <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">
-                 <Publish Event="AddLocal" Value="feaClient"><![CDATA[&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3)]]></Publish>
-                 <Publish Event="AddLocal" Value="feaControlCenter"><![CDATA[&feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3)]]></Publish>
-                 <Publish Event="NewDialog" Value="ConfigClientDlg">
-                       <![CDATA[ &feaClient = 3 ]]>
-                 </Publish>
+          <Publish Event="AddLocal" Value="feaClient"><![CDATA[&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3)]]></Publish>
+          <Publish Event="AddLocal" Value="feaControlCenter"><![CDATA[&feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3)]]></Publish>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">
+            <![CDATA[ &feaClient = 3 AND NOT SAVED_CONFIG ]]>
+          </Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">
+            <![CDATA[ &feaClient = 3 AND SAVED_CONFIG ]]>
+          </Publish>
           <Publish Event="NewDialog" Value="VerifyReadyDlg">
             <![CDATA[ &feaClient <> 3 ]]>
           </Publish>
           <Text>[DlgTitleFont]Server Dependencies</Text>
         </Control>
       </Dialog>
+      <?endif?>
 
       <Dialog Id="DiskCostDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[ButtonText_OK]">
         </Control>
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" FixedSize="yes" TabSkip="no" Text="[BannerBitmap]" />
         <Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no">
-          <Text>{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} {\f23\froman\fcharset128\fprq1{\*\panose 00000000000000000000}MS Mincho{\*\falt MS ??};}{\f54\froman\fcharset128\fprq1{\*\panose 00000000000000000000}@MS Mincho;}{\f55\froman\fcharset238\fprq2 Times New Roman CE;} {\f56\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f58\froman\fcharset161\fprq2 Times New Roman Greek;}{\f59\froman\fcharset162\fprq2 Times New Roman Tur;}{\f60\froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\f61\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f62\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f71\fmodern\fcharset238\fprq1 Courier New CE;}{\f72\fmodern\fcharset204\fprq1 Courier New Cyr;} {\f74\fmodern\fcharset161\fprq1 Courier New Greek;}{\f75\fmodern\fcharset162\fprq1 Courier New Tur;}{\f76\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f77\fmodern\fcharset178\fprq1 Courier New (Arabic);} {\f78\fmodern\fcharset186\fprq1 Courier New Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255; \red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{ \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive Default Paragraph Font;}{ \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 Plain Text;}}{\info{\title Copyright 1998-2000 by the Massachusetts Institute of Technology} {\author Jamie Rasmussen}{\operator Jamie Rasmussen}{\creatim\yr2000\mo9\dy29\hr16\min17}{\revtim\yr2000\mo9\dy29\hr16\min17}{\version2}{\edmins0}{\nofpages1}{\nofwords0}{\nofchars0}{\*\company MIT Information Systems}{\nofcharsws0}{\vern8269}} \margl1319\margr1319 \widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow1\dgvshow1 \jexpand\viewkind4\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl {\*\pnseclvl1 \pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5 \pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s15\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f2\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\dbch\af23  \hich\af2\dbch\af23\loch\f2 Copyright 1998-2000 by the Massachusetts Institute of Technology. \par \hich\af2\dbch\af23\loch\f2 All Rights Reserved. \par \hich\af2\dbch\af23\loch\f2  \par \hich\af2\dbch\af23\loch\f2 Export of this software from the United States of America may require a specific license from the United States Government. It is the responsibility of any person o\hich\af2\dbch\af23\loch\f2r organization contemplating export to obtain such a license before exporting.\par \hich\af2\dbch\af23\loch\f2  \par \hich\af2\dbch\af23\loch\f2 WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that \hich\af2\dbch\af23\loch\f2 the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the softwa\hich\af2\dbch\af23\loch\f2 r\hich\af2\dbch\af23\loch\f2 e without specific, written prior permission.  M.I.T. makes no representations about the suitability of this software for any purpose.  It is provided "as is" without express or implied warranty. \par \par }}</Text>
+          <Text src="licenses.rtf"></Text>
         </Control>
         <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
           <Text>Please read the following license agreement carefully</Text>
         <Control Id="ActionText" Type="Text" X="70" Y="100" Width="265" Height="10">
           <Subscribe Event="ActionText" Attribute="Text" />
         </Control>
+        <Control Id="ActionData" Type="Text" X="70" Y="110" Width="265" Height="10">
+          <Subscribe Event="ActionData" Attribute="Text" />
+        </Control>
         <Control Id="Text" Type="Text" X="35" Y="65" Width="300" Height="20">
           <Text>Please wait while the [Wizard] [Progress2] [ProductName].  This may take several minutes.</Text>
         </Control>
         <Control Id="Title" Type="Text" X="20" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
           <Text>[DlgTitleFont][Progress1] [ProductName]</Text>
         </Control>
-        <Control Id="ProgressBar" Type="ProgressBar" X="35" Y="115" Width="300" Height="10" ProgressBlocks="yes" Text="Progress done">
+        <Control Id="ProgressBar" Type="ProgressBar" X="35" Y="125" Width="300" Height="10" ProgressBlocks="yes" Text="Progress done">
           <Subscribe Event="SetProgress" Attribute="Progress" />
         </Control>
         <Control Id="StatusLabel" Type="Text" X="35" Y="100" Width="35" Height="10" Text="Status:" />
           <Text>{\VerdanaBold13}Resuming the [ProductName] [Wizard]</Text>
         </Control>
       </Dialog>
+      <?ifndef BinsOnly?>
+      <Dialog Id="SetupTypeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
+
+        <Control Id="TypicalIFSLabel" Type="Text" X="85" Y="79" Width="100" Height="10" TabSkip="no">
+          <Text>[DlgTitleFont]&amp;IFS Based Client</Text>
+        </Control>
+        <Control Id="TypicalIFSText" Type="Text" X="85" Y="92" Width="230" Height="20">
+          <Text>Installs the OpenAFS Client as an installable file system driver.  This is more robust than the SMB interface.</Text>
+        </Control>
+        <Control Id="TypicalIFSButton" Type="PushButton" X="40" Y="77" Width="38" Height="38" ToolTip="IFS Based Client Installation" Default="yes" Icon="yes" FixedSize="yes" IconSize="32" Text="[InstallerIcon]">
+          <Publish Property="InstallMode" Value="Typical">1</Publish>
+          <Publish Event="SetInstallLevel" Value="100">1</Publish>
+          <Publish Event="AddLocal" Value="feaClientDriver">1</Publish>
+          <?ifdef DebugSyms?>
+          <Publish Event="AddLocal" Value="feaClientDriverDebug">$(var.DebugSymLowLevel) &lt; 100</Publish>
+          <?endif?>
+          <Publish Event="Remove" Value="feaLoopback">1</Publish>
+          <Publish Event="Remove" Value="feaAfsCreds">1</Publish>
+          <Publish Event="AddLocal" Value="feaAfsConfig">USEAFSCONFIG &lt;&gt; 0</Publish>
+          <?ifdef DebugSyms?>
+          <Publish Event="AddLocal" Value="feaAfsConfigDebug">USEAFSCONFIG &lt;&gt; 0 And $(var.DebugSymLowLevel) &lt; 100</Publish>
+          <Publish Event="Remove" Value="feaAfsCredsDebug">1</Publish>
+          <?endif?>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">1</Publish>
+        </Control>
+
+        <Control Id="CustomLabel" Type="Text" X="85" Y="122" Width="100" Height="10" TabSkip="no">
+          <Text>[DlgTitleFont]C&amp;ustom</Text>
+        </Control>
+        <Control Id="CustomText" Type="Text" X="85" Y="135" Width="230" Height="30">
+          <Text>Choose which individual components you want to install.  This option is only recommended for advanced users.</Text>
+        </Control>
+        <Control Id="CustomButton" Type="PushButton" X="40" Y="120" Width="38" Height="38" ToolTip="Custom Installation" Icon="yes" FixedSize="yes" IconSize="32" Text="[CustomSetupIcon]">
+          <Publish Property="InstallMode" Value="Custom">1</Publish>
+          <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
+        </Control>
+
+        <Control Id="CompleteLabel" Type="Text" X="85" Y="164" Width="100" Height="10" TabSkip="no">
+          <Text>[DlgTitleFont]C&amp;omplete</Text>
+        </Control>
+        <Control Id="CompleteText" Type="Text" X="85" Y="177" Width="230" Height="20">
+          <Text>Installs the OpenAFS Client, Server and Control Center utilities.  The Client installation will use the IFS interface.</Text>
+        </Control>
+        <Control Id="CompleteButton" Type="PushButton" X="40" Y="162" Width="38" Height="38" ToolTip="Complete Installation" Icon="yes" FixedSize="yes" IconSize="32" Text="[CompleteSetupIcon]">
+          <Publish Property="InstallMode" Value="Complete">1</Publish>
+          <Publish Event="SetInstallLevel" Value="1000">1</Publish>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">1</Publish>
+        </Control>
+
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg">ShowUserRegistrationDlg &lt;&gt; 1 AND NOT (IBMAFS_UPGRADE OR OPENAFS_UPGRADE)</Publish>
+          <Publish Event="NewDialog" Value="UserRegistrationDlg">ShowUserRegistrationDlg = 1 AND NOT (IBMAFS_UPGRADE OR OPENAFS_UPGRADE)</Publish>
+          <Publish Event="NewDialog" Value="RemovePreviousDlg">IBMAFS_UPGRADE OR OPENAFS_UPGRADE OR NSISUNINSTALL &lt;&gt; ""</Publish>
+        </Control>
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="[ButtonText_Next]" />
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" FixedSize="yes" TabSkip="no" Text="[BannerBitmap]" />
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>Choose the setup type that best suits your needs</Text>
+        </Control>
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>[DlgTitleFont]Choose Setup Type</Text>
+        </Control>
+      </Dialog>
+      <?else?> <!-- BinsOnly -->
       <Dialog Id="SetupTypeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="TypicalLabel" Type="Text" X="105" Y="65" Width="100" Height="10" TabSkip="no">
           <Text>[DlgTitleFont]&amp;Typical</Text>
         <Control Id="TypicalButton" Type="PushButton" X="50" Y="65" Width="38" Height="38" ToolTip="Typical Installation" Default="yes" Icon="yes" FixedSize="yes" IconSize="32" Text="[InstallerIcon]">
           <Publish Property="InstallMode" Value="Typical">1</Publish>
           <Publish Event="SetInstallLevel" Value="100">1</Publish>
-          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+          <?ifndef BinsOnly?>
+         <Publish Event="NewDialog" Value="ConfigClientDlg">NOT SAVED_CONFIG</Publish>
+         <Publish Event="NewDialog" Value="RestoreConfigDlg">SAVED_CONFIG</Publish>
+          <?else?>
+         <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+          <?endif?>
         </Control>
         <Control Id="CustomLabel" Type="Text" X="105" Y="118" Width="100" Height="10" TabSkip="no">
           <Text>[DlgTitleFont]C&amp;ustom</Text>
         <Control Id="CompleteButton" Type="PushButton" X="50" Y="171" Width="38" Height="38" ToolTip="Complete Installation" Icon="yes" FixedSize="yes" IconSize="32" Text="[CompleteSetupIcon]">
           <Publish Property="InstallMode" Value="Complete">1</Publish>
           <Publish Event="SetInstallLevel" Value="1000">1</Publish>
+          <?ifndef BinsOnly ?>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">NOT SAVED_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">SAVED_CONFIG</Publish>
+          <?else?>
           <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+          <?endif?>
         </Control>
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
           <Publish Event="NewDialog" Value="LicenseAgreementDlg">ShowUserRegistrationDlg &lt;&gt; 1 AND NOT (IBMAFS_UPGRADE OR OPENAFS_UPGRADE)</Publish>
           <Text>Installs the most common program features. Recommended for most users.</Text>
         </Control>
       </Dialog>
+      <?endif?> <!-- BinsOnly -->
+
+      <?ifndef BinsOnly ?>
+
+      <Dialog Id="RestoreConfigDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
+        <Control Id="RestoreLabel" Type="Text" X="105" Y="65" Width="100" Height="10" TabSkip="no">
+          <Text>[DlgTitleFont]&amp;Restore</Text>
+        </Control>
+        <Control Id="RestoreButton" Type="PushButton" X="50" Y="65" Width="38" Height="38" ToolTip="Restore saved settings" Default="yes" Icon="yes" FixedSize="yes" IconSize="32" Text="[RestoreIcon]">
+          <Publish Property="RESTORE_CONFIG" Value="1">1</Publish>
+         <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+        </Control>
+        <Control Id="NewSettingsLabel" Type="Text" X="105" Y="118" Width="100" Height="10" TabSkip="no">
+          <Text>[DlgTitleFont]&amp;New settings</Text>
+        </Control>
+        <Control Id="NewSettingsButton" Type="PushButton" X="50" Y="118" Width="38" Height="38" ToolTip="New settings" Icon="yes" FixedSize="yes" IconSize="32" Text="[NewSettingsIcon]">
+          <Publish Property="RESTORE_CONFIG">1</Publish>
+          <Publish Event="NewDialog" Value="ConfigClientDlg">1</Publish>
+        </Control>
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
+          <Publish Event="NewDialog" Value="CustomizeDlg">InstallMode &lt;&gt; "Typical" AND InstallMode &lt;&gt; "Complete"</Publish>
+          <Publish Event="NewDialog" Value="SetupTypeDlg">InstallMode = "Typical" OR InstallMode = "Complete"</Publish>
+        </Control>
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="[ButtonText_Next]" />
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" FixedSize="yes" TabSkip="no" Text="[BannerBitmap]" />
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>Configuration settings from a previous OpenAFS installation are available.</Text>
+        </Control>
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>[DlgTitleFont]Preserve configuration?</Text>
+        </Control>
+        <Control Id="CustomText" Type="Text" X="105" Y="131" Width="230" Height="30">
+          <Text>Specify new settings.  Basic settings can be set via this installer.  All others will be reset to defaults.</Text>
+        </Control>
+        <Control Id="TypicalText" Type="Text" X="105" Y="78" Width="230" Height="20">
+          <Text>Use the existing or saved configuration.</Text>
+        </Control>
+      </Dialog>
 
       <Dialog Id="ConfigClientDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
-          <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
+          <Publish Event="NewDialog" Value="CustomizeDlg">InstallMode &lt;&gt; "Typical" AND InstallMode &lt;&gt; "Complete" AND NOT SAVED_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="SetupTypeDlg">( InstallMode = "Typical" OR InstallMode = "Complete" ) AND NOT SAVED_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">SAVED_CONFIG</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="[ButtonText_Next]">
-          <Publish Event="NewDialog" Value="ConfigCredsDlg">1</Publish>
+          <Publish Event="NewDialog" Value="ConfigCredsDlg">&amp;feaAfsCreds = 3</Publish>
+         <Publish Event="NewDialog" Value="VerifyReadyDlg">&amp;feaAfsCreds &lt;&gt; 3</Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">
           <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
         <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
           <Text>[DlgTitleFont]Configure AFS Client</Text>
         </Control>
-        <Control Id="CellLabel" Type="Text" X="45" Y="73" Width="100" Height="15" TabSkip="no" Text="Default &amp;Cell" />
-        <Control Id="CellEdit" Type="Edit" X="150" Y="73" Width="115" Height="18" Property="AFSCELLNAME" Text="{120}" />
-        <Control Id="LogonOptionsLabel" Type="Text" X="45" Y="93" Width="100" Height="15" Text="Integrated logon options" />
-        <Control Id="LogonOptionSel" Type="RadioButtonGroup" X="45" Y="108" Width="220" Height="60" Property="LOGONOPTIONS" />
-        <Control Id="FreelanceLabel" Type="Text" X="45" Y="168" Width="100" Height="15" Text="Freelance mode" />
-        <Control Id="FreelanceSel" Type="RadioButtonGroup" X="150" Y="168" Width="120" Height="20" Property="FREELANCEMODE" />
-        <Control Id="DNSLabel" Type="Text" X="45" Y="188" Width="100" Height="15" Text="Lookup cells in DNS" />
-        <Control Id="DNSSel" Type="RadioButtonGroup" X="150" Y="188" Width="120" Height="20" Property="USEDNS" />
+        <Control Id="CellLabel" Type="Text"                     X="45"  Y="73"  Width="100" Height="15" TabSkip="no" Text="Default &amp;Cell" />
+        <Control Id="CellEdit" Type="Edit"                      X="150" Y="73"  Width="115" Height="18" Property="AFSCELLNAME" Text="{255}" />
+        <Control Id="LogonOptionsLabel" Type="Text"             X="45"  Y="100" Width="100" Height="15" Text="Integrated logon" />
+        <Control Id="LogonOptionSel" Type="RadioButtonGroup"    X="150" Y="100" Width="120" Height="20" Property="LOGONOPTIONS" />
+        <Control Id="SecurityLevelLabel" Type="Text"           X="45"  Y="120" Width="100" Height="15" Text="AFS crypt security" />
+        <Control Id="SecurityLevelSel" Type="RadioButtonGroup"  X="150"        Y="120" Width="120" Height="20" Property="SECURITYLEVEL" />
+        <Control Id="FreelanceLabel" Type="Text"               X="45"  Y="140" Width="100" Height="15" Text="Freelance mode" />
+        <Control Id="FreelanceSel" Type="RadioButtonGroup"     X="150" Y="140" Width="120" Height="20" Property="FREELANCEMODE" />
+        <Control Id="DNSLabel" Type="Text"                     X="45"  Y="160" Width="100" Height="15" Text="Lookup cells in DNS" />
+        <Control Id="DNSSel" Type="RadioButtonGroup"           X="150" Y="160" Width="120" Height="20" Property="USEDNS" />
       </Dialog>
-      <RadioGroup Property="FREELANCEMODE">
-               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable">0</RadioButton>
-               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable">1</RadioButton>
-      </RadioGroup>
-      <RadioGroup Property="USEDNS">
-               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable">0</RadioButton>
-               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable">1</RadioButton>
-      </RadioGroup>
-      <RadioGroup Property="LOGONOPTIONS">
-               <RadioButton X="5" Y="0" Width="215" Height="15" Text="Disable integrated logon">0</RadioButton>
-               <RadioButton X="5" Y="20" Width="215" Height="15" Text="Enable integrated logon">1</RadioButton>
-               <RadioButton X="5" Y="40" Width="215" Height="15" Text="Enable integrated logon and high security">3</RadioButton>              
-      </RadioGroup>
+      <RadioButtonGroup Property="SECURITYLEVEL">
+               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable" Value="0"></RadioButton>
+               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable" Value="1"></RadioButton>
+      </RadioButtonGroup>
+      <RadioButtonGroup Property="FREELANCEMODE">
+               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable" Value="0"></RadioButton>
+               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable" Value="1"></RadioButton>
+      </RadioButtonGroup>
+      <RadioButtonGroup Property="USEDNS">
+               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable" Value="0"></RadioButton>
+               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable" Value="1"></RadioButton>
+      </RadioButtonGroup>
+      <RadioButtonGroup Property="LOGONOPTIONS">
+               <RadioButton X="5" Y="0" Width="55" Height="15" Text="Disable" Value="0"></RadioButton>
+               <RadioButton X="65" Y="0" Width="55" Height="15" Text="Enable" Value="1"></RadioButton>
+      </RadioButtonGroup>
 
       <Dialog Id="ConfigCredsDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
         <Control Id="CredStartLabel" Type="Text" X="45" Y="53" Width="295" Height="15" TabSkip="yes" Text="Startup options for AFS Credentials" />
         <Control Id="CredStartup" Type="CheckBox" X="50" Y="73" Width="300" Height="15" Property="CREDSSTARTUP" CheckBoxValue="1" Text="Start AFS Credentials at startup" />
         <Control Id="CredCommandLabel" Type="Text" X="45" Y="93" Width="295" Height="15" TabSkip="yes" Text="Command line options for AFS Credentials" />
-        <Control Id="CredAutoInit" Type="CheckBox" X="50" Y="113" Width="300" Height="15" Property="CREDSAUTOINIT" CheckBoxValue="-a" Text="Auto initialize AFS Credentials." />
+        <Control Id="CredAutoInit" Type="CheckBox" X="50" Y="113" Width="300" Height="15" Property="CREDSAUTOINIT" CheckBoxValue="-a" Text="Auto initialize AFS Credentials" />
         <Control Id="CredRenew" Type="CheckBox" X="50" Y="133" Width="300" Height="15" Property="CREDSRENEWDRMAP" CheckBoxValue="-m" Text="Renew drive maps" />
         <Control Id="CredIPCg" Type="CheckBox" X="50" Y="153" Width="300" Height="15" Property="CREDSIPCHDET" CheckBoxValue="-n" Text="Detect IP address changes" />
         <Control Id="CredQuiet" Type="CheckBox" X="50" Y="173" Width="300" Height="15" Property="CREDSQUIET" CheckBoxValue="-q" Text="Quiet mode" />
         <Control Id="CredShow" Type="CheckBox" X="50" Y="193" Width="300" Height="15" Property="CREDSSHOW" CheckBoxValue="-s" Text="Show credentials window on startup" />
       </Dialog>
+      <?endif?>                 <!-- ifndef BinsOnly -->
 
       <Dialog Id="UserExit" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
         <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[ButtonText_Finish]">
           <Text>{\VerdanaBold13}[ProductName] [Wizard] was interrupted</Text>
         </Control>
         <Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-          <Text>[ProductName] setup was interrupted.  Your system has not been modified.  To install this program at a later time, please run the installation again.</Text>
+          <Text>[ProductName] setup was interrupted.  Your system has not been modified.  To install or modify this program at a later time, please run the installation again.</Text>
         </Control>
         <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
           <Text>Click the Finish button to exit the [Wizard].</Text>
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" FixedSize="yes" TabSkip="no" Text="[BannerBitmap]" />
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">
           <Publish Event="NewDialog" Value="AdminInstallPointDlg">InstallMode = "Server Image"</Publish>
+          <?ifndef BinsOnly ?>
           <Publish Event="NewDialog" Value="CustomizeDlg">(InstallMode = "Custom" OR InstallMode = "Change") AND &amp;feaClient &lt;&gt; 3</Publish>
-          <Publish Event="NewDialog" Value="ConfigCredsDlg">(InstallMode = "Custom" OR InstallMode = "Change") AND &amp;feaClient = 3</Publish>
-          <Publish Event="NewDialog" Value="MaintenanceTypeDlg">InstallMode = "Repair"</Publish>
+          <Publish Event="NewDialog" Value="ConfigCredsDlg">(InstallMode = "Custom" OR InstallMode = "Change") AND &amp;feaClient = 3 AND NOT RESTORE_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="ConfigCredsDlg">(InstallMode = "Typical" OR InstallMode = "Complete") AND NOT RESTORE_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">(InstallMode = "Custom" OR InstallMode = "Change") AND &amp;feaClient = 3 AND RESTORE_CONFIG</Publish>
+          <Publish Event="NewDialog" Value="RestoreConfigDlg">(InstallMode = "Typical" OR InstallMode = "Complete") AND RESTORE_CONFIG</Publish>
+          <?else?>
+          <Publish Event="NewDialog" Value="CustomizeDlg">InstallMode = "Custom" OR InstallMode = "Change"</Publish>
           <Publish Event="NewDialog" Value="SetupTypeDlg">InstallMode = "Typical" OR InstallMode = "Complete"</Publish>
+          <?endif?>
+          <Publish Event="NewDialog" Value="MaintenanceTypeDlg">InstallMode = "Repair"</Publish>
         </Control>
         <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
           <Text>The [Wizard] is ready to begin the [InstallMode] installation</Text>
         <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="20">
           <Text>Click Install to begin the installation.  If you want to review or change any of your installation settings, click Back.  Click Cancel to exit the wizard.</Text>
         </Control>
+
+        <?ifdef Debug?>
+        <Control Id="C0" Type="Text" X="25" Y="100" Width="100" Height="10" Text="OpenAFS Client">
+          <Condition Action="disable"><![CDATA[ &feaClient <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C1" Type="Text" X="50" Y="110" Width="100" Height="10" Text="Loopback adapter">
+          <Condition Action="disable"><![CDATA[ &feaLoopback <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C2" Type="Text" X="50" Y="120" Width="100" Height="10" Text="Client Redirector">
+          <Condition Action="disable"><![CDATA[ &feaClientDriver <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C3" Type="Text" X="75" Y="130" Width="100" Height="10" Text="Client Redirector (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaClientDriverDebug <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C4" Type="Text" X="50" Y="140" Width="100" Height="10" Text="AFSCREDS.EXE">
+          <Condition Action="disable"><![CDATA[  &feaAfsCreds <> 3 ]]></Condition>
+        </Control>
+        <Control Id="C5" Type="Text" X="75" Y="150" Width="100" Height="10" Text="AFSCREDS.EXE (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaAfsCredsDebug <> 3]]></Condition>
+        </Control>
+        <Control Id="C6" Type="Text" X="75" Y="160" Width="100" Height="10" Text="AFSCREDS Start Menu Shortcut">
+          <Condition Action="disable"><![CDATA[ &feaCredsStartup <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C7" Type="Text" X="50" Y="170" Width="100" Height="10" Text="AFS_CONFIG.EXE">
+          <Condition Action="disable"><![CDATA[ &feaAfsConfig <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C8" Type="Text" X="75" Y="180" Width="100" Height="10" Text="AFS_CONFIG.EXE (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaAfsConfigDebug <> 3  ]]></Condition>
+        </Control>
+        <Control Id="C9" Type="Text" X="50" Y="190" Width="100" Height="10" Text="NIM Plugin">
+          <Condition Action="disable"><![CDATA[ &feaNetIDMgrPlugin <> 3  ]]></Condition>
+        </Control>
+        <Control Id="CA" Type="Text" X="75" Y="200" Width="100" Height="10" Text="NIM Plugin (DBG)">
+          <Condition Action="disable"><![CDATA[  &DebugSyms <> 3 ]]></Condition>
+        </Control>
+        <Control Id="CB" Type="Text" X="50" Y="210" Width="100" Height="10" Text="Client (DBG)">
+          <Condition Action="disable"><![CDATA[  &feaClientDebug <> 3 ]]></Condition>
+        </Control>
+
+        <Control Id="S0" Type="Text" X="180" Y="100" Width="100" Height="10" Text="OpenAFS Server">
+          <Condition Action="disable"><![CDATA[ &feaServer <> 3  ]]></Condition>
+        </Control>
+        <Control Id="S1" Type="Text" X="205" Y="110" Width="100" Height="10" Text="Server (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaServerDebug <> 3  ]]></Condition>
+        </Control>
+        <Control Id="CC0" Type="Text" X="180" Y="120" Width="100" Height="10" Text="Control Center">
+          <Condition Action="disable"><![CDATA[ &feaControlCenter <> 3  ]]></Condition>
+        </Control>
+        <Control Id="CC1" Type="Text" X="205" Y="130" Width="100" Height="10" Text="Control Center (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaControlCenterDebug <> 3  ]]></Condition>
+        </Control>
+        <Control Id="SD0" Type="Text" X="180" Y="140" Width="100" Height="10" Text="SDK">
+          <Condition Action="disable"><![CDATA[ &feaSDK <> 3  ]]></Condition>
+        </Control>
+        <Control Id="SD1" Type="Text" X="205" Y="150" Width="100" Height="10" Text="SDK (DBG)">
+          <Condition Action="disable"><![CDATA[ &feaSDKDebug <> 3  ]]></Condition>
+        </Control>
+        <Control Id="D0" Type="Text" X="180" Y="160" Width="100" Height="10" Text="Admin Documentation">
+          <Condition Action="disable"><![CDATA[ &feaDocumentation <> 3  ]]></Condition>
+        </Control>
+        <?endif?>
+
         <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
         <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
         </Control>
         <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="no" NoPrefix="yes">
-          <Text>[DlgTitleFont]Remove [ProductName]</Text>
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="240" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>[DlgTitleFont]Remove OpenAFS for Windows</Text>
         </Control>
       </Dialog>
       <Dialog Id="VerifyRepairDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">
         </Control>
         <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-          <Text>[DlgTitleFont]Repair [ProductName]</Text>
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="240" Height="15" Transparent="yes" NoPrefix="yes">
+          <Text>[DlgTitleFont]Repair OpenAFS for Windows</Text>
         </Control>
       </Dialog>
       <Dialog Id="WaitForCostingDlg" Y="10" Width="260" Height="85" Title="[ProductName] [Setup]" NoMinimize="yes">
           <Text>{\VerdanaBold13}Welcome to the [ProductName] [Wizard]</Text>
         </Control>
       </Dialog>
-      <RadioGroup Property="IAgree">
-        <RadioButton Text="{\DlgFont8}I &amp;accept the terms in the License Agreement" X="5" Y="0" Width="250" Height="15">yes</RadioButton>
-        <RadioButton Text="{\DlgFont8}I &amp;do not accept the terms in the License Agreement" X="5" Y="20" Width="250" Height="15">no</RadioButton>
-      </RadioGroup>
+      <RadioButtonGroup Property="IAgree">
+        <RadioButton Text="{\DlgFont8}I &amp;accept the terms in the License Agreement" X="5" Y="0" Width="250" Height="15" Value="yes"></RadioButton>
+        <RadioButton Text="{\DlgFont8}I &amp;do not accept the terms in the License Agreement" X="5" Y="20" Width="250" Height="15" Value="no"></RadioButton>
+      </RadioButtonGroup>
       <TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
       <TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
       <TextStyle Id="VerdanaBold13" FaceName="Verdana" Size="13" Bold="yes" />
          <Error Id="4003">$(loc.ErrSCSFailed)</Error>
          <Error Id="4004">$(loc.ErrAbort)</Error>
          <Error Id="4005">$(loc.ErrNsisFailed)</Error>
-         <ProgressText Action="RemoveLoopback">$(loc.ActRemoveLoopback)</ProgressText>
-         <ProgressText Action="InstallLoopback">$(loc.ActInstallLoopback)</ProgressText>
+         <Error Id="4006">$(loc.ErrCantCreateGroup)</Error>
+         <Error Id="4007">$(loc.ErrCantAddMembers)</Error>
+         <ProgressText Action="RemoveLoopback" Template="[1]:([2])([3])([4])">$(loc.ActRemoveLoopback)</ProgressText>
+         <ProgressText Action="InstallLoopback" Template="[1]:([2])([3])([4])">$(loc.ActInstallLoopback)</ProgressText>
          <ProgressText Action="RemoveNetProvider">$(loc.ActRemoveNetProvider)</ProgressText>
          <ProgressText Action="InstallNetProvider">$(loc.ActInstallNetProvider)</ProgressText>
          <ProgressText Action="ConfigureClient">$(loc.ActConfigureClient)</ProgressText>
          <ProgressText Action="ConfigureServer">$(loc.ActConfigureServer)</ProgressText>
          <ProgressText Action="RemoveNsisInstallation">$(loc.ActRemoveNsisInstallation)</ProgressText>
-         
+         <ProgressText Action="InstallIDNMRedistributable">$(loc.ActInstallIDNMRedistributable)</ProgressText>
+          <ProgressText Action="InstallRedirNetProvider">$(loc.ActInstallRedirNetProvider)</ProgressText>
+          <ProgressText Action="RemoveRedirNetProvider">$(loc.ActRemoveRedirNetProvider)</ProgressText>
+          <ProgressText Action="UnloadFilterDriver">$(loc.ActUnloadFilterDriver)</ProgressText>
+          <ProgressText Action="UninstallRdrDriver">$(loc.ActUninstallRdrDriver)</ProgressText>
+          <ProgressText Action="InstallRdrDriver">$(loc.ActInstallRdrDriver)</ProgressText>
+          <ProgressText Action="LoadFilterDriver">$(loc.ActLoadFilterDriver)</ProgressText>
          
       <AdminUISequence>
         <Show Dialog="FatalError" OnExit="error" />
         <Show Dialog="MaintenanceWelcomeDlg" After="ResumeDlg">Installed AND NOT RESUME AND NOT Preselected</Show>
         <Show Dialog="ContinueDlg" After="MaintenanceWelcomeDlg">(NOT Installed) AND AFTERREBOOT</Show>
         <Show Dialog="ProgressDlg" After="ContinueDlg" />
+        <?ifndef BinsOnly?>
+        <Custom Action="DetectSavedConfiguration" Before="CostInitialize" />
+        <?endif?>
       </InstallUISequence>
     </UI>
     <Binary Id="Up" src="Binary\Up.ico" />
     <Binary Id="insticon" src="Binary\insticon.ico" />
     <Binary Id="removico" src="Binary\removico.ico" />
     <Binary Id="repairic" src="Binary\repairic.ico" />
+    <Binary Id="restore" src="Binary\restore.ico" />
+    <Binary Id="newconfig" src="Binary\newconfig.ico" />
     <Icon Id="ico_AcctManager" src="Icon\ico_AcctManager.ico" />
     <Icon Id="ico_afscreds" src="Icon\ico_afscreds.ico" />
     <Icon Id="ico_Help" src="Icon\ico_Help.ico" />
     <Icon Id="ico_ServerManager" src="Icon\ico_ServerManager.ico" />
     <Icon Id="ico_afssvrcfg" src="Icon\ico_afssvrcfg.ico" />
+    <Icon Id="ico_OpenAFS" src="Icon\ico_OpenAFS.ico" />
 </Include>