Update installer texts and fix condition (#68)

IB-7241, IB-7234

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

HyperlinkSidebarTheme.en.wxl

@@ -38,7 +38,14 @@
   <String Id="SuccessRepairHeader">Repair completed successfully.</String>
   <String Id="SuccessUninstallHeader">Uninstall completed</String>
   <String Id="SuccessInstallHeader">Installation completed successfully.</String>
-  <String Id="SuccessInstallMessage">You can find answers to questions about the electronic use of ID-card and mobile-ID on the id.ee webpage.</String>
+  <String Id="SuccessInstallMessage">
+
+Enable extension in the web browser to use the ID-card.
+
+1. Open browser
+2. Go to Extensions
+3. Enable Web eID
+The guide can be found &lt;a href="https://www.id.ee/en/article/configuring-browsers-for-using-id-card/"&gt;here&lt;/a&gt;.</String>
   <String Id="SuccessHeader">Setup successful</String>
   <String Id="SuccessLaunchButton">&amp;Launch ID-card utility</String>
   <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>

HyperlinkSidebarTheme.et.wxl

@@ -38,7 +38,14 @@
   <String Id="SuccessRepairHeader">Tarkvara parandus õnnestus</String>
   <String Id="SuccessUninstallHeader">Tarkvara eemaldatud</String>
   <String Id="SuccessInstallHeader">Tarkvara paigaldus õnnestus!</String>
-  <String Id="SuccessInstallMessage">ID-kaardi ja mobiil-ID elektroonilist kasutamist puudutavatele küsimustele leiad vastused id.ee veebilehelt.</String>
+  <String Id="SuccessInstallMessage">
+
+Aktiveeri veebilehitsejas laiendus ID-kaardi kasutamiseks.
+
+1. Ava veebilehitseja
+2. Ava menüüst Laiendused
+3. Luba Web eID
+Juhend on leitav &lt;a href="https://www.id.ee/artikkel/veebibrauserite-seadistamine-id-kaardi-kasutamiseks/"&gt;siit&lt;/a&gt;.</String>
   <String Id="SuccessHeader">Toiming õnnestus</String>
   <String Id="SuccessLaunchButton">&amp;Käivita ID-kaardi haldusvahend</String><!--Seda teadet ei kuvata.-->
   <String Id="SuccessRestartText">Enne tarkvara kasutamist tuleb arvuti taaskäivitada.</String>

HyperlinkSidebarTheme.xml

@@ -96,7 +96,7 @@
     <Image X="0" Y="0" Width="165" Height="400" ImageFile="logoside.png"/>
     <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
     <Text Name="SuccessHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-    <Text Name="SuccessInstallHeader" X="185" Y="50" Width="-11" Height="250" TabStop="yes" FontId="5" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader) #(loc.SuccessInstallMessage)</Text>
+    <Hypertext Name="SuccessInstallHeader" X="185" Y="50" Width="-11" Height="250" TabStop="yes" FontId="5" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader) #(loc.SuccessInstallMessage)</Hypertext>
     <Text Name="SuccessRepairHeader" X="185" Y="50" Width="-11" Height="100" FontId="2" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
     <Text Name="SuccessUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
     <Button Name="LaunchButton" X="-91" Y="-11" Width="175" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>

bootstrapper.wxs

@@ -98,7 +98,7 @@
         <MsiProperty Name="INSTALL_DRIVER" Value="1"/>
       </MsiPackage>
 
-      <MsiPackage Id="WebEID.X86" InstallCondition="NOT VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
+      <MsiPackage Id="WebEID.X86" InstallCondition="(NOT VersionNT64 OR InstallX64 = 0) AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
           SourceFile="$(var.webeid).x86.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
         <MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
         <MsiProperty Name="REINSTALLMODE" Value="amus"/>
@@ -109,7 +109,7 @@
         <MsiProperty Name="FIREFOXINSTALL" Value="[FirefoxSupport]"/>
       </MsiPackage>
 
-      <MsiPackage Id="WebEID.X64" InstallCondition="VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
+      <MsiPackage Id="WebEID.X64" InstallCondition="(VersionNT64 AND InstallX64 = 1) AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
           SourceFile="$(var.webeid).x64.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
         <MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
         <MsiProperty Name="REINSTALLMODE" Value="amus"/>