--- VBox/Installer/win/NLS/de_DE.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/de_DE.wxl	Tue Nov 05 20:11:08 2013
@@ -117,10 +117,11 @@
 
     <String Id="Customize2Dlg_Header">Anpassen</String>
     <String Id="Customize2Dlg_Desc">Bitte unten die gewünschten Optionen auswählen:</String>
     <String Id="Customize2Dlg_CreateShortcut">Verknüpfung auf dem Desktop anlegen</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Verknüpfung in der Schnellstartleiste anlegen</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Registrieren Dateizuordnungen</String>
 
     <!---->
 
     <String Id="WarnDisconNetIfacesDlg_Title">Warnung:</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">Netzwerkschnittstellen</String>
--- VBox/Installer/win/NLS/en_US.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/en_US.wxl	Tue Nov 05 20:11:16 2013
@@ -121,10 +121,11 @@
 
     <String Id="Customize2Dlg_Header">Customize</String>
     <String Id="Customize2Dlg_Desc">Please choose from the options below:</String>
     <String Id="Customize2Dlg_CreateShortcut">Create a shortcut on the desktop</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Create a shortcut in the Quick Launch Bar</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Register file associations</String>
 
     <!---->
 
     <String Id="WarnDisconNetIfacesDlg_Title">Warning:</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">Network Interfaces</String>
--- VBox/Installer/win/NLS/fa_IR.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/fa_IR.wxl	Tue Nov 05 20:11:21 2013
@@ -88,10 +88,11 @@
     <!---->
     <String Id="Customize2Dlg_Header">سفارشی</String>
     <String Id="Customize2Dlg_Desc">لطفاً از گزینه های زیر انتخاب کنید:</String>
     <String Id="Customize2Dlg_CreateShortcut">ایجاد یک میانبر روی دسکتاپ</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">ایجاد یک میانبر در اِجرای سریع</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">ثبت نام انجمن فایل</String>
     <!---->
     <String Id="WarnDisconNetIfacesDlg_Title">هشدار:</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">رابط های شبکه</String>
     <String Id="WarnDisconNetIfacesDlg_Desc">نصب ویژگی شبکه [ProductName] ارتباط شبکه شما را ریست خواهد کرد و موقتا ارتباط شما قطع خواهد شد.</String>
     <String Id="WarnDisconNetIfacesDlg_Question">حالا با نصب اقدام کند؟</String>
--- VBox/Installer/win/NLS/fr_FR.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/fr_FR.wxl	Tue Nov 05 20:11:25 2013
@@ -115,10 +115,11 @@
 
     <String Id="Customize2Dlg_Header">Personaliser</String>
     <String Id="Customize2Dlg_Desc">Veuillez choisir une des options suivantes:</String>
     <String Id="Customize2Dlg_CreateShortcut">Créer un raccourci sur le bureau</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Créer un raccourci dans la barre de lancement rapide</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Inscription des associations de fichiers</String>
 
     <!---->
 
     <String Id="WarnDisconNetIfacesDlg_Title">Avertissement</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">Interfaces réseau</String>
--- VBox/Installer/win/NLS/it_IT.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/it_IT.wxl	Tue Nov 05 20:11:29 2013
@@ -88,10 +88,11 @@
     <!---->
     <String Id="Customize2Dlg_Header">Personalizza</String>
     <String Id="Customize2Dlg_Desc">Scegli dalle opzioni seguenti:</String>
     <String Id="Customize2Dlg_CreateShortcut">Crea una scorciatoia sul desktop</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Crea una scorciatoia nella barra di avvio veloce</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Registrati associazioni di file</String>
     <!---->
     <String Id="WarnDisconNetIfacesDlg_Title">Avviso:</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">Interfacce di rete</String>
     <String Id="WarnDisconNetIfacesDlg_Desc">L'installazione delle funzionalità di rete di [ProductName] ripristinerà la connessione di rete causando una disconnessione temporanea dalla rete.</String>
     <String Id="WarnDisconNetIfacesDlg_Question">Vuoi procedere subito con l'installazione?</String>
