Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/CancelDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/CancelDlgDeltares.wxs	(.../CancelDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/CancelDlgDeltares.wxs	(.../CancelDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,10 +14,10 @@
     <Fragment>
         <UI>
             <Dialog Id="CancelDlgDeltares" Width="260" Height="85" Title="!(loc.CancelDlg_Title)">
-                <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)">
+                <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.NoButtonText)">
                     <Publish Event="EndDialog" Value="Return">1</Publish>
                 </Control>
-                <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.WixUIYes)">
+                <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.YesButtonText)">
                     <Publish Event="EndDialog" Value="Exit">1</Publish>
                 </Control>
                 <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" NoPrefix="yes" Text="!(loc.CancelDlgText)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ExitDialogDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ExitDialogDeltares.wxs	(.../ExitDialogDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ExitDialogDeltares.wxs	(.../ExitDialogDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,7 +14,7 @@
     <Fragment>
         <UI>
             <Dialog Id="ExitDialogDeltares" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
-                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.FinishButtonText)" />
 
                 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/LicenseAgreementDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/LicenseAgreementDlgDeltares.wxs	(.../LicenseAgreementDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/LicenseAgreementDlgDeltares.wxs	(.../LicenseAgreementDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -19,17 +19,17 @@
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
         <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
         <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
-        <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
-        <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+        <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBoxText)" />
+        <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.PrintButtonText)">
           <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
         </Control>
-        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)">
           <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
           <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
           <Condition Action="enable">LicenseAccepted = "1"</Condition>
         </Control>
-        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
           <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
         </Control>
         <Control Id="LicenseText" Type="ScrollableText" X="20" Y="65" Width="330" Height="140" Sunken="yes" TabSkip="no">
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,19 +14,19 @@
     <Fragment>
         <UI>
             <Dialog Id="ProgressDlgDeltares" Width="370" Height="270" Title="!(loc.ProgressDlg_Title)" Modeless="yes">
-                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)">
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.CancelButtonText)">
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
                 </Control>
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.ProgressDlgBannerBitmap)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.BackButtonText)" />
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.NextButtonText)" />
                 <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <!-- mutually exclusive title and description strings overlap  -->
                 <Control Id="TextInstalling" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextInstalling)">
                     <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition>
                 </Control>
-		<Control Id="TitleInstalling" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)">
+		            <Control Id="TitleInstalling" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)">
                     <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition>
                 </Control>
                 <Control Id="TextChanging" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextChanging)">
@@ -38,7 +38,7 @@
                 <Control Id="TextRepairing" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRepairing)">
                     <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
                 </Control>
-		<Control Id="TitleRepairing" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)">
+		            <Control Id="TitleRepairing" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)">
                     <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
                 </Control>
                 <Control Id="TextRemoving" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRemoving)">
@@ -50,7 +50,7 @@
                 <Control Id="TextUpdating" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextUpdating)">
                     <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
                 </Control>
-		<Control Id="TitleUpdating" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)">
+		            <Control Id="TitleUpdating" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)">
                     <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
                 </Control>
                 <Control Id="ActionText" Type="Text" X="70" Y="100" Width="285" Height="10">
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -21,13 +21,13 @@
                 <Control Id="CustomButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCustomButtonTooltip)" Text="!(loc.SetupTypeDlgCustomButton)">
                     <Publish Property="WixUI_InstallMode" Value="InstallCustom">1</Publish>
                 </Control>
-                <Control Id="CompleteButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCompleteButtonTooltip)" Text="!(loc.SetupTypeDlgCompleteButton)">
+                <Control Id="CompleteButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.SetupTypeDlgCompleteButtonTooltip)" Text="!(loc.CompleetInstallationButtonText)">
                     <Publish Property="WixUI_InstallMode" Value="InstallComplete">1</Publish>
                     <Publish Event="SetInstallLevel" Value="1000">1</Publish>
                 </Control>
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
-                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.NextButtonText)" />
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
                     <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
                 </Control>
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.SetupTypeDlgBannerBitmap)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/UserExitDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/UserExitDeltares.wxs	(.../UserExitDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/UserExitDeltares.wxs	(.../UserExitDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,7 +14,7 @@
     <Fragment>
         <UI>
             <Dialog Id="UserExitDeltares" Width="370" Height="270" Title="!(loc.UserExit_Title)">
-                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.FinishButtonText)">
                     <Publish Event="EndDialog" Value="Exit">1</Publish>
                 </Control>
                  <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.UserExitBitmap)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/VerifyReadyDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/VerifyReadyDlgDeltares.wxs	(.../VerifyReadyDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/VerifyReadyDlgDeltares.wxs	(.../VerifyReadyDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,7 +14,7 @@
     <Fragment>
         <UI>
             <Dialog Id="VerifyReadyDlgDeltares" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
-                <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
+                <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.InstallButtonText)">
                     <Condition Action="show">NOT Installed AND ALLUSERS</Condition>
                     <Condition Action="enable">NOT Installed</Condition>
                     <Condition Action="default">NOT Installed</Condition>
@@ -24,7 +24,7 @@
                     <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
                     <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
                 </Control>
-                <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
+                <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.InstallButtonText)">
                     <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition>
                     <Condition Action="enable">NOT Installed</Condition>
                     <Condition Action="default">NOT Installed</Condition>
