Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

26 files changed, 1220 insertions, 164 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
new file mode 100644
index 000000000..a8dc5ebd5
--- /dev/null
+++ b/libre/calibre-libre/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Petrov Roman <nwhisper@gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=calibre
+pkgname=calibre-libre
+pkgver=0.9.11
+pkgrel=1
+pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
+arch=('i686' 'x86_64') 
+url="http://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
+         'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
+         'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
+         'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
+         'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
+         'python2-netifaces' 'python2-cssselect')
+makedepends=('python2-pycountry')
+optdepends=('ipython2: to use calibre-debug')
+install=calibre.install
+source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
+        'desktop_integration.patch'
+        'calibre-mount-helper')
+md5sums=('07e620aed65d7bae2a27ccea123da4c9'
+         '42c07b43d575b5e7e7524bd7b9528f0e'
+         '675cd87d41342119827ef706055491e7')
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+
+  #rm -rf src/{cherrypy,pyPdf}
+  rm -rf src/cherrypy
+  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
+
+  # Fix for calibre-0.8.58
+  sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py
+
+  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
+    $(find . -regex ".*.py\|.*.recipe")
+
+  # Remove nonfree fonts
+  cd resources/fonts; \
+    rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
+    rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \
+    rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \
+  cd ../..
+
+  LANG='en_US.UTF-8' python2 setup.py build
+  # LANG='en_US.UTF-8' python2 setup.py resources
+  LANG='en_US.UTF-8' python2 setup.py translations
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  
+  patch -Np1 -i "${srcdir}/desktop_integration.patch"
+
+  # More on desktop integration (e.g. enforce arch defaults)
+  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
+      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
+      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
+      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
+
+  # Fix the environment module location
+  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
+
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
+  LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
+    --staging-bindir="${pkgdir}/usr/bin" \
+    --staging-libdir="${pkgdir}/usr/lib" \
+    --staging-sharedir="${pkgdir}/usr/share"
+
+  find "${pkgdir}" -type d -empty -delete
+
+  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
+  rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
+  install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
+}
diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper
new file mode 100644
index 000000000..00cac4270
--- /dev/null
+++ b/libre/calibre-libre/calibre-mount-helper
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+# Replacement for upstream mount helper using udisks/eject
+# (C) 2010 Martin Pitt <mpitt@debian.org>
+
+ACTION="$1"
+DEV="$2"
+
+case "$ACTION" in
+    mount)
+	udisks --mount "$DEV"
+    
+	# check if mount worked. If not, fail
+	# udisks does return 0 even if mount failed
+	mount | grep -q "$DEV" || exit 0
+	;;
+
+    eject)
+	eject "$DEV"
+	;;
+
+    cleanup)
+	;;
+
+    *)
+	echo "unknown action" >&2
+	exit 1
+esac
+
diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install
new file mode 100644
index 000000000..6210bd0ab
--- /dev/null
+++ b/libre/calibre-libre/calibre.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
new file mode 100644
index 000000000..4c756f5d4
--- /dev/null
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -0,0 +1,109 @@
+--- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
++++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
+@@ -179,19 +179,6 @@
+             self.setup_completion()
+         if islinux or isbsd:
+             self.setup_desktop_integration()
+-        self.create_uninstaller()
+-
+-        from calibre.utils.config import config_dir
+-        if os.path.exists(config_dir):
+-            os.chdir(config_dir)
+-            if islinux or isbsd:
+-                for f in os.listdir('.'):
+-                    if os.stat(f).st_uid == 0:
+-                        import shutil
+-                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
+-                if os.stat(config_dir).st_uid == 0:
+-                    os.rmdir(config_dir)
+-
+         if warn is None and self.warnings:
+             self.info('There were %d warnings'%len(self.warnings))
+             for args, kwargs in self.warnings:
+@@ -237,7 +224,7 @@
+                 if isnetbsd:
+                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
+                 else:
+-                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
++                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
+             if not os.path.exists(os.path.dirname(f)):
+                 os.makedirs(os.path.dirname(f))
+             self.manifest.append(f)
+@@ -357,63 +344,39 @@
+ 
+             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
+                                 PreserveMIMEDefaults():
+-                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-lrs',
+-                '128'))
+-                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
+-                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
+-                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
+-                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
+-                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
+-                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-gui', '128'))
+-                render_img('viewer.png', 'calibre-viewer.png')
+-                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
++                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
++                os.mkdir(dir)
++                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
++                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
++                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
+ 
+                 mimetypes = set([])
+                 for x in all_input_formats():
+                     mt = guess_type('dummy.'+x)[0]
+-                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
++                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
+                         mimetypes.add(mt)
+ 
+                 def write_mimetypes(f):
+                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
+ 
+-                f = open('calibre-lrfviewer.desktop', 'wb')
++                dir = os.path.join(self.opts.staging_sharedir,'../applications')
++                os.mkdir(dir)
++                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+                 f.write(VIEWER)
+                 f.close()
+-                f = open('calibre-ebook-viewer.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
+                 f.write(EVIEWER)
+                 write_mimetypes(f)
+                 f.close()
+-                f = open('calibre-gui.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
+                 f.write(GUI)
+                 write_mimetypes(f)
+                 f.close()
+-                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
+-                        'calibre-ebook-viewer.desktop')
+-                for x in des:
+-                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
+-                    cc(' '.join(cmd), shell=True)
+-                    self.menu_resources.append(x)
+-                cc(['xdg-desktop-menu', 'forceupdate'])
+-                f = open('calibre-mimetypes.xml', 'wb')
++                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
++                os.makedirs(dir)
++                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
+                 f.write(MIME)
+                 f.close()
+-                self.mime_resources.append('calibre-mimetypes.xml')
+-                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
+         except Exception:
+             if self.opts.fatal_errors:
+                 raise
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index e39dfc88a..306a9ec0c 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=33
+pkgrel=34
 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index aa71a92ac..3847b8b14 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.6-LIBRE'
+  EXTRAMODULES='extramodules-3.7-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.6-LIBRE'
+  EXTRAMODULES='extramodules-3.7-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.6-LIBRE'
+  EXTRAMODULES='extramodules-3.7-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index e96c047a8..5a20ba446 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $
+# $Id: PKGBUILD 173502 2012-12-19 18:25:44Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=gst-plugins-bad
 pkgname=gst-plugins-bad-libre
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
 arch=(
@@ -57,7 +57,7 @@ source=(
   "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
 )
 sha256sums=(
-  2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0
+  198759adb10ceb1777245f5706a198708e4539cd1e19b8a900f5d573fc76089f
 )
 
 build() {
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 81c5088e3..64008c7b6 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,38 +1,41 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.6.10
+_kernver=3.7.1
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_pkgver=2012-10-03
-pkgver=20121003
-pkgrel=7
+_pkgver=2012-12-04-1-u
+pkgver=20121204
+pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
-url='http://linuxwireless.org/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
 license=('GPL2')
 depends=("linux-libre=$_kernver")
 makedepends=("linux-libre-headers=$_kernver")
 install=linux-libre-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
+replaces=('alx' 'alx-driver' 'dkms-alx')
+provides=('alx' 'alx-driver' 'dkms-alx')
+conflicts=('alx' 'alx-driver' 'dkms-alx')
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
 
-md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+md5sums=('bc46200e288acb862149a2af11f4b293')
 
 
 build() {
 	# current extramodules version
-	_extraver=extramodules-3.6-LIBRE
+	_extraver=extramodules-3.7-LIBRE
 
-	cd $srcdir/compat-wireless-$_pkgver-pc
+	cd $srcdir/compat-drivers-$_pkgver
 
 	# replacing to specific linux-libre kernel version
 	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile
 
 	./scripts/driver-select alx
 	make
-	cd $srcdir/compat-wireless-$_pkgver-pc/compat
+	cd $srcdir/compat-drivers-$_pkgver/compat
 	gzip -9 compat.ko
 	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
-	cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
+	cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
 	gzip -9 alx.ko
 	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
 }
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 02e85467c..767609934 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,38 +1,41 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.56
+_kernver=3.0.57
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
-_pkgver=2012-10-03
-pkgver=20121003
-pkgrel=8
+_pkgver=2012-12-04-1-u
+pkgver=20121204
+pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
-url='http://linuxwireless.org/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
 license=('GPL2')
 depends=("linux-libre-lts=$_kernver")
 makedepends=("linux-libre-lts-headers=$_kernver")
 install=linux-libre-lts-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
+replaces=('alx' 'alx-driver' 'dkms-alx')
+provides=('alx' 'alx-driver' 'dkms-alx')
+conflicts=('alx' 'alx-driver' 'dkms-alx')
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
 
-md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+md5sums=('bc46200e288acb862149a2af11f4b293')
 
 
 build() {
 	# current extramodules version
 	_extraver=extramodules-3.0-LIBRE-LTS
 
-	cd ${srcdir}/compat-wireless-$_pkgver-pc
+	cd $srcdir/compat-drivers-$_pkgver
 
 	# replacing to specific linux-libre-lts kernel version
 	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile
 
 	./scripts/driver-select alx
 	make
-	cd $srcdir/compat-wireless-$_pkgver-pc/compat
+	cd $srcdir/compat-drivers-$_pkgver/compat
 	gzip -9 compat.ko
 	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
-	cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
+	cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
 	gzip -9 alx.ko
 	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
 }
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 083330019..47666d7b4 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@ _basekernel=3.0
 _sublevel=57
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'fbaf6e706052fdd45ab889505758c3fc')
+         '21f93138b6d4410b095cc9998f89e47d')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 68b75c631..1fe61100d 100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -8,7 +8,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -89,6 +89,7 @@ build() {
 
 package_libtraceevent-libre() {
   pkgdesc='Linux-libre kernel trace event library'
+  depends=('glibc')
   replaces=('libtraceevent')
   conflicts=('libtraceevent')
   provides=("libtraceevent=$pkgver")
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index a1aabf311..a4a67ef14 100755
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,4 +1,4 @@
-2012-12-18  André Silva  <emulatorman@lavabit.com>
+2012-12-19  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.7.1-1
 	* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 452929cce..26c18da17 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgbase=linux-libre         # Build stock -LIBRE kernel
 _basekernel=3.7
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+pkgrel=2
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,6 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'fat-3.6.x.patch'
+        'fix-watchdog-3.7.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '6f4bb80d3d91b69daf5ccfea836d02df'
@@ -41,7 +42,8 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '88d501404f172dac6fcb248978251560'
-         '0a74f8d9c640daabb774c25cb74db512')
+         '3485d6c7ae3af35d16e09d6d9a7ed32a'
+         'b56c33eaee920970151fffdfc7df0766')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -70,6 +72,10 @@ build() {
   # https://bugs.archlinux.org/task/32916
   patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
 
+  # fix watchdog enable/disable regression
+  # https://bugs.archlinux.org/task/33095
+  patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch
new file mode 100644
index 000000000..fe4431604
--- /dev/null
+++ b/libre/linux-libre/fix-watchdog-3.7.patch
@@ -0,0 +1,38 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62
+
+diff --git a/kernel/watchdog.c b/kernel/watchdog.c
+index 997c6a1..75a2ab3 100644
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu)
+ {
+ 	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+ 
++	/* kick off the timer for the hardlockup detector */
++	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer->function = watchdog_timer_fn;
++
+ 	if (!watchdog_enabled) {
+ 		kthread_park(current);
+ 		return;
+@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu)
+ 	/* Enable the perf event */
+ 	watchdog_nmi_enable(cpu);
+ 
+-	/* kick off the timer for the hardlockup detector */
+-	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+-	hrtimer->function = watchdog_timer_fn;
+-
+ 	/* done here because hrtimer_start can only pin to smp_processor_id() */
+ 	hrtimer_start(hrtimer, ns_to_ktime(sample_period),
+ 		      HRTIMER_MODE_REL_PINNED);
+@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu)
+ {
+ 	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+ 
+-	if (!watchdog_enabled)
+-		return;
+-
+ 	watchdog_set_prio(SCHED_NORMAL, 0);
+ 	hrtimer_cancel(hrtimer);
+ 	/* disable the perf event */
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index e8f8b6979..301a1b6c2 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.1-1-LIBRE
+KERNEL_VERSION=3.7.1-2-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 2d7f3be5f..c8cd92d40 100755
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=34
+pkgrel=35
 epoch=1
-_extramodules=extramodules-3.6-LIBRE
+_extramodules=extramodules-3.7-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -56,7 +56,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
-  depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
+  depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 976f5ab8a..a6694836f 100755
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.6-LIBRE
+EXTRAMODULES=extramodules-3.7-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 27e9ce6ea..37a7c1ad9 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=11
+pkgrel=12
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.6' 'linux-libre<3.7')
-makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
+depends=('linux-libre>=3.7' 'linux-libre<3.8')
+makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 3662e7f34..3e1c13750 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.6-ARCH
+extramodules=/usr/lib/modules/extramodules-3.7-ARCH
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index febefacfa..962087b82 100755
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,13 +7,13 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.6-LIBRE
-pkgrel=14
+_extramodules=extramodules-3.7-LIBRE
+pkgrel=15
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.6' 'linux-libre<3.7')
+depends=('linux-libre>=3.7' 'linux-libre<3.8')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 8bd740943..9f376f541 100755
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.6-LIBRE'
+  EXTRAMODULES='extramodules-3.7-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 1ecee7b2c..b0b6385df 100755
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -32,7 +32,7 @@ build() {
 
 package_virtualbox-libre-host-modules(){
   pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+  depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
@@ -51,7 +51,7 @@ package_virtualbox-libre-host-modules(){
 package_virtualbox-libre-guest-modules(){
   pkgdesc='Guest kernel libre modules for VirtualBox'
   license=('GPL')
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+  depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index caf59aa13..41b5ac73a 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index 8605cf20a..1ac430c3b 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 54978ea3c..c7ca35aca 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-utils'
          'virtualbox-libre-guest-source')
 pkgver=4.2.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -109,7 +109,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '85141ccd2621a8e004b8f55c9a1f83eb'
-         'c7b29fbf4c24a00e8646ca6dd73f38a1')
+         '54884839546647efd75adb22dbd68337')
 
 build() {
     cd "VirtualBox-$pkgver"
@@ -152,13 +152,14 @@ build() {
         --enable-vde \
         --enable-vnc \
         --disable-kmods
-#        --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
     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
     cp "$srcdir/LocalConfig.kmk" .
+    # fix keymap path FS#32548
+    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
     kmk all
 }
 
@@ -172,6 +173,7 @@ package_virtualbox-libre() {
              'libxml2'
              'libxmu'
              'sdl-libre'
+             'shared-mime-info'
              'virtualbox-libre-host-modules')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index fcdb3c631..db6774542 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 4c52fb0..fbccfaf 100644
+--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+@@ -44,45 +44,33 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -542,6 +546,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 +573,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 @@
+@@ -90,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 +587,7 @@
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@
+@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -641,7 +646,7 @@
      { 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 @@
+@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
@@ -650,9 +655,28 @@
      { 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 @@
+@@ -230,11 +255,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 +696,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,8 +718,10 @@
        </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
+diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+index 075f097..3d311e1 100644
+--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
 @@ -70,6 +70,24 @@
          <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
          <file alias="os_macosx.png">images/os_macosx.png</file>
@@ -719,9 +747,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 ec404df..c09e3b1 100644
+--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+@@ -4334,11 +4334,11 @@ void VBoxGlobal::init()
          {"OS2Warp45",       ":/os_os2warp45.png"},
          {"OS2eCS",          ":/os_os2ecs.png"},
          {"OS2",             ":/os_os2_other.png"},
@@ -738,7 +768,7 @@
          {"ArchLinux",       ":/os_archlinux.png"},
          {"ArchLinux_64",    ":/os_archlinux_64.png"},
          {"Debian",          ":/os_debian.png"},
-@@ -4337,7 +4337,7 @@
+@@ -4361,7 +4361,7 @@ void VBoxGlobal::init()
          {"Xandros_64",      ":/os_xandros_64.png"},
          {"Oracle",          ":/os_oracle.png"},
          {"Oracle_64",       ":/os_oracle_64.png"},
@@ -747,7 +777,7 @@
          {"FreeBSD",         ":/os_freebsd.png"},
          {"FreeBSD_64",      ":/os_freebsd_64.png"},
          {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4353,6 +4353,25 @@
+@@ -4377,6 +4377,25 @@ void VBoxGlobal::init()
          {"MacOS",           ":/os_macosx.png"},
          {"MacOS_64",        ":/os_macosx_64.png"},
          {"JRockitVE",       ":/os_jrockitve.png"},
@@ -773,9 +803,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 +833,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 +871,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 +880,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 +995,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 +1021,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 +1034,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 fcaed77..ab92ef9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+@@ -4830,6 +4830,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>