Index: /trunk/src/VBox/Installer/common/virtualbox.desktop.in
===================================================================
--- /trunk/src/VBox/Installer/common/virtualbox.desktop.in	(revision 35000)
+++ /trunk/src/VBox/Installer/common/virtualbox.desktop.in	(revision 35000)
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=@VBOX_PRODUCT@
+GenericName=Virtual Machine
+Type=Application
+Exec=VirtualBox %U
+TryExec=VirtualBox
+MimeType=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova
+DocPath=file://@VBOX_DOC_PATH@/UserManual.pdf
+Icon=VBox
+Categories=Emulator;System;X-MandrivaLinux-System;
+Comment=Run several virtual systems on a single host computer
+Comment[de]=Mehrere virtuelle Maschinen auf einem einzigen Rechner ausführen
+Comment[it]=Esegui più macchine virtuali su un singolo computer
+Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza
+Comment[sv]=Kör flera virtuella system på en enda värddator
+Comment[ko]=가상 머신
Index: /trunk/src/VBox/Installer/common/virtualbox.xml
===================================================================
--- /trunk/src/VBox/Installer/common/virtualbox.xml	(revision 35000)
+++ /trunk/src/VBox/Installer/common/virtualbox.xml	(revision 35000)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-virtualbox-vbox">
+      <comment>VirtualBox Machine Definition</comment>
+      <comment xml:lang="en">VirtualBox Machine Definition</comment>
+      <glob pattern="*.vbox"/>
+      <icon name="virtualbox-vbox"/>
+   </mime-type> 
+
+   <mime-type type="application/x-virtualbox-vbox-extpack">
+      <comment>VirtualBox Extension Pack</comment>
+      <comment xml:lang="en">VirtualBox Extension Pack</comment>
+      <glob pattern="*.vbox-extpack"/>
+      <icon name="virtualbox-vbox-extpack"/>
+   </mime-type> 
+
+   <mime-type type="application/x-virtualbox-ovf">
+      <comment>Open Virtualization Format</comment>
+      <comment xml:lang="en">Open Virtualization Format</comment>
+      <glob pattern="*.ovf"/>
+      <icon name="virtualbox-ovf"/>
+   </mime-type> 
+
+   <mime-type type="application/x-virtualbox-ova">
+      <comment>Open Virtualization Format Archive</comment>
+      <comment xml:lang="en">Open Virtualization Format Archive</comment>
+      <glob pattern="*.ova"/>
+      <icon name="virtualbox-ova"/>
+   </mime-type> 
+</mime-info>
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 34999)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 35000)
@@ -75,15 +75,19 @@
 linux-misc_SOURCES = \
 	$(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
-	$(PATH_ROOT)/src/VBox/Installer/linux/virtualbox.xml \
+	$(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
 	$(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
 	$(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/virtualbox.desktop,)
 linux-misc_CLEAN = $(PATH_linux-misc)/virtualbox.desktop
 
-$$(PATH_linux-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
+$$(PATH_linux-misc)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
 	$(call MSG_GENERATE,,$@,$<)
 ifdef VBOX_PATH_PACKAGE_DOCS
-	$(QUIET)$(SED) -e "s+\$$VBOX_DOC_PATH+$(VBOX_PATH_PACKAGE_DOCS)+" --output $@ $<
+	$(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_PATH_PACKAGE_DOCS)+" \
+		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+		--output $@ $<
 else
-	$(QUIET)$(SED) -e "s+\$$VBOX_DOC_PATH+/opt/VirtualBox+" --output $@ $<
+	$(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
+		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+		--output $@ $<
 endif
 
Index: unk/src/VBox/Installer/linux/virtualbox.desktop
===================================================================
--- /trunk/src/VBox/Installer/linux/virtualbox.desktop	(revision 34999)
+++ 	(revision )
@@ -1,18 +1,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Oracle VM VirtualBox
-GenericName=Virtual Machine
-Type=Application
-Exec=VirtualBox %U
-TryExec=VirtualBox
-MimeType=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova
-DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
-Icon=VBox
-Categories=Emulator;System;X-MandrivaLinux-System;
-Comment=Run several virtual systems on a single host computer
-Comment[de]=Windows und andere Betriebssysteme unter Linux ausführen
-Comment[it]=Esegui più macchine virtuali su un singolo computer
-Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza
-Comment[sv]=Kör flera virtuella system på en enda värddator
-Comment[ko]=가상 머신
Index: unk/src/VBox/Installer/linux/virtualbox.xml
===================================================================
--- /trunk/src/VBox/Installer/linux/virtualbox.xml	(revision 34999)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-   <mime-type type="application/x-virtualbox-vbox">
-      <comment>VirtualBox Machine Definition</comment>
-      <comment xml:lang="en">VirtualBox Machine Definition</comment>
-      <glob pattern="*.vbox"/>
-      <icon name="virtualbox-vbox"/>
-   </mime-type> 
-
-   <mime-type type="application/x-virtualbox-vbox-extpack">
-      <comment>VirtualBox Extension Pack</comment>
-      <comment xml:lang="en">VirtualBox Extension Pack</comment>
-      <glob pattern="*.vbox-extpack"/>
-      <icon name="virtualbox-vbox-extpack"/>
-   </mime-type> 
-
-   <mime-type type="application/x-virtualbox-ovf">
-      <comment>Open Virtualization Format</comment>
-      <comment xml:lang="en">Open Virtualization Format</comment>
-      <glob pattern="*.ovf"/>
-      <icon name="virtualbox-ovf"/>
-   </mime-type> 
-
-   <mime-type type="application/x-virtualbox-ova">
-      <comment>Open Virtualization Format Archive</comment>
-      <comment xml:lang="en">Open Virtualization Format Archive</comment>
-      <glob pattern="*.ova"/>
-      <icon name="virtualbox-ova"/>
-   </mime-type> 
-</mime-info>