@@ -134,13 +134,13 @@
                 <Control Id="UpdateText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
                     <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
                 </Control>
-		<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"  Cancel="yes" Text="!(loc.WixUICancel)">
+		            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"  Cancel="yes" Text="!(loc.CancelButtonText)">
                     <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
                 </Control>
                 
-		<Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Hidden="yes" TabSkip="yes" Text="!(loc.WixUIBack)">
-		     <Condition Action="show">NOT Installed</Condition>
-		</Control>
+		            <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Hidden="yes" TabSkip="yes" Text="!(loc.BackButtonText)">
+		                 <Condition Action="show">NOT Installed</Condition>
+		            </Control>
                  
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
                 <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/WelcomeDlgDeltares.wxs
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/WelcomeDlgDeltares.wxs	(.../WelcomeDlgDeltares.wxs)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Installer UI/WelcomeDlgDeltares.wxs	(.../WelcomeDlgDeltares.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -14,8 +14,8 @@
   <Fragment>
         <UI>
           <Dialog Id="WelcomeDlgDeltares" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
             </Control>
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Localization_nl-NL.wxl
===================================================================
diff -u -rc27ed83459ff7a7e3375b6122cf27769bbbfff4d -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision c27ed83459ff7a7e3375b6122cf27769bbbfff4d)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Localization_nl-NL.wxl	(.../Localization_nl-NL.wxl)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -6,4 +6,15 @@
   <String Id="NetFramework45Required">De installatie vereist dat Microsoft .NET Framework 4.5 geïnstalleerd is om verder te gaan.</String>
   <String Id="DowngradeErrorMessage">Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd.</String>
   <String Id="StartApplicationDescription">Start !(loc.ApplicationLongName).</String>
+
+  <String Id="BackButtonText">&amp;Vorige</String>
+  <String Id="NextButtonText">V&amp;olgende</String>
+  <String Id="PrintButtonText">A&amp;fdrukken</String>
+  <String Id="CancelButtonText">A&amp;nnuleren</String>
+  <String Id="CompleetInstallationButtonText">Vo&amp;lledig</String>
+  <String Id="InstallButtonText">&amp;Installeren</String>
+  <String Id="NoButtonText">&amp;Nee</String>
+  <String Id="YesButtonText">&amp;Ja</String>
+  <String Id="FinishButtonText">&amp;Voltooien</String>
+  <String Id="LicenseAgreementDlgLicenseAcceptedCheckBoxText">Ik ga &amp;akkoord met de voorwaarden in de overeenkomst</String>
 </WixLocalization>
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs
===================================================================
diff -u -r23af68aad684a6c98e5768de7f5c05ef4140f5c6 -r26907b2ddb2fd1aa1330adf49dee259581838174
--- Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision 23af68aad684a6c98e5768de7f5c05ef4140f5c6)
+++ Application/Ringtoets/src/Application.Ringtoets.Setup/Product.wxs	(.../Product.wxs)	(revision 26907b2ddb2fd1aa1330adf49dee259581838174)
@@ -51,7 +51,8 @@
                         Target="[BINDIR]$(var.Application.Ringtoets.TargetFileName)"
                         WorkingDirectory="INSTALLDIR"
                         Icon="Ringtoets.ico"/>
-
+              
+              <RemoveFolder Id="RemoveBINDIR" Directory="BINDIR" On="uninstall"/>
               <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
               <RemoveFolder Id="RemoveDeltares" Directory="Deltares" On="uninstall" />
               <RegistryValue Root="HKCU" Key="Software\!(loc.Manufacturer)\!(loc.ApplicationShortName)" Name="RingtoetsAppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>