--- VBox/Installer/win/NLS/zh_TW.wxl	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/NLS/zh_TW.wxl	Tue Nov 05 20:11:33 2013
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage="950" Culture="zh_TW">
 
   <!--
           Language Definition Include for VirtualBox WiX script.
 
@@ -121,10 +121,11 @@
 
     <String Id="Customize2Dlg_Header">自訂</String>
     <String Id="Customize2Dlg_Desc">請選擇以下選項：</String>
     <String Id="Customize2Dlg_CreateShortcut">在桌面建立捷徑</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">在快速啟動列建立捷徑</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">註冊文件關聯</String>
 
     <!---->
 
     <String Id="WarnDisconNetIfacesDlg_Title">警告：</String>
     <String Id="WarnDisconNetIfacesDlg_Title2">網路介面</String>
--- VBox/Installer/win/UserInterface.wxi	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/UserInterface.wxi	Tue Nov 05 20:10:52 2013
@@ -332,10 +332,14 @@
             </Control>
             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
                      Property="INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1">
                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
             </Control>
+            <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
+                     Property="REGISTERFILEEXTENSIONS" CheckBoxValue="1">
+                <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
+            </Control>
 
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17"
                 Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)">
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
                 <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3) AND NOT(!VBoxNetworkFlt=3)]]></Publish>
--- VBox/Installer/win/VirtualBox.wxs	Fri Sep 06 14:30:06 2013
+++ VBox/Installer/win/VirtualBox.wxs	Tue Nov 05 20:10:43 2013
@@ -114,10 +114,11 @@
         <Property Id="ARPPRODUCTICON">IconVirtualBox</Property>
         <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
         <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
         <Property Id="INSTALLDESKTOPSHORTCUT" Value="1"></Property>
         <Property Id="INSTALLQUICKLAUNCHSHORTCUT" Value="1"></Property>
+        <Property Id="REGISTERFILEEXTENSIONS" Value="1"></Property>
         <Property Id="STARTVBOX" Value="1"></Property>
 
         <!-- Install the product for all users on the system -->
         <Property Id="ALLUSERS"><![CDATA[1]]></Property>
 
@@ -366,18 +367,13 @@
                         <RemoveFolder Id="ShortcutStartMenuVBoxRemove" On="uninstall" />
                     </Component>-->
 
                     <!---->
 
-                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
-                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
-                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
-
-                        <!-- Set required environment variables. -->
-                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
-                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
-
+                    
+                    <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)">
+                        <Condition>REGISTERFILEEXTENSIONS</Condition>
                         <!-- Register file extensions. Note: Extension Id's *must not* be changed! These specify the actual
                              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
                              Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h". -->
                         <ProgId Id="progId_VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="file_VBoxRes.dll" IconIndex="-201">
                             <Extension Id="vbox" ContentType="application/x-virtualbox-vbox">
@@ -409,10 +405,19 @@
                             <Extension Id="vhd" ContentType="application/x-virtualbox-vhd" />
                         </ProgId>
                         <ProgId Id="progId_VirtualBox.Shell.hdd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-306">
                             <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
                         </ProgId>
+                    </Component> <!-- RegisterExtensions -->
+
+                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
+                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
+                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
+
+                        <!-- Set required environment variables. -->
+                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
+                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
 
                         <!-- Files -->
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
                         <!-- Include all user manual .CHM files (file is generated by makefile). -->
                         <?include $(env.PATH_TARGET)\Files_Main.wxi ?>
@@ -693,10 +698,11 @@
             <ComponentRef Id="cp_Docs" />
 <?endif?>
             <ComponentRef Id="cp_NLS" />
             <ComponentRef Id="cp_MainCOM" />
             <ComponentRef Id="cp_MainBinaries" />
+            <ComponentRef Id="cp_RegisterExtensions" />
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
             <ComponentRef Id="cp_QtAccessible" />
 <?endif?>
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
             <ComponentRef Id="cp_VBoxPyInst" />