Changeset 108587 in vbox for trunk/src

Timestamp:

Mar 18, 2025 6:23:27 AM (8 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167993

Message:

Windows host installer/NLS: Trying to beat some common file structure into all NLS files. This should make it a LOT easier to compare contents or sync the files. Reference always is en_US. When adding / removing / changing NLS entries, make sure to also edit all other language files to keep this stuff in sync in the future [build fix, forgot files].

Location:

trunk/src/VBox/Installer/win

Files:

• UserInterface.wxi (modified) (1 diff)
• VirtualBox.wxs (modified) (1 diff)

trunk/src/VBox/Installer/win/UserInterface.wxi

@@ -454 +454 @@
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
                 <Text Value="[DlgTitleFont]!(loc.VerifyReadyDlg_ReadyToInstall)" />
-            </Control>
-            <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="80">
-                <Text Value="!(loc.VerifyReadyDlg_ClickInstall)" />
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -92 +92 @@
          Thight might be handed-in via command line (MSI properties) or through a customized merge module. See @bugref{10616} -->
     <Launch Condition="Installed OR (VBox_Target_Dir_Is_Valid=&quot;1&quot;)" Message="!(loc.InvalidTargetDir)" />
-
-    <!-- Detect old innotek installation -->
-    <!-- Force a manual uninstall of an already installed innotek VirtualBox version first -->
-    <Property Id="VBOXINNOTEK">
-        <RegistrySearch Id="RegSearchInnotekVersion" Root="HKLM" Key="SOFTWARE\Innotek\VirtualBox" Name="Version" Type="raw" Bitness="$(var.Property_Bitness)" />
-    </Property>
-    <Launch Condition="NOT VBOXINNOTEK" Message="!(loc.InnotekFound)" />
-
 
     <!-- *************************** Upgrade packages only ******************************* -->