Merge branch 'master' of ssh://gparabola/srv/git/abslibre

42 files changed, 1081 insertions, 216 deletions

diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch
index 51fd6361c..b75c3c565 100644
--- a/libre/virtualbox-libre/001-vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch
@@ -1,88 +1,44 @@
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -67,38 +67,34 @@
- 
- /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
- QString g_QStrHintLinuxNoMemory = QApplication::tr(
--  "This error means that the kernel driver was either not able to "
-+  "This error means that the kernel libre driver was either not able to "
-   "allocate enough memory or that some mapping operation failed."
-   );
- 
- QString g_QStrHintLinuxNoDriver = QApplication::tr(
--  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-+  "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or "
+@@ -75,10 +75,9 @@
+   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
--  "module by executing<br/><br/>"
+   "module by executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "as root. If it is available in your distribution, you should install the "
 -  "DKMS package first. This package keeps track of Linux kernel changes and "
 -  "recompiles the vboxdrv kernel module if necessary."
-+  "libre module by executing<br/><br/>"
 +  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and "
++  "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and "
 +  "execute dkms autoinstall ."
    );
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
--  "The VirtualBox kernel modules do not match this version of "
-+  "The VirtualBox kernel libre modules do not match this version of "
-   "VirtualBox. The installation of VirtualBox was apparently not "
-   "successful. Please try completely uninstalling and reinstalling "
-   "VirtualBox."
-   );
+@@ -90,11 +89,8 @@
  
  QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
--  "The VirtualBox kernel modules do not match this version of "
+   "The VirtualBox kernel modules do not match this version of "
 -  "VirtualBox. The installation of VirtualBox was apparently not "
 -  "successful. Executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "may correct this. Make sure that you do not mix the "
 -  "OSE version and the PUEL version of VirtualBox."
-+  "The VirtualBox kernel libre modules do not match this version of "
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
++  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
 +  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
    );
  
  QString g_QStrHintOtherNoDriver = QApplication::tr(
--  "Make sure the kernel module has been loaded successfully."
-+  "Make sure the kernel libre module has been loaded successfully."
-   );
- 
- /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
-@@ -590,7 +586,7 @@
-             case VERR_VM_DRIVER_NOT_INSTALLED:
-             case VERR_VM_DRIVER_LOAD_ERROR:
-                 msgText += QApplication::tr (
--                        "<b>Cannot access the kernel driver!</b><br/><br/>");
-+                        "<b>Cannot access the kernel libre driver!</b><br/><br/>");
- # ifdef RT_OS_LINUX
-                 msgText += g_QStrHintLinuxNoDriver;
- # else
-@@ -603,7 +599,7 @@
-                 break;
- # endif
-             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
--                msgText += QApplication::tr ("Kernel driver not accessible");
-+                msgText += QApplication::tr ("Kernel libre driver not accessible");
-                 break;
-             case VERR_VM_DRIVER_VERSION_MISMATCH:
- # ifdef RT_OS_LINUX
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -30,19 +30,20 @@
-     SHUTDOWN="true"
- elif ! lsmod|grep -q vboxdrv; then
+@@ -32,17 +32,18 @@
      cat << EOF
--WARNING: The vboxdrv kernel module is not loaded. Either there is no module
--         available for the current kernel (`uname -r`) or it failed to
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+          available for the current kernel (`uname -r`) or it failed to
 -         load. Please recompile the kernel module and install it by
-+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module
-+         available for the current kernel libre (`uname -r`) or it failed to
-+         load. Please reinstall the kernel libre module virtualbox-libre-host-modules or
-+         if you don't use our stock kernel libre compile the modules with
++         load. Please reinstall the kernel module virtualbox-libre-host-modules or
++         if you don't use our stock kernel compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
 +           sudo dkms autoinstall
@@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  
           and if that is not successful, try to re-install the package.
  
-@@ -52,9 +53,8 @@
- 
- if [ -f /etc/vbox/module_not_compiled ]; then
-     cat << EOF
--WARNING: The compilation of the vboxdrv.ko kernel module failed during the
-+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the
-          installation for some reason. Starting a VM will not be possible.
--         Please consult the User Manual for build instructions.
- EOF
- fi
- 
\ No newline at end of file
diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch
index d8531499d..d8531499d 100755..100644
--- a/libre/virtualbox-libre/002-change_default_driver_dir.patch
+++ b/libre/virtualbox-libre/002-change_default_driver_dir.patch
diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules
index 37403ae2f..37403ae2f 100755..100644
--- a/libre/virtualbox-libre/10-vboxdrv.rules
+++ b/libre/virtualbox-libre/10-vboxdrv.rules
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
index 6eca06d9b..6eca06d9b 100755..100644
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ b/libre/virtualbox-libre/LocalConfig.kmk
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 54978ea3c..dc94a2a33 100755..100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -8,18 +8,18 @@
 
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre'
+         'virtualbox-libre-host-dkms'
+         'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
-         'virtualbox-libre-host-source'
-         'virtualbox-libre-guest-utils'
-         'virtualbox-libre-guest-source')
-pkgver=4.2.4
-pkgrel=1
+         'virtualbox-libre-guest-utils')
+pkgver=4.2.6
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('alsa-lib'
              'bin86'
-             'cdrkit-libre'
+             'cdrkit'
              'curl'
              'dev86'
              'gsoap'
@@ -28,7 +28,6 @@ makedepends=('alsa-lib'
              'libidl2'
              'libpulse'
              'libstdc++5'
-             'libvncserver'
              'libxcursor'
              'libxinerama'
              'libxml2'
@@ -41,7 +40,7 @@ makedepends=('alsa-lib'
              'glu'
              'python2'
              'qt'
-             'sdl-libre'
+             'sdl'
              'sdl_ttf'
              'vde2'
              'xalan-c')
@@ -78,7 +77,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
+md5sums=('d680aeb3b4379b8281527aeb012b2df5'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,7 +87,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '7e9483b1069a54f181546083ac7e5469'
          'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '4f1692638d6740df4c4ad9766ba4e179'
+         'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -108,8 +107,8 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '85141ccd2621a8e004b8f55c9a1f83eb'
-         'c7b29fbf4c24a00e8646ca6dd73f38a1')
+         '05d166104a66ee479896c941ac27a3d0'
+         '78168f8699aa01a632603f0d5b1b8281')
 
 build() {
     cd "VirtualBox-$pkgver"
@@ -150,33 +149,37 @@ build() {
     ./configure --disable-docs \
         --enable-webservice \
         --enable-vde \
-        --enable-vnc \
         --disable-kmods
-#        --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
+
+    # fix python2
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+
     # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    cd src/VBox/RDP/client
+    pushd src/VBox/RDP/client
     cp "$srcdir/LocalConfig.kmk" .
+    # fix keymap path FS#32548
+    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
     kmk all
+    popd
 }
 
 package_virtualbox-libre() {
     pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
     depends=('curl'
              'libpng'
-             'libvncserver'
              'libxcursor'
              'libxinerama'
              'libxml2'
              'libxmu'
-             'sdl-libre'
+             'sdl'
+             'shared-mime-info'
              'virtualbox-libre-host-modules')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels'
+                'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
                 'net-tools: Host-only or bridged networking support')
     backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
     replaces=('virtualbox' 'virtualbox-ose')
@@ -275,15 +278,15 @@ package_virtualbox-libre-sdk() {
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
 
-package_virtualbox-libre-host-source() {
-    pkgdesc='VirtualBox Host kernel libre modules source (DKMS)'
+package_virtualbox-libre-host-dkms() {
+    pkgdesc='VirtualBox Host kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
-    conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
+    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
+    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
-    install=virtualbox-libre-host-source.install
+    install=virtualbox-libre-host-dkms.install
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -291,15 +294,15 @@ package_virtualbox-libre-host-source() {
     cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
 }
 
-package_virtualbox-libre-guest-source() {
-    pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)'
+package_virtualbox-libre-guest-dkms() {
+    pkgdesc='VirtualBox Guest kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
-    conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
+    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
+    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
-    install=virtualbox-libre-guest-source.install
+    install=virtualbox-libre-guest-dkms.install
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -310,7 +313,7 @@ package_virtualbox-libre-guest-source() {
 package_virtualbox-libre-guest-utils(){
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels')
+    optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
     provides=("virtualbox-guest-utils=$pkgver")
     replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
     conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index fcdb3c631..91d15e380 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,6 +1,8 @@
---- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp	2012-09-08 06:36:02.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp	2012-10-16 23:00:19.998701465 -0200
-@@ -33,289 +33,365 @@
+diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
+index 6ae0372..df65e60 100644
+--- a/src/VBox/Main/src-all/Global.cpp
++++ b/src/VBox/Main/src-all/Global.cpp
+@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] =
        VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -190,318 +192,320 @@
 +      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "ArchLinux",          "Arch Linux",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
        VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "ArchLinux_64",       "Arch Linux (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
        VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian",             "Debian",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Debian",             "Debian",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
        VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Debian_64",          "Debian (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
        VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
 -    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "OpenSUSE",           "openSUSE",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
        VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "OpenSUSE_64",        "openSUSE (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "OpenSUSE_64",        "openSUSE (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
        VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora",             "Fedora",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Fedora",             "Fedora",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
        VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Fedora_64",          "Fedora (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
        VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Gentoo",             "Gentoo",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
        VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Gentoo_64",          "Gentoo (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
        VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Mandriva",           "Mandriva",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Mandriva",           "Mandriva",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
        VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Mandriva_64",        "Mandriva (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Mandriva_64",        "Mandriva (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
        VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat",             "Red Hat",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "RedHat",             "Red Hat",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
        VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "RedHat_64",          "Red Hat (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
        VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Turbolinux",         "Turbolinux",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
        VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Turbolinux_64",      "Turbolinux (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
        VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Ubuntu",             "Ubuntu",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
        VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Ubuntu_64",          "Ubuntu (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
        VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros",            "Xandros",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Xandros",            "Xandros",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
        VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Xandros_64",         "Xandros (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
        VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle",             "Oracle",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Oracle",             "Oracle",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
        VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
         512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros (Using it is surrendering your freedom)",             "Oracle_64",          "Oracle (64 bit)",
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
        VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux",              "Other Linux",
 -      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 -       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31",          "Windows 3.1",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
 +      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
 +        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95",          "Windows 95",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
 +      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
 +        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98",          "Windows 98",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
 +      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
 +        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe",          "Windows ME",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
 +      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
 +        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4",         "Windows NT 4",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
 +      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
 +       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000",        "Windows 2000",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
 +      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
 +       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP",          "Windows XP",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
 +      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
 +       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64",       "Windows XP (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
 +      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003",        "Windows 2003",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
 +      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
 +       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64",     "Windows 2003 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
 +      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista",       "Windows Vista",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
 +      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64",    "Windows Vista (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
 +      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008",        "Windows 2008",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
 +      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64",     "Windows 2008 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
 +      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7",           "Windows 7",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
 +      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64",        "Windows 7 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
 +      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8",           "Windows 8",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
 +      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
 +       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64",        "Windows 8 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
 +      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64",     "Windows 2012 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
 +      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT",          "Other Windows",
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
 +      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
 +       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
        VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
         768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
        VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
++    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
        VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
         768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
        VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
        VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "FreeBSD",            "FreeBSD",
++    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
        VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
         128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "FreeBSD_64",         "FreeBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
        VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
         128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "OpenBSD",            "OpenBSD",
++    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
        VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "OpenBSD_64",         "OpenBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
        VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "NetBSD",             "NetBSD",
++    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD",             "NetBSD",
        VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",               "NetBSD_64",          "NetBSD (64 bit)",
++    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
        VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
          64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp3",           "OS/2 Warp 3",
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
        VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp4",           "OS/2 Warp 4",
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
        VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2Warp45",          "OS/2 Warp 4.5",
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
        VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
          128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2eCS",             "eComStation",
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2eCS",             "eComStation",
        VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
          256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
-+    { "Non-free OSs",     "Non-free Operating Systems (Using it is surrendering your freedom)",          "OS2",                "Other OS/2",
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2",                "Other OS/2",
        VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
          96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",          "MacOS",              "Mac OS X",
++    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS",              "Mac OS X",
        VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
        2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
         StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
        ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",          "MacOS_64",           "Mac OS X (64 bit)",
++    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
        VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
        2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
        ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "Other",   "Other",             "DOS",                "DOS",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "DOS",                "DOS",
++    { "Non-free OSs",   "Non-free Operating Systems",             "DOS",                "DOS",
        VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
          32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "Other",   "Other",             "Netware",            "Netware",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "Netware",            "Netware",
++    { "Non-free OSs",   "Non-free Operating Systems",             "Netware",            "Netware",
        VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
         512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "L4",                 "L4",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "L4",                 "L4",
++    { "Non-free OSs",   "Non-free Operating Systems",             "L4",                 "L4",
        VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "QNX",                "QNX",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "QNX",                "QNX",
++    { "Non-free OSs",   "Non-free Operating Systems",             "QNX",                "QNX",
        VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
         512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
-+    { "Non-free OSs",   "Non-free Operating Systems (Using it is surrendering your freedom)",             "JRockitVE",          "JRockitVE",
++    { "Non-free OSs",   "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
          VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-10-16 22:44:37.177454655 -0200
-@@ -44,45 +44,33 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+index c5a4cfe..7d2b363 100644
+--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+@@ -44,46 +44,33 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -519,6 +523,7 @@
 -    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
 -    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
 -    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+-    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
 -    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
 -    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
 -    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -542,6 +547,8 @@
 -    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
 -    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
 -    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+-
+-    /* Code names for Linux distributions: */
 +    /* Code names for free GNU/Linux distributions */
 +    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
 +    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -567,13 +574,12 @@
 +    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
 +    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
 +    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
- 
--    /* Code names for Linux distributions: */
++
 +    /* Code names for non-free GNU/Linux distributions: */
      { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
      { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
      { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +78,7 @@
+@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
      { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
  
@@ -582,7 +588,7 @@
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@
+@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -619,6 +625,7 @@
 +    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
 +    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
 +    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
++    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
 +    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
 +    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
 +    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -641,18 +648,37 @@
      { QRegExp("L4", Qt::CaseInsensitive), "L4" },
      { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
      { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -136,6 +159,8 @@
+@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+    
++
 +    /* Other: */
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp	2012-08-29 11:13:34.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp	2012-10-03 17:02:44.581501053 -0300
-@@ -3405,7 +3405,18 @@
+@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+     /* Create widgets: */
+     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+     {
++        pMainLayout->setContentsMargins(8, 6, 8, 6);
+         m_pLabel = new QIRichTextLabel(this);
++        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+         m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
+-        pMainLayout->addWidget(m_pLabel);
+-        pMainLayout->addWidget(m_pNameAndSystemEditor);
+-        pMainLayout->addStretch();
++        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
++        pMainLayout->addWidget(m_pLabel, 1);
++        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
+     }
+ 
+     /* Setup connections: */
+diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
+index 8cb1e12..20e3eda 100644
+--- a/src/VBox/Main/xml/Settings.cpp
++++ b/src/VBox/Main/xml/Settings.cpp
+@@ -3405,7 +3405,18 @@ const struct {
      { "netware", "Netware" },
      { "solaris", "Solaris" },
      { "opensolaris", "OpenSolaris" },
@@ -672,9 +698,11 @@
  };
  
  void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl	2012-09-04 09:48:43.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl	2012-10-03 17:02:10.780019131 -0300
-@@ -763,6 +763,17 @@
+diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl
+index 9a31a4c..7db11ad 100644
+--- a/src/VBox/Main/xml/SettingsConverter.xsl
++++ b/src/VBox/Main/xml/SettingsConverter.xsl
+@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid.
          <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
          <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
          <xsl:when test="@OSType='l4'">L4</xsl:when>
@@ -692,9 +720,11 @@
        </xsl:choose>
      </xsl:attribute>
      <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-05-30 07:39:18.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-10-03 00:13:20.408089706 -0300
-@@ -70,6 +70,24 @@
+diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+index 4523dad..38ae21a 100644
+--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+@@ -71,6 +71,24 @@
          <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
          <file alias="os_macosx.png">images/os_macosx.png</file>
          <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
@@ -719,9 +749,11 @@
          <file alias="hd_16px.png">images/hd_16px.png</file>
          <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
          <file alias="hd_32px.png">images/hd_32px.png</file>
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-09-04 09:48:45.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-10-03 17:03:46.114796857 -0300
-@@ -4310,11 +4310,11 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+index 8af9597..39a8d39 100644
+--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
          {"OS2Warp45",       ":/os_os2warp45.png"},
          {"OS2eCS",          ":/os_os2ecs.png"},
          {"OS2",             ":/os_os2_other.png"},
@@ -738,7 +770,7 @@
          {"ArchLinux",       ":/os_archlinux.png"},
          {"ArchLinux_64",    ":/os_archlinux_64.png"},
          {"Debian",          ":/os_debian.png"},
-@@ -4337,7 +4337,7 @@
+@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
          {"Xandros_64",      ":/os_xandros_64.png"},
          {"Oracle",          ":/os_oracle.png"},
          {"Oracle_64",       ":/os_oracle_64.png"},
@@ -747,7 +779,7 @@
          {"FreeBSD",         ":/os_freebsd.png"},
          {"FreeBSD_64",      ":/os_freebsd_64.png"},
          {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4353,6 +4353,25 @@
+@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
          {"MacOS",           ":/os_macosx.png"},
          {"MacOS_64",        ":/os_macosx_64.png"},
          {"JRockitVE",       ":/os_jrockitve.png"},
@@ -773,9 +805,11 @@
      };
      for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
      {
---- VirtualBox-4.2.0.orig/include/VBox/ostypes.h	2012-09-08 06:35:56.000000000 -0300
-+++ VirtualBox-4.2.0/include/VBox/ostypes.h	2012-10-03 17:07:12.143504689 -0300
-@@ -116,6 +116,25 @@
+diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
+index cbc0b73..31516cd 100644
+--- a/include/VBox/ostypes.h
++++ b/include/VBox/ostypes.h
+@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE
      VBOXOSTYPE_MacOS            = 0xB0000,
      VBOXOSTYPE_MacOS_x64        = 0xB0100,
      VBOXOSTYPE_JRockitVE        = 0xC0000,
@@ -801,9 +835,11 @@
  /** The bit number which indicates 64-bit or 32-bit. */
  #define VBOXOSTYPE_x64_BIT       8
      /** The mask which indicates 64-bit. */
---- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-08-03 09:28:30.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-10-03 17:11:27.739487250 -0300
-@@ -84,7 +84,32 @@
+diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
+index 05fc3b6..ce24d92 100644
+--- a/src/VBox/Main/src-server/ApplianceImpl.cpp
++++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
+@@ -84,7 +84,32 @@ g_osTypes[] =
      { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
      { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
  
@@ -837,7 +873,7 @@
      { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
      { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
      { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
-@@ -110,7 +135,7 @@
+@@ -110,7 +135,7 @@ g_osTypes[] =
      { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
      { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
  
@@ -846,7 +882,7 @@
      { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
      { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
      { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
-@@ -151,53 +176,72 @@
+@@ -151,53 +176,72 @@ struct osTypePattern
  /* These are the 32-Bit ones. They are sorted by priority. */
  static const osTypePattern g_osTypesPattern[] =
  {
@@ -961,9 +997,11 @@
  };
  
  /**
---- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h	2011-04-28 05:00:56.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h	2012-10-03 17:13:50.738308572 -0300
-@@ -145,8 +145,20 @@
+diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h
+index e1e21d5..6d2da12 100644
+--- a/src/VBox/Main/include/ovfreader.h
++++ b/src/VBox/Main/include/ovfreader.h
+@@ -145,8 +145,20 @@ enum CIMOSType_T
      CIMOSType_CIMOS_CentOS_64 = 107,
      CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
      CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
@@ -985,9 +1023,11 @@
  };
  
  
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	2012-07-18 05:58:09.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	2012-10-03 22:49:11.871882837 -0300
-@@ -141,7 +141,7 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
+index 59749be..8e2b425 100644
+--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
+@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
  #ifdef VBOX_WITH_VIDEOHWACCEL
      /* Check if 2D video acceleration supported by the guest OS type: */
      QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
@@ -996,3 +1036,737 @@
  #endif /* VBOX_WITH_VIDEOHWACCEL */
  #ifdef VBOX_WITH_CRHGSMI
      /* Check if WDDM mode supported by the guest OS type: */
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+index f67cfc2..438ffee 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+@@ -32,6 +32,11 @@ enum
+     TypeID = Qt::UserRole + 1
+ };
+ 
++const char* FreedomLabel = "We hope you don't use non-free "
++                           "GNU/Linux distros and non-free operating "
++                           "systems, since to use them is to surrender "
++                           "your freedom.";
++
+ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
+     : QIWithRetranslateUI<QWidget>(pParent)
+ {
+@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
+     qRegisterMetaType<CGuestOSType>();
+ 
+     /* Create widgets: */
+-    QGridLayout *pMainLayout = new QGridLayout(this);
++    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+     {
+         pMainLayout->setContentsMargins(0, 0, 0, 0);
+-        m_pNameLabel = new QLabel(this);
+-        {
+-            m_pNameLabel->setAlignment(Qt::AlignRight);
+-            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+-        }
+-        m_pNameEditor = new QLineEdit(this);
+-        {
+-            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+-            m_pNameLabel->setBuddy(m_pNameEditor);
+-        }
+-        m_pFamilyLabel = new QLabel(this);
+-        {
+-            m_pFamilyLabel->setAlignment(Qt::AlignRight);
+-            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+-        }
+-        m_pFamilyCombo = new QComboBox(this);
+-        {
+-            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+-            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
+-        }
+-        m_pTypeLabel = new QLabel(this);
+-        {
+-            m_pTypeLabel->setAlignment(Qt::AlignRight);
+-            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+-        }
+-        m_pTypeCombo = new QComboBox(this);
+-        {
+-            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+-            m_pTypeLabel->setBuddy(m_pTypeCombo);
+-        }
+-        QVBoxLayout *pIconLayout = new QVBoxLayout;
+-        {
+-            m_pTypeIcon = new QLabel(this);
++
++	/* Top QWidget */
++	m_pGlobalCnt = new QFrame;
++        m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++
++	QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt);
++	{
++	    m_pGridCnt = new QFrame;
++            m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++	    m_pGridCnt->setMinimumWidth(500);
++
++	    QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt);
+             {
+-                m_pTypeIcon->setFixedSize(32, 32);
+-            }
+-            pIconLayout->addWidget(m_pTypeIcon);
+-            pIconLayout->addStretch();
+-        }
+-        pMainLayout->addWidget(m_pNameLabel, 0, 0);
+-        pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
+-        pMainLayout->addWidget(m_pFamilyLabel, 1, 0);
+-        pMainLayout->addWidget(m_pFamilyCombo, 1, 1);
+-        pMainLayout->addWidget(m_pTypeLabel, 2, 0);
+-        pMainLayout->addWidget(m_pTypeCombo, 2, 1);
+-        pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1);
++	        pGridLayout->setContentsMargins(4, 4, 4, 4);
++	        m_pNameLabel = new QLabel(m_pGridCnt);
++	        {
++	            m_pNameLabel->setAlignment(Qt::AlignRight);
++	            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++	        }
++	        m_pNameEditor = new QLineEdit(m_pGridCnt);
++	        {
++	            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
++	            m_pNameLabel->setBuddy(m_pNameEditor);
++	        }
++	        m_pFamilyLabel = new QLabel(m_pGridCnt);
++	        {
++	            m_pFamilyLabel->setAlignment(Qt::AlignRight);
++	            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++	        }
++	        m_pFamilyCombo = new QComboBox(m_pGridCnt);
++	        {
++	            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
++	            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
++	        }
++	        m_pTypeLabel = new QLabel(m_pGridCnt);
++	        {
++	            m_pTypeLabel->setAlignment(Qt::AlignRight);
++	            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++	        }
++	        m_pTypeCombo = new QComboBox(m_pGridCnt);
++	        {
++	            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
++	            m_pTypeLabel->setBuddy(m_pTypeCombo);
++	        }
++	        QVBoxLayout *pIconLayout = new QVBoxLayout;
++                {
++	            m_pTypeIcon = new QLabel;
++	            {
++	                m_pTypeIcon->setFixedSize(32, 32);
++	            }
++	            pIconLayout->addWidget(m_pTypeIcon);
++	            pIconLayout->addStretch();
++	        }
++
++	        pGridLayout->addWidget(m_pNameLabel, 0, 0);
++	        pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
++	        pGridLayout->addWidget(m_pFamilyLabel, 1, 0);
++	        pGridLayout->addWidget(m_pFamilyCombo, 1, 1);
++	        pGridLayout->addWidget(m_pTypeLabel, 2, 0);
++	        pGridLayout->addWidget(m_pTypeCombo, 2, 1);
++	        pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1);
++	    }
++
++	    m_pFreedomLabel = new QLabel(m_pGlobalCnt);
++	    {
++                m_pFreedomLabel->setStyleSheet("color: red;"
++                                               "border-radius: 4px;"
++                                               "padding: 2px;"
++                                               "background-color: #DDDDDD;");
++	        m_pFreedomLabel->setWordWrap(true);
++		m_pFreedomLabel->setAlignment(Qt::AlignCenter);
++	        m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++		m_pFreedomLabel->hide();
++	    }
++
++	    pGlobalLayout->addStretch();
++	    pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter);
++	    pGlobalLayout->addWidget(m_pFreedomLabel);
++	    pGlobalLayout->addStretch();
++	}
++
++        pMainLayout->addWidget(m_pGlobalCnt);
+     }
+ 
+     /* Check if host supports (AMD-V or VT-x) and long mode: */
+@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi()
+     m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that "
+                                   "you plan to install into this virtual machine "
+                                   "(called a guest operating system)."));
++    m_pFreedomLabel->setText(tr(FreedomLabel));
+ }
+ 
+ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
+@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
+     /* Else simply select the first one present: */
+     else m_pTypeCombo->setCurrentIndex(0);
+ 
++    /* Hide or show the freedom label if it is translated to the active language */
++    int isEnglish = QLocale::system().language();
++    if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31)
++    {
++        if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros")
++        {
++	    m_pFreedomLabel->show();
++        }
++        else
++        {
++            m_pFreedomLabel->hide();
++        }
++    }
++
+     /* Update all the stuff: */
+     sltTypeChanged(m_pTypeCombo->currentIndex());
+ 
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
+index 6a698c0..3c23845 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
+@@ -30,6 +30,7 @@
+ class QLabel;
+ class QLineEdit;
+ class QComboBox;
++class QFrame;
+ 
+ /* QWidget reimplementation providing editor for basic VM parameters: */
+ class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget>
+@@ -76,6 +77,8 @@ private slots:
+ private:
+ 
+     /* Widgets: */
++    QFrame *m_pGlobalCnt;
++    QFrame *m_pGridCnt;
+     QLabel *m_pNameLabel;
+     QLabel *m_pFamilyLabel;
+     QLabel *m_pTypeLabel;
+@@ -83,6 +86,7 @@ private:
+     QLineEdit *m_pNameEditor;
+     QComboBox *m_pFamilyCombo;
+     QComboBox *m_pTypeCombo;
++    QLabel *m_pFreedomLabel;
+ 
+     /* Variables: */
+     CGuestOSType m_type;
+diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
+index 100cb8c..5ab98ad 100644
+--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
+@@ -19,7 +19,7 @@
+ 
+ /* Global includes: */
+ #include <QVBoxLayout>
+-#include <QHBoxLayout>
++#include <QVBoxLayout>
+ #include <QGroupBox>
+ #include <QGridLayout>
+ #include <QSpacerItem>
+@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
+         m_pNameAndSystemCnt = new QGroupBox(this);
+         {
+             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+-            QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
++	    m_pNameAndSystemCnt->setFixedHeight(170);
++
++            QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt);
+             {
++                pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2);
+                 m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
+                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
+             }
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+index cea825b..7ade350 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+index e41d97d..f449069 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;aquesta màquina virtual (anomenat sistema operatiu client).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+index e82fc7c..a98be2c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;esta màquina virtual (anomenat sistema operatiu client).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+index 176f417..bb58906 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManager</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+index 3f88de8..1d48468 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+index 14a3721..945d554 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+@@ -4838,6 +4838,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+index 4e52534..3d7dba6 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+index 275e1e6..34171eb 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+@@ -5951,6 +5951,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+index f902373..625da36 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+@@ -4850,6 +4850,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+index 3f31f8f..9248344 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+index b918edb..a6868a4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+@@ -6432,6 +6432,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Affiche le type du système d&apos;exploitation (dit système d&apos;exploitation invité) que vous allez installer dans cette machine virtuelle.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Nous espérons que vous n&apos;utilisez pas de distribution GNU/Linux non libre ni de système d&apos;exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+index b04f31b..77a389f 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Mostrar o tipo do sistema operativo  que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+index 76d4371..c1aff65 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>A tervezett vendég operációs rendszer típusa.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+index 349d776..fb81c2c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+@@ -6768,6 +6768,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished"></translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+index 61f6a37..70e66b9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManager</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+index 9ab3823..40006f9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation>
+     </message>
++    <message>
++        <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+index be82aab..7d73e23 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+@@ -6451,6 +6451,10 @@ medium</comment>
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+index 05ccf51..3fb2a07 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로,  사용하지 않을 것을 권유합니다.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+index 3e06e93..cadd54b 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+@@ -6767,6 +6767,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+index 2b81abd..610dad8 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+@@ -5894,6 +5894,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+index 7122389..ca0b4b2 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished"></translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+index ebcba39..0bb693b 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+@@ -6816,6 +6816,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+index 6a82c7e..c866fa4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManager</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+index 3b79282..345725c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+index c2230a2..653f436 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется &quot;гостевая ОС&quot;).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+index 40eec9d..dcecd31 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+@@ -6762,6 +6762,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+index 9eeef05..649c108 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+index 800d10b..239a8d4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+@@ -7768,6 +7768,10 @@ serial ports</comment>
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished"></translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManager</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+index cdb888e..4c8d86c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+@@ -6312,6 +6312,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+index 8b51e82..2557231 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; }
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManager</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+index 2690322..0ea229a 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+@@ -4810,6 +4810,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation type="unfinished"></translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+index 5b567f7..8709191 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+@@ -5858,6 +5858,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>显示你要安装到虚拟电脑的操作系统类型.</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+index 5d1d136..095c169 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+@@ -4834,6 +4834,10 @@
+         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+         <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation>
+     </message>
++    <message>
++        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
++        <translation type="unfinished"></translation>
++    </message>
+ </context>
+ <context>
+     <name>UINetworkManagerDialog</name>
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 138bbd612..e93fe80e8 100755..100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
---- VirtualBox-4.2.0.orig/Config.kmk	2012-09-13 05:26:16.000000000 -0300
-+++ VirtualBox-4.2.0/Config.kmk		2012-09-18 21:35:33.118487052 -0300
+--- VirtualBox-4.2.6.orig/Config.kmk	2012-12-19 16:24:34.000000000 -0200
++++ VirtualBox-4.2.6/Config.kmk		2012-12-27 14:28:22.897125304 -0200
 @@ -56,9 +56,6 @@
  PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
  PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
@@ -55,7 +55,16 @@
  ifdef VBOX_WITH_PCI_PASSTHROUGH
   VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
  endif
-@@ -609,17 +596,6 @@
+@@ -580,8 +567,6 @@
+ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
+  VBOX_WITH_CROGL = 1
+ endif
+-# Enable the VNC server extension pack (GPL only).
+-#VBOX_WITH_EXTPACK_VNC = 1
+ # Enable S3 support (requires libcurl)
+ VBOX_WITH_S3 = 1
+ # Enable Host=>Guest Drag'n'Drop
+@@ -621,17 +606,6 @@
  endif
  ## @}
  
@@ -73,7 +82,7 @@
  ## @name Misc
  ## @{
  # Enable Seamless mode
-@@ -810,14 +786,6 @@
+@@ -822,14 +796,6 @@
  # Skip stuff.
  #
  
@@ -88,7 +97,7 @@
  # VBOX_QUICK can be used by core developers to speed to the build
  ifdef VBOX_QUICK
   # undefine variables by assigning blank.
-@@ -872,7 +840,6 @@
+@@ -884,7 +850,6 @@
   VBOX_WITH_TESTSUITE=
   VBOX_WITH_QTGUI=
   VBOX_WITH_USB=
@@ -96,7 +105,7 @@
   VBOX_WITH_DOCS=
   VBOX_WITH_PDM_ASYNC_COMPLETION=
   VBOX_WITH_KCHMVIEWER=
-@@ -894,7 +861,6 @@
+@@ -906,7 +871,6 @@
   VBOX_WITH_CROGL=
   VBOX_WITH_DEBUGGER=
   VBOX_WITH_DOCS=
@@ -104,7 +113,16 @@
   VBOX_WITH_HARDENING=
   VBOX_WITH_HEADLESS=
   VBOX_WITH_HGCM=
-@@ -985,9 +951,6 @@
+@@ -979,7 +943,7 @@
+ #
+ # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
+ #
+-VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
++VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
+ 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
+ if $(words $(VBOX_ONLY_BUILD)) > 1
+  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
+@@ -997,9 +961,6 @@
  #
  ifdef VBOX_OSE
   VBOX_WITH_VRDP=
@@ -114,7 +132,7 @@
   VBOX_WITH_PCI_PASSTHROUGH_IMPL=
   VBOX_WITH_OS2_ADDITIONS_BIN=
   VBOX_WITH_SECURELABEL=
-@@ -1118,10 +1081,6 @@
+@@ -1130,10 +1091,6 @@
   VBOX_WITH_KCHMVIEWER=
  endif
  
@@ -125,7 +143,7 @@
  #
  # Mark OSE builds clearly, helps figuring out limitations more easily.
  #
-@@ -1744,9 +1703,6 @@
+@@ -1738,9 +1695,6 @@
  # bin2c (convert binary files into C arrays)
  VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
  
@@ -135,7 +153,7 @@
  # VBoxCmp (simple /bin/cmp with more sensible output)
  VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
  
-@@ -2638,13 +2594,6 @@
+@@ -2632,13 +2586,6 @@
   SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
  endif
  
@@ -149,7 +167,7 @@
  SDK_VBOX_BLD_OPENSSL      = .
  SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
  SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4049,6 @@
+@@ -4099,99 +4046,6 @@
  TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
  
  
@@ -249,6 +267,131 @@
  #
  # Qt 4
  # Qt 4
+--- VirtualBox-4.2.6.orig/configure	2012-12-19 16:24:34.000000000 -0200
++++ VirtualBox-4.2.6/configure		2012-12-27 14:26:25.743442978 -0200
+@@ -90,8 +90,6 @@
+ WITH_HARDENING=1
+ WITH_UDPTUNNEL=1
+ WITH_VDE=0
+-WITH_VNC=0
+-WITH_EXTPACK=1
+ WITH_DOCS=1
+ BUILD_LIBXML2=
+ BUILD_LIBCURL=
+@@ -124,8 +122,6 @@
+ MESA="-lGL"
+ INCZ=""
+ LIBZ="-lz"
+-INCVNCSERVER=""
+-LIBVNCSERVER="-lvncserver"
+ INCDEVMAPPER=""
+ LIBDEVMAPPER="-ldevmapper"
+ CXX_FLAGS=""
+@@ -930,47 +926,6 @@
+ }
+ 
+ #
+-# Check for libvncserver, needed for VNC in OSE
+-#
+-check_vncserver()
+-{
+-  test_header libvncserver
+-  cat > $ODIR.tmp_src.cc <<EOF
+-#include <cstdio>
+-#include <rfb/rfbconfig.h>
+-
+-extern "C" int main()
+-{
+-  const char* v=LIBVNCSERVER_VERSION;
+-  unsigned int major = 0, minor = 0, micro = 0;
+-
+-  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
+-  if (*v == '.') v++;
+-  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
+-  if (*v == '.') v++;
+-  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
+-
+-  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
+-  if (major*10000 + minor*100 + micro >= 900)
+-  {
+-    printf(", OK.\n");
+-    return 0;
+-  }
+-  else
+-  {
+-    printf(", expected version 0.9 or higher\n");
+-    return 1;
+-  }
+-}
+-EOF
+-  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
+-    if test_execute; then
+-      cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
+-    fi
+-  fi
+-}
+-
+-#
+ # Check for libcurl, needed by S3
+ #
+ check_curl()
+@@ -2173,8 +2128,6 @@
+ [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
+ [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
+ [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
+-[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
+-[ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
+ [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
+ [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
+ cat << EOF
+@@ -2346,15 +2299,9 @@
+     --enable-webservice)
+       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
+       ;;
+-    --enable-vnc)
+-      WITH_VNC=1
+-      ;;
+     --disable-hardening)
+       WITH_HARDENING=0
+       ;;
+-    --disable-extpack)
+-      WITH_EXTPACK=0
+-      ;;
+     --disable-docs)
+       WITH_DOCS=0
+       ;;
+@@ -2512,15 +2459,6 @@
+   echo >> $CNF
+ fi
+ 
+-# extpack
+-if [ $OSE -eq 0 ]; then
+-  if [ $WITH_EXTPACK -eq 1 ]; then
+-    BUILD_LIBSSL=1
+-  else
+-    cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
+-  fi
+-fi
+-
+ # headless
+ if [ -n "$HEADLESS" ]; then
+   cnf_append "VBOX_HEADLESS" "1"
+@@ -2646,15 +2584,6 @@
+   cnf_append "VBOX_WITH_DOCS_PACKING" ""
+ fi
+ 
+-# VNC server support
+-if [ $OSE -ge 1 ]; then
+-  if [ $WITH_VNC = 1 ]; then
+-    check_vncserver
+-  else
+-    cnf_append "VBOX_WITH_EXTPACK_VNC" ""
+-  fi
+-fi
+-
+ # success!
+ echo
+ echo "Successfully generated '$CNF' and '$ENV'."
 --- VirtualBox-4.2.0.orig/Makefile.kmk	2012-08-29 11:13:46.000000000 -0300
 +++ VirtualBox-4.2.0/Makefile.kmk	2012-09-18 23:43:54.750454776 -0300
 @@ -378,7 +378,6 @@
diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png
index 61995ca10..61995ca10 100755..100644
--- a/libre/virtualbox-libre/os_blag.png
+++ b/libre/virtualbox-libre/os_blag.png
diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png
index aa4463a97..aa4463a97 100755..100644
--- a/libre/virtualbox-libre/os_blag_64.png
+++ b/libre/virtualbox-libre/os_blag_64.png
diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png
index d1df45880..d1df45880 100755..100644
--- a/libre/virtualbox-libre/os_dragora.png
+++ b/libre/virtualbox-libre/os_dragora.png
diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png
index 64bcecf20..64bcecf20 100755..100644
--- a/libre/virtualbox-libre/os_dragora_64.png
+++ b/libre/virtualbox-libre/os_dragora_64.png
diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png
index 67b07d4c0..67b07d4c0 100755..100644
--- a/libre/virtualbox-libre/os_dynebolic.png
+++ b/libre/virtualbox-libre/os_dynebolic.png
diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png
index 76d9e38b3..76d9e38b3 100755..100644
--- a/libre/virtualbox-libre/os_gnewsense.png
+++ b/libre/virtualbox-libre/os_gnewsense.png
diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png
index 8859c34e8..8859c34e8 100755..100644
--- a/libre/virtualbox-libre/os_gnewsense_64.png
+++ b/libre/virtualbox-libre/os_gnewsense_64.png
diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png
index 26c4550f9..26c4550f9 100755..100644
--- a/libre/virtualbox-libre/os_gnu.png
+++ b/libre/virtualbox-libre/os_gnu.png
diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png
index 4161634e9..4161634e9 100755..100644
--- a/libre/virtualbox-libre/os_gnu_64.png
+++ b/libre/virtualbox-libre/os_gnu_64.png
diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png
index 26c4550f9..26c4550f9 100755..100644
--- a/libre/virtualbox-libre/os_gnuhurd.png
+++ b/libre/virtualbox-libre/os_gnuhurd.png
diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png
index 26c4550f9..26c4550f9 100755..100644
--- a/libre/virtualbox-libre/os_gnulinux.png
+++ b/libre/virtualbox-libre/os_gnulinux.png
diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png
index 4161634e9..4161634e9 100755..100644
--- a/libre/virtualbox-libre/os_gnulinux_64.png
+++ b/libre/virtualbox-libre/os_gnulinux_64.png
diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png
index fb7b94577..fb7b94577 100755..100644
--- a/libre/virtualbox-libre/os_musix.png
+++ b/libre/virtualbox-libre/os_musix.png
diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png
index a1bbbbf3a..a1bbbbf3a 100755..100644
--- a/libre/virtualbox-libre/os_musix_64.png
+++ b/libre/virtualbox-libre/os_musix_64.png
diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png
index 7aec20314..7aec20314 100755..100644
--- a/libre/virtualbox-libre/os_os64base.png
+++ b/libre/virtualbox-libre/os_os64base.png
diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf
index d8e28e35e..d8e28e35e 100755..100644
--- a/libre/virtualbox-libre/os_os64base.xcf
+++ b/libre/virtualbox-libre/os_os64base.xcf
diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png
index 00f197fca..00f197fca 100755..100644
--- a/libre/virtualbox-libre/os_osbase.png
+++ b/libre/virtualbox-libre/os_osbase.png
diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf
index c4463c857..c4463c857 100755..100644
--- a/libre/virtualbox-libre/os_osbase.xcf
+++ b/libre/virtualbox-libre/os_osbase.xcf
diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png
index 757abc484..757abc484 100755..100644
--- a/libre/virtualbox-libre/os_parabola.png
+++ b/libre/virtualbox-libre/os_parabola.png
diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png
index 5ac7c2767..5ac7c2767 100755..100644
--- a/libre/virtualbox-libre/os_parabola_64.png
+++ b/libre/virtualbox-libre/os_parabola_64.png
diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png
index c6f0d3d7a..c6f0d3d7a 100755..100644
--- a/libre/virtualbox-libre/os_trisquel.png
+++ b/libre/virtualbox-libre/os_trisquel.png
diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png
index ebca3dd43..ebca3dd43 100755..100644
--- a/libre/virtualbox-libre/os_trisquel_64.png
+++ b/libre/virtualbox-libre/os_trisquel_64.png
diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png
index e1dffb575..e1dffb575 100755..100644
--- a/libre/virtualbox-libre/os_ututo.png
+++ b/libre/virtualbox-libre/os_ututo.png
diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png
index 158468e0a..158468e0a 100755..100644
--- a/libre/virtualbox-libre/os_ututo_64.png
+++ b/libre/virtualbox-libre/os_ututo_64.png
diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png
index 5e0c1585d..5e0c1585d 100755..100644
--- a/libre/virtualbox-libre/os_venenux.png
+++ b/libre/virtualbox-libre/os_venenux.png
diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf
index 9d4ec629f..9d4ec629f 100755..100644
--- a/libre/virtualbox-libre/vboxservice.conf
+++ b/libre/virtualbox-libre/vboxservice.conf
diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc
index 5a62d69a3..5a62d69a3 100755..100644
--- a/libre/virtualbox-libre/vboxservice.rc
+++ b/libre/virtualbox-libre/vboxservice.rc
diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service
index bbd61617d..bbd61617d 100755..100644
--- a/libre/virtualbox-libre/vboxservice.service
+++ b/libre/virtualbox-libre/vboxservice.service
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
index c36f6a143..c36f6a143 100755..100644
--- a/libre/virtualbox-libre/vboxweb.conf
+++ b/libre/virtualbox-libre/vboxweb.conf
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
index 97273e3c7..97273e3c7 100755..100644
--- a/libre/virtualbox-libre/vboxweb.rc
+++ b/libre/virtualbox-libre/vboxweb.rc
diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service
index 303381597..303381597 100755..100644
--- a/libre/virtualbox-libre/vboxweb.service
+++ b/libre/virtualbox-libre/vboxweb.service
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
index 2d62eae43..2d62eae43 100755..100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
index 38bbe807d..38bbe807d 100755..100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
index 8028cb7e0..8028cb7e0 100755..100644
--- a/libre/virtualbox-libre/virtualbox-libre-host-source.install
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index b6d804eb7..90d8a8739 100755..100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -30,8 +30,8 @@ post_upgrade() {
   post_install "$1"
   if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
     cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules.
-===> Use virtualbox-libre-source package if you don't use our stock linux-libre package.
+===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
+===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
 EOF
     fi
